[PATCH v2 0/2] Add R8A7794 GPIO DT support

[PATCH v2 0/2] Add R8A7794 GPIO DT support

[Sergei Shtylyov]

Hello.

   Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
'renesas-devel-20150803-v4.2-rc5' tag. Here we add the GPIO device tree support
for the R8A7794 SoC.

[1/2] ARM: shmobile: r8a7794: add GPIO clocks
[2/2] ARM: shmobile: r8a7794: add GPIO DT support

WBR, Sergei

[PATCH v2 1/2] ARM: shmobile: r8a7794: add GPIO clocks

[Sergei Shtylyov]

Describe the GPIO clocks in the R8A7794 device tree.

Based on the original patch by Koji Matsuoka <koji.matsuoka.xm@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

---
Changes in version 2:
- refreshed the patch;
- added Geert's and Laurent's ACKs.

 arch/arm/boot/dts/r8a7794.dtsi |   22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+++ renesas/arch/arm/boot/dts/r8a7794.dtsi
@@ -720,16 +720,22 @@
 		mstp9_clks: mstp9_clks@e6150994 {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
-			clocks = <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
-				<&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
+			clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
+				 <&cp_clk>, <&cp_clk>, <&cp_clk>,
+				 <&cpg_clocks R8A7794_CLK_QSPI>, <&hp_clk>, <&hp_clk>,
+				 <&hp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>;
 			#clock-cells = <1>;
-			clock-indices = <
-				R8A7794_CLK_QSPI_MOD R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
-				R8A7794_CLK_I2C3 R8A7794_CLK_I2C2 R8A7794_CLK_I2C1
-				R8A7794_CLK_I2C0
-			>;
+			clock-indices = <R8A7794_CLK_GPIO6 R8A7794_CLK_GPIO5
+					 R8A7794_CLK_GPIO4 R8A7794_CLK_GPIO3
+					 R8A7794_CLK_GPIO2 R8A7794_CLK_GPIO1
+					 R8A7794_CLK_GPIO0 R8A7794_CLK_QSPI_MOD
+					 R8A7794_CLK_I2C5 R8A7794_CLK_I2C4
+					 R8A7794_CLK_I2C3 R8A7794_CLK_I2C2
+					 R8A7794_CLK_I2C1 R8A7794_CLK_I2C0>;
 			clock-output-names =
-				"qspi_mod", "i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
+				"gpio6", "gpio5", "gpio4", "gpio3", "gpio2",
+				"gpio1", "gpio0", "qspi_mod",
+				"i2c5", "i2c4", "i2c3", "i2c2", "i2c1", "i2c0";
 		};
 		mstp11_clks: mstp11_clks@e615099c {
 			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";

[PATCH v2 2/2] ARM: shmobile: r8a7794: add GPIO DT support

[Sergei Shtylyov]

Describe GPIO[0-6] controllers in the R8A7794 device tree.

Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

---
Changes in version 2:
- fixed "gpio-ranges" property's last value for GPIO1/5/6;
- added Geert's ACK.

 arch/arm/boot/dts/r8a7794.dtsi |   84 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
===================================================================
--- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
+++ renesas/arch/arm/boot/dts/r8a7794.dtsi
@@ -50,6 +50,90 @@
 		interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	gpio0: gpio@e6050000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6050000 0 0x50>;
+		interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 0 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO0>;
+	};
+
+	gpio1: gpio@e6051000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6051000 0 0x50>;
+		interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 32 26>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO1>;
+	};
+
+	gpio2: gpio@e6052000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6052000 0 0x50>;
+		interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 64 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO2>;
+	};
+
+	gpio3: gpio@e6053000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6053000 0 0x50>;
+		interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 96 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO3>;
+	};
+
+	gpio4: gpio@e6054000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6054000 0 0x50>;
+		interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 128 32>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO4>;
+	};
+
+	gpio5: gpio@e6055000 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6055000 0 0x50>;
+		interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 160 28>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO5>;
+	};
+
+	gpio6: gpio@e6055400 {
+		compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
+		reg = <0 0xe6055400 0 0x50>;
+		interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
+		#gpio-cells = <2>;
+		gpio-controller;
+		gpio-ranges = <&pfc 0 192 26>;
+		#interrupt-cells = <2>;
+		interrupt-controller;
+		clocks = <&mstp9_clks R8A7794_CLK_GPIO6>;
+	};
+
 	cmt0: timer@ffca0000 {
 		compatible = "renesas,cmt-48-gen2";
 		reg = <0 0xffca0000 0 0x1004>;

Re: [PATCH v2 2/2] ARM: shmobile: r8a7794: add GPIO DT support

[Geert Uytterhoeven]

Hi Sergei,

On Mon, Aug 3, 2015 at 11:39 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Describe GPIO[0-6] controllers in the R8A7794 device tree.
>
> Based on original patch by Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>.
>
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

As CPG/MSTP Clock Domain support is in, I have to withdraw my Acked-by.

> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi
> ===================================================================
> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi
> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi
> @@ -50,6 +50,90 @@
>                 interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;
>         };
>
> +       gpio0: gpio@e6050000 {
> +               compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar";
> +               reg = <0 0xe6050000 0 0x50>;
> +               interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
> +               #gpio-cells = <2>;
> +               gpio-controller;
> +               gpio-ranges = <&pfc 0 0 32>;
> +               #interrupt-cells = <2>;
> +               interrupt-controller;
> +               clocks = <&mstp9_clks R8A7794_CLK_GPIO0>;

Missing "power-domains = <&cpg_clocks>;"

> +       };

Same comment for the other gpio device nodes.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2 0/2] Add R8A7794 GPIO DT support

[Simon Horman]

On Tue, Aug 04, 2015 at 12:36:27AM +0300, Sergei Shtylyov wrote:
> Hello.
> 
>    Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
> 'renesas-devel-20150803-v4.2-rc5' tag. Here we add the GPIO device tree support
> for the R8A7794 SoC.
> 
> [1/2] ARM: shmobile: r8a7794: add GPIO clocks
> [2/2] ARM: shmobile: r8a7794: add GPIO DT support

Thanks, I have queued these up for v4.4.

Re: [PATCH v2 0/2] Add R8A7794 GPIO DT support

[Geert Uytterhoeven]

On Thu, Aug 6, 2015 at 2:47 AM, Simon Horman <horms@verge.net.au> wrote:
> On Tue, Aug 04, 2015 at 12:36:27AM +0300, Sergei Shtylyov wrote:
>>    Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
>> 'renesas-devel-20150803-v4.2-rc5' tag. Here we add the GPIO device tree support
>> for the R8A7794 SoC.
>>
>> [1/2] ARM: shmobile: r8a7794: add GPIO clocks
>> [2/2] ARM: shmobile: r8a7794: add GPIO DT support
>
> Thanks, I have queued these up for v4.4.

Woops, Since CPG/MSTP support is in, GPIO won't work, as the nodes
lack "power-domains" properties.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH v2 0/2] Add R8A7794 GPIO DT support

[Simon Horman]

On Thu, Aug 06, 2015 at 09:21:34AM +0200, Geert Uytterhoeven wrote:
> On Thu, Aug 6, 2015 at 2:47 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Tue, Aug 04, 2015 at 12:36:27AM +0300, Sergei Shtylyov wrote:
> >>    Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
> >> 'renesas-devel-20150803-v4.2-rc5' tag. Here we add the GPIO device tree support
> >> for the R8A7794 SoC.
> >>
> >> [1/2] ARM: shmobile: r8a7794: add GPIO clocks
> >> [2/2] ARM: shmobile: r8a7794: add GPIO DT support
> >
> > Thanks, I have queued these up for v4.4.
> 
> Woops, Since CPG/MSTP support is in, GPIO won't work, as the nodes
> lack "power-domains" properties.

Sorry for letting that through.
I will drop these patches accordingly.
Sergei, could you please re-spin them?

Re: [PATCH v2 0/2] Add R8A7794 GPIO DT support

[Sergei Shtylyov]

Hello.

On 08/06/2015 03:47 AM, Simon Horman wrote:

>>     Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
>> 'renesas-devel-20150803-v4.2-rc5' tag. Here we add the GPIO device tree support
>> for the R8A7794 SoC.

>> [1/2] ARM: shmobile: r8a7794: add GPIO clocks
>> [2/2] ARM: shmobile: r8a7794: add GPIO DT support

> Thanks, I have queued these up for v4.4.

    Not seeing anything new in your repo. Which is probably a good thing 
considering Geert's comments.

MBR, Sergei

Re: [PATCH v2 0/2] Add R8A7794 GPIO DT support

[Simon Horman]

On Thu, Aug 06, 2015 at 11:06:13PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 08/06/2015 03:47 AM, Simon Horman wrote:
> 
> >>    Here's the set of 2 patches against Simon Horman's 'renesas.git' repo,
> >>'renesas-devel-20150803-v4.2-rc5' tag. Here we add the GPIO device tree support
> >>for the R8A7794 SoC.
> 
> >>[1/2] ARM: shmobile: r8a7794: add GPIO clocks
> >>[2/2] ARM: shmobile: r8a7794: add GPIO DT support
> 
> >Thanks, I have queued these up for v4.4.
> 
>    Not seeing anything new in your repo. Which is probably a good thing
> considering Geert's comments.

It seems that I forgot to push yesterday, which as you say,
does seem quite fortunate given Geert's comments.
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html