projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| dceebc4b GKH |
1 | From 9a06757dcc8509c162ac00488c8c82fc98e04227 Mon Sep 17 00:00:00 2001 |
| 2 | From: Santiago Esteban <Santiago.Esteban@microchip.com> | |
| 3 | Date: Thu, 18 Jan 2018 15:38:47 +0100 | |
| 4 | Subject: ARM: dts: at91: sama5d4: fix pinctrl compatible string | |
| 5 | ||
| 6 | From: Santiago Esteban <Santiago.Esteban@microchip.com> | |
| 7 | ||
| 8 | commit 9a06757dcc8509c162ac00488c8c82fc98e04227 upstream. | |
| 9 | ||
| 10 | The compatible string is incorrect. Add atmel,sama5d3-pinctrl since | |
| 11 | it's the appropriate compatible string. Remove the | |
| 12 | atmel,at91rm9200-pinctrl compatible string, this fallback is | |
| 13 | useless, there are too many changes. | |
| 14 | ||
| 15 | Signed-off-by: Santiago Esteban <Santiago.Esteban@microchip.com> | |
| 16 | Signed-off-by: Ludovic Desroches <ludovic.desroches@microchip.com> | |
| 17 | Cc: stable@vger.kernel.org #v3.18 | |
| 18 | Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 20 | ||
| 21 | --- | |
| 22 | arch/arm/boot/dts/sama5d4.dtsi | 2 +- | |
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 24 | ||
| 25 | --- a/arch/arm/boot/dts/sama5d4.dtsi | |
| 26 | +++ b/arch/arm/boot/dts/sama5d4.dtsi | |
| 27 | @@ -1354,7 +1354,7 @@ | |
| 28 | pinctrl@fc06a000 { | |
| 29 | #address-cells = <1>; | |
| 30 | #size-cells = <1>; | |
| 31 | - compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus"; | |
| 32 | + compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus"; | |
| 33 | ranges = <0xfc068000 0xfc068000 0x100 | |
| 34 | 0xfc06a000 0xfc06a000 0x4000>; | |
| 35 | /* WARNING: revisit as pin spec has changed */ |