target/linux/brcm2708/patches-4.9/031-v4.10-0006-ARM-dts-bcm283x-drop-alt3-from-gpio.patch

   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
   5
   6 As the alt3 group has no pins left drop it from &gpio.
   7
   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>
  11 ---
  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(-)
  21
  22 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  23 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  24 @@ -22,7 +22,7 @@
  25  };
  26
  27  &gpio {
  28 -       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
  29 +       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
  30
  31         /* I2S interface */
  32         i2s_alt0: i2s_alt0 {
  33 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
  34 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
  35 @@ -15,7 +15,7 @@
  36  };
  37
  38  &gpio {
  39 -       pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
  40 +       pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
  41
  42         /* I2S interface */
  43         i2s_alt2: i2s_alt2 {
  44 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
  45 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
  46 @@ -23,7 +23,7 @@
  47  };
  48
  49  &gpio {
  50 -       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
  51 +       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
  52
  53         /* I2S interface */
  54         i2s_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
  57 @@ -16,7 +16,7 @@
  58  };
  59
  60  &gpio {
  61 -       pinctrl-0 = <&gpioout &alt0 &i2s_alt2 &alt3>;
  62 +       pinctrl-0 = <&gpioout &alt0 &i2s_alt2>;
  63
  64         /* I2S interface */
  65         i2s_alt2: i2s_alt2 {
  66 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
  67 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
  68 @@ -16,7 +16,7 @@
  69  };
  70
  71  &gpio {
  72 -       pinctrl-0 = <&gpioout &alt0 &alt3>;
  73 +       pinctrl-0 = <&gpioout &alt0>;
  74  };
  75
  76  &hdmi {
  77 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
  78 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
  79 @@ -26,7 +26,7 @@
  80  };
  81
  82  &gpio {
  83 -       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
  84 +       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
  85
  86         /* I2S interface */
  87         i2s_alt0: i2s_alt0 {
  88 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
  89 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
  90 @@ -42,11 +42,6 @@
  91                 brcm,pins = <4 5 7 8 9 10 11 14 15>;
  92                 brcm,function = <BCM2835_FSEL_ALT0>;
  93         };
  94 -
  95 -       alt3: alt3 {
  96 -               brcm,pins = <>;
  97 -               brcm,function = <BCM2835_FSEL_ALT3>;
  98 -       };
  99  };
 100
 101  &i2c0 {
 102 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 103 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 104 @@ -27,7 +27,7 @@
 105  };
 106
 107  &gpio {
 108 -       pinctrl-0 = <&gpioout &alt0 &i2s_alt0 &alt3>;
 109 +       pinctrl-0 = <&gpioout &alt0 &i2s_alt0>;
 110
 111         /* I2S interface */
 112         i2s_alt0: i2s_alt0 {