1 From a6d962aeb22fbf73c023334bdf55dc45c9fd7dba Mon Sep 17 00:00:00 2001
2 From: Gerd Hoffmann <kraxel@redhat.com>
3 Date: Mon, 19 Sep 2016 10:43:23 +0200
4 Subject: [PATCH] ARM: dts: bcm283x: drop alt3 from &gpio
6 As the alt3 group has no pins left drop it from &gpio.
8 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
9 Signed-off-by: Eric Anholt <eric@anholt.net>
10 Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
12 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 2 +-
13 arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +-
14 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 2 +-
15 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +-
16 arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +-
17 arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +-
18 arch/arm/boot/dts/bcm2835-rpi.dtsi | 5 -----
19 arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
20 8 files changed, 7 insertions(+), 12 deletions(-)
22 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
23 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
28 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
29 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
33 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
34 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
39 - pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
40 + pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
44 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
45 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
50 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
51 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
55 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
56 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
61 - pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
62 + pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
66 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
67 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
72 - pinctrl-0 = <&gpioout &alt0 &alt3>;
73 + pinctrl-0 = <&gpioout &alt0>;
77 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
78 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
83 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
84 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
88 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
89 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
91 brcm,pins = <4 5 7 8 9 10 11 14 15>;
92 brcm,function = <BCM2835_FSEL_ALT0>;
97 - brcm,function = <BCM2835_FSEL_ALT3>;
102 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
103 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
108 - pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
109 + pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;