Merge tag 'docs-4.10-2' of git://git.lwn.net/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / bcm2835-rpi.dtsi

diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
index e9b47b2bbc3390edc2541f251ae5167640a445d9..6ddf7dfe3f7202642cc4d595ff4763f91248c0a5 100644 (file)
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -39,22 +39,21 @@
        };
 
        alt0: alt0 {
-               brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;
+               brcm,pins = <4 5 7 8 9 10 11 14 15>;
                brcm,function = <BCM2835_FSEL_ALT0>;
        };
-
-       alt3: alt3 {
-               brcm,pins = <48 49 50 51 52 53>;
-               brcm,function = <BCM2835_FSEL_ALT3>;
-       };
 };
 
 &i2c0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c0_gpio0>;
        status = "okay";
        clock-frequency = <100000>;
 };
 
 &i2c1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&i2c1_gpio2>;
        status = "okay";
        clock-frequency = <100000>;
 };
@@ -64,11 +63,15 @@
 };
 
 &sdhci {
+       pinctrl-names = "default";
+       pinctrl-0 = <&emmc_gpio48>;
        status = "okay";
        bus-width = <4>;
 };
 
 &pwm {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
        status = "okay";
 };