summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBraden Kell <bradenkell@google.com>2017-07-07 17:03:49 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-07 17:03:49 +0000
commit940f7ab886377e3a7debfcd50e2dc9b4947d58e9 (patch)
treefe037f22d898cc0abe08de566147f560e464c390
parentb1390da6516cbcd773783f706d70539837fe6ce1 (diff)
parentcd82bdd62541aef2a8f139ab80382e6e1fcb93da (diff)
downloadpi-v4.4-940f7ab886377e3a7debfcd50e2dc9b4947d58e9.tar.gz
Revert "Revert "pio: Add pin devices, spi0 fix to device tree""
am: cd82bdd625 Change-Id: Iaa87f58aa31833528f289a97d630b825eed4976c
-rw-r--r--arch/arm/boot/dts/overlays/Makefile2
-rw-r--r--arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-spi0-pin-reorder-overlay.dts18
-rw-r--r--arch/arm/boot/dts/overlays/runtimepinconfig-overlay.dts330
3 files changed, 350 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index 2d3437d634b4..43c15add4dd0 100644
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -33,6 +33,7 @@ dtbo-$(RPI_DT_OVERLAYS) += hifiberry-dac.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-dacplus.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hifiberry-digi-pro.dtbo
+dtbo-$(RPI_DT_OVERLAYS) += bcm2710-rpi-3-b-spi0-pin-reorder.dtbo
dtbo-$(RPI_DT_OVERLAYS) += generic-i2s.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hy28a.dtbo
dtbo-$(RPI_DT_OVERLAYS) += hy28b.dtbo
@@ -78,6 +79,7 @@ dtbo-$(RPI_DT_OVERLAYS) += rpi-ft5406.dtbo
dtbo-$(RPI_DT_OVERLAYS) += rpi-proto.dtbo
dtbo-$(RPI_DT_OVERLAYS) += rpi-sense.dtbo
dtbo-$(RPI_DT_OVERLAYS) += rra-digidac1-wm8741-audio.dtbo
+dtbo-$(RPI_DT_OVERLAYS) += runtimepinconfig.dtbo
dtbo-$(RPI_DT_OVERLAYS) += sc16is750-i2c.dtbo
dtbo-$(RPI_DT_OVERLAYS) += sc16is752-spi1.dtbo
dtbo-$(RPI_DT_OVERLAYS) += sdhost.dtbo
diff --git a/arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-spi0-pin-reorder-overlay.dts b/arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-spi0-pin-reorder-overlay.dts
new file mode 100644
index 000000000000..07a466c10915
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/bcm2710-rpi-3-b-spi0-pin-reorder-overlay.dts
@@ -0,0 +1,18 @@
+/dts-v1/;
+/plugin/;
+
+/{
+ fragment@0 {
+ target = <&spi0_cs_pins>;
+ __overlay__ {
+ brcm,pins = <7 8>;
+ };
+ };
+
+ fragment@1 {
+ target = <&spi0>;
+ __overlay__ {
+ pinctrl-0 = <&spi0_cs_pins &spi0_pins>;
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/overlays/runtimepinconfig-overlay.dts b/arch/arm/boot/dts/overlays/runtimepinconfig-overlay.dts
new file mode 100644
index 000000000000..c47a9bdd69f8
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/runtimepinconfig-overlay.dts
@@ -0,0 +1,330 @@
+/dts-v1/;
+/plugin/;
+
+/ {
+ fragment@0 {
+ target = <&soc>;
+ __overlay__ {
+ android-things-pins {
+ compatible = "simple-bus";
+
+ BCM2 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin2_config>;
+ };
+
+ BCM3 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin3_config>;
+ };
+
+ BCM4 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin4_config>;
+ };
+
+ BCM5 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin5_config>;
+ };
+
+ BCM6 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin6_config>;
+ };
+
+ BCM7 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin7_config>;
+ };
+
+ BCM8 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin8_config>;
+ };
+
+ BCM9 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin9_config>;
+ };
+
+ BCM10 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin10_config>;
+ };
+
+ BCM11 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin11_config>;
+ };
+
+ BCM12 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin12_config>;
+ };
+
+ BCM13 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin13_config>;
+ };
+
+ BCM14 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin14_config>;
+ };
+
+ BCM15 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin15_config>;
+ };
+
+ BCM16 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin16_config>;
+ };
+
+ BCM17 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin17_config>;
+ };
+
+ BCM18 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin18_config>;
+ };
+
+ BCM19 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin19_config>;
+ };
+
+ BCM20 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin20_config>;
+ };
+
+ BCM21 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin21_config>;
+ };
+
+ BCM22 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin22_config>;
+ };
+
+ BCM23 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin23_config>;
+ };
+
+ BCM24 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin24_config>;
+ };
+
+ BCM25 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin25_config>;
+ };
+
+ BCM26 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin26_config>;
+ };
+
+ BCM27 {
+ compatible = "google,android-things-pins";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pin27_config>;
+ };
+ };
+ };
+ };
+
+ fragment@1 {
+ target = <&gpio>;
+ __overlay__ {
+ pin2_config: pin2_config {
+ brcm,pins = <2>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin3_config: pin3_config {
+ brcm,pins = <3>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin4_config: pin4_config {
+ brcm,pins = <4>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin5_config: pin5_config {
+ brcm,pins = <5>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin6_config: pin6_config {
+ brcm,pins = <6>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin7_config: pin7_config {
+ brcm,pins = <7>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin8_config: pin8_config {
+ brcm,pins = <8>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin9_config: pin9_config {
+ brcm,pins = <9>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin10_config: pin10_config {
+ brcm,pins = <10>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin11_config: pin11_config {
+ brcm,pins = <11>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin12_config: pin12_config {
+ brcm,pins = <12>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin13_config: pin13_config {
+ brcm,pins = <13>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin14_config: pin14_config {
+ brcm,pins = <14>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin15_config: pin15_config {
+ brcm,pins = <15>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin16_config: pin16_config {
+ brcm,pins = <16>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin17_config: pin17_config {
+ brcm,pins = <17>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin18_config: pin18_config {
+ brcm,pins = <18>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin19_config: pin19_config {
+ brcm,pins = <19>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin20_config: pin20_config {
+ brcm,pins = <20>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin21_config: pin21_config {
+ brcm,pins = <21>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin22_config: pin22_config {
+ brcm,pins = <22>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin23_config: pin23_config {
+ brcm,pins = <23>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin24_config: pin24_config {
+ brcm,pins = <24>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin25_config: pin25_config {
+ brcm,pins = <25>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin26_config: pin26_config {
+ brcm,pins = <26>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+
+ pin27_config: pin27_config {
+ brcm,pins = <27>;
+ brcm,function = <0>;
+ brcm,pull = <0>;
+ };
+ };
+ };
+};