diff --git a/[refs] b/[refs]
index 629861a792f0..656cdeb65427 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2
+refs/heads/master: 5cbcccb370355d4cd8534796bf32ac8bb04627cc
diff --git a/trunk/arch/arm/mach-s3c2440/Kconfig b/trunk/arch/arm/mach-s3c2440/Kconfig
index 80879358eb2f..5486929dc3d0 100644
--- a/trunk/arch/arm/mach-s3c2440/Kconfig
+++ b/trunk/arch/arm/mach-s3c2440/Kconfig
@@ -21,8 +21,7 @@ config S3C2440_DMA
 	help
 	  Support for S3C2440 specific DMA code5A
 
-
-menu "S3C2440 Machines"
+menu "S3C2440 and S3C2442 Machines"
 
 config MACH_ANUBIS
 	bool "Simtec Electronics ANUBIS"
@@ -37,6 +36,18 @@ config MACH_ANUBIS
 	  Say Y here if you are using the Simtec Electronics ANUBIS
 	  development system
 
+config MACH_NEO1973_GTA02
+	bool "Openmoko GTA02 / Freerunner phone"
+	select CPU_S3C2442
+	select MFD_PCF50633
+	select PCF50633_GPIO
+	select I2C
+	select POWER_SUPPLY
+	select MACH_NEO1973
+	select S3C2410_PWM
+	help
+	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
+
 config MACH_OSIRIS
 	bool "Simtec IM2440D20 (OSIRIS) module"
 	select CPU_S3C2440
@@ -99,6 +110,11 @@ config SMDK2440_CPU2440
 	select S3C2440_XTAL_16934400
 	select CPU_S3C2440
 
+config SMDK2440_CPU2442
+	bool "SMDM2440 with S3C2442 CPU module"
+	depends on ARCH_S3C2440
+	select CPU_S3C2442
+
 config MACH_AT2440EVB
 	bool "Avantech AT2440EVB development board"
 	select CPU_S3C2440
diff --git a/trunk/arch/arm/mach-s3c2440/Makefile b/trunk/arch/arm/mach-s3c2440/Makefile
index 5f3224531885..e51497ca12ea 100644
--- a/trunk/arch/arm/mach-s3c2440/Makefile
+++ b/trunk/arch/arm/mach-s3c2440/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_ARCH_S3C2440)	+= mach-smdk2440.o
 obj-$(CONFIG_MACH_NEXCODER_2440) += mach-nexcoder.o
 obj-$(CONFIG_MACH_AT2440EVB) += mach-at2440evb.o
 obj-$(CONFIG_MACH_MINI2440) += mach-mini2440.o
+obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
 
 # extra machine support
 
diff --git a/trunk/arch/arm/mach-s3c2442/include/mach/gta02.h b/trunk/arch/arm/mach-s3c2440/include/mach/gta02.h
similarity index 100%
rename from trunk/arch/arm/mach-s3c2442/include/mach/gta02.h
rename to trunk/arch/arm/mach-s3c2440/include/mach/gta02.h
diff --git a/trunk/arch/arm/mach-s3c2442/mach-gta02.c b/trunk/arch/arm/mach-s3c2440/mach-gta02.c
similarity index 100%
rename from trunk/arch/arm/mach-s3c2442/mach-gta02.c
rename to trunk/arch/arm/mach-s3c2440/mach-gta02.c
diff --git a/trunk/arch/arm/mach-s3c2442/Kconfig b/trunk/arch/arm/mach-s3c2442/Kconfig
index 8d3811852fc7..4832cd6ccfbc 100644
--- a/trunk/arch/arm/mach-s3c2442/Kconfig
+++ b/trunk/arch/arm/mach-s3c2442/Kconfig
@@ -13,25 +13,3 @@ config CPU_S3C2442
 	select CPU_LLSERIAL_S3C2440
 	help
 	  Support for S3C2442 Samsung Mobile CPU based systems.
-
-
-menu "S3C2442 Machines"
-
-config SMDK2440_CPU2442
-	bool "SMDM2440 with S3C2442 CPU module"
-	depends on ARCH_S3C2440
-	select CPU_S3C2442
-
-config MACH_NEO1973_GTA02
-	bool "Openmoko GTA02 / Freerunner phone"
-	select CPU_S3C2442
-	select MFD_PCF50633
-	select PCF50633_GPIO
-	select I2C
-	select POWER_SUPPLY
-	select MACH_NEO1973
-	select S3C2410_PWM
-	help
-	   Say Y here if you are using the Openmoko GTA02 / Freerunner GSM Phone
-
-endmenu
diff --git a/trunk/arch/arm/mach-s3c2442/Makefile b/trunk/arch/arm/mach-s3c2442/Makefile
index 2a19113a5769..2a909c6c5798 100644
--- a/trunk/arch/arm/mach-s3c2442/Makefile
+++ b/trunk/arch/arm/mach-s3c2442/Makefile
@@ -12,7 +12,5 @@ obj-				:=
 obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
 obj-$(CONFIG_CPU_S3C2442)	+= clock.o
 
-obj-$(CONFIG_MACH_NEO1973_GTA02) += mach-gta02.o
-
 # Machine support
 
diff --git a/trunk/arch/arm/plat-s3c64xx/Makefile b/trunk/arch/arm/plat-s3c64xx/Makefile
index 33a73f3e9f01..80255a5e1789 100644
--- a/trunk/arch/arm/plat-s3c64xx/Makefile
+++ b/trunk/arch/arm/plat-s3c64xx/Makefile
@@ -40,16 +40,11 @@ obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
 
 obj-$(CONFIG_S3C_ADC)		+= dev-adc.o
 
-# SPI support
-obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o
-
-# Device support
-obj-y				+= dev-audio.o
-
 # Device setup
 
 obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
 obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
 obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
-
+obj-$(CONFIG_SND_S3C24XX_SOC) += dev-audio.o
+obj-$(CONFIG_SPI_S3C64XX) += dev-spi.o
diff --git a/trunk/arch/arm/plat-samsung/Kconfig b/trunk/arch/arm/plat-samsung/Kconfig
index 72da6461db12..1c2fe91c23e9 100644
--- a/trunk/arch/arm/plat-samsung/Kconfig
+++ b/trunk/arch/arm/plat-samsung/Kconfig
@@ -132,12 +132,6 @@ config S3C_DEV_NAND
 	help
 	  Compile in platform device definition for NAND controller
 
-config S3C64XX_DEV_SPI
-	bool
-	help
-	  Compile in platform device definitions for S3C64XX's type
-	  SPI controllers.
-
 comment "Power management"
 
 config SAMSUNG_PM_DEBUG
diff --git a/trunk/arch/arm/plat-samsung/adc.c b/trunk/arch/arm/plat-samsung/adc.c
index 81caf2135721..c7659b7378b1 100644
--- a/trunk/arch/arm/plat-samsung/adc.c
+++ b/trunk/arch/arm/plat-samsung/adc.c
@@ -262,7 +262,6 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
 {
 	struct adc_device *adc = pw;
 	struct s3c_adc_client *client = adc->cur;
-	enum s3c_cpu_type cpu = platform_get_device_id(adc->pdev)->driver_data;
 	unsigned long flags;
 	unsigned data0, data1;
 
@@ -277,17 +276,9 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
 
 	client->nr_samples--;
 
-	if (cpu == TYPE_S3C64XX) {
-		/* S3C64XX ADC resolution is 12-bit */
-		data0 &= 0xfff;
-		data1 &= 0xfff;
-	} else {
-		data0 &= 0x3ff;
-		data1 &= 0x3ff;
-	}
-
 	if (client->convert_cb)
-		(client->convert_cb)(client, data0, data1, &client->nr_samples);
+		(client->convert_cb)(client, data0 & 0x3ff, data1 & 0x3ff,
+				     &client->nr_samples);
 
 	if (client->nr_samples > 0) {
 		/* fire another conversion for this */
@@ -304,7 +295,7 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw)
 	}
 
 exit:
-	if (cpu == TYPE_S3C64XX) {
+	if (platform_get_device_id(adc->pdev)->driver_data == TYPE_S3C64XX) {
 		/* Clear ADC interrupt */
 		writel(0, adc->regs + S3C64XX_ADCCLRINT);
 	}
@@ -317,7 +308,6 @@ static int s3c_adc_probe(struct platform_device *pdev)
 	struct adc_device *adc;
 	struct resource *regs;
 	int ret;
-	unsigned tmp;
 
 	adc = kzalloc(sizeof(struct adc_device), GFP_KERNEL);
 	if (adc == NULL) {
@@ -364,12 +354,8 @@ static int s3c_adc_probe(struct platform_device *pdev)
 
 	clk_enable(adc->clk);
 
-	tmp = adc->prescale | S3C2410_ADCCON_PRSCEN;
-	if (platform_get_device_id(pdev)->driver_data == TYPE_S3C64XX) {
-		/* Enable 12-bit ADC resolution */
-		tmp |= S3C64XX_ADCCON_RESSEL;
-	}
-	writel(tmp, adc->regs + S3C2410_ADCCON);
+	writel(adc->prescale | S3C2410_ADCCON_PRSCEN,
+	       adc->regs + S3C2410_ADCCON);
 
 	dev_info(dev, "attached adc driver\n");
 
diff --git a/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c b/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c
index 33a844ab6917..e2f604b51c86 100644
--- a/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c
+++ b/trunk/arch/arm/plat-samsung/dev-usb-hsotg.c
@@ -14,7 +14,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
-#include <linux/dma-mapping.h>
 
 #include <mach/irqs.h>
 #include <mach/map.h>
@@ -34,15 +33,9 @@ static struct resource s3c_usb_hsotg_resources[] = {
 	},
 };
 
-static u64 s3c_hsotg_dmamask = DMA_BIT_MASK(32);
-
 struct platform_device s3c_device_usb_hsotg = {
 	.name		= "s3c-hsotg",
 	.id		= -1,
 	.num_resources	= ARRAY_SIZE(s3c_usb_hsotg_resources),
 	.resource	= s3c_usb_hsotg_resources,
-	.dev		= {
-		.dma_mask		= &s3c_hsotg_dmamask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-	},
 };
diff --git a/trunk/arch/arm/plat-samsung/include/plat/regs-adc.h b/trunk/arch/arm/plat-samsung/include/plat/regs-adc.h
index 7554c4fcddb9..f43c8dab39e4 100644
--- a/trunk/arch/arm/plat-samsung/include/plat/regs-adc.h
+++ b/trunk/arch/arm/plat-samsung/include/plat/regs-adc.h
@@ -25,7 +25,6 @@
 
 
 /* ADCCON Register Bits */
-#define S3C64XX_ADCCON_RESSEL		(1<<16)
 #define S3C2410_ADCCON_ECFLG		(1<<15)
 #define S3C2410_ADCCON_PRSCEN		(1<<14)
 #define S3C2410_ADCCON_PRSCVL(x)	(((x)&0xFF)<<6)
diff --git a/trunk/drivers/serial/Kconfig b/trunk/drivers/serial/Kconfig
index b2157c36566d..ebdd2b984d16 100644
--- a/trunk/drivers/serial/Kconfig
+++ b/trunk/drivers/serial/Kconfig
@@ -447,7 +447,7 @@ config SERIAL_CLPS711X_CONSOLE
 
 config SERIAL_SAMSUNG
 	tristate "Samsung SoC serial support"
-	depends on ARM && PLAT_SAMSUNG
+	depends on ARM && PLAT_S3C
 	select SERIAL_CORE
 	help
 	  Support for the on-chip UARTs on the Samsung S3C24XX series CPUs,
@@ -455,18 +455,11 @@ config SERIAL_SAMSUNG
 	  provide all of these ports, depending on how the serial port
 	  pins are configured.
 
-config SERIAL_SAMSUNG_UARTS_4
-	bool
-	depends on ARM && PLAT_SAMSUNG
-	default y if CPU_S3C2443
-	help
-	  Internal node for the common case of 4 Samsung compatible UARTs
-
 config SERIAL_SAMSUNG_UARTS
 	int
-	depends on ARM && PLAT_SAMSUNG
+	depends on ARM && PLAT_S3C
 	default 2 if ARCH_S3C2400
-	default 4 if SERIAL_SAMSUNG_UARTS_4
+	default 4 if ARCH_S5P6440 || ARCH_S5PC1XX || ARCH_S5PV210 || ARCH_S3C64XX || CPU_S3C2443
 	default 3
 	help
 	  Select the number of available UART ports for the Samsung S3C
@@ -533,9 +526,8 @@ config SERIAL_S3C24A0
 	  Serial port support for the Samsung S3C24A0 SoC
 
 config SERIAL_S3C6400
-	tristate "Samsung S3C6400/S3C6410/S5P6440 Seria port support"
+	tristate "Samsung S3C6400/S3C6410/S5P6440 Serial port support"
 	depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440)
-	select SERIAL_SAMSUNG_UARTS_4
 	default y
 	help
 	  Serial port support for the Samsung S3C6400, S3C6410 and S5P6440
@@ -544,7 +536,6 @@ config SERIAL_S3C6400
 config SERIAL_S5PC100
 	tristate "Samsung S5PC100 Serial port support"
 	depends on SERIAL_SAMSUNG && CPU_S5PC100
-	select SERIAL_SAMSUNG_UARTS_4
 	default y
 	help
 	  Serial port support for the Samsung S5PC100 SoCs
@@ -552,7 +543,6 @@ config SERIAL_S5PC100
 config SERIAL_S5PV210
 	tristate "Samsung S5PV210 Serial port support"
 	depends on SERIAL_SAMSUNG && CPU_S5PV210
-	select SERIAL_SAMSUNG_UARTS_4
 	default y
 	help
 	  Serial port support for Samsung's S5P Family of SoC's
diff --git a/trunk/drivers/serial/s3c2412.c b/trunk/drivers/serial/s3c2412.c
index 1700b1a2fb7e..ce75e28e36ef 100644
--- a/trunk/drivers/serial/s3c2412.c
+++ b/trunk/drivers/serial/s3c2412.c
@@ -102,7 +102,6 @@ static struct s3c24xx_uart_info s3c2412_uart_inf = {
 	.name		= "Samsung S3C2412 UART",
 	.type		= PORT_S3C2412,
 	.fifosize	= 64,
-	.has_divslot	= 1,
 	.rx_fifomask	= S3C2440_UFSTAT_RXMASK,
 	.rx_fifoshift	= S3C2440_UFSTAT_RXSHIFT,
 	.rx_fifofull	= S3C2440_UFSTAT_RXFULL,