target/linux/brcm2708/patches-4.4/0424-BCM270X_DT-Declare-the-audio-PWM-pins-explicitly.patch

   1 From 4a1655a918b26f5d24d04b1bb798feb39982ac78 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Mon, 20 Jun 2016 13:21:26 +0100
   4 Subject: [PATCH] BCM270X_DT: Declare the audio PWM pins explicitly
   5
   6 Make the audio driver's use of the PWM functions explicit. Overlays
   7 that want to use the PWM functionality for other purposes must
   8 disable the audio node.
   9
  10 See: https://github.com/raspberrypi/linux/issues/1473
  11
  12 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  13 ---
  14  arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 10 ++++++++++
  15  arch/arm/boot/dts/bcm2708-rpi-b.dts      |  9 +++++++++
  16  arch/arm/boot/dts/bcm2709-rpi-2-b.dts    | 10 ++++++++++
  17  arch/arm/boot/dts/bcm2710-rpi-3-b.dts    | 10 ++++++++++
  18  4 files changed, 39 insertions(+)
  19
  20 --- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  21 +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
  22 @@ -37,6 +37,11 @@
  23                 brcm,pins = <18 19 20 21>;
  24                 brcm,function = <4>; /* alt0 */
  25         };
  26 +
  27 +       audio_pins: audio_pins {
  28 +               brcm,pins = <40 45>;
  29 +               brcm,function = <4>;
  30 +       };
  31  };
  32
  33  &sdhost {
  34 @@ -120,6 +125,11 @@
  35         hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
  36  };
  37
  38 +&audio {
  39 +       pinctrl-names = "default";
  40 +       pinctrl-0 = <&audio_pins>;
  41 +};
  42 +
  43  / {
  44         __overrides__ {
  45                 uart0 = <&uart0>,"status";
  46 --- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
  47 +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
  48 @@ -36,6 +36,10 @@
  49         i2s_pins: i2s {
  50                 brcm,pins = <28 29 30 31>;
  51                 brcm,function = <6>; /* alt2 */
  52 +
  53 +       audio_pins: audio_pins {
  54 +               brcm,pins = <40 45>;
  55 +               brcm,function = <4>;
  56         };
  57  };
  58
  59 @@ -114,6 +118,11 @@
  60         hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
  61  };
  62
  63 +&audio {
  64 +       pinctrl-names = "default";
  65 +       pinctrl-0 = <&audio_pins>;
  66 +};
  67 +
  68  / {
  69         __overrides__ {
  70                 uart0 = <&uart0>,"status";
  71 --- a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  72 +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
  73 @@ -37,6 +37,11 @@
  74                 brcm,pins = <18 19 20 21>;
  75                 brcm,function = <4>; /* alt0 */
  76         };
  77 +
  78 +       audio_pins: audio_pins {
  79 +               brcm,pins = <40 45>;
  80 +               brcm,function = <4>;
  81 +       };
  82  };
  83
  84  &sdhost {
  85 @@ -120,6 +125,11 @@
  86         hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
  87  };
  88
  89 +&audio {
  90 +       pinctrl-names = "default";
  91 +       pinctrl-0 = <&audio_pins>;
  92 +};
  93 +
  94  / {
  95         __overrides__ {
  96                 uart0 = <&uart0>,"status";
  97 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  98 +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
  99 @@ -61,6 +61,11 @@
 100                 brcm,function;
 101                 brcm,pull;
 102         };
 103 +
 104 +       audio_pins: audio_pins {
 105 +               brcm,pins = <40 41>;
 106 +               brcm,function = <4>;
 107 +       };
 108  };
 109
 110  &sdhost {
 111 @@ -165,6 +170,11 @@
 112         hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
 113  };
 114
 115 +&audio {
 116 +       pinctrl-names = "default";
 117 +       pinctrl-0 = <&audio_pins>;
 118 +};
 119 +
 120  / {
 121         chosen {
 122                 bootargs = "8250.nr_uarts=1";