113 lines
2.8 KiB
Diff
113 lines
2.8 KiB
Diff
|
From a6d962aeb22fbf73c023334bdf55dc45c9fd7dba Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Date: Mon, 19 Sep 2016 10:43:23 +0200
|
||
|
|
Subject: [PATCH] ARM: dts: bcm283x: drop alt3 from &gpio
|
||
|
|
|
||
|
|
As the alt3 group has no pins left drop it from &gpio.
|
||
|
|
|
||
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
||
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||
|
|
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
|
||
|
|
---
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 2 +-
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +-
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +-
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +-
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +-
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +-
|
||
|
|
arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 -----
|
||
|
|
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
|
||
|
|
8 files changed, 7 insertions(+), 12 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
|
||
|
|
@@ -22,7 +22,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
|
||
|
|
|
||
|
|
/* I2S interface */
|
||
|
|
i2s_alt0: i2s_alt0 {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
|
||
|
|
@@ -15,7 +15,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
|
||
|
|
|
||
|
|
/* I2S interface */
|
||
|
|
i2s_alt2: i2s_alt2 {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
|
||
|
|
@@ -23,7 +23,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
|
||
|
|
|
||
|
|
/* I2S interface */
|
||
|
|
i2s_alt0: i2s_alt0 {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
|
||
|
|
@@ -16,7 +16,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
|
||
|
|
|
||
|
|
/* I2S interface */
|
||
|
|
i2s_alt2: i2s_alt2 {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
|
||
|
|
@@ -16,7 +16,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0>;
|
||
|
|
};
|
||
|
|
|
||
|
|
&hdmi {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
|
||
|
|
@@ -26,7 +26,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
|
||
|
|
|
||
|
|
/* I2S interface */
|
||
|
|
i2s_alt0: i2s_alt0 {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
|
||
|
|
@@ -42,11 +42,6 @@
|
||
|
|
brcm,pins = <4 5 7 8 9 10 11 14 15>;
|
||
|
|
brcm,function = <BCM2835_FSEL_ALT0>;
|
||
|
|
};
|
||
|
|
-
|
||
|
|
- alt3: alt3 {
|
||
|
|
- brcm,pins = <>;
|
||
|
|
- brcm,function = <BCM2835_FSEL_ALT3>;
|
||
|
|
- };
|
||
|
|
};
|
||
|
|
|
||
|
|
&i2c0 {
|
||
|
|
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
||
|
|
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
|
||
|
|
@@ -27,7 +27,7 @@
|
||
|
|
};
|
||
|
|
|
||
|
|
&gpio {
|
||
|
|
- pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
|
||
|
|
+ pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
|
||
|
|
|
||
|
|
/* I2S interface */
|
||
|
|
i2s_alt0: i2s_alt0 {
|