From 7a25d3965726768b0eba9222138d9d47d050bbe1 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Thu, 9 Jun 2016 10:03:36 +0200 Subject: [PATCH] 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 --- arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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>; -- 2.34.1