Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12091112 authored by Stefan Wahren's avatar Stefan Wahren Committed by Lee Jones
Browse files

ARM: bcm2835: dt: Use pinctrl header 



This patch converts all bcm2835 dts and dtsi files to use the pinctrl
header file.

Reviewed-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 62c69d76

arch/arm/boot/dts/bcm2835-rpi-b-plus.dts

+2 −2
Original line number Diff line number Diff line 
/dts-v1/;

/include/ "bcm2835-rpi.dtsi"

#include "bcm2835-rpi.dtsi"



/ {

	compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
@@ -25,6 +25,6 @@ 
	/* I2S interface */

	i2s_alt0: i2s_alt0 {

		brcm,pins = <18 19 20 21>;

		brcm,function = <4>; /* alt0 */

		brcm,function = <BCM2835_FSEL_ALT0>;

	};

};

arch/arm/boot/dts/bcm2835-rpi-b.dts

+2 −2
Original line number Diff line number Diff line 
/dts-v1/;

/include/ "bcm2835-rpi.dtsi"

#include "bcm2835-rpi.dtsi"



/ {

	compatible = "raspberrypi,model-b", "brcm,bcm2835";
@@ -18,6 +18,6 @@ 
	/* I2S interface */

	i2s_alt2: i2s_alt2 {

		brcm,pins = <28 29 30 31>;

		brcm,function = <6>; /* alt2 */

		brcm,function = <BCM2835_FSEL_ALT2>;

	};

};

arch/arm/boot/dts/bcm2835-rpi.dtsi

+4 −4
Original line number Diff line number Diff line 
/include/ "bcm2835.dtsi"

#include "bcm2835.dtsi"



/ {

	memory {
@@ -21,17 +21,17 @@ 


	gpioout: gpioout {

		brcm,pins = <6>;

		brcm,function = <1>; /* GPIO out */

		brcm,function = <BCM2835_FSEL_GPIO_OUT>;

	};



	alt0: alt0 {

		brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>;

		brcm,function = <4>; /* alt0 */

		brcm,function = <BCM2835_FSEL_ALT0>;

	};



	alt3: alt3 {

		brcm,pins = <48 49 50 51 52 53>;

		brcm,function = <7>; /* alt3 */

		brcm,function = <BCM2835_FSEL_ALT3>;

	};

};

arch/arm/boot/dts/bcm2835.dtsi

+2 −1
Original line number Diff line number Diff line 
/include/ "skeleton.dtsi"

#include <dt-bindings/pinctrl/bcm2835.h>

#include "skeleton.dtsi"



/ {

	compatible = "brcm,bcm2835";