This patch series adds the needed clkctrl and ty-sysc nodes for VPE module.
We also document the VPE DT bindings.
Changes since v4:
- Added Tony's ack
Changes since v3:
- Patches [1](dt-bindings) and [5](driver compatible) were merged in
linux-media
- Added special clock naming notice to commit message as per Tony's
comment
Changes since v2:
- Fix binding spdx license
- Added Rob's ack
Changes since v1:
- Added a patch to update the compatible in the driver
- Removed unnededed #cell #size properties
- Updated the compatible in dtsi to match binding
- Split off the clk code into its own patch
- Added device specific prefix
- Converted binding to dt schema
Benoit Parrot (3):
clk: ti: dra7: add vpe clkctrl data
ARM: dts: dra7: add vpe clkctrl node
ARM: dts: dra7: Add ti-sysc node for VPE
arch/arm/boot/dts/dra7-l4.dtsi | 28 +++++++++++++++++++++++++---
arch/arm/boot/dts/dra7xx-clocks.dtsi | 18 ++++++++++++++++--
drivers/clk/ti/clk-7xx.c | 6 ++++++
include/dt-bindings/clock/dra7.h | 10 ++++++++++
4 files changed, 57 insertions(+), 5 deletions(-)
--
2.17.1
Add clkctrl data for VPE.
Signed-off-by: Benoit Parrot <[email protected]>
Acked-by: Tony Lindgren <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
drivers/clk/ti/clk-7xx.c | 6 ++++++
include/dt-bindings/clock/dra7.h | 10 ++++++++++
2 files changed, 16 insertions(+)
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index 5f46782cebeb..34e49f909a07 100644
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -146,6 +146,11 @@ static const struct omap_clkctrl_reg_data dra7_rtc_clkctrl_regs[] __initconst =
{ 0 },
};
+static const struct omap_clkctrl_reg_data dra7_vpe_clkctrl_regs[] __initconst = {
+ { DRA7_VPE_VPE_CLKCTRL, NULL, CLKF_HW_SUP, "dpll_core_h23x2_ck" },
+ { 0 },
+};
+
static const struct omap_clkctrl_reg_data dra7_coreaon_clkctrl_regs[] __initconst = {
{ DRA7_COREAON_SMARTREFLEX_MPU_CLKCTRL, NULL, CLKF_SW_SUP, "wkupaon_iclk_mux" },
{ DRA7_COREAON_SMARTREFLEX_CORE_CLKCTRL, NULL, CLKF_SW_SUP, "wkupaon_iclk_mux" },
@@ -769,6 +774,7 @@ const struct omap_clkctrl_data dra7_clkctrl_data[] __initconst = {
{ 0x4a005550, dra7_ipu_clkctrl_regs },
{ 0x4a005620, dra7_dsp2_clkctrl_regs },
{ 0x4a005720, dra7_rtc_clkctrl_regs },
+ { 0x4a005760, dra7_vpe_clkctrl_regs },
{ 0x4a008620, dra7_coreaon_clkctrl_regs },
{ 0x4a008720, dra7_l3main1_clkctrl_regs },
{ 0x4a008920, dra7_ipu2_clkctrl_regs },
diff --git a/include/dt-bindings/clock/dra7.h b/include/dt-bindings/clock/dra7.h
index 72f2e8411523..2b765e579b2a 100644
--- a/include/dt-bindings/clock/dra7.h
+++ b/include/dt-bindings/clock/dra7.h
@@ -29,6 +29,11 @@
#define DRA7_RTC_CLKCTRL_INDEX(offset) ((offset) - DRA7_RTC_CLKCTRL_OFFSET)
#define DRA7_RTCSS_CLKCTRL DRA7_RTC_CLKCTRL_INDEX(0x44)
+/* vpe clocks */
+#define DRA7_VPE_CLKCTRL_OFFSET 0x60
+#define DRA7_VPE_CLKCTRL_INDEX(offset) ((offset) - DRA7_VPE_CLKCTRL_OFFSET)
+#define DRA7_VPE_CLKCTRL DRA7_VPE_CLKCTRL_INDEX(0x64)
+
/* coreaon clocks */
#define DRA7_SMARTREFLEX_MPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
#define DRA7_SMARTREFLEX_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x38)
@@ -192,6 +197,11 @@
/* rtc clocks */
#define DRA7_RTC_RTCSS_CLKCTRL DRA7_CLKCTRL_INDEX(0x44)
+/* vpe clocks */
+#define DRA7_VPE_CLKCTRL_OFFSET 0x60
+#define DRA7_VPE_CLKCTRL_INDEX(offset) ((offset) - DRA7_VPE_CLKCTRL_OFFSET)
+#define DRA7_VPE_VPE_CLKCTRL DRA7_VPE_CLKCTRL_INDEX(0x64)
+
/* coreaon clocks */
#define DRA7_COREAON_SMARTREFLEX_MPU_CLKCTRL DRA7_CLKCTRL_INDEX(0x28)
#define DRA7_COREAON_SMARTREFLEX_CORE_CLKCTRL DRA7_CLKCTRL_INDEX(0x38)
--
2.17.1
Quoting Benoit Parrot (2019-12-11 06:08:08)
> Add clkctrl data for VPE.
>
> Signed-off-by: Benoit Parrot <[email protected]>
> Acked-by: Tony Lindgren <[email protected]>
> Acked-by: Rob Herring <[email protected]>
> ---
Acked-by: Stephen Boyd <[email protected]>
On 30/12/2019 21:58, Stephen Boyd wrote:
> Quoting Benoit Parrot (2019-12-11 06:08:08)
>> Add clkctrl data for VPE.
>>
>> Signed-off-by: Benoit Parrot <[email protected]>
>> Acked-by: Tony Lindgren <[email protected]>
>> Acked-by: Rob Herring <[email protected]>
>> ---
>
> Acked-by: Stephen Boyd <[email protected]>
>
Queued this patch towards 5.6, thanks.
-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
* Tero Kristo <[email protected]> [200121 07:33]:
> On 30/12/2019 21:58, Stephen Boyd wrote:
> > Quoting Benoit Parrot (2019-12-11 06:08:08)
> > > Add clkctrl data for VPE.
> > >
> > > Signed-off-by: Benoit Parrot <[email protected]>
> > > Acked-by: Tony Lindgren <[email protected]>
> > > Acked-by: Rob Herring <[email protected]>
> > > ---
> >
> > Acked-by: Stephen Boyd <[email protected]>
> >
>
> Queued this patch towards 5.6, thanks.
And I'm picking the dts changes into
omap-for-v5.6/ti-sysc-dt-cam.
Thanks,
Tony