From: Kukjin Kim <kgene.kim@samsung.com>
To: "'Arnd Bergmann'" <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org,
"'Russell King'" <linux@arm.linux.org.uk>,
"'Kyungmin Park'" <kyungmin.park@samsung.com>,
"'Ben Dooks'" <ben-linux@fluff.org>,
"'Mark Brown'" <broonie@opensource.wolfsonmicro.com>,
"'Jeff Garzik'" <jgarzik@pobox.com>,
"'Guenter Roeck'" <linux@roeck-us.net>,
"'Wolfram Sang (embedded platforms)'" <w.sang@pengutronix.de>,
"'Dmitry Torokhov'" <dmitry.torokhov@gmail.com>,
"'Bryan Wu'" <bryan.wu@canonical.com>,
"'Richard Purdie'" <rpurdie@rpsys.net>,
"'Sylwester Nawrocki'" <s.nawrocki@samsung.com>,
"'Mauro Carvalho Chehab'" <mchehab@infradead.org>,
"'Chris Ball'" <cjb@laptop.org>,
"'David Woodhouse'" <dwmw2@infradead.org>,
"'Grant Likely'" <grant.likely@secretlab.ca>,
"'Felipe Balbi'" <balbi@ti.com>,
"'Greg Kroah-Hartman'" <gregkh@linuxfoundation.org>,
"'Alan Stern'" <stern@rowland.harvard.edu>,
"'Sangbeom Kim'" <sbkim73@samsung.com>,
"'Liam Girdwood'" <lrg@ti.com>,
linux-samsung-soc@vger.kernel.org
Subject: RE: [PATCH 15/16] ARM: samsung: move platform_data definitions
Date: Wed, 12 Sep 2012 11:20:54 +0900 [thread overview]
Message-ID: <010001cd908d$3e7a3fc0$bb6ebf40$%kim@samsung.com> (raw)
In-Reply-To: <1347368559-31329-3-git-send-email-arnd@arndb.de>
Arnd Bergmann wrote:
>
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
>
> This moves such data out of the samsung include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
Yeah, basically looks OK on this.
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
BTW, how about re-ordering inclusion <linux/platform_data/xxx.h> after
<linux/xxx.h> rather than just replacing like following?
---
#include <linux/xxx.h>
...
#include <linux/platform_data/xxx.h>
...
#include <mach/xxx.h>
...
#include <plat/xxx.h>
...
---
And there are small comments...
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Ben Dooks <ben-linux@fluff.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Bryan Wu <bryan.wu@canonical.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Sangbeom Kim <sbkim73@samsung.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: linux-samsung-soc@vger.kernel.org
> ---
> arch/arm/mach-exynos/dev-audio.c | 2 +-
> arch/arm/mach-exynos/dev-ohci.c | 2 +-
> arch/arm/mach-exynos/mach-nuri.c | 6 +++---
> arch/arm/mach-exynos/mach-origen.c | 6 +++---
> arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
> arch/arm/mach-exynos/mach-smdkv310.c | 6 +++---
> arch/arm/mach-exynos/mach-universal_c210.c | 4 ++--
> arch/arm/mach-exynos/setup-i2c0.c | 2 +-
> arch/arm/mach-exynos/setup-i2c1.c | 2 +-
> arch/arm/mach-exynos/setup-i2c2.c | 2 +-
> arch/arm/mach-exynos/setup-i2c3.c | 2 +-
> arch/arm/mach-exynos/setup-i2c4.c | 2 +-
> arch/arm/mach-exynos/setup-i2c5.c | 2 +-
> arch/arm/mach-exynos/setup-i2c6.c | 2 +-
> arch/arm/mach-exynos/setup-i2c7.c | 2 +-
> arch/arm/mach-s3c24xx/common-smdk.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
> arch/arm/mach-s3c24xx/mach-anubis.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-bast.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-gta02.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-h1940.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-jive.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-n30.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 +-
> arch/arm/mach-s3c24xx/mach-osiris.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
> arch/arm/mach-s3c24xx/mach-qt2410.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-rx1950.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 +-
> arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
> arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-vstms.c | 4 ++--
> arch/arm/mach-s3c24xx/setup-i2c.c | 2 +-
> arch/arm/mach-s3c24xx/simtec-audio.c | 2 +-
> arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
> arch/arm/mach-s3c64xx/dev-audio.c | 2 +-
> arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
> arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
> arch/arm/mach-s3c64xx/mach-crag6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-hmt.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-mini6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
> arch/arm/mach-s3c64xx/mach-real6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-smartq.c | 8 ++++----
> arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
> arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +++---
> arch/arm/mach-s3c64xx/setup-i2c0.c | 2 +-
> arch/arm/mach-s3c64xx/setup-i2c1.c | 2 +-
> arch/arm/mach-s3c64xx/setup-ide.c | 2 +-
> arch/arm/mach-s5p64x0/dev-audio.c | 2 +-
> arch/arm/mach-s5p64x0/mach-smdk6440.c | 4 ++--
> arch/arm/mach-s5p64x0/mach-smdk6450.c | 4 ++--
> arch/arm/mach-s5p64x0/setup-i2c0.c | 2 +-
> arch/arm/mach-s5p64x0/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pc100/dev-audio.c | 2 +-
> arch/arm/mach-s5pc100/mach-smdkc100.c | 8 ++++----
> arch/arm/mach-s5pc100/setup-i2c0.c | 2 +-
> arch/arm/mach-s5pc100/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pv210/dev-audio.c | 2 +-
> arch/arm/mach-s5pv210/mach-goni.c | 2 +-
> arch/arm/mach-s5pv210/mach-smdkc110.c | 4 ++--
> arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +++---
> arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c0.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c2.c | 2 +-
> arch/arm/plat-samsung/devs.c | 20
++++++++++----------
> drivers/ata/pata_samsung_cf.c | 2 +-
> drivers/hwmon/s3c-hwmon.c | 2 +-
> drivers/i2c/busses/i2c-s3c2410.c | 2 +-
> drivers/input/touchscreen/s3c2410_ts.c | 2 +-
> drivers/leds/leds-s3c24xx.c | 2 +-
> drivers/media/video/s5p-fimc/mipi-csis.c | 2 +-
> drivers/mmc/host/s3cmci.c | 2 +-
> drivers/mtd/nand/s3c2410.c | 2 +-
> drivers/spi/spi-s3c64xx.c | 2 +-
> drivers/usb/gadget/s3c2410_udc.c | 2 +-
> drivers/usb/host/ehci-s5p.c | 2 +-
> drivers/usb/host/ohci-exynos.c | 2 +-
> drivers/usb/host/ohci-s3c2410.c | 2 +-
> .../linux/platform_data/asoc-s3c.h | 0
> .../linux/platform_data/asoc-s3c24xx_simtec.h | 0
> .../linux/platform_data/ata-samsung_cf.h | 0
> .../linux/platform_data/hwmon-s3c.h | 0
> .../linux/platform_data/i2c-s3c2410.h | 0
> .../linux/platform_data/leds-s3c24xx.h | 0
> .../linux/platform_data/mipi-csis.h | 0
> .../linux/platform_data/mmc-s3cmci.h | 0
> .../linux/platform_data/mtd-nand-s3c2410.h | 0
> .../linux/platform_data/spi-s3c64xx.h | 0
> .../linux/platform_data/touchscreen-s3c2410.h | 0
> .../linux/platform_data/usb-ehci-s5p.h | 0
> .../linux/platform_data/usb-exynos.h | 0
> .../linux/platform_data/usb-ohci-s3c2410.h | 0
> .../linux/platform_data/usb-s3c2410_udc.h | 0
> sound/soc/samsung/ac97.c | 2 +-
> sound/soc/samsung/i2s.c | 2 +-
> sound/soc/samsung/pcm.c | 2 +-
> sound/soc/samsung/s3c24xx_simtec.c | 2 +-
> sound/soc/samsung/spdif.c | 2 +-
> 107 files changed, 164 insertions(+), 164 deletions(-)
> rename arch/arm/plat-samsung/include/plat/audio.h =>
> include/linux/platform_data/asoc-s3c.h (100%)
I'd prefer asoc-samsung.h and...
> rename arch/arm/plat-samsung/include/plat/audio-simtec.h =>
> include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
This will be merged into above header.
arch/arm/plat-samsung/include/plat/audio-simtec.h | 34 ----------------
.../linux/platform_data/asoc-samsung.h | 42
++++++++++++++++---
2 files changed, 35 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
rename arch/arm/plat-samsung/include/plat/audio.h =>
include/linux/platform_data/asoc-samsung.h (63%)
diff --git a/arch/arm/plat-samsung/include/plat/audio-simtec.h
b/arch/arm/plat-samsung/include/plat/audio-simtec.h
deleted file mode 100644
index 376af52..0000000
--- a/arch/arm/plat-samsung/include/plat/audio-simtec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio-simtec.h
- *
- * Copyright 2008 Simtec Electronics
- * http://armlinux.simtec.co.uk/
- * Ben Dooks <ben@simtec.co.uk>
- *
- * 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.
- *
- * Simtec Audio support.
-*/
-
-/**
- * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
- * @use_mpllin: Select codec clock from MPLLin
- * @output_cdclk: Need to output CDCLK to the codec
- * @have_mic: Set if we have a MIC socket
- * @have_lout: Set if we have a LineOut socket
- * @amp_gpio: GPIO pin to enable the AMP
- * @amp_gain: Option GPIO to control AMP gain
- */
-struct s3c24xx_audio_simtec_pdata {
- unsigned int use_mpllin:1;
- unsigned int output_cdclk:1;
-
- unsigned int have_mic:1;
- unsigned int have_lout:1;
-
- int amp_gpio;
- int amp_gain[2];
-
- void (*startup)(void);
-};
diff --git a/arch/arm/plat-samsung/include/plat/audio.h
b/include/linux/platform_data/asoc-samsung.h
similarity index 63%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-samsung.h
index aa9875f..6b1d947 100644
--- a/arch/arm/plat-samsung/include/plat/audio.h
+++ b/include/linux/platform_data/asoc-samsung.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-samsung/include/plat/audio.h
- *
+/*
* Copyright (c) 2009 Samsung Electronics Co. Ltd
* Author: Jaswinder Singh <jassi.brar@samsung.com>
*
@@ -8,12 +7,13 @@
* published by the Free Software Foundation.
*/
-/* The machine init code calls s3c*_ac97_setup_gpio with
+/*
+ * The machine init code calls s3c*_ac97_setup_gpio with
* one of these defines in order to select appropriate bank
* of GPIO for AC97 pins
*/
-#define S3C64XX_AC97_GPD 0
-#define S3C64XX_AC97_GPE 1
+#define S3C64XX_AC97_GPD 0
+#define S3C64XX_AC97_GPE 1
extern void s3c64xx_ac97_setup_gpio(int);
/*
@@ -21,8 +21,8 @@ extern void s3c64xx_ac97_setup_gpio(int);
* one of these defines in order to select appropriate bank
* of GPIO for S/PDIF pins
*/
-#define S5PC100_SPDIF_GPD 0
-#define S5PC100_SPDIF_GPG3 1
+#define S5PC100_SPDIF_GPD 0
+#define S5PC100_SPDIF_GPG3 1
extern void s5pc100_spdif_setup_gpio(int);
struct samsung_i2s {
@@ -57,3 +57,31 @@ struct s3c_audio_pdata {
struct samsung_i2s i2s;
} type;
};
+
+/**
+ * Simtec Audio support
+
+ * Copyright 2008 Simtec Electronics
+ * http://armlinux.simtec.co.uk/
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
+ * @use_mpllin: Select codec clock from MPLLin
+ * @output_cdclk: Need to output CDCLK to the codec
+ * @have_mic: Set if we have a MIC socket
+ * @have_lout: Set if we have a LineOut socket
+ * @amp_gpio: GPIO pin to enable the AMP
+ * @amp_gain: Option GPIO to control AMP gain
+ */
+struct s3c24xx_audio_simtec_pdata {
+ unsigned int use_mpllin:1;
+ unsigned int output_cdclk:1;
+
+ unsigned int have_mic:1;
+ unsigned int have_lout:1;
+
+ int amp_gpio;
+ int amp_gain[2];
+
+ void (*startup)(void);
+};
--
And I think, need to check what header name is better like following?...But
if any policy on the naming, I'm OK :-)
> rename arch/arm/plat-samsung/include/plat/ata.h =>
> include/linux/platform_data/ata-samsung_cf.h (100%)
ata-samsung.h?
> rename arch/arm/plat-samsung/include/plat/hwmon.h =>
> include/linux/platform_data/hwmon-s3c.h (100%)
s3c-hwmon.h?
> rename arch/arm/plat-samsung/include/plat/iic.h =>
> include/linux/platform_data/i2c-s3c2410.h (100%)
> rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h =>
> include/linux/platform_data/leds-s3c24xx.h (100%)
> rename arch/arm/plat-samsung/include/plat/mipi_csis.h =>
> include/linux/platform_data/mipi-csis.h (100%)
> rename arch/arm/plat-samsung/include/plat/mci.h =>
> include/linux/platform_data/mmc-s3cmci.h (100%)
> rename arch/arm/plat-samsung/include/plat/nand.h =>
> include/linux/platform_data/mtd-nand-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h =>
> include/linux/platform_data/spi-s3c64xx.h (100%)
> rename arch/arm/plat-samsung/include/plat/ts.h =>
> include/linux/platform_data/touchscreen-s3c2410.h (100%)
s3c2410-ts.h?
> rename arch/arm/plat-samsung/include/plat/ehci.h =>
> include/linux/platform_data/usb-ehci-s5p.h (100%)
> rename arch/arm/mach-exynos/include/mach/ohci.h =>
> include/linux/platform_data/usb-exynos.h (100%)
usb-ohci-exynos.h?
> rename arch/arm/plat-samsung/include/plat/usb-control.h =>
> include/linux/platform_data/usb-ohci-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/udc.h =>
> include/linux/platform_data/usb-s3c2410_udc.h (100%)
>
And just note that conflicts will be happened when merge this into Samsung
tree.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
WARNING: multiple messages have this Message-ID (diff)
From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Arnd Bergmann' <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org,
'Russell King' <linux@arm.linux.org.uk>,
'Kyungmin Park' <kyungmin.park@samsung.com>,
'Ben Dooks' <ben-linux@fluff.org>,
'Mark Brown' <broonie@opensource.wolfsonmicro.com>,
'Jeff Garzik' <jgarzik@pobox.com>,
'Guenter Roeck' <linux@roeck-us.net>,
"'Wolfram Sang (embedded platforms)'" <w.sang@pengutronix.de>,
'Dmitry Torokhov' <dmitry.torokhov@gmail.com>,
'Bryan Wu' <bryan.wu@canonical.com>,
'Richard Purdie' <rpurdie@rpsys.net>,
'Sylwester Nawrocki' <s.nawrocki@samsung.com>,
'Mauro Carvalho Chehab' <mchehab@infradead.org>,
'Chris Ball' <cjb@laptop.org>,
'David Woodhouse' <dwmw2@infradead.org>,
'Grant Likely' <grant.likely@secretlab.ca>,
'Felipe Balbi' <balbi@ti.com>,
'Greg Kroah-Hartman' <gregkh@linuxfoundation.org>,
'Alan Stern' <stern@rowland.harvard.edu>,
'Sangbeom Kim' <sbkim73@samsung.com>,
'Liam Girdwood' <lrg@ti.com>,
linux-samsu
Subject: RE: [PATCH 15/16] ARM: samsung: move platform_data definitions
Date: Wed, 12 Sep 2012 11:20:54 +0900 [thread overview]
Message-ID: <010001cd908d$3e7a3fc0$bb6ebf40$%kim@samsung.com> (raw)
In-Reply-To: <1347368559-31329-3-git-send-email-arnd@arndb.de>
Arnd Bergmann wrote:
>
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
>
> This moves such data out of the samsung include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
Yeah, basically looks OK on this.
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
BTW, how about re-ordering inclusion <linux/platform_data/xxx.h> after
<linux/xxx.h> rather than just replacing like following?
---
#include <linux/xxx.h>
...
#include <linux/platform_data/xxx.h>
...
#include <mach/xxx.h>
...
#include <plat/xxx.h>
...
---
And there are small comments...
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Ben Dooks <ben-linux@fluff.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Bryan Wu <bryan.wu@canonical.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Sangbeom Kim <sbkim73@samsung.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: linux-samsung-soc@vger.kernel.org
> ---
> arch/arm/mach-exynos/dev-audio.c | 2 +-
> arch/arm/mach-exynos/dev-ohci.c | 2 +-
> arch/arm/mach-exynos/mach-nuri.c | 6 +++---
> arch/arm/mach-exynos/mach-origen.c | 6 +++---
> arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
> arch/arm/mach-exynos/mach-smdkv310.c | 6 +++---
> arch/arm/mach-exynos/mach-universal_c210.c | 4 ++--
> arch/arm/mach-exynos/setup-i2c0.c | 2 +-
> arch/arm/mach-exynos/setup-i2c1.c | 2 +-
> arch/arm/mach-exynos/setup-i2c2.c | 2 +-
> arch/arm/mach-exynos/setup-i2c3.c | 2 +-
> arch/arm/mach-exynos/setup-i2c4.c | 2 +-
> arch/arm/mach-exynos/setup-i2c5.c | 2 +-
> arch/arm/mach-exynos/setup-i2c6.c | 2 +-
> arch/arm/mach-exynos/setup-i2c7.c | 2 +-
> arch/arm/mach-s3c24xx/common-smdk.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
> arch/arm/mach-s3c24xx/mach-anubis.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-bast.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-gta02.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-h1940.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-jive.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-n30.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 +-
> arch/arm/mach-s3c24xx/mach-osiris.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
> arch/arm/mach-s3c24xx/mach-qt2410.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-rx1950.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 +-
> arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
> arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-vstms.c | 4 ++--
> arch/arm/mach-s3c24xx/setup-i2c.c | 2 +-
> arch/arm/mach-s3c24xx/simtec-audio.c | 2 +-
> arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
> arch/arm/mach-s3c64xx/dev-audio.c | 2 +-
> arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
> arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
> arch/arm/mach-s3c64xx/mach-crag6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-hmt.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-mini6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
> arch/arm/mach-s3c64xx/mach-real6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-smartq.c | 8 ++++----
> arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
> arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +++---
> arch/arm/mach-s3c64xx/setup-i2c0.c | 2 +-
> arch/arm/mach-s3c64xx/setup-i2c1.c | 2 +-
> arch/arm/mach-s3c64xx/setup-ide.c | 2 +-
> arch/arm/mach-s5p64x0/dev-audio.c | 2 +-
> arch/arm/mach-s5p64x0/mach-smdk6440.c | 4 ++--
> arch/arm/mach-s5p64x0/mach-smdk6450.c | 4 ++--
> arch/arm/mach-s5p64x0/setup-i2c0.c | 2 +-
> arch/arm/mach-s5p64x0/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pc100/dev-audio.c | 2 +-
> arch/arm/mach-s5pc100/mach-smdkc100.c | 8 ++++----
> arch/arm/mach-s5pc100/setup-i2c0.c | 2 +-
> arch/arm/mach-s5pc100/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pv210/dev-audio.c | 2 +-
> arch/arm/mach-s5pv210/mach-goni.c | 2 +-
> arch/arm/mach-s5pv210/mach-smdkc110.c | 4 ++--
> arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +++---
> arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c0.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c2.c | 2 +-
> arch/arm/plat-samsung/devs.c | 20
++++++++++----------
> drivers/ata/pata_samsung_cf.c | 2 +-
> drivers/hwmon/s3c-hwmon.c | 2 +-
> drivers/i2c/busses/i2c-s3c2410.c | 2 +-
> drivers/input/touchscreen/s3c2410_ts.c | 2 +-
> drivers/leds/leds-s3c24xx.c | 2 +-
> drivers/media/video/s5p-fimc/mipi-csis.c | 2 +-
> drivers/mmc/host/s3cmci.c | 2 +-
> drivers/mtd/nand/s3c2410.c | 2 +-
> drivers/spi/spi-s3c64xx.c | 2 +-
> drivers/usb/gadget/s3c2410_udc.c | 2 +-
> drivers/usb/host/ehci-s5p.c | 2 +-
> drivers/usb/host/ohci-exynos.c | 2 +-
> drivers/usb/host/ohci-s3c2410.c | 2 +-
> .../linux/platform_data/asoc-s3c.h | 0
> .../linux/platform_data/asoc-s3c24xx_simtec.h | 0
> .../linux/platform_data/ata-samsung_cf.h | 0
> .../linux/platform_data/hwmon-s3c.h | 0
> .../linux/platform_data/i2c-s3c2410.h | 0
> .../linux/platform_data/leds-s3c24xx.h | 0
> .../linux/platform_data/mipi-csis.h | 0
> .../linux/platform_data/mmc-s3cmci.h | 0
> .../linux/platform_data/mtd-nand-s3c2410.h | 0
> .../linux/platform_data/spi-s3c64xx.h | 0
> .../linux/platform_data/touchscreen-s3c2410.h | 0
> .../linux/platform_data/usb-ehci-s5p.h | 0
> .../linux/platform_data/usb-exynos.h | 0
> .../linux/platform_data/usb-ohci-s3c2410.h | 0
> .../linux/platform_data/usb-s3c2410_udc.h | 0
> sound/soc/samsung/ac97.c | 2 +-
> sound/soc/samsung/i2s.c | 2 +-
> sound/soc/samsung/pcm.c | 2 +-
> sound/soc/samsung/s3c24xx_simtec.c | 2 +-
> sound/soc/samsung/spdif.c | 2 +-
> 107 files changed, 164 insertions(+), 164 deletions(-)
> rename arch/arm/plat-samsung/include/plat/audio.h =>
> include/linux/platform_data/asoc-s3c.h (100%)
I'd prefer asoc-samsung.h and...
> rename arch/arm/plat-samsung/include/plat/audio-simtec.h =>
> include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
This will be merged into above header.
arch/arm/plat-samsung/include/plat/audio-simtec.h | 34 ----------------
.../linux/platform_data/asoc-samsung.h | 42
++++++++++++++++---
2 files changed, 35 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
rename arch/arm/plat-samsung/include/plat/audio.h =>
include/linux/platform_data/asoc-samsung.h (63%)
diff --git a/arch/arm/plat-samsung/include/plat/audio-simtec.h
b/arch/arm/plat-samsung/include/plat/audio-simtec.h
deleted file mode 100644
index 376af52..0000000
--- a/arch/arm/plat-samsung/include/plat/audio-simtec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio-simtec.h
- *
- * Copyright 2008 Simtec Electronics
- * http://armlinux.simtec.co.uk/
- * Ben Dooks <ben@simtec.co.uk>
- *
- * 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.
- *
- * Simtec Audio support.
-*/
-
-/**
- * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
- * @use_mpllin: Select codec clock from MPLLin
- * @output_cdclk: Need to output CDCLK to the codec
- * @have_mic: Set if we have a MIC socket
- * @have_lout: Set if we have a LineOut socket
- * @amp_gpio: GPIO pin to enable the AMP
- * @amp_gain: Option GPIO to control AMP gain
- */
-struct s3c24xx_audio_simtec_pdata {
- unsigned int use_mpllin:1;
- unsigned int output_cdclk:1;
-
- unsigned int have_mic:1;
- unsigned int have_lout:1;
-
- int amp_gpio;
- int amp_gain[2];
-
- void (*startup)(void);
-};
diff --git a/arch/arm/plat-samsung/include/plat/audio.h
b/include/linux/platform_data/asoc-samsung.h
similarity index 63%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-samsung.h
index aa9875f..6b1d947 100644
--- a/arch/arm/plat-samsung/include/plat/audio.h
+++ b/include/linux/platform_data/asoc-samsung.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-samsung/include/plat/audio.h
- *
+/*
* Copyright (c) 2009 Samsung Electronics Co. Ltd
* Author: Jaswinder Singh <jassi.brar@samsung.com>
*
@@ -8,12 +7,13 @@
* published by the Free Software Foundation.
*/
-/* The machine init code calls s3c*_ac97_setup_gpio with
+/*
+ * The machine init code calls s3c*_ac97_setup_gpio with
* one of these defines in order to select appropriate bank
* of GPIO for AC97 pins
*/
-#define S3C64XX_AC97_GPD 0
-#define S3C64XX_AC97_GPE 1
+#define S3C64XX_AC97_GPD 0
+#define S3C64XX_AC97_GPE 1
extern void s3c64xx_ac97_setup_gpio(int);
/*
@@ -21,8 +21,8 @@ extern void s3c64xx_ac97_setup_gpio(int);
* one of these defines in order to select appropriate bank
* of GPIO for S/PDIF pins
*/
-#define S5PC100_SPDIF_GPD 0
-#define S5PC100_SPDIF_GPG3 1
+#define S5PC100_SPDIF_GPD 0
+#define S5PC100_SPDIF_GPG3 1
extern void s5pc100_spdif_setup_gpio(int);
struct samsung_i2s {
@@ -57,3 +57,31 @@ struct s3c_audio_pdata {
struct samsung_i2s i2s;
} type;
};
+
+/**
+ * Simtec Audio support
+
+ * Copyright 2008 Simtec Electronics
+ * http://armlinux.simtec.co.uk/
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
+ * @use_mpllin: Select codec clock from MPLLin
+ * @output_cdclk: Need to output CDCLK to the codec
+ * @have_mic: Set if we have a MIC socket
+ * @have_lout: Set if we have a LineOut socket
+ * @amp_gpio: GPIO pin to enable the AMP
+ * @amp_gain: Option GPIO to control AMP gain
+ */
+struct s3c24xx_audio_simtec_pdata {
+ unsigned int use_mpllin:1;
+ unsigned int output_cdclk:1;
+
+ unsigned int have_mic:1;
+ unsigned int have_lout:1;
+
+ int amp_gpio;
+ int amp_gain[2];
+
+ void (*startup)(void);
+};
--
And I think, need to check what header name is better like following?...But
if any policy on the naming, I'm OK :-)
> rename arch/arm/plat-samsung/include/plat/ata.h =>
> include/linux/platform_data/ata-samsung_cf.h (100%)
ata-samsung.h?
> rename arch/arm/plat-samsung/include/plat/hwmon.h =>
> include/linux/platform_data/hwmon-s3c.h (100%)
s3c-hwmon.h?
> rename arch/arm/plat-samsung/include/plat/iic.h =>
> include/linux/platform_data/i2c-s3c2410.h (100%)
> rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h =>
> include/linux/platform_data/leds-s3c24xx.h (100%)
> rename arch/arm/plat-samsung/include/plat/mipi_csis.h =>
> include/linux/platform_data/mipi-csis.h (100%)
> rename arch/arm/plat-samsung/include/plat/mci.h =>
> include/linux/platform_data/mmc-s3cmci.h (100%)
> rename arch/arm/plat-samsung/include/plat/nand.h =>
> include/linux/platform_data/mtd-nand-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h =>
> include/linux/platform_data/spi-s3c64xx.h (100%)
> rename arch/arm/plat-samsung/include/plat/ts.h =>
> include/linux/platform_data/touchscreen-s3c2410.h (100%)
s3c2410-ts.h?
> rename arch/arm/plat-samsung/include/plat/ehci.h =>
> include/linux/platform_data/usb-ehci-s5p.h (100%)
> rename arch/arm/mach-exynos/include/mach/ohci.h =>
> include/linux/platform_data/usb-exynos.h (100%)
usb-ohci-exynos.h?
> rename arch/arm/plat-samsung/include/plat/usb-control.h =>
> include/linux/platform_data/usb-ohci-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/udc.h =>
> include/linux/platform_data/usb-s3c2410_udc.h (100%)
>
And just note that conflicts will be happened when merge this into Samsung
tree.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
WARNING: multiple messages have this Message-ID (diff)
From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 15/16] ARM: samsung: move platform_data definitions
Date: Wed, 12 Sep 2012 11:20:54 +0900 [thread overview]
Message-ID: <010001cd908d$3e7a3fc0$bb6ebf40$%kim@samsung.com> (raw)
In-Reply-To: <1347368559-31329-3-git-send-email-arnd@arndb.de>
Arnd Bergmann wrote:
>
> Platform data for device drivers should be defined in
> include/linux/platform_data/*.h, not in the architecture
> and platform specific directories.
>
> This moves such data out of the samsung include directories
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Kukjin Kim <kgene.kim@samsung.com>
Yeah, basically looks OK on this.
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
BTW, how about re-ordering inclusion <linux/platform_data/xxx.h> after
<linux/xxx.h> rather than just replacing like following?
---
#include <linux/xxx.h>
...
#include <linux/platform_data/xxx.h>
...
#include <mach/xxx.h>
...
#include <plat/xxx.h>
...
---
And there are small comments...
> Cc: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Ben Dooks <ben-linux@fluff.org>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Jeff Garzik <jgarzik@pobox.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: Bryan Wu <bryan.wu@canonical.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
> Cc: Chris Ball <cjb@laptop.org>
> Cc: David Woodhouse <dwmw2@infradead.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Cc: Sangbeom Kim <sbkim73@samsung.com>
> Cc: Liam Girdwood <lrg@ti.com>
> Cc: linux-samsung-soc at vger.kernel.org
> ---
> arch/arm/mach-exynos/dev-audio.c | 2 +-
> arch/arm/mach-exynos/dev-ohci.c | 2 +-
> arch/arm/mach-exynos/mach-nuri.c | 6 +++---
> arch/arm/mach-exynos/mach-origen.c | 6 +++---
> arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
> arch/arm/mach-exynos/mach-smdkv310.c | 6 +++---
> arch/arm/mach-exynos/mach-universal_c210.c | 4 ++--
> arch/arm/mach-exynos/setup-i2c0.c | 2 +-
> arch/arm/mach-exynos/setup-i2c1.c | 2 +-
> arch/arm/mach-exynos/setup-i2c2.c | 2 +-
> arch/arm/mach-exynos/setup-i2c3.c | 2 +-
> arch/arm/mach-exynos/setup-i2c4.c | 2 +-
> arch/arm/mach-exynos/setup-i2c5.c | 2 +-
> arch/arm/mach-exynos/setup-i2c6.c | 2 +-
> arch/arm/mach-exynos/setup-i2c7.c | 2 +-
> arch/arm/mach-s3c24xx/common-smdk.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-amlm5900.c | 2 +-
> arch/arm/mach-s3c24xx/mach-anubis.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-bast.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-gta02.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-h1940.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-jive.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-n30.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-nexcoder.c | 2 +-
> arch/arm/mach-s3c24xx/mach-osiris.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-otom.c | 2 +-
> arch/arm/mach-s3c24xx/mach-qt2410.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-rx1950.c | 10 +++++-----
> arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2410.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2413.c | 4 ++--
> arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 ++++----
> arch/arm/mach-s3c24xx/mach-smdk2440.c | 2 +-
> arch/arm/mach-s3c24xx/mach-smdk2443.c | 2 +-
> arch/arm/mach-s3c24xx/mach-tct_hammer.c | 2 +-
> arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +++---
> arch/arm/mach-s3c24xx/mach-vstms.c | 4 ++--
> arch/arm/mach-s3c24xx/setup-i2c.c | 2 +-
> arch/arm/mach-s3c24xx/simtec-audio.c | 2 +-
> arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
> arch/arm/mach-s3c64xx/dev-audio.c | 2 +-
> arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
> arch/arm/mach-s3c64xx/mach-crag6410-module.c | 2 +-
> arch/arm/mach-s3c64xx/mach-crag6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-hmt.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-mini6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
> arch/arm/mach-s3c64xx/mach-real6410.c | 4 ++--
> arch/arm/mach-s3c64xx/mach-smartq.c | 8 ++++----
> arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
> arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +++---
> arch/arm/mach-s3c64xx/setup-i2c0.c | 2 +-
> arch/arm/mach-s3c64xx/setup-i2c1.c | 2 +-
> arch/arm/mach-s3c64xx/setup-ide.c | 2 +-
> arch/arm/mach-s5p64x0/dev-audio.c | 2 +-
> arch/arm/mach-s5p64x0/mach-smdk6440.c | 4 ++--
> arch/arm/mach-s5p64x0/mach-smdk6450.c | 4 ++--
> arch/arm/mach-s5p64x0/setup-i2c0.c | 2 +-
> arch/arm/mach-s5p64x0/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pc100/dev-audio.c | 2 +-
> arch/arm/mach-s5pc100/mach-smdkc100.c | 8 ++++----
> arch/arm/mach-s5pc100/setup-i2c0.c | 2 +-
> arch/arm/mach-s5pc100/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pv210/dev-audio.c | 2 +-
> arch/arm/mach-s5pv210/mach-goni.c | 2 +-
> arch/arm/mach-s5pv210/mach-smdkc110.c | 4 ++--
> arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +++---
> arch/arm/mach-s5pv210/mach-torbreck.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c0.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c1.c | 2 +-
> arch/arm/mach-s5pv210/setup-i2c2.c | 2 +-
> arch/arm/plat-samsung/devs.c | 20
++++++++++----------
> drivers/ata/pata_samsung_cf.c | 2 +-
> drivers/hwmon/s3c-hwmon.c | 2 +-
> drivers/i2c/busses/i2c-s3c2410.c | 2 +-
> drivers/input/touchscreen/s3c2410_ts.c | 2 +-
> drivers/leds/leds-s3c24xx.c | 2 +-
> drivers/media/video/s5p-fimc/mipi-csis.c | 2 +-
> drivers/mmc/host/s3cmci.c | 2 +-
> drivers/mtd/nand/s3c2410.c | 2 +-
> drivers/spi/spi-s3c64xx.c | 2 +-
> drivers/usb/gadget/s3c2410_udc.c | 2 +-
> drivers/usb/host/ehci-s5p.c | 2 +-
> drivers/usb/host/ohci-exynos.c | 2 +-
> drivers/usb/host/ohci-s3c2410.c | 2 +-
> .../linux/platform_data/asoc-s3c.h | 0
> .../linux/platform_data/asoc-s3c24xx_simtec.h | 0
> .../linux/platform_data/ata-samsung_cf.h | 0
> .../linux/platform_data/hwmon-s3c.h | 0
> .../linux/platform_data/i2c-s3c2410.h | 0
> .../linux/platform_data/leds-s3c24xx.h | 0
> .../linux/platform_data/mipi-csis.h | 0
> .../linux/platform_data/mmc-s3cmci.h | 0
> .../linux/platform_data/mtd-nand-s3c2410.h | 0
> .../linux/platform_data/spi-s3c64xx.h | 0
> .../linux/platform_data/touchscreen-s3c2410.h | 0
> .../linux/platform_data/usb-ehci-s5p.h | 0
> .../linux/platform_data/usb-exynos.h | 0
> .../linux/platform_data/usb-ohci-s3c2410.h | 0
> .../linux/platform_data/usb-s3c2410_udc.h | 0
> sound/soc/samsung/ac97.c | 2 +-
> sound/soc/samsung/i2s.c | 2 +-
> sound/soc/samsung/pcm.c | 2 +-
> sound/soc/samsung/s3c24xx_simtec.c | 2 +-
> sound/soc/samsung/spdif.c | 2 +-
> 107 files changed, 164 insertions(+), 164 deletions(-)
> rename arch/arm/plat-samsung/include/plat/audio.h =>
> include/linux/platform_data/asoc-s3c.h (100%)
I'd prefer asoc-samsung.h and...
> rename arch/arm/plat-samsung/include/plat/audio-simtec.h =>
> include/linux/platform_data/asoc-s3c24xx_simtec.h (100%)
This will be merged into above header.
arch/arm/plat-samsung/include/plat/audio-simtec.h | 34 ----------------
.../linux/platform_data/asoc-samsung.h | 42
++++++++++++++++---
2 files changed, 35 insertions(+), 41 deletions(-)
delete mode 100644 arch/arm/plat-samsung/include/plat/audio-simtec.h
rename arch/arm/plat-samsung/include/plat/audio.h =>
include/linux/platform_data/asoc-samsung.h (63%)
diff --git a/arch/arm/plat-samsung/include/plat/audio-simtec.h
b/arch/arm/plat-samsung/include/plat/audio-simtec.h
deleted file mode 100644
index 376af52..0000000
--- a/arch/arm/plat-samsung/include/plat/audio-simtec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio-simtec.h
- *
- * Copyright 2008 Simtec Electronics
- * http://armlinux.simtec.co.uk/
- * Ben Dooks <ben@simtec.co.uk>
- *
- * 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.
- *
- * Simtec Audio support.
-*/
-
-/**
- * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
- * @use_mpllin: Select codec clock from MPLLin
- * @output_cdclk: Need to output CDCLK to the codec
- * @have_mic: Set if we have a MIC socket
- * @have_lout: Set if we have a LineOut socket
- * @amp_gpio: GPIO pin to enable the AMP
- * @amp_gain: Option GPIO to control AMP gain
- */
-struct s3c24xx_audio_simtec_pdata {
- unsigned int use_mpllin:1;
- unsigned int output_cdclk:1;
-
- unsigned int have_mic:1;
- unsigned int have_lout:1;
-
- int amp_gpio;
- int amp_gain[2];
-
- void (*startup)(void);
-};
diff --git a/arch/arm/plat-samsung/include/plat/audio.h
b/include/linux/platform_data/asoc-samsung.h
similarity index 63%
rename from arch/arm/plat-samsung/include/plat/audio.h
rename to include/linux/platform_data/asoc-samsung.h
index aa9875f..6b1d947 100644
--- a/arch/arm/plat-samsung/include/plat/audio.h
+++ b/include/linux/platform_data/asoc-samsung.h
@@ -1,5 +1,4 @@
-/* arch/arm/plat-samsung/include/plat/audio.h
- *
+/*
* Copyright (c) 2009 Samsung Electronics Co. Ltd
* Author: Jaswinder Singh <jassi.brar@samsung.com>
*
@@ -8,12 +7,13 @@
* published by the Free Software Foundation.
*/
-/* The machine init code calls s3c*_ac97_setup_gpio with
+/*
+ * The machine init code calls s3c*_ac97_setup_gpio with
* one of these defines in order to select appropriate bank
* of GPIO for AC97 pins
*/
-#define S3C64XX_AC97_GPD 0
-#define S3C64XX_AC97_GPE 1
+#define S3C64XX_AC97_GPD 0
+#define S3C64XX_AC97_GPE 1
extern void s3c64xx_ac97_setup_gpio(int);
/*
@@ -21,8 +21,8 @@ extern void s3c64xx_ac97_setup_gpio(int);
* one of these defines in order to select appropriate bank
* of GPIO for S/PDIF pins
*/
-#define S5PC100_SPDIF_GPD 0
-#define S5PC100_SPDIF_GPG3 1
+#define S5PC100_SPDIF_GPD 0
+#define S5PC100_SPDIF_GPG3 1
extern void s5pc100_spdif_setup_gpio(int);
struct samsung_i2s {
@@ -57,3 +57,31 @@ struct s3c_audio_pdata {
struct samsung_i2s i2s;
} type;
};
+
+/**
+ * Simtec Audio support
+
+ * Copyright 2008 Simtec Electronics
+ * http://armlinux.simtec.co.uk/
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
+ * @use_mpllin: Select codec clock from MPLLin
+ * @output_cdclk: Need to output CDCLK to the codec
+ * @have_mic: Set if we have a MIC socket
+ * @have_lout: Set if we have a LineOut socket
+ * @amp_gpio: GPIO pin to enable the AMP
+ * @amp_gain: Option GPIO to control AMP gain
+ */
+struct s3c24xx_audio_simtec_pdata {
+ unsigned int use_mpllin:1;
+ unsigned int output_cdclk:1;
+
+ unsigned int have_mic:1;
+ unsigned int have_lout:1;
+
+ int amp_gpio;
+ int amp_gain[2];
+
+ void (*startup)(void);
+};
--
And I think, need to check what header name is better like following?...But
if any policy on the naming, I'm OK :-)
> rename arch/arm/plat-samsung/include/plat/ata.h =>
> include/linux/platform_data/ata-samsung_cf.h (100%)
ata-samsung.h?
> rename arch/arm/plat-samsung/include/plat/hwmon.h =>
> include/linux/platform_data/hwmon-s3c.h (100%)
s3c-hwmon.h?
> rename arch/arm/plat-samsung/include/plat/iic.h =>
> include/linux/platform_data/i2c-s3c2410.h (100%)
> rename arch/arm/mach-s3c24xx/include/mach/leds-gpio.h =>
> include/linux/platform_data/leds-s3c24xx.h (100%)
> rename arch/arm/plat-samsung/include/plat/mipi_csis.h =>
> include/linux/platform_data/mipi-csis.h (100%)
> rename arch/arm/plat-samsung/include/plat/mci.h =>
> include/linux/platform_data/mmc-s3cmci.h (100%)
> rename arch/arm/plat-samsung/include/plat/nand.h =>
> include/linux/platform_data/mtd-nand-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/s3c64xx-spi.h =>
> include/linux/platform_data/spi-s3c64xx.h (100%)
> rename arch/arm/plat-samsung/include/plat/ts.h =>
> include/linux/platform_data/touchscreen-s3c2410.h (100%)
s3c2410-ts.h?
> rename arch/arm/plat-samsung/include/plat/ehci.h =>
> include/linux/platform_data/usb-ehci-s5p.h (100%)
> rename arch/arm/mach-exynos/include/mach/ohci.h =>
> include/linux/platform_data/usb-exynos.h (100%)
usb-ohci-exynos.h?
> rename arch/arm/plat-samsung/include/plat/usb-control.h =>
> include/linux/platform_data/usb-ohci-s3c2410.h (100%)
> rename arch/arm/plat-samsung/include/plat/udc.h =>
> include/linux/platform_data/usb-s3c2410_udc.h (100%)
>
And just note that conflicts will be happened when merge this into Samsung
tree.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
next prev parent reply other threads:[~2012-09-12 2:21 UTC|newest]
Thread overview: 182+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1347368245-30989-1-git-send-email-arnd@arndb.de>
2012-09-11 12:59 ` [PATCH 00/16] ARM: big platform data header rename Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 01/16] ARM: at91: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 02/16] ARM: davinci: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:05 ` Felipe Balbi
2012-09-11 13:05 ` Felipe Balbi
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 10:42 ` Hebbar, Gururaja
2012-09-12 17:11 ` Arnd Bergmann
2012-09-12 17:11 ` Arnd Bergmann
2012-09-13 7:00 ` Hebbar, Gururaja
2012-09-13 7:00 ` Hebbar, Gururaja
2012-09-11 12:59 ` [PATCH 03/16] ARM: ep93xx: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 16:26 ` H Hartley Sweeten
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 17:16 ` Arnd Bergmann
2012-09-11 22:56 ` Ryan Mallon
2012-09-11 22:56 ` Ryan Mallon
2012-09-14 3:18 ` Vinod Koul
2012-09-14 3:18 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 04/16] ARM: imx: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 13:40 ` Guennadi Liakhovetski
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:10 ` Arnd Bergmann
2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-11 14:31 ` Guennadi Liakhovetski
2012-09-12 15:52 ` Arnd Bergmann
2012-09-12 15:52 ` Arnd Bergmann
2012-09-13 7:21 ` Shawn Guo
2012-09-13 7:21 ` Shawn Guo
2012-09-11 13:45 ` Sascha Hauer
2012-09-11 13:45 ` Sascha Hauer
2012-09-14 3:17 ` Vinod Koul
2012-09-14 3:17 ` Vinod Koul
2012-09-11 12:59 ` [PATCH 05/16] ARM: msm: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 21:07 ` David Brown
2012-09-11 21:07 ` David Brown
2012-09-11 12:59 ` [PATCH 06/16] ARM: netx: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 13:35 ` Sascha Hauer
2012-09-11 12:59 ` [PATCH 07/16] ARM: pxa: " Arnd Bergmann
2012-09-11 13:56 ` Igor Grinberg
2012-09-11 17:11 ` Jeff Garzik
2012-09-11 19:13 ` Marek Vasut
2012-09-11 19:36 ` Robert Jarzmik
2012-09-12 22:56 ` Paul Parsons
2012-09-13 8:46 ` stefan at sostec.de
2012-10-02 19:03 ` [PATCH] ARM: pxa: Fix build error caused by sram.h rename Chris Ball
2012-10-02 20:27 ` Arnd Bergmann
2012-10-05 14:48 ` Chris Ball
2012-10-05 18:57 ` Arnd Bergmann
2012-10-06 8:55 ` Mark Brown
2012-09-11 12:59 ` [PATCH 08/16] ARM: sa1100: move platform_data definitions Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 09/16] ARM: tegra: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
[not found] ` <1347368390-31252-9-git-send-email-arnd-r2nGTMty4D4@public.gmane.org>
2012-09-11 15:35 ` Stephen Warren
2012-09-11 15:35 ` Stephen Warren
2012-09-11 15:35 ` Stephen Warren
2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 16:21 ` Arnd Bergmann
2012-09-12 16:21 ` Arnd Bergmann
[not found] ` <201209121621.16019.arnd-r2nGTMty4D4@public.gmane.org>
2012-09-12 17:29 ` Stephen Warren
2012-09-12 17:29 ` Stephen Warren
2012-09-12 17:29 ` Stephen Warren
2012-09-11 15:42 ` Chris Ball
2012-09-11 15:42 ` Chris Ball
2012-09-11 15:42 ` Chris Ball
[not found] ` <871ui8y3at.fsf-DGHOrqG7t0YzNDMTQreKSUB+6BGkLq7r@public.gmane.org>
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:05 ` Arnd Bergmann
2012-09-11 17:05 ` Arnd Bergmann
[not found] ` <201209111705.37490.arnd-r2nGTMty4D4@public.gmane.org>
2012-09-11 17:11 ` Chris Ball
2012-09-11 17:11 ` Chris Ball
2012-09-11 17:11 ` Chris Ball
2012-09-12 16:42 ` Chris Brand
2012-09-12 16:42 ` Chris Brand
2012-09-12 16:42 ` Chris Brand
2012-09-11 12:59 ` [PATCH 10/16] ARM: vt8500: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 20:54 ` Tony Prisk
2012-09-11 20:54 ` Tony Prisk
2012-09-11 12:59 ` [PATCH 11/16] ARM: w90x900: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 12/16] ARM: nomadik: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:31 ` Linus Walleij
2012-09-11 13:46 ` Arnd Bergmann
2012-09-11 13:46 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
2012-09-12 16:24 ` Arnd Bergmann
2012-09-11 12:59 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 12:59 ` Arnd Bergmann
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-11 13:52 ` Peter Ujfalusi
2012-09-12 17:20 ` Arnd Bergmann
2012-09-12 17:20 ` Arnd Bergmann
2012-09-18 9:57 ` Peter Ujfalusi
2012-09-18 9:57 ` Peter Ujfalusi
2012-09-19 14:49 ` Arnd Bergmann
2012-09-19 14:49 ` Arnd Bergmann
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 7:16 ` Pihet-XID, Jean
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:15 ` Arnd Bergmann
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-12 17:40 ` Pihet-XID, Jean
2012-09-11 13:20 ` [PATCH 01/16] ARM: at91: " Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:20 ` Jean-Christophe PLAGNIOL-VILLARD
2012-09-11 13:35 ` Nicolas Ferre
2012-09-11 13:35 ` Nicolas Ferre
2012-09-11 18:29 ` [PATCH 12/16] ARM: nomadik: " Alessandro Rubini
2012-09-11 18:29 ` Alessandro Rubini
2012-09-14 3:18 ` [PATCH 01/16] ARM: at91: " Vinod Koul
2012-09-14 3:18 ` Vinod Koul
2012-09-11 13:02 ` [PATCH 13/16] ARM: omap: " Arnd Bergmann
2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:02 ` [PATCH 14/16] ARM: orion: " Arnd Bergmann
2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:11 ` Thomas Petazzoni
2012-09-11 13:02 ` [PATCH 15/16] ARM: samsung: " Arnd Bergmann
2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:02 ` Arnd Bergmann
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 13:07 ` Felipe Balbi
2012-09-11 17:12 ` Jeff Garzik
2012-09-11 17:12 ` Jeff Garzik
2012-09-11 17:12 ` Jeff Garzik
2012-09-12 1:27 ` Jingoo Han
2012-09-12 1:27 ` Jingoo Han
2012-09-12 2:20 ` Kukjin Kim [this message]
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 2:20 ` Kukjin Kim
2012-09-12 5:44 ` Kyungmin Park
2012-09-12 5:44 ` Kyungmin Park
2012-09-12 5:44 ` Kyungmin Park
2012-09-11 13:02 ` [PATCH 16/16] ARM: spear: " Arnd Bergmann
2012-09-11 13:02 ` Arnd Bergmann
2012-09-12 3:17 ` viresh kumar
2012-09-12 3:17 ` viresh kumar
2012-09-11 14:06 ` [PATCH 13/16] ARM: omap: " Shilimkar, Santosh
2012-09-11 14:06 ` Shilimkar, Santosh
2012-09-11 14:06 ` Shilimkar, Santosh
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:17 ` Arnd Bergmann
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 14:24 ` Shilimkar, Santosh
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 16:09 ` Vaibhav Hiremath
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:04 ` Arnd Bergmann
2012-09-11 17:36 ` Tony Lindgren
2012-09-11 17:36 ` Tony Lindgren
2012-09-11 17:36 ` Tony Lindgren
2012-09-12 3:53 ` Hiremath, Vaibhav
2012-09-12 3:53 ` Hiremath, Vaibhav
2012-09-12 17:55 ` Sekhar Nori
2012-09-12 17:55 ` Sekhar Nori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='010001cd908d$3e7a3fc0$bb6ebf40$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=ben-linux@fluff.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=bryan.wu@canonical.com \
--cc=cjb@laptop.org \
--cc=dmitry.torokhov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=jgarzik@pobox.com \
--cc=kyungmin.park@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=linux@roeck-us.net \
--cc=lrg@ti.com \
--cc=mchehab@infradead.org \
--cc=rpurdie@rpsys.net \
--cc=s.nawrocki@samsung.com \
--cc=sbkim73@samsung.com \
--cc=stern@rowland.harvard.edu \
--cc=w.sang@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.