diff options
| author | Magnus Damm <damm@opensource.se> | 2013-11-21 00:19:29 -0500 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-11-28 03:04:39 -0500 |
| commit | 23de2278ebc3a2f971ce45ca5e5e35c9d5a74040 (patch) | |
| tree | 37613cc544730d43aa489f7781324fe62031378b | |
| parent | e55bc55867585e6628359fd5496316576fe58a2f (diff) | |
ARM: shmobile: r8a7790: Fix GPIO resources in DTS
The r8a7790 GPIO resources are currently incorrect. Fix that
by making them match the English r8a7790 v0.6 data sheet.
Tested with GPIO LED using Lager DT reference.
This problem has been present since GPIOs were added to the r8a7790 SoC by
f98e10c88aa95bf7 ("ARM: shmobile: r8a7790: Add GPIO controller devices to
device tree") in v3.12-rc1.
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index ee845fad939b..46e1d7ef163f 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi | |||
| @@ -87,9 +87,9 @@ | |||
| 87 | interrupts = <1 9 0xf04>; | 87 | interrupts = <1 9 0xf04>; |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | gpio0: gpio@ffc40000 { | 90 | gpio0: gpio@e6050000 { |
| 91 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 91 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| 92 | reg = <0 0xffc40000 0 0x2c>; | 92 | reg = <0 0xe6050000 0 0x50>; |
| 93 | interrupt-parent = <&gic>; | 93 | interrupt-parent = <&gic>; |
| 94 | interrupts = <0 4 0x4>; | 94 | interrupts = <0 4 0x4>; |
| 95 | #gpio-cells = <2>; | 95 | #gpio-cells = <2>; |
| @@ -99,9 +99,9 @@ | |||
| 99 | interrupt-controller; | 99 | interrupt-controller; |
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | gpio1: gpio@ffc41000 { | 102 | gpio1: gpio@e6051000 { |
| 103 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 103 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| 104 | reg = <0 0xffc41000 0 0x2c>; | 104 | reg = <0 0xe6051000 0 0x50>; |
| 105 | interrupt-parent = <&gic>; | 105 | interrupt-parent = <&gic>; |
| 106 | interrupts = <0 5 0x4>; | 106 | interrupts = <0 5 0x4>; |
| 107 | #gpio-cells = <2>; | 107 | #gpio-cells = <2>; |
| @@ -111,9 +111,9 @@ | |||
| 111 | interrupt-controller; | 111 | interrupt-controller; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | gpio2: gpio@ffc42000 { | 114 | gpio2: gpio@e6052000 { |
| 115 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 115 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| 116 | reg = <0 0xffc42000 0 0x2c>; | 116 | reg = <0 0xe6052000 0 0x50>; |
| 117 | interrupt-parent = <&gic>; | 117 | interrupt-parent = <&gic>; |
| 118 | interrupts = <0 6 0x4>; | 118 | interrupts = <0 6 0x4>; |
| 119 | #gpio-cells = <2>; | 119 | #gpio-cells = <2>; |
| @@ -123,9 +123,9 @@ | |||
| 123 | interrupt-controller; | 123 | interrupt-controller; |
| 124 | }; | 124 | }; |
| 125 | 125 | ||
| 126 | gpio3: gpio@ffc43000 { | 126 | gpio3: gpio@e6053000 { |
| 127 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 127 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| 128 | reg = <0 0xffc43000 0 0x2c>; | 128 | reg = <0 0xe6053000 0 0x50>; |
| 129 | interrupt-parent = <&gic>; | 129 | interrupt-parent = <&gic>; |
| 130 | interrupts = <0 7 0x4>; | 130 | interrupts = <0 7 0x4>; |
| 131 | #gpio-cells = <2>; | 131 | #gpio-cells = <2>; |
| @@ -135,9 +135,9 @@ | |||
| 135 | interrupt-controller; | 135 | interrupt-controller; |
| 136 | }; | 136 | }; |
| 137 | 137 | ||
| 138 | gpio4: gpio@ffc44000 { | 138 | gpio4: gpio@e6054000 { |
| 139 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 139 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| 140 | reg = <0 0xffc44000 0 0x2c>; | 140 | reg = <0 0xe6054000 0 0x50>; |
| 141 | interrupt-parent = <&gic>; | 141 | interrupt-parent = <&gic>; |
| 142 | interrupts = <0 8 0x4>; | 142 | interrupts = <0 8 0x4>; |
| 143 | #gpio-cells = <2>; | 143 | #gpio-cells = <2>; |
| @@ -147,9 +147,9 @@ | |||
| 147 | interrupt-controller; | 147 | interrupt-controller; |
| 148 | }; | 148 | }; |
| 149 | 149 | ||
| 150 | gpio5: gpio@ffc45000 { | 150 | gpio5: gpio@e6055000 { |
| 151 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; | 151 | compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar"; |
| 152 | reg = <0 0xffc45000 0 0x2c>; | 152 | reg = <0 0xe6055000 0 0x50>; |
| 153 | interrupt-parent = <&gic>; | 153 | interrupt-parent = <&gic>; |
| 154 | interrupts = <0 9 0x4>; | 154 | interrupts = <0 9 0x4>; |
| 155 | #gpio-cells = <2>; | 155 | #gpio-cells = <2>; |
