OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: dts: rockchip: rename i2s model for Veyron devices 

Commit 6c42db30d8 introduced audio support based on alsa ucm profiles
taken from the ChromeOS userspace. Both in the kernel as well as alsa
they were named (and matched against) ROCKCHIP-I2S. Audio profiles are
very much board-specific and hogging the ROCKCHIP-I2S name would make
it harder for future boards and also is misleading.

For Veyron boards the audio setup is similar over all variants, so
VEYRON-I2S is a more suitable name. This rename also was merged into
the alsa ucm profile so both userspace and kernel match and the old
naming was never released in any alsa or kernel release.

Fixes: 6c42db30d8 ("ARM: dts: rockchip: Add shared file for audio on rk3288-veyron boards")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
This commit is contained in:
Heiko Stuebner 2016-06-09 10:03:36 +02:00
parent 3445b2fae5
commit 7a25d39657
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
View File

@ -14,7 +14,7 @@
compatible = "rockchip,rockchip-audio-max98090"; compatible = "rockchip,rockchip-audio-max98090";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mic_det>, <&hp_det>; pinctrl-0 = <&mic_det>, <&hp_det>;
rockchip,model = "ROCKCHIP-I2S"; rockchip,model = "VEYRON-I2S";
rockchip,i2s-controller = <&i2s>; rockchip,i2s-controller = <&i2s>;
rockchip,audio-codec = <&max98090>; rockchip,audio-codec = <&max98090>;
rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>; rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;