linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 2/2] ARM: shmobile: r8a7791 dtsi: Add GPIO clocks
@ 2014-04-23  8:25 Geert Uytterhoeven
  0 siblings, 0 replies; 2+ messages in thread
From: Geert Uytterhoeven @ 2014-04-23  8:25 UTC (permalink / raw)
  To: linux-sh

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
v3:
  - Add Acked-by
  - Bindings have been accepted in
    git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next

v2:
  - No changes
---
 arch/arm/boot/dts/r8a7791.dtsi |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 44f03444ef74..81f27a35b19f 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -76,6 +76,7 @@
 		gpio-ranges = <&pfc 0 0 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO0>;
 	};
 
 	gpio1: gpio@e6051000 {
@@ -87,6 +88,7 @@
 		gpio-ranges = <&pfc 0 32 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO1>;
 	};
 
 	gpio2: gpio@e6052000 {
@@ -98,6 +100,7 @@
 		gpio-ranges = <&pfc 0 64 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO2>;
 	};
 
 	gpio3: gpio@e6053000 {
@@ -109,6 +112,7 @@
 		gpio-ranges = <&pfc 0 96 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO3>;
 	};
 
 	gpio4: gpio@e6054000 {
@@ -120,6 +124,7 @@
 		gpio-ranges = <&pfc 0 128 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO4>;
 	};
 
 	gpio5: gpio@e6055000 {
@@ -131,6 +136,7 @@
 		gpio-ranges = <&pfc 0 160 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO5>;
 	};
 
 	gpio6: gpio@e6055400 {
@@ -142,6 +148,7 @@
 		gpio-ranges = <&pfc 0 192 32>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO6>;
 	};
 
 	gpio7: gpio@e6055800 {
@@ -153,6 +160,7 @@
 		gpio-ranges = <&pfc 0 224 26>;
 		#interrupt-cells = <2>;
 		interrupt-controller;
+		clocks = <&mstp9_clks R8A7791_CLK_GPIO7>;
 	};
 
 	thermal@e61f0000 {
@@ -805,18 +813,23 @@
 		mstp9_clks: mstp9_clks@e6150994 {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
-			clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7791_CLK_QSPI>, <&hp_clk>,
+			clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
+				 <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
+				 <&p_clk>, <&p_clk>, <&cpg_clocks R8A7791_CLK_QSPI>, <&hp_clk>,
 				 <&cp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>,
 				 <&hp_clk>, <&hp_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
+				R8A7791_CLK_GPIO7 R8A7791_CLK_GPIO6 R8A7791_CLK_GPIO5 R8A7791_CLK_GPIO4
+				R8A7791_CLK_GPIO3 R8A7791_CLK_GPIO2 R8A7791_CLK_GPIO1 R8A7791_CLK_GPIO0
 				R8A7791_CLK_RCAN1 R8A7791_CLK_RCAN0 R8A7791_CLK_QSPI_MOD R8A7791_CLK_I2C5
 				R8A7791_CLK_IICDVFS R8A7791_CLK_I2C4 R8A7791_CLK_I2C3 R8A7791_CLK_I2C2
 				R8A7791_CLK_I2C1 R8A7791_CLK_I2C0
 			>;
 			clock-output-names -				"rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3",
-				"i2c2", "i2c1", "i2c0";
+				"gpio7", "gpio6", "gpio5", "gpio4", "gpio3", "gpio2", "gpio1", "gpio0",
+				"rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3", "i2c2",
+				"i2c1", "i2c0";
 		};
 		mstp11_clks: mstp11_clks@e615099c {
 			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v3 2/2] ARM: shmobile: r8a7791 dtsi: Add GPIO clocks
@ 2014-05-13  1:49 Simon Horman
  0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-05-13  1:49 UTC (permalink / raw)
  To: linux-sh

On Wed, Apr 23, 2014 at 10:25:28AM +0200, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Sorry for missing this.
I have queued it up.

> ---
> v3:
>   - Add Acked-by
>   - Bindings have been accepted in
>     git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next
> 
> v2:
>   - No changes
> ---
>  arch/arm/boot/dts/r8a7791.dtsi |   19 ++++++++++++++++---
>  1 file changed, 16 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
> index 44f03444ef74..81f27a35b19f 100644
> --- a/arch/arm/boot/dts/r8a7791.dtsi
> +++ b/arch/arm/boot/dts/r8a7791.dtsi
> @@ -76,6 +76,7 @@
>  		gpio-ranges = <&pfc 0 0 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO0>;
>  	};
>  
>  	gpio1: gpio@e6051000 {
> @@ -87,6 +88,7 @@
>  		gpio-ranges = <&pfc 0 32 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO1>;
>  	};
>  
>  	gpio2: gpio@e6052000 {
> @@ -98,6 +100,7 @@
>  		gpio-ranges = <&pfc 0 64 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO2>;
>  	};
>  
>  	gpio3: gpio@e6053000 {
> @@ -109,6 +112,7 @@
>  		gpio-ranges = <&pfc 0 96 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO3>;
>  	};
>  
>  	gpio4: gpio@e6054000 {
> @@ -120,6 +124,7 @@
>  		gpio-ranges = <&pfc 0 128 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO4>;
>  	};
>  
>  	gpio5: gpio@e6055000 {
> @@ -131,6 +136,7 @@
>  		gpio-ranges = <&pfc 0 160 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO5>;
>  	};
>  
>  	gpio6: gpio@e6055400 {
> @@ -142,6 +148,7 @@
>  		gpio-ranges = <&pfc 0 192 32>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO6>;
>  	};
>  
>  	gpio7: gpio@e6055800 {
> @@ -153,6 +160,7 @@
>  		gpio-ranges = <&pfc 0 224 26>;
>  		#interrupt-cells = <2>;
>  		interrupt-controller;
> +		clocks = <&mstp9_clks R8A7791_CLK_GPIO7>;
>  	};
>  
>  	thermal@e61f0000 {
> @@ -805,18 +813,23 @@
>  		mstp9_clks: mstp9_clks@e6150994 {
>  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
>  			reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
> -			clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7791_CLK_QSPI>, <&hp_clk>,
> +			clocks = <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
> +				 <&cp_clk>, <&cp_clk>, <&cp_clk>, <&cp_clk>,
> +				 <&p_clk>, <&p_clk>, <&cpg_clocks R8A7791_CLK_QSPI>, <&hp_clk>,
>  				 <&cp_clk>, <&hp_clk>, <&hp_clk>, <&hp_clk>,
>  				 <&hp_clk>, <&hp_clk>;
>  			#clock-cells = <1>;
>  			renesas,clock-indices = <
> +				R8A7791_CLK_GPIO7 R8A7791_CLK_GPIO6 R8A7791_CLK_GPIO5 R8A7791_CLK_GPIO4
> +				R8A7791_CLK_GPIO3 R8A7791_CLK_GPIO2 R8A7791_CLK_GPIO1 R8A7791_CLK_GPIO0
>  				R8A7791_CLK_RCAN1 R8A7791_CLK_RCAN0 R8A7791_CLK_QSPI_MOD R8A7791_CLK_I2C5
>  				R8A7791_CLK_IICDVFS R8A7791_CLK_I2C4 R8A7791_CLK_I2C3 R8A7791_CLK_I2C2
>  				R8A7791_CLK_I2C1 R8A7791_CLK_I2C0
>  			>;
>  			clock-output-names > -				"rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3",
> -				"i2c2", "i2c1", "i2c0";
> +				"gpio7", "gpio6", "gpio5", "gpio4", "gpio3", "gpio2", "gpio1", "gpio0",
> +				"rcan1", "rcan0", "qspi_mod", "i2c5", "i2c6", "i2c4", "i2c3", "i2c2",
> +				"i2c1", "i2c0";
>  		};
>  		mstp11_clks: mstp11_clks@e615099c {
>  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-05-13  1:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-13  1:49 [PATCH v3 2/2] ARM: shmobile: r8a7791 dtsi: Add GPIO clocks Simon Horman
  -- strict thread matches above, loose matches on Subject: below --
2014-04-23  8:25 Geert Uytterhoeven

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).