Skip to content
Permalink
Browse files

BCM270X_DT: Declare the audio PWM pins explicitly

Make the audio driver's use of the PWM functions explicit. Overlays
that want to use the PWM functionality for other purposes must
disable the audio node.

See: #1473

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  • Loading branch information...
pelwell authored and popcornmix committed Jun 20, 2016
1 parent a5a491f commit aac501e3244ecffbffe3ed7442c34307bd6aad6b
@@ -37,6 +37,11 @@
brcm,pins = <18 19 20 21>;
brcm,function = <4>; /* alt0 */
};

audio_pins: audio_pins {
brcm,pins = <40 45>;
brcm,function = <4>;
};
};

&sdhost {
@@ -120,6 +125,11 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};

&audio {
pinctrl-names = "default";
pinctrl-0 = <&audio_pins>;
};

/ {
__overrides__ {
uart0 = <&uart0>,"status";
@@ -36,6 +36,10 @@
i2s_pins: i2s {
brcm,pins = <28 29 30 31>;
brcm,function = <6>; /* alt2 */

audio_pins: audio_pins {
brcm,pins = <40 45>;
brcm,function = <4>;
};
};

@@ -114,6 +118,11 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_HIGH>;
};

&audio {
pinctrl-names = "default";
pinctrl-0 = <&audio_pins>;
};

/ {
__overrides__ {
uart0 = <&uart0>,"status";
@@ -37,6 +37,11 @@
brcm,pins = <18 19 20 21>;
brcm,function = <4>; /* alt0 */
};

audio_pins: audio_pins {
brcm,pins = <40 45>;
brcm,function = <4>;
};
};

&sdhost {
@@ -120,6 +125,11 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};

&audio {
pinctrl-names = "default";
pinctrl-0 = <&audio_pins>;
};

/ {
__overrides__ {
uart0 = <&uart0>,"status";
@@ -61,6 +61,11 @@
brcm,function;
brcm,pull;
};

audio_pins: audio_pins {
brcm,pins = <40 41>;
brcm,function = <4>;
};
};

&sdhost {
@@ -165,6 +170,11 @@
hpd-gpios = <&gpio 46 GPIO_ACTIVE_LOW>;
};

&audio {
pinctrl-names = "default";
pinctrl-0 = <&audio_pins>;
};

/ {
chosen {
bootargs = "8250.nr_uarts=1";

0 comments on commit aac501e

Please sign in to comment.
You can’t perform that action at this time.