tracking-2.6.28-breakage-after-change-to-64xx-tree.patch

Signed-off-by: Andy Green <andy@openmoko.com>

13 files changed, 60 insertions, 33 deletions

diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 2a12a6a67b2..6c537ecb1af 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -15,7 +15,7 @@ obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_CPU_S3C2410_DMA)	+= dma.o
 obj-$(CONFIG_S3C2410_PM)	+= pm.o sleep.o
 obj-$(CONFIG_S3C2410_GPIO)	+= gpio.o
-obj-$(CONFIG_S3C2410_CLOCK)	+= clock.o
+#obj-$(CONFIG_S3C2410_CLOCK)	+= clock.o
 obj-$(CONFIG_S3C2410_PWM)	+= pwm.o
 
 # Machine support
diff --git a/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
index 8f7744eab63..e74aa2ccc40 100644
--- a/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
+++ b/arch/arm/mach-s3c2410/include/mach/fiq_ipc_gta02.h
@@ -17,7 +17,7 @@
  */
 
 #include <mach/pwm.h>
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 
 extern u8 fiq_ready;
 
diff --git a/arch/arm/mach-s3c2410/include/mach/pwm.h b/arch/arm/mach-s3c2410/include/mach/pwm.h
index 5689ce973d2..4e3a298f407 100644
--- a/arch/arm/mach-s3c2410/include/mach/pwm.h
+++ b/arch/arm/mach-s3c2410/include/mach/pwm.h
@@ -8,7 +8,7 @@
 #include <mach/io.h>
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 #include <mach/gta01.h>
 
 enum pwm_timer {
diff --git a/arch/arm/mach-s3c2410/pwm.c b/arch/arm/mach-s3c2410/pwm.c
index d6780841c69..9528d7aab63 100644
--- a/arch/arm/mach-s3c2410/pwm.c
+++ b/arch/arm/mach-s3c2410/pwm.c
@@ -22,7 +22,7 @@
 #include <linux/clk.h>
 #include <linux/device.h>
 #include <mach/hardware.h>
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 #include <mach/pwm.h>
 #include <asm/io.h>
 
diff --git a/arch/arm/mach-s3c2440/fiq_c_isr.c b/arch/arm/mach-s3c2440/fiq_c_isr.c
index 3db402748f6..924f1f926cf 100644
--- a/arch/arm/mach-s3c2440/fiq_c_isr.c
+++ b/arch/arm/mach-s3c2440/fiq_c_isr.c
@@ -16,11 +16,11 @@
 
 #include <asm/io.h>
 
-#include <asm/plat-s3c24xx/cpu.h>
-#include <asm/plat-s3c24xx/irq.h>
+#include <plat/cpu.h>
+#include <plat/irq.h>
 
 #include <mach/pwm.h>
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 
 /*
  * Major Caveats for using FIQ
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index db0965dd064..ba9afb870a6 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -70,11 +70,11 @@
 
 #include <mach/gta02.h>
 
-#include <asm/plat-s3c/regs-serial.h>
+#include <plat/regs-serial.h>
 #include <asm/plat-s3c/nand.h>
 #include <asm/plat-s3c24xx/devs.h>
-#include <asm/plat-s3c24xx/cpu.h>
-#include <asm/plat-s3c24xx/pm.h>
+#include <plat/cpu.h>
+#include <plat/pm.h>
 #include <asm/plat-s3c24xx/udc.h>
 #include <asm/plat-s3c24xx/neo1973.h>
 #include <mach/neo1973-pm-gsm.h>
diff --git a/arch/arm/plat-s3c24xx/cpu.c b/arch/arm/plat-s3c24xx/cpu.c
index 8d8cb268740..c340cb43f18 100644
--- a/arch/arm/plat-s3c24xx/cpu.c
+++ b/arch/arm/plat-s3c24xx/cpu.c
@@ -170,24 +170,6 @@ static struct map_desc s3c_iodesc[] __initdata = {
 };
 
 /* read cpu identificaiton code */
-static struct cpu_table * __init
-s3c_lookup_cpu(unsigned long idcode)
-{
-	struct cpu_table *tab;
-	int count;
-
-	tab = cpu_ids;
-	for (count = 0; count < ARRAY_SIZE(cpu_ids); count++, tab++) {
-		if ((idcode & tab->idmask) == tab->idcode)
-			return tab;
-	}
-
-	return NULL;
-}
-
-/* cpu information */
-
-static struct cpu_table *cpu;
 
 static unsigned long s3c24xx_read_idcode_v5(void)
 {
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index b689cf464c7..6cc157cf655 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -26,7 +26,7 @@
 #include <asm/mach/irq.h>
 #include <mach/fb.h>
 #include <mach/hardware.h>
-#include <asm/arch-s3c2410/ts.h>
+#include <mach/ts.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 
diff --git a/arch/arm/plat-s3c24xx/s3c244x.c b/arch/arm/plat-s3c24xx/s3c244x.c
index d306885807d..df78a15a80b 100644
--- a/arch/arm/plat-s3c24xx/s3c244x.c
+++ b/arch/arm/plat-s3c24xx/s3c244x.c
@@ -59,6 +59,8 @@ void __init s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 	s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
 }
 
+extern struct platform_device s3c_device_ts;
+
 void __init s3c244x_map_io(void)
 {
 	/* register our io-tables */
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
index 8a4fefa02fe..ceca0886a80 100644
--- a/drivers/input/touchscreen/s3c2410_ts.c
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -57,7 +57,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/ts.h>
 
-#include <asm/plat-s3c/regs-adc.h>
+#include <plat/regs-adc.h>
 
 /* For ts.dev.id.version */
 #define S3C2410TSVERSION	0x0101
diff --git a/drivers/leds/leds-neo1973-gta02.c b/drivers/leds/leds-neo1973-gta02.c
index 9350eb36ac4..cb3cf03dece 100644
--- a/drivers/leds/leds-neo1973-gta02.c
+++ b/drivers/leds/leds-neo1973-gta02.c
@@ -18,7 +18,7 @@
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <mach/gta02.h>
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 #include <asm/plat-s3c24xx/neo1973.h>
 
 #define MAX_LEDS 3
diff --git a/drivers/leds/leds-neo1973-vibrator.c b/drivers/leds/leds-neo1973-vibrator.c
index cbbc33092f4..27e3b67eeb5 100644
--- a/drivers/leds/leds-neo1973-vibrator.c
+++ b/drivers/leds/leds-neo1973-vibrator.c
@@ -21,7 +21,7 @@
 #include <asm/mach-types.h>
 #include <mach/pwm.h>
 #include <mach/gta01.h>
-#include <asm/plat-s3c/regs-timer.h>
+#include <plat/regs-timer.h>
 
 #ifdef CONFIG_MACH_NEO1973_GTA02
 #include <mach/fiq_ipc_gta02.h>
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 04553e22575..4706b87d3f1 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -1684,6 +1684,47 @@ static struct i2c_driver wm8753_i2c_driver = {
 	.class =    I2C_CLASS_SOUND
 };
 
+static int wm8753_add_i2c_device(struct platform_device *pdev,
+				 const struct wm8753_setup_data *setup)
+{
+	struct i2c_board_info info;
+	struct i2c_adapter *adapter;
+	struct i2c_client *client;
+	int ret;
+
+	ret = i2c_add_driver(&wm8753_i2c_driver);
+	if (ret != 0) {
+		dev_err(&pdev->dev, "can't add i2c driver\n");
+		return ret;
+	}
+
+	memset(&info, 0, sizeof(struct i2c_board_info));
+	info.addr = setup->i2c_address;
+	strlcpy(info.type, "wm8753", I2C_NAME_SIZE);
+
+	adapter = i2c_get_adapter(setup->i2c_bus);
+	if (!adapter) {
+		dev_err(&pdev->dev, "can't get i2c adapter %d\n",
+			setup->i2c_bus);
+		goto err_driver;
+	}
+
+	client = i2c_new_device(adapter, &info);
+	i2c_put_adapter(adapter);
+	if (!client) {
+		dev_err(&pdev->dev, "can't add i2c device at 0x%x\n",
+			(unsigned int)info.addr);
+		goto err_driver;
+	}
+
+	return 0;
+
+err_driver:
+	i2c_del_driver(&wm8753_i2c_driver);
+	return -ENODEV;
+}
+
+
 #endif
 
 #if defined(CONFIG_SPI_MASTER)
@@ -1746,12 +1787,14 @@ static int wm8753_spi_write(struct spi_device *spi, const char *data, int len)
 static int wm8753_probe(struct platform_device *pdev)
 {
 	struct snd_soc_device *socdev = platform_get_drvdata(pdev);
+	struct wm8753_setup_data *setup;
 	struct snd_soc_codec *codec;
 	struct wm8753_priv *wm8753;
 	int ret = 0;
 
 	pr_info("WM8753 Audio Codec %s\n", WM8753_VERSION);
 
+	setup = socdev->codec_data;
 	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
 	if (codec == NULL)
 		return -ENOMEM;
@@ -1773,7 +1816,7 @@ static int wm8753_probe(struct platform_device *pdev)
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 	if (setup->i2c_address) {
 		codec->hw_write = (hw_write_t)i2c_master_send;
-		ret = add_i2c_device(pdev, setup);
+		ret = wm8753_add_i2c_device(pdev, setup);
 	}
 #endif
 #if defined(CONFIG_SPI_MASTER)