[Patch 0/3] ARM: dts: dra7: add vpe nodes

[Patch 0/3] ARM: dts: dra7: add vpe nodes

[Benoit Parrot]

This patch series adds the needed clkctrl and ty-sysc nodes for VPE module.
We also document the VPE DT bindings.

Benoit Parrot (3):
  dt-bindings: media: ti-vpe: Document VPE driver
  ARM: dts: dra7: add vpe clkctrl node
  ARM: dts: dra7: Add ti-sysc node for VPE

 .../devicetree/bindings/media/ti-vpe.txt      | 48 +++++++++++++++++++
 MAINTAINERS                                   |  1 +
 arch/arm/boot/dts/dra7-l4.dtsi                | 30 ++++++++++--
 arch/arm/boot/dts/dra7xx-clocks.dtsi          | 18 ++++++-
 drivers/clk/ti/clk-7xx.c                      |  6 +++
 include/dt-bindings/clock/dra7.h              | 10 ++++
 6 files changed, 108 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/media/ti-vpe.txt

-- 
2.17.1

[Patch 1/3] dt-bindings: media: ti-vpe: Document VPE driver

[Benoit Parrot]

Device Tree bindings for the Video Processing Engine (VPE) driver.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
 .../devicetree/bindings/media/ti-vpe.txt      | 48 +++++++++++++++++++
 MAINTAINERS                                   |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/media/ti-vpe.txt

diff --git a/Documentation/devicetree/bindings/media/ti-vpe.txt b/Documentation/devicetree/bindings/media/ti-vpe.txt
new file mode 100644
index 000000000000..b2942fa8c3ea
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/ti-vpe.txt
@@ -0,0 +1,48 @@
+Texas Instruments DRA7x VIDEO PROCESSING ENGINE (VPE)
+------------------------------------------------------
+
+The Video Processing Engine (VPE) is a key component for image post
+processing applications. VPE consist of a single memory to memory
+path which can perform chroma up/down sampling, deinterlacing,
+scaling and color space conversion.
+
+Required properties:
+- compatible: must be "ti,vpe"
+- reg:	physical base address and length of the registers set for the 4
+	memory regions required;
+- reg-names: name associated with the memory regions described is <reg>;
+- interrupts: should contain IRQ line for VPE;
+
+Example:
+
+	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,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>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
diff --git a/MAINTAINERS b/MAINTAINERS
index 8598f49fa2c8..63dcda51f8ae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16299,6 +16299,7 @@ W:	http://linuxtv.org/
 Q:	http://patchwork.linuxtv.org/project/linux-media/list/
 S:	Maintained
 F:	drivers/media/platform/ti-vpe/
+F:	Documentation/devicetree/bindings/media/ti-vpe.txt
 
 TI WILINK WIRELESS DRIVERS
 L:	linux-wireless@vger.kernel.org
-- 
2.17.1

[Patch 2/3] ARM: dts: dra7: add vpe clkctrl node

[Benoit Parrot]

Add clkctrl nodes for VPE module.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
 arch/arm/boot/dts/dra7xx-clocks.dtsi | 18 ++++++++++++++++--
 drivers/clk/ti/clk-7xx.c             |  6 ++++++
 include/dt-bindings/clock/dra7.h     | 10 ++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/dra7xx-clocks.dtsi b/arch/arm/boot/dts/dra7xx-clocks.dtsi
index 93e1eb83bed9..d1c2406ec71c 100644
--- a/arch/arm/boot/dts/dra7xx-clocks.dtsi
+++ b/arch/arm/boot/dts/dra7xx-clocks.dtsi
@@ -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 {
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c
index b57fe09b428b..5dd9cad07542 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

[Patch 3/3] ARM: dts: dra7: Add ti-sysc node for VPE

[Benoit Parrot]

Add VPE node as a child of l4 interconnect in order for it to probe
using ti-sysc.

Signed-off-by: Benoit Parrot <bparrot@ti.com>
---
 arch/arm/boot/dts/dra7-l4.dtsi | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
index ea0e7c19eb4e..d876c1754f33 100644
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -4158,12 +4158,36 @@
 			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,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>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+			};
 		};
 	};
 };
-- 
2.17.1

Re: [Patch 0/3] ARM: dts: dra7: add vpe nodes

[Benoit Parrot]

Tony,

Ping,

I already had comments from Rob but i would like your feedback before
sending a v2.

Regards,
Benoit

Benoit Parrot <bparrot@ti.com> wrote on Wed [2019-Oct-09 12:56:25 -0500]:
> This patch series adds the needed clkctrl and ty-sysc nodes for VPE module.
> We also document the VPE DT bindings.
> 
> Benoit Parrot (3):
>   dt-bindings: media: ti-vpe: Document VPE driver
>   ARM: dts: dra7: add vpe clkctrl node
>   ARM: dts: dra7: Add ti-sysc node for VPE
> 
>  .../devicetree/bindings/media/ti-vpe.txt      | 48 +++++++++++++++++++
>  MAINTAINERS                                   |  1 +
>  arch/arm/boot/dts/dra7-l4.dtsi                | 30 ++++++++++--
>  arch/arm/boot/dts/dra7xx-clocks.dtsi          | 18 ++++++-
>  drivers/clk/ti/clk-7xx.c                      |  6 +++
>  include/dt-bindings/clock/dra7.h              | 10 ++++
>  6 files changed, 108 insertions(+), 5 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/media/ti-vpe.txt
> 
> -- 
> 2.17.1
> 

Re: [Patch 0/3] ARM: dts: dra7: add vpe nodes

[Tony Lindgren]

* Benoit Parrot <bparrot@ti.com> [191022 16:28]:
> Tony,
> 
> Ping,
> 
> I already had comments from Rob but i would like your feedback before
> sending a v2.

Looks good to me in general other than what Rob commented
on. Did not spot any node naming issues here :)

Regards,

Tony

Re: [Patch 0/3] ARM: dts: dra7: add vpe nodes

[Benoit Parrot]

Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 09:30:48 -0700]:
> * Benoit Parrot <bparrot@ti.com> [191022 16:28]:
> > Tony,
> > 
> > Ping,
> > 
> > I already had comments from Rob but i would like your feedback before
> > sending a v2.
> 
> Looks good to me in general other than what Rob commented
> on. Did not spot any node naming issues here :)

Would I need to split off the clk*.c/.h as well here though?

Benoit

> 
> Regards,
> 
> Tony

Re: [Patch 0/3] ARM: dts: dra7: add vpe nodes

[Tony Lindgren]

* Benoit Parrot <bparrot@ti.com> [191022 16:34]:
> Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 09:30:48 -0700]:
> > * Benoit Parrot <bparrot@ti.com> [191022 16:28]:
> > > Tony,
> > > 
> > > Ping,
> > > 
> > > I already had comments from Rob but i would like your feedback before
> > > sending a v2.
> > 
> > Looks good to me in general other than what Rob commented
> > on. Did not spot any node naming issues here :)
> 
> Would I need to split off the clk*.c/.h as well here though?

Yeah please do patches with just drivers/clk/ti and
include/dt-bindings/clock changes in them. then Tero
can queue them into an immutable branch that I can merge
in too and use as a base for the dts changes.

Regards,

Tony

Re: [Patch 0/3] ARM: dts: dra7: add vpe nodes

[Benoit Parrot]

Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 09:37:54 -0700]:
> * Benoit Parrot <bparrot@ti.com> [191022 16:34]:
> > Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 09:30:48 -0700]:
> > > * Benoit Parrot <bparrot@ti.com> [191022 16:28]:
> > > > Tony,
> > > > 
> > > > Ping,
> > > > 
> > > > I already had comments from Rob but i would like your feedback before
> > > > sending a v2.
> > > 
> > > Looks good to me in general other than what Rob commented
> > > on. Did not spot any node naming issues here :)
> > 
> > Would I need to split off the clk*.c/.h as well here though?
> 
> Yeah please do patches with just drivers/clk/ti and
> include/dt-bindings/clock changes in them. then Tero
> can queue them into an immutable branch that I can merge
> in too and use as a base for the dts changes.

Although the .h is in include/dt-binding. Does it still belong in the same
patch as drivers/clk/ti/clk-7xx.c then?

Just making sure....

> 
> Regards,
> 
> Tony

Re: [Patch 0/3] ARM: dts: dra7: add vpe nodes

[Tony Lindgren]

* Benoit Parrot <bparrot@ti.com> [191022 16:45]:
> Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 09:37:54 -0700]:
> > * Benoit Parrot <bparrot@ti.com> [191022 16:34]:
> > > Tony Lindgren <tony@atomide.com> wrote on Tue [2019-Oct-22 09:30:48 -0700]:
> > > > * Benoit Parrot <bparrot@ti.com> [191022 16:28]:
> > > > > Tony,
> > > > > 
> > > > > Ping,
> > > > > 
> > > > > I already had comments from Rob but i would like your feedback before
> > > > > sending a v2.
> > > > 
> > > > Looks good to me in general other than what Rob commented
> > > > on. Did not spot any node naming issues here :)
> > > 
> > > Would I need to split off the clk*.c/.h as well here though?
> > 
> > Yeah please do patches with just drivers/clk/ti and
> > include/dt-bindings/clock changes in them. then Tero
> > can queue them into an immutable branch that I can merge
> > in too and use as a base for the dts changes.
> 
> Although the .h is in include/dt-binding. Does it still belong in the same
> patch as drivers/clk/ti/clk-7xx.c then?
> 
> Just making sure....

Yes if it's needed to compile the drivers/clk/ti patch.
Otherwise it can stay with the dts changes.

Regards,

Tony