From fc321ca0f2328ed6d93701c345535fabb9185ca0 Mon Sep 17 00:00:00 2001 From: Sun Mingjun Date: Thu, 14 Aug 2014 09:31:54 +0800 Subject: [PATCH] spdif : changed the spdif device name to uniform naming --- arch/arm/boot/dts/rk312x.dtsi | 2 +- sound/soc/rockchip/rk_spdif.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index c099982ece38..c9dd4bf6d1da 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -496,7 +496,7 @@ }; spdif: spdif@10204000 { - compatible = "rk312x-spdif"; + compatible = "rockchip-spdif"; reg = <0x10204000 0x1000>; clocks = <&clk_spdif>, <&clk_gates10 9>; clock-names = "spdif_mclk", "spdif_hclk"; diff --git a/sound/soc/rockchip/rk_spdif.c b/sound/soc/rockchip/rk_spdif.c index 755c596eabb1..e59ca12f9749 100755 --- a/sound/soc/rockchip/rk_spdif.c +++ b/sound/soc/rockchip/rk_spdif.c @@ -516,7 +516,7 @@ static int spdif_remove(struct platform_device *pdev) #ifdef CONFIG_OF static const struct of_device_id exynos_spdif_match[] = { - { .compatible = "rk312x-spdif"}, + { .compatible = "rockchip-spdif"}, {}, }; MODULE_DEVICE_TABLE(of, exynos_spdif_match); @@ -526,7 +526,7 @@ static struct platform_driver rockchip_spdif_driver = { .probe = spdif_probe, .remove = spdif_remove, .driver = { - .name = "rk312x-spdif", + .name = "rockchip-spdif", .owner = THIS_MODULE, .of_match_table = of_match_ptr(exynos_spdif_match), }, -- 2.34.1