This patch series add support of Clock for temperature sensor
on Amlogic G12a SoC.
Guillaume
cahnges sinve v2:
- rebase on good branch
changes since v1:
- fix .width value
Guillaume La Roque (2):
dt-bindings: clk: g12a-clkc: add Temperature Sensor clock ID
clk: meson-g12a: Add Temperature Sensor clock
drivers/clk/meson/g12a.c | 31 +++++++++++++++++++++++++++
drivers/clk/meson/g12a.h | 3 ++-
include/dt-bindings/clock/g12a-clkc.h | 1 +
3 files changed, 34 insertions(+), 1 deletion(-)
--
2.17.1
Add TS clock used by two temperature sensor
Signed-off-by: Guillaume La Roque <[email protected]>
---
drivers/clk/meson/g12a.c | 31 +++++++++++++++++++++++++++++++
drivers/clk/meson/g12a.h | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c
index 86a7c1b5bd42..0a1cf782670b 100644
--- a/drivers/clk/meson/g12a.c
+++ b/drivers/clk/meson/g12a.c
@@ -2480,6 +2480,33 @@ static struct clk_regmap g12a_mali = {
},
};
+static struct clk_regmap g12a_ts_div = {
+ .data = &(struct clk_regmap_div_data){
+ .offset = HHI_TS_CLK_CNTL,
+ .shift = 0,
+ .width = 8,
+ },
+ .hw.init = &(struct clk_init_data){
+ .name = "ts_div",
+ .ops = &clk_regmap_divider_ro_ops,
+ .parent_names = (const char *[]){ "xtal" },
+ .num_parents = 1,
+ },
+};
+
+static struct clk_regmap g12a_ts = {
+ .data = &(struct clk_regmap_gate_data){
+ .offset = HHI_TS_CLK_CNTL,
+ .bit_idx = 8,
+ },
+ .hw.init = &(struct clk_init_data){
+ .name = "ts",
+ .ops = &clk_regmap_gate_ops,
+ .parent_names = (const char *[]){ "ts_div" },
+ .num_parents = 1,
+ },
+};
+
/* Everything Else (EE) domain gates */
static MESON_GATE(g12a_ddr, HHI_GCLK_MPEG0, 0);
static MESON_GATE(g12a_dos, HHI_GCLK_MPEG0, 1);
@@ -2769,6 +2796,8 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = {
[CLKID_VDEC_HEVCF_SEL] = &g12a_vdec_hevcf_sel.hw,
[CLKID_VDEC_HEVCF_DIV] = &g12a_vdec_hevcf_div.hw,
[CLKID_VDEC_HEVCF] = &g12a_vdec_hevcf.hw,
+ [CLKID_TS_DIV] = &g12a_ts_div.hw,
+ [CLKID_TS] = &g12a_ts.hw,
[NR_CLKS] = NULL,
},
.num = NR_CLKS,
@@ -2966,6 +2995,8 @@ static struct clk_regmap *const g12a_clk_regmaps[] = {
&g12a_vdec_hevcf_sel,
&g12a_vdec_hevcf_div,
&g12a_vdec_hevcf,
+ &g12a_ts_div,
+ &g12a_ts,
};
static const struct meson_eeclkc_data g12a_clkc_data = {
diff --git a/drivers/clk/meson/g12a.h b/drivers/clk/meson/g12a.h
index 39c41af70804..877b8d205f12 100644
--- a/drivers/clk/meson/g12a.h
+++ b/drivers/clk/meson/g12a.h
@@ -195,8 +195,9 @@
#define CLKID_VDEC_HEVC_DIV 206
#define CLKID_VDEC_HEVCF_SEL 208
#define CLKID_VDEC_HEVCF_DIV 209
+#define CLKID_TS_DIV 211
-#define NR_CLKS 211
+#define NR_CLKS 213
/* include the CLKIDs that have been made part of the DT binding */
#include <dt-bindings/clock/g12a-clkc.h>
--
2.17.1
Add clock id used by temperature sensor for G12A Socs
Signed-off-by: Guillaume La Roque <[email protected]>
---
include/dt-bindings/clock/g12a-clkc.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h
index 82c9e0c020b2..cfda463091b7 100644
--- a/include/dt-bindings/clock/g12a-clkc.h
+++ b/include/dt-bindings/clock/g12a-clkc.h
@@ -136,5 +136,6 @@
#define CLKID_VDEC_1 204
#define CLKID_VDEC_HEVC 207
#define CLKID_VDEC_HEVCF 210
+#define CLKID_TS 212
#endif /* __G12A_CLKC_H */
--
2.17.1
On Fri, Apr 12, 2019 at 12:02 PM Guillaume La Roque
<[email protected]> wrote:
>
> Add clock id used by temperature sensor for G12A Socs
nit-pick if you have to re-send if for some reason: "used by the
temperature sensors for G12A SoCs" (because as far as I know the two
temperature sensors share this clock)
> Signed-off-by: Guillaume La Roque <[email protected]>
Reviewed-by: Martin Blumenstingl<[email protected]>
On Fri, Apr 12, 2019 at 12:03 PM Guillaume La Roque
<[email protected]> wrote:
>
> Add TS clock used by two temperature sensor
>
> Signed-off-by: Guillaume La Roque <[email protected]>
Reviewed-by: Martin Blumenstingl<[email protected]>
On Fri, Apr 12, 2019 at 12:02:20PM +0200, Guillaume La Roque wrote:
> Add clock id used by temperature sensor for G12A Socs
>
> Signed-off-by: Guillaume La Roque <[email protected]>
> ---
> include/dt-bindings/clock/g12a-clkc.h | 1 +
> 1 file changed, 1 insertion(+)
Acked-by: Rob Herring <[email protected]>
On Fri, 2019-04-12 at 12:02 +0200, Guillaume La Roque wrote:
> This patch series add support of Clock for temperature sensor
> on Amlogic G12a SoC.
>
> Guillaume
>
> cahnges sinve v2:
> - rebase on good branch
>
> changes since v1:
> - fix .width value
>
> Guillaume La Roque (2):
> dt-bindings: clk: g12a-clkc: add Temperature Sensor clock ID
> clk: meson-g12a: Add Temperature Sensor clock
>
> drivers/clk/meson/g12a.c | 31 +++++++++++++++++++++++++++
> drivers/clk/meson/g12a.h | 3 ++-
> include/dt-bindings/clock/g12a-clkc.h | 1 +
> 3 files changed, 34 insertions(+), 1 deletion(-)
>
Fixed the commit messages as suggested by Martin and applied
Thx