ARM: dts: dra7: add vpe nodes
Subsystems (3)
v5 cover ARM: dts: dra7: add vpe nodes
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(-)
Signature · 1 line
2.17.1
PATCH v5 1/3 clk: ti: dra7: add vpe clkctrl data
Add clkctrl data for VPE.
--- drivers/clk/ti/clk-7xx.c | 6 ++++++ include/dt-bindings/clock/dra7.h | 10 ++++++++++ 2 files changed, 16 insertions(+)
drivers/clk/ti/clk-7xx.c +6 -0
@@ -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 },
include/dt-bindings/clock/dra7.h +10 -0
@@ -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)
Signature · 1 line
2.17.1
Re: [Patch v5 1/3] clk: ti: dra7: add vpe clkctrl data
Quoting Benoit Parrot (2019-12-11 06:08:08)
Quoted 6 lines
Add clkctrl data for VPE.
Signed-off-by Benoit Parrot <[email protected]>Acked-by Tony Lindgren <[email protected]>Acked-by Rob Herring <[email protected]>---
Tero Kristo
AppliedRe: [Patch v5 1/3] clk: ti: dra7: add vpe clkctrl data
Quoted 10 lines · Stephen Boyd
Quoting Benoit Parrot (2019-12-11 06:08:08)
Quoted 6 lines
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
Re: [Patch v5 1/3] clk: ti: dra7: add vpe clkctrl data
Quoted 9 lines · Tero Kristo
Quoted 8 lines · Stephen Boyd
Quoting Benoit Parrot (2019-12-11 06:08:08)
Quoted 6 lines
Add clkctrl data for VPE.
Signed-off-by Benoit Parrot <[email protected]>Acked-by Tony Lindgren <[email protected]>Acked-by Rob Herring <[email protected]>---
Quoted 4 lines
Quoted 2 lines
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
PATCH v5 2/3 ARM: dts: dra7: add vpe clkctrl node
In reply to Benoit ParrotAdd clkctrl nodes for VPE module.
Note that because of the current dts node name dependency for mapping to clock domain, we must still use "vpe-clkctrl@" naming instead of generic "clock@" naming for the node. And because of this, it's probably best to apply the dts node addition together along with the other clock changes.
--- arch/arm/boot/dts/dra7xx-clocks.dtsi | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
arch/arm/boot/dts/dra7xx-clocks.dtsi +16 -2
@@ -1591,10 +1591,10 @@ rtc_cm: rtc-cm@700 { compatible = "ti,omap4-cm"; - reg = <0x700 0x100>; + reg = <0x700 0x60>; #address-cells = <1>; #size-cells = <1>; - ranges = <0 0x700 0x100>; + ranges = <0 0x700 0x60>; rtc_clkctrl: rtc-clkctrl@20 { compatible = "ti,clkctrl";
@@ -1603,6 +1603,20 @@ }; }; + vpe_cm: vpe-cm@760 { + compatible = "ti,omap4-cm"; + reg = <0x760 0xc>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0x760 0xc>; + + vpe_clkctrl: vpe-clkctrl@0 { + compatible = "ti,clkctrl"; + reg = <0x0 0xc>; + #clock-cells = <2>; + }; + }; + }; &cm_core {
Signature · 1 line
2.17.1
PATCH v5 3/3 ARM: dts: dra7: Add ti-sysc node for VPE
In reply to Benoit ParrotAdd VPE node as a child of l4 interconnect in order for it to probe using ti-sysc.
--- arch/arm/boot/dts/dra7-l4.dtsi | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
arch/arm/boot/dts/dra7-l4.dtsi +25 -3
@@ -4189,12 +4189,34 @@ ranges = <0x0 0x1b0000 0x10000>; }; - target-module@1d0000 { /* 0x489d0000, ap 27 30.0 */ - compatible = "ti,sysc"; - status = "disabled"; + target-module@1d0010 { /* 0x489d0000, ap 27 30.0 */ + compatible = "ti,sysc-omap4", "ti,sysc"; + reg = <0x1d0010 0x4>; + reg-names = "sysc"; + ti,sysc-midle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + ti,sysc-sidle = <SYSC_IDLE_FORCE>, + <SYSC_IDLE_NO>, + <SYSC_IDLE_SMART>; + clocks = <&vpe_clkctrl DRA7_VPE_VPE_CLKCTRL 0>; + clock-names = "fck"; #address-cells = <1>; #size-cells = <1>; ranges = <0x0 0x1d0000 0x10000>; + + vpe: vpe@0 { + compatible = "ti,dra7-vpe"; + reg = <0x0000 0x120>, + <0x0700 0x80>, + <0x5700 0x18>, + <0xd000 0x400>; + reg-names = "vpe_top", + "sc", + "csc", + "vpdma"; + interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; + }; }; }; };
Signature · 1 line
2.17.1