evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: bcm2835: dt: Use pinctrl header

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

Reviewed-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Stefan Wahren 2015-01-29 18:10:50 +00:00 • committed by Lee Jones
parent 62c69d7635
commit 1209111209
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
View file

@ -1,5 +1,5 @@
/dts-v1/; /dts-v1/;
/include/ "bcm2835-rpi.dtsi" #include "bcm2835-rpi.dtsi"
/ { / {
compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
@ -25,6 +25,6 @@
/* I2S interface */ /* I2S interface */
i2s_alt0: i2s_alt0 { i2s_alt0: i2s_alt0 {
brcm,pins = <18 19 20 21>; brcm,pins = <18 19 20 21>;
brcm,function = <4>; /* alt0 */ brcm,function = <BCM2835_FSEL_ALT0>;
}; };
}; };

4
arch/arm/boot/dts/bcm2835-rpi-b.dts
View file

@ -1,5 +1,5 @@
/dts-v1/; /dts-v1/;
/include/ "bcm2835-rpi.dtsi" #include "bcm2835-rpi.dtsi"
/ { / {
compatible = "raspberrypi,model-b", "brcm,bcm2835"; compatible = "raspberrypi,model-b", "brcm,bcm2835";
@ -18,6 +18,6 @@
/* I2S interface */ /* I2S interface */
i2s_alt2: i2s_alt2 { i2s_alt2: i2s_alt2 {
brcm,pins = <28 29 30 31>; brcm,pins = <28 29 30 31>;
brcm,function = <6>; /* alt2 */ brcm,function = <BCM2835_FSEL_ALT2>;
}; };
}; };

8
arch/arm/boot/dts/bcm2835-rpi.dtsi
View file

@ -1,4 +1,4 @@
/include/ "bcm2835.dtsi" #include "bcm2835.dtsi"
/ { / {
memory { memory {
@ -21,17 +21,17 @@
gpioout: gpioout { gpioout: gpioout {
brcm,pins = <6>; brcm,pins = <6>;
brcm,function = <1>; /* GPIO out */ brcm,function = <BCM2835_FSEL_GPIO_OUT>;
}; };
alt0: alt0 { alt0: alt0 {
brcm,pins = <0 1 2 3 4 5 7 8 9 10 11 14 15 40 45>; 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 { alt3: alt3 {
brcm,pins = <48 49 50 51 52 53>; brcm,pins = <48 49 50 51 52 53>;
brcm,function = <7>; /* alt3 */ brcm,function = <BCM2835_FSEL_ALT3>;
}; };
}; };

3
arch/arm/boot/dts/bcm2835.dtsi
View file

@ -1,4 +1,5 @@
/include/ "skeleton.dtsi" #include <dt-bindings/pinctrl/bcm2835.h>
#include "skeleton.dtsi"
/ { / {
compatible = "brcm,bcm2835"; compatible = "brcm,bcm2835";