summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2016-06-09 11:03:36 +0300
committerHeiko Stuebner <heiko@sntech.de>2016-06-09 11:03:36 +0300
commit7a25d3965726768b0eba9222138d9d47d050bbe1 (patch)
tree083b9769026a6825b4f6093a3ad37d3c7240cca4 /arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
parent3445b2fae55f1a232e6e4843f4f74de074d8c07f (diff)
downloadlinux-7a25d3965726768b0eba9222138d9d47d050bbe1.tar.xz
ARM: dts: rockchip: rename i2s model for Veyron devices
Commit 6c42db30d8c8 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: 6c42db30d8c8 ("ARM: dts: rockchip: Add shared file for audio on rk3288-veyron boards") Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi')
-rw-r--r--arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
index 3d57c050f9b6..6d105914a4f3 100644
--- a/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi
@@ -14,7 +14,7 @@
compatible = "rockchip,rockchip-audio-max98090";
pinctrl-names = "default";
pinctrl-0 = <&mic_det>, <&hp_det>;
- rockchip,model = "ROCKCHIP-I2S";
+ rockchip,model = "VEYRON-I2S";
rockchip,i2s-controller = <&i2s>;
rockchip,audio-codec = <&max98090>;
rockchip,hp-det-gpios = <&gpio6 5 GPIO_ACTIVE_HIGH>;