diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2017-10-13 08:33:11 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2017-10-16 03:47:38 -0400 |
commit | c8ee880415894e75b5289618dc2b8108bdd96a23 (patch) | |
tree | ae2b725075b2b5d0eab00cfa9b9ce4d316811130 | |
parent | d6d7037cb2f8d33cae5384eeaea9b5248fb383ae (diff) |
arm64: dts: r8a7796: Use R-Car GPIO Gen3 fallback compat string
Use newly added R-Car GPIO Gen3 fallback compat string
in place of now deprecated non-generation specific
R-Car GPIO fallback compat string in the DT of the r8a7796 SoC.
This should have no run-time effect as the driver matches against
the per-SoC compat string before considering the fallback compat string.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
-rw-r--r-- | arch/arm64/boot/dts/renesas/r8a7796.dtsi | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index 8085fd91811e..f2b2e40c655e 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi | |||
@@ -214,7 +214,7 @@ | |||
214 | 214 | ||
215 | gpio0: gpio@e6050000 { | 215 | gpio0: gpio@e6050000 { |
216 | compatible = "renesas,gpio-r8a7796", | 216 | compatible = "renesas,gpio-r8a7796", |
217 | "renesas,gpio-rcar"; | 217 | "renesas,rcar-gen3-gpio"; |
218 | reg = <0 0xe6050000 0 0x50>; | 218 | reg = <0 0xe6050000 0 0x50>; |
219 | interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; | 219 | interrupts = <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>; |
220 | #gpio-cells = <2>; | 220 | #gpio-cells = <2>; |
@@ -229,7 +229,7 @@ | |||
229 | 229 | ||
230 | gpio1: gpio@e6051000 { | 230 | gpio1: gpio@e6051000 { |
231 | compatible = "renesas,gpio-r8a7796", | 231 | compatible = "renesas,gpio-r8a7796", |
232 | "renesas,gpio-rcar"; | 232 | "renesas,rcar-gen3-gpio"; |
233 | reg = <0 0xe6051000 0 0x50>; | 233 | reg = <0 0xe6051000 0 0x50>; |
234 | interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; | 234 | interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; |
235 | #gpio-cells = <2>; | 235 | #gpio-cells = <2>; |
@@ -244,7 +244,7 @@ | |||
244 | 244 | ||
245 | gpio2: gpio@e6052000 { | 245 | gpio2: gpio@e6052000 { |
246 | compatible = "renesas,gpio-r8a7796", | 246 | compatible = "renesas,gpio-r8a7796", |
247 | "renesas,gpio-rcar"; | 247 | "renesas,rcar-gen3-gpio"; |
248 | reg = <0 0xe6052000 0 0x50>; | 248 | reg = <0 0xe6052000 0 0x50>; |
249 | interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; | 249 | interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>; |
250 | #gpio-cells = <2>; | 250 | #gpio-cells = <2>; |
@@ -259,7 +259,7 @@ | |||
259 | 259 | ||
260 | gpio3: gpio@e6053000 { | 260 | gpio3: gpio@e6053000 { |
261 | compatible = "renesas,gpio-r8a7796", | 261 | compatible = "renesas,gpio-r8a7796", |
262 | "renesas,gpio-rcar"; | 262 | "renesas,rcar-gen3-gpio"; |
263 | reg = <0 0xe6053000 0 0x50>; | 263 | reg = <0 0xe6053000 0 0x50>; |
264 | interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; | 264 | interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; |
265 | #gpio-cells = <2>; | 265 | #gpio-cells = <2>; |
@@ -274,7 +274,7 @@ | |||
274 | 274 | ||
275 | gpio4: gpio@e6054000 { | 275 | gpio4: gpio@e6054000 { |
276 | compatible = "renesas,gpio-r8a7796", | 276 | compatible = "renesas,gpio-r8a7796", |
277 | "renesas,gpio-rcar"; | 277 | "renesas,rcar-gen3-gpio"; |
278 | reg = <0 0xe6054000 0 0x50>; | 278 | reg = <0 0xe6054000 0 0x50>; |
279 | interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; | 279 | interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; |
280 | #gpio-cells = <2>; | 280 | #gpio-cells = <2>; |
@@ -289,7 +289,7 @@ | |||
289 | 289 | ||
290 | gpio5: gpio@e6055000 { | 290 | gpio5: gpio@e6055000 { |
291 | compatible = "renesas,gpio-r8a7796", | 291 | compatible = "renesas,gpio-r8a7796", |
292 | "renesas,gpio-rcar"; | 292 | "renesas,rcar-gen3-gpio"; |
293 | reg = <0 0xe6055000 0 0x50>; | 293 | reg = <0 0xe6055000 0 0x50>; |
294 | interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; | 294 | interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; |
295 | #gpio-cells = <2>; | 295 | #gpio-cells = <2>; |
@@ -304,7 +304,7 @@ | |||
304 | 304 | ||
305 | gpio6: gpio@e6055400 { | 305 | gpio6: gpio@e6055400 { |
306 | compatible = "renesas,gpio-r8a7796", | 306 | compatible = "renesas,gpio-r8a7796", |
307 | "renesas,gpio-rcar"; | 307 | "renesas,rcar-gen3-gpio"; |
308 | reg = <0 0xe6055400 0 0x50>; | 308 | reg = <0 0xe6055400 0 0x50>; |
309 | interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; | 309 | interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; |
310 | #gpio-cells = <2>; | 310 | #gpio-cells = <2>; |
@@ -319,7 +319,7 @@ | |||
319 | 319 | ||
320 | gpio7: gpio@e6055800 { | 320 | gpio7: gpio@e6055800 { |
321 | compatible = "renesas,gpio-r8a7796", | 321 | compatible = "renesas,gpio-r8a7796", |
322 | "renesas,gpio-rcar"; | 322 | "renesas,rcar-gen3-gpio"; |
323 | reg = <0 0xe6055800 0 0x50>; | 323 | reg = <0 0xe6055800 0 0x50>; |
324 | interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; | 324 | interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; |
325 | #gpio-cells = <2>; | 325 | #gpio-cells = <2>; |