| From 84f8b8b8ba4f88dc51998708f164c2646cfa85a8 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Wed, 23 Apr 2014 10:25:28 +0200 |
| Subject: ARM: shmobile: r8a7791 dtsi: Add GPIO clocks |
| |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 4faf9c5e56d1326067f5faca551eb67ecf76696c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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 ed57f6f5f532..8d7ffaeff6e0 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 { |
| @@ -802,18 +810,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"; |
| -- |
| 2.1.2 |
| |
