Rename sun4i-hdmi to sunxi-hdmi

Renamed the content and sources of sun4i hdmi sources to sunxi. Signed-off-by: Oliver Schinagl <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
waxiangzi · Jul 29, 2013 · 5059469 · 5059469
1 parent edac96f
commit 5059469
Show file tree

Hide file tree

Showing 17 changed files with 1,122 additions and 1,122 deletions.
diff --git a/arch/arm/configs/a12_defconfig b/arch/arm/configs/a12_defconfig
@@ -154,7 +154,7 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SOUND_SUN4I=y
 CONFIG_SND_SUN4I_SOC_CODEC=y
-CONFIG_SND_SUN4I_SOC_HDMIAUDIO=y
+CONFIG_SND_SUNXI_SOC_HDMIAUDIO=y
 CONFIG_SND_SUN4I_SOC_SPDIF=m
 CONFIG_SND_SUN4I_SOC_I2S_INTERFACE=m
 CONFIG_HID_KYE=y

diff --git a/arch/arm/configs/sun4i_crane_defconfig b/arch/arm/configs/sun4i_crane_defconfig
@@ -271,7 +271,7 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SOUND_SUN4I=y
 CONFIG_SND_SUN4I_SOC_CODEC=y
-CONFIG_SND_SUN4I_SOC_HDMIAUDIO=y
+CONFIG_SND_SUNXI_SOC_HDMIAUDIO=y
 CONFIG_SND_SUN4I_SOC_SPDIF=m
 CONFIG_SND_SUN4I_SOC_I2S_INTERFACE=m
 CONFIG_HID_KYE=y

diff --git a/arch/arm/configs/sun5i_defconfig b/arch/arm/configs/sun5i_defconfig
@@ -148,7 +148,7 @@ CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SOUND_SUN4I=y
 CONFIG_SND_SUN4I_SOC_CODEC=y
-CONFIG_SND_SUN4I_SOC_HDMIAUDIO=y
+CONFIG_SND_SUNXI_SOC_HDMIAUDIO=y
 CONFIG_SND_SUN4I_SOC_SPDIF=m
 CONFIG_SND_SUN4I_SOC_I2S_INTERFACE=m
 CONFIG_HID_KYE=y

diff --git a/drivers/video/sunxi/hdmi/drv_hdmi.c b/drivers/video/sunxi/hdmi/drv_hdmi.c
@@ -340,8 +340,8 @@ __s32 Hdmi_init(struct platform_device *dev)
 
 	audio_func.hdmi_audio_enable = Hdmi_Audio_Enable;
 	audio_func.hdmi_set_audio_para = Hdmi_Set_Audio_Para;
-#if defined CONFIG_SND_SUN4I_SOC_HDMIAUDIO || \
-    (defined CONFIG_SND_SUN4I_SOC_HDMIAUDIO_MODULE && \
+#if defined CONFIG_SND_SUNXI_SOC_HDMIAUDIO || \
+    (defined CONFIG_SND_SUNXI_SOC_HDMIAUDIO_MODULE && \
      defined CONFIG_FB_SUNXI_HDMI_MODULE)
 	audio_set_hdmi_func(&audio_func);
 #endif

diff --git a/drivers/video/sunxi/hdmi/hdmi_core.c b/drivers/video/sunxi/hdmi/hdmi_core.c
@@ -69,10 +69,10 @@ struct __disp_video_timing video_timing[] = {
 const int video_timing_edid = ARRAY_SIZE(video_timing) - 1;
 
 static struct platform_device audio_devs[] = {
-	{ .name = "sun4i-sndhdmi" },
-	{ .name = "sun4i-hdmiaudio" },
-	{ .name = "sun4i-hdmiaudio-codec" },
-	{ .name = "sun4i-hdmiaudio-pcm-audio" },
+	{ .name = "sunxi-sndhdmi" },
+	{ .name = "sunxi-hdmiaudio" },
+	{ .name = "sunxi-hdmiaudio-codec" },
+	{ .name = "sunxi-hdmiaudio-pcm-audio" },
 };
 
 void hdmi_delay_ms(__u32 t)

diff --git a/sound/soc/sun4i/hdmiaudio/Kconfig b/sound/soc/sun4i/hdmiaudio/Kconfig
@@ -1,6 +1,6 @@
 
-config SND_SUN4I_SOC_HDMIAUDIO
-	tristate "HDMI Audio for the AllWinner SUN4I chips"
+config SND_SUNXI_SOC_HDMIAUDIO
+	tristate "HDMI Audio for the AllWinner sun4i and sun5i chips"
 	default n
 	help
 	  Say Y or M if you want to add support for hdmi audio
diff --git a/sound/soc/sun4i/hdmiaudio/Makefile b/sound/soc/sun4i/hdmiaudio/Makefile
@@ -1,6 +1,6 @@
 
-obj-$(CONFIG_SND_SUN4I_SOC_HDMIAUDIO) += sun4i-hdmiaudio.o
-obj-$(CONFIG_SND_SUN4I_SOC_HDMIAUDIO) += sun4i-hdmipcm.o
-obj-$(CONFIG_SND_SUN4I_SOC_HDMIAUDIO) += sndhdmi.o
-obj-$(CONFIG_SND_SUN4I_SOC_HDMIAUDIO) += sun4i-sndhdmi.o
+obj-$(CONFIG_SND_SUNXI_SOC_HDMIAUDIO) += sunxi-hdmiaudio.o
+obj-$(CONFIG_SND_SUNXI_SOC_HDMIAUDIO) += sunxi-hdmipcm.o
+obj-$(CONFIG_SND_SUNXI_SOC_HDMIAUDIO) += sndhdmi.o
+obj-$(CONFIG_SND_SUNXI_SOC_HDMIAUDIO) += sunxi-sndhdmi.o
 
diff --git a/sound/soc/sun4i/hdmiaudio/sndhdmi.c b/sound/soc/sun4i/hdmiaudio/sndhdmi.c
@@ -1,5 +1,5 @@
 /*
- * sound\soc\sun4i\hdmiaudio\sndhdmi.c
+ * sound\soc\sunxi\hdmiaudio\sndhdmi.c
  * (C) Copyright 2007-2011
  * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
  * chenpailin <[email protected]>
@@ -167,7 +167,7 @@ static int __devexit sndhdmi_codec_remove(struct platform_device *pdev)
 
 static struct platform_driver sndhdmi_codec_driver = {
 	.driver = {
-		.name = "sun4i-hdmiaudio-codec",
+		.name = "sunxi-hdmiaudio-codec",
 		.owner = THIS_MODULE,
 	},
 	.probe = sndhdmi_codec_probe,

diff --git a/sound/soc/sun4i/hdmiaudio/sndhdmi.h b/sound/soc/sun4i/hdmiaudio/sndhdmi.h
@@ -1,5 +1,5 @@
 /*
- * sound\soc\sun4i\hdmiaudio\sndhdmi.h
+ * sound\soc\sunxi\hdmiaudio\sndhdmi.h
  * (C) Copyright 2007-2011
  * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
  * chenpailin <[email protected]>