diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-06-01 22:28:14 +0200 |
| commit | 11271540bfe6adafbc133caf6b5b902a816f5f02 (patch) | |
| tree | 48df469d4e88c7e6efc0a8f4f8d5a386468ed72b /board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch | |
| parent | 24d6c5258ee38c38f0156b057cecd3cfe7ed7b1d (diff) | |
| parent | 8e5eef6c323c6a928ccea7279b3d9848419b99d9 (diff) | |
| download | buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.tar.gz buildroot-11271540bfe6adafbc133caf6b5b902a816f5f02.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch')
| -rw-r--r-- | board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch b/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch new file mode 100644 index 0000000000..a095222c2f --- /dev/null +++ b/board/lego/ev3/patches/linux/0002-sound-device-tree-node.patch @@ -0,0 +1,85 @@ +From 7723d70bebd749ef24fef19db52d827c7fd7f858 Mon Sep 17 00:00:00 2001 +From: David Lechner <david@lechnology.com> +Date: Tue, 7 Feb 2017 13:22:09 -0600 +Subject: ARM: da850-lego-ev3: Add device tree node for sound + +This adds a device tree node for sound on LEGO MINDSTORMS EV3. The EV3 +uses one of the SoC PWMs connected to an amplifier to create sound from +a speaker. + +The PWM is passed through a low-pass filter, so it is actually possible +to do PCM playback, but there is no existing driver, so just using +pwm-beeper for now, since it is also a compatible mode of operation. + +Signed-off-by: David Lechner <david@lechnology.com> +Signed-off-by: Sekhar Nori <nsekhar@ti.com> +--- + arch/arm/boot/dts/da850-lego-ev3.dts | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/arch/arm/boot/dts/da850-lego-ev3.dts b/arch/arm/boot/dts/da850-lego-ev3.dts +index 0309537..c20580a 100644 +--- a/arch/arm/boot/dts/da850-lego-ev3.dts ++++ b/arch/arm/boot/dts/da850-lego-ev3.dts +@@ -123,6 +123,14 @@ + pinctrl-0 = <&system_power_pin>; + }; + ++ sound { ++ compatible = "pwm-beeper"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&ehrpwm0b_pins>; ++ pwms = <&ehrpwm0 1 1000000 0>; ++ amp-supply = <&>; ++ }; ++ + /* + * This is a 5V current limiting regulator that is shared by USB, + * the sensor (input) ports, the motor (output) ports and the A/DC. +@@ -152,6 +160,18 @@ + regulator-boot-on; + vin-supply = <&vcc5v>; + }; ++ ++ /* ++ * This is the amplifier for the speaker. ++ */ ++ amp: regulator3 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&_pins>; ++ compatible = "regulator-fixed"; ++ regulator-name = "amp"; ++ gpio = <&gpio 111 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; + }; + + &pmx_core { +@@ -208,6 +228,13 @@ + 0x4c 0x00008000 0x0000f000 + >; + }; ++ ++ amp_pins: pinmux_amp_pins { ++ pinctrl-single,bits = < ++ /* GP6[15] */ ++ 0x34 0x00000008 0x0000000f ++ >; ++ }; + }; + + &pinconf { +@@ -316,6 +343,10 @@ + }; + }; + ++&ehrpwm0 { ++ status = "okay"; ++}; ++ + &gpio { + status = "okay"; + }; +-- +cgit v1.1 + |
