From: Marek Roszko Date: Sun, 24 Aug 2014 03:12:05 +0000 (-0400) Subject: ARM: at91/dt: sama5d3: use new pinctrl compatible string X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e0065cf719a9d84a05c9722d149c9ce8f0508a36;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ARM: at91/dt: sama5d3: use new pinctrl compatible string This switches the SAMA5D3 to use the new atmel,sama5d3-pinctrl id that was added with the drive strength options patch. Signed-off-by: Marek Roszko Acked-by: Linus Walleij [nicolas.ferre@atmel.com: second compatible string kept as at91sam9x5] Signed-off-by: Nicolas Ferre --- diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index 277541b99eb2..5f4144d1e3a1 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi @@ -445,7 +445,7 @@ pinctrl@fffff200 { #address-cells = <1>; #size-cells = <1>; - compatible = "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus"; + compatible = "atmel,sama5d3-pinctrl", "atmel,at91sam9x5-pinctrl", "simple-bus"; ranges = <0xfffff200 0xfffff200 0xa00>; atmel,mux-mask = < /* A B C */