ASoC: SAMSUNG: Change s3c24xx directory name to samsung

This patch changes s3c24xx directory name to samsung. (sound/soc/s3c24xx -> sound/soc/samsung)

Currently, the source files related to samsung SoCs(s3c24xx & s3c64xx) are included in sound/soc/s3c24xx. It would be better to change s3c24xx directory name to samsung, because s3c24xx directory will support many board based on samsung SoCs(s5p, etc).

---
 sound/soc/Kconfig                              |    2 +-
 sound/soc/Makefile                             |    2 +-
 sound/soc/s3c24xx/Kconfig                      |  127 ----
 sound/soc/s3c24xx/Makefile                     |   43 --
 sound/soc/s3c24xx/jive_wm8750.c                |  196 ------
 sound/soc/s3c24xx/lm4857.h                     |   32 -
 sound/soc/s3c24xx/ln2440sbc_alc650.c           |   85 ---
 sound/soc/s3c24xx/neo1973_gta02_wm8753.c       |  506 ---------------
 sound/soc/s3c24xx/neo1973_wm8753.c             |  707 ---------------------
 sound/soc/s3c24xx/regs-i2s-v2.h                |  115 ----
 sound/soc/s3c24xx/s3c-ac97.c                   |  521 ----------------
 sound/soc/s3c24xx/s3c-ac97.h                   |   23 -
 sound/soc/s3c24xx/s3c-dma.c                    |  483 ---------------
 sound/soc/s3c24xx/s3c-dma.h                    |   31 -
 sound/soc/s3c24xx/s3c-i2s-v2.c                 |  776 ------------------------
 sound/soc/s3c24xx/s3c-i2s-v2.h                 |  103 ----
 sound/soc/s3c24xx/s3c-pcm.c                    |  554 -----------------
 sound/soc/s3c24xx/s3c-pcm.h                    |  123 ----
 sound/soc/s3c24xx/s3c2412-i2s.c                |  190 ------
 sound/soc/s3c24xx/s3c2412-i2s.h                |   29 -
 sound/soc/s3c24xx/s3c24xx-i2s.c                |  503 ---------------
 sound/soc/s3c24xx/s3c24xx-i2s.h                |   37 --
 sound/soc/s3c24xx/s3c24xx_simtec.c             |  394 ------------
 sound/soc/s3c24xx/s3c24xx_simtec.h             |   22 -
 sound/soc/s3c24xx/s3c24xx_simtec_hermes.c      |  153 -----
 sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c |  137 -----
 sound/soc/s3c24xx/s3c24xx_uda134x.c            |  373 ------------
 sound/soc/s3c24xx/s3c64xx-i2s-v4.c             |  209 -------
 sound/soc/s3c24xx/s3c64xx-i2s.c                |  190 ------
 sound/soc/s3c24xx/s3c64xx-i2s.h                |   42 --
 sound/soc/s3c24xx/smdk2443_wm9710.c            |   81 ---
 sound/soc/s3c24xx/smdk64xx_wm8580.c            |  266 --------
 sound/soc/s3c24xx/smdk_wm9713.c                |   94 ---
 sound/soc/samsung/Kconfig                      |  127 ++++
 sound/soc/samsung/Makefile                     |   43 ++
 sound/soc/samsung/jive_wm8750.c                |  196 ++++++
 sound/soc/samsung/lm4857.h                     |   32 +
 sound/soc/samsung/ln2440sbc_alc650.c           |   85 +++
 sound/soc/samsung/neo1973_gta02_wm8753.c       |  506 +++++++++++++++
 sound/soc/samsung/neo1973_wm8753.c             |  707 +++++++++++++++++++++
 sound/soc/samsung/regs-i2s-v2.h                |  115 ++++
 sound/soc/samsung/s3c-ac97.c                   |  521 ++++++++++++++++
 sound/soc/samsung/s3c-ac97.h                   |   23 +
 sound/soc/samsung/s3c-dma.c                    |  483 +++++++++++++++
 sound/soc/samsung/s3c-dma.h                    |   31 +
 sound/soc/samsung/s3c-i2s-v2.c                 |  776 ++++++++++++++++++++++++
 sound/soc/samsung/s3c-i2s-v2.h                 |  103 ++++
 sound/soc/samsung/s3c-pcm.c                    |  554 +++++++++++++++++
 sound/soc/samsung/s3c-pcm.h                    |  123 ++++
 sound/soc/samsung/s3c2412-i2s.c                |  190 ++++++
 sound/soc/samsung/s3c2412-i2s.h                |   29 +
 sound/soc/samsung/s3c24xx-i2s.c                |  503 +++++++++++++++
 sound/soc/samsung/s3c24xx-i2s.h                |   37 ++
 sound/soc/samsung/s3c24xx_simtec.c             |  394 ++++++++++++
 sound/soc/samsung/s3c24xx_simtec.h             |   22 +
 sound/soc/samsung/s3c24xx_simtec_hermes.c      |  153 +++++
 sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c |  137 +++++
 sound/soc/samsung/s3c24xx_uda134x.c            |  373 ++++++++++++
 sound/soc/samsung/s3c64xx-i2s-v4.c             |  209 +++++++
 sound/soc/samsung/s3c64xx-i2s.c                |  190 ++++++
 sound/soc/samsung/s3c64xx-i2s.h                |   42 ++
 sound/soc/samsung/smdk2443_wm9710.c            |   81 +++
 sound/soc/samsung/smdk64xx_wm8580.c            |  266 ++++++++
 sound/soc/samsung/smdk_wm9713.c                |   94 +++
 64 files changed, 7147 insertions(+), 7147 deletions(-)
 delete mode 100644 sound/soc/s3c24xx/Kconfig
 delete mode 100644 sound/soc/s3c24xx/Makefile
 delete mode 100644 sound/soc/s3c24xx/jive_wm8750.c
 delete mode 100644 sound/soc/s3c24xx/lm4857.h
 delete mode 100644 sound/soc/s3c24xx/ln2440sbc_alc650.c
 delete mode 100644 sound/soc/s3c24xx/neo1973_gta02_wm8753.c
 delete mode 100644 sound/soc/s3c24xx/neo1973_wm8753.c
 delete mode 100644 sound/soc/s3c24xx/regs-i2s-v2.h
 delete mode 100644 sound/soc/s3c24xx/s3c-ac97.c
 delete mode 100644 sound/soc/s3c24xx/s3c-ac97.h
 delete mode 100644 sound/soc/s3c24xx/s3c-dma.c
 delete mode 100644 sound/soc/s3c24xx/s3c-dma.h
 delete mode 100644 sound/soc/s3c24xx/s3c-i2s-v2.c
 delete mode 100644 sound/soc/s3c24xx/s3c-i2s-v2.h
 delete mode 100644 sound/soc/s3c24xx/s3c-pcm.c
 delete mode 100644 sound/soc/s3c24xx/s3c-pcm.h
 delete mode 100644 sound/soc/s3c24xx/s3c2412-i2s.c
 delete mode 100644 sound/soc/s3c24xx/s3c2412-i2s.h
 delete mode 100644 sound/soc/s3c24xx/s3c24xx-i2s.c
 delete mode 100644 sound/soc/s3c24xx/s3c24xx-i2s.h
 delete mode 100644 sound/soc/s3c24xx/s3c24xx_simtec.c
 delete mode 100644 sound/soc/s3c24xx/s3c24xx_simtec.h
 delete mode 100644 sound/soc/s3c24xx/s3c24xx_simtec_hermes.c
 delete mode 100644 sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c
 delete mode 100644 sound/soc/s3c24xx/s3c24xx_uda134x.c
 delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c
 delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c
 delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h
 delete mode 100644 sound/soc/s3c24xx/smdk2443_wm9710.c
 delete mode 100644 sound/soc/s3c24xx/smdk64xx_wm8580.c
 delete mode 100644 sound/soc/s3c24xx/smdk_wm9713.c
 create mode 100644 sound/soc/samsung/Kconfig
 create mode 100644 sound/soc/samsung/Makefile
 create mode 100644 sound/soc/samsung/jive_wm8750.c
 create mode 100644 sound/soc/samsung/lm4857.h
 create mode 100644 sound/soc/samsung/ln2440sbc_alc650.c
 create mode 100644 sound/soc/samsung/neo1973_gta02_wm8753.c
 create mode 100644 sound/soc/samsung/neo1973_wm8753.c
 create mode 100644 sound/soc/samsung/regs-i2s-v2.h
 create mode 100644 sound/soc/samsung/s3c-ac97.c
 create mode 100644 sound/soc/samsung/s3c-ac97.h
 create mode 100644 sound/soc/samsung/s3c-dma.c
 create mode 100644 sound/soc/samsung/s3c-dma.h
 create mode 100644 sound/soc/samsung/s3c-i2s-v2.c
 create mode 100644 sound/soc/samsung/s3c-i2s-v2.h
 create mode 100644 sound/soc/samsung/s3c-pcm.c
 create mode 100644 sound/soc/samsung/s3c-pcm.h
 create mode 100644 sound/soc/samsung/s3c2412-i2s.c
 create mode 100644 sound/soc/samsung/s3c2412-i2s.h
 create mode 100644 sound/soc/samsung/s3c24xx-i2s.c
 create mode 100644 sound/soc/samsung/s3c24xx-i2s.h
 create mode 100644 sound/soc/samsung/s3c24xx_simtec.c
 create mode 100644 sound/soc/samsung/s3c24xx_simtec.h
 create mode 100644 sound/soc/samsung/s3c24xx_simtec_hermes.c
 create mode 100644 sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c
 create mode 100644 sound/soc/samsung/s3c24xx_uda134x.c
 create mode 100644 sound/soc/samsung/s3c64xx-i2s-v4.c
 create mode 100644 sound/soc/samsung/s3c64xx-i2s.c
 create mode 100644 sound/soc/samsung/s3c64xx-i2s.h
 create mode 100644 sound/soc/samsung/smdk2443_wm9710.c
 create mode 100644 sound/soc/samsung/smdk64xx_wm8580.c
 create mode 100644 sound/soc/samsung/smdk_wm9713.c

index b1749bc..5d467ef 100644
@@ -32,7 +32,7 @@ source "sound/soc/fsl/Kconfig"
 source "sound/soc/imx/Kconfig"
 source "sound/soc/omap/Kconfig"
 source "sound/soc/pxa/Kconfig"
-source "sound/soc/s3c24xx/Kconfig"
+source "sound/soc/samsung/Kconfig"
 source "sound/soc/s6000/Kconfig"
 source "sound/soc/sh/Kconfig"
 source "sound/soc/txx9/Kconfig"

index 1470141..9572925 100644
@@ -10,7 +10,7 @@ obj-$(CONFIG_SND_SOC)	+= fsl/
 obj-$(CONFIG_SND_SOC)   += imx/
 obj-$(CONFIG_SND_SOC)	+= omap/
 obj-$(CONFIG_SND_SOC)	+= pxa/
-obj-$(CONFIG_SND_SOC)	+= s3c24xx/
+obj-$(CONFIG_SND_SOC)	+= samsung/
 obj-$(CONFIG_SND_SOC)	+= s6000/
 obj-$(CONFIG_SND_SOC)	+= sh/
 obj-$(CONFIG_SND_SOC)	+= txx9/

deleted file mode 100644
index 0cf5b70..0000000
@@ -1,32 +0,0 @@
-/*
- * lm4857.h  --  ALSA Soc Audio Layer
- *
- * Copyright 2007 Wolfson Microelectronics PLC.
- * Author: Graeme Gregory
- *         [email protected] or [email protected]
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  Revision history
- *    18th Jun 2007   Initial version.
- */
-
-#ifndef LM4857_H_
-#define LM4857_H_
-
-/* The register offsets in the cache array */
-#define LM4857_MVOL 0
-#define LM4857_LVOL 1
-#define LM4857_RVOL 2
-#define LM4857_CTRL 3
-
-/* the shifts required to set these bits */
-#define LM4857_3D 5
-#define LM4857_WAKEUP 5
-#define LM4857_EPGAIN 4
-
-#endif /*LM4857_H_*/
-

deleted file mode 100644
index 2781983..0000000
@@ -1,23 +0,0 @@
-/* sound/soc/s3c24xx/s3c-ac97.h
- *
- * ALSA SoC Audio Layer - S3C AC97 Controller driver
- * 	Evolved from s3c2443-ac97.h
- *
- * Copyright (c) 2010 Samsung Electronics Co. Ltd
- * 	Author: Jaswinder Singh <[email protected]>
- * 	Credits: Graeme Gregory, Sean Choi
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __S3C_AC97_H_
-#define __S3C_AC97_H_
-
-#define S3C_AC97_DAI_PCM 0
-#define S3C_AC97_DAI_MIC 1
-
-extern struct snd_soc_dai s3c_ac97_dai[];
-
-#endif /* __S3C_AC97_H_ */

deleted file mode 100644
index 69bb6bf..0000000
@@ -1,31 +0,0 @@
-/*
- *  s3c-dma.h --
- *
- *  This program is free software; you can redistribute  it and/or modify it
- *  under  the terms of  the GNU General  Public License as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  ALSA PCM interface for the Samsung S3C24xx CPU
- */
-
-#ifndef _S3C_AUDIO_H
-#define _S3C_AUDIO_H
-
-#define ST_RUNNING		(1<<0)
-#define ST_OPENED		(1<<1)
-
-struct s3c_dma_params {
-	struct s3c2410_dma_client *client;	/* stream identifier */
-	int channel;				/* Channel ID */
-	dma_addr_t dma_addr;
-	int dma_size;			/* Size of the DMA transfer */
-};
-
-#define S3C24XX_DAI_I2S			0
-
-/* platform data */
-extern struct snd_soc_platform s3c24xx_soc_platform;
-extern struct snd_ac97_bus_ops s3c24xx_ac97_ops;
-
-#endif

deleted file mode 100644
index 0b5686b..0000000

deleted file mode 100644
index 726d91c..0000000

deleted file mode 100644
index e18faee..0000000

new file mode 100644
index 0000000..0cf5b70

new file mode 100644
index 0000000..2781983

new file mode 100644
index 0000000..69bb6bf

new file mode 100644
index 0000000..0b5686b

new file mode 100644
index 0000000..726d91c

new file mode 100644
index 0000000..e18faee

1.6.3.3

Part of the diff is not shown here. View the raw message.

I think if we're going to do this it would be best postponed until after the multi-component work is merged since the rename is basically a cosmetic change and there's a lot of demand for multi-component support. Could you please redo this on top of the multi-component work?

When submitting patches like this that do file renames please remember to use git format-patch -M to show the renames as renames - this makes the patch much more legible.
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel