8 files changed, 124 insertions, 33 deletions

diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 019c3a69b0e4..dab6ef3b6ca9 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -467,20 +467,20 @@ static struct clk init_clocks_disable[] = {
                 .enable         = s5pv210_clk_ip3_ctrl,
                 .ctrlbit        = (1<<21),
         }, {
-                .name           = "i2s_v50",
+                .name           = "iis",
                 .id             = 0,
                 .parent         = &clk_p,
                 .enable         = s5pv210_clk_ip3_ctrl,
                 .ctrlbit        = (1<<4),
         }, {
-                .name           = "i2s_v32",
-                .id             = 0,
+                .name           = "iis",
+                .id             = 1,
                 .parent         = &clk_p,
                 .enable         = s5pv210_clk_ip3_ctrl,
                 .ctrlbit        = (1 << 5),
         }, {
-                .name           = "i2s_v32",
-                .id             = 1,
+                .name           = "iis",
+                .id             = 2,
                 .parent         = &clk_p,
                 .enable         = s5pv210_clk_ip3_ctrl,
                 .ctrlbit        = (1 << 6),
@@ -525,6 +525,12 @@ static struct clk init_clocks[] = {
                 .parent         = &clk_pclk_psys.clk,
                 .enable         = s5pv210_clk_ip3_ctrl,
                 .ctrlbit        = (1 << 20),
+        }, {
+                .name           = "sromc",
+                .id             = -1,
+                .parent         = &clk_hclk_psys.clk,
+                .enable         = s5pv210_clk_ip1_ctrl,
+                .ctrlbit        = (1 << 26),
         },
 };
 
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 8eb480e201b0..61e6c24b90ac 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -81,11 +81,6 @@ static struct map_desc s5pv210_iodesc[] __initdata = {
                 .length         = SZ_512K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = (unsigned long)S5P_VA_SROMC,
-                .pfn            = __phys_to_pfn(S5PV210_PA_SROMC),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = (unsigned long)S5P_VA_DMC0,
                 .pfn            = __phys_to_pfn(S5PV210_PA_DMC0),
                 .length         = SZ_4K,
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
index 1303fcb12b51..ddd2704b3467 100644
--- a/arch/arm/mach-s5pv210/dev-audio.c
+++ b/arch/arm/mach-s5pv210/dev-audio.c
@@ -19,22 +19,24 @@
 #include <mach/dma.h>
 #include <mach/irqs.h>
 
+static const char *rclksrc[] = {
+        [0] = "busclk",
+        [1] = "i2sclk",
+};
+
 static int s5pv210_cfg_i2s(struct platform_device *pdev)
 {
         /* configure GPIO for i2s port */
         switch (pdev->id) {
+        case 0:
+                s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
+                break;
         case 1:
                 s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(2));
                 break;
-
         case 2:
                 s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(4));
                 break;
-
-        case -1:
-                s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
-                break;
-
         default:
                 printk(KERN_ERR "Invalid Device %d\n", pdev->id);
                 return -EINVAL;
@@ -43,8 +45,15 @@ static int s5pv210_cfg_i2s(struct platform_device *pdev)
         return 0;
 }
 
-static struct s3c_audio_pdata s3c_i2s_pdata = {
+static struct s3c_audio_pdata i2sv5_pdata = {
         .cfg_gpio = s5pv210_cfg_i2s,
+        .type = {
+                .i2s = {
+                        .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
+                                         | QUIRK_NEED_RSTCLR,
+                        .src_clk = rclksrc,
+                },
+        },
 };
 
 static struct resource s5pv210_iis0_resource[] = {
@@ -63,15 +72,34 @@ static struct resource s5pv210_iis0_resource[] = {
                 .end   = DMACH_I2S0_RX,
                 .flags = IORESOURCE_DMA,
         },
+        [3] = {
+                .start = DMACH_I2S0S_TX,
+                .end = DMACH_I2S0S_TX,
+                .flags = IORESOURCE_DMA,
+        },
 };
 
 struct platform_device s5pv210_device_iis0 = {
-        .name             = "s3c64xx-iis-v4",
-        .id               = -1,
+        .name = "samsung-i2s",
+        .id = 0,
         .num_resources    = ARRAY_SIZE(s5pv210_iis0_resource),
         .resource         = s5pv210_iis0_resource,
         .dev = {
-                .platform_data = &s3c_i2s_pdata,
+                .platform_data = &i2sv5_pdata,
+        },
+};
+
+static const char *rclksrc_v3[] = {
+        [0] = "iis",
+        [1] = "audio-bus",
+};
+
+static struct s3c_audio_pdata i2sv3_pdata = {
+        .cfg_gpio = s5pv210_cfg_i2s,
+        .type = {
+                .i2s = {
+                        .src_clk = rclksrc_v3,
+                },
         },
 };
 
@@ -94,12 +122,12 @@ static struct resource s5pv210_iis1_resource[] = {
 };
 
 struct platform_device s5pv210_device_iis1 = {
-        .name             = "s3c64xx-iis",
+        .name             = "samsung-i2s",
         .id               = 1,
         .num_resources    = ARRAY_SIZE(s5pv210_iis1_resource),
         .resource         = s5pv210_iis1_resource,
         .dev = {
-                .platform_data = &s3c_i2s_pdata,
+                .platform_data = &i2sv3_pdata,
         },
 };
 
@@ -122,12 +150,12 @@ static struct resource s5pv210_iis2_resource[] = {
 };
 
 struct platform_device s5pv210_device_iis2 = {
-        .name             = "s3c64xx-iis",
+        .name             = "samsung-i2s",
         .id               = 2,
         .num_resources    = ARRAY_SIZE(s5pv210_iis2_resource),
         .resource         = s5pv210_iis2_resource,
         .dev = {
-                .platform_data = &s3c_i2s_pdata,
+                .platform_data = &i2sv3_pdata,
         },
 };
 
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
index 119b95fdc3ce..26710b35ef87 100644
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -65,7 +65,7 @@
 #define IRQ_HSMMC0              S5P_IRQ_VIC1(26)
 #define IRQ_HSMMC1              S5P_IRQ_VIC1(27)
 #define IRQ_HSMMC2              S5P_IRQ_VIC1(28)
-#define IRQ_MIPICSI             S5P_IRQ_VIC1(29)
+#define IRQ_MIPI_CSIS           S5P_IRQ_VIC1(29)
 #define IRQ_MIPIDSI             S5P_IRQ_VIC1(30)
 #define IRQ_ONENAND_AUDI        S5P_IRQ_VIC1(31)
 
@@ -132,5 +132,6 @@
 #define IRQ_LCD_FIFO            IRQ_LCD0
 #define IRQ_LCD_VSYNC           IRQ_LCD1
 #define IRQ_LCD_SYSTEM          IRQ_LCD2
+#define IRQ_MIPI_CSIS0          IRQ_MIPI_CSIS
 
 #endif /* ASM_ARCH_IRQS_H */
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 861d7fe11fc9..3611492ad681 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -16,6 +16,8 @@
 #include <plat/map-base.h>
 #include <plat/map-s5p.h>
 
+#define S5PV210_PA_SROM_BANK5   (0xA8000000)
+
 #define S5PC110_PA_ONENAND      (0xB0000000)
 #define S5P_PA_ONENAND          S5PC110_PA_ONENAND
 
@@ -60,6 +62,7 @@
 #define S3C_VA_UARTx(x)         (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
 
 #define S5PV210_PA_SROMC        (0xE8000000)
+#define S5P_PA_SROMC            S5PV210_PA_SROMC
 
 #define S5PV210_PA_CFCON        (0xE8200000)
 
@@ -107,6 +110,8 @@
 #define S5PV210_PA_DMC0         (0xF0000000)
 #define S5PV210_PA_DMC1         (0xF1400000)
 
+#define S5PV210_PA_MIPI_CSIS    0xFA600000
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART             S5PV210_PA_UART
 #define S3C_PA_HSMMC0           S5PV210_PA_HSMMC(0)
@@ -123,6 +128,7 @@
 #define S5P_PA_FIMC0            S5PV210_PA_FIMC0
 #define S5P_PA_FIMC1            S5PV210_PA_FIMC1
 #define S5P_PA_FIMC2            S5PV210_PA_FIMC2
+#define S5P_PA_MIPI_CSIS0       S5PV210_PA_MIPI_CSIS
 
 #define SAMSUNG_PA_ADC          S5PV210_PA_ADC
 #define SAMSUNG_PA_CFCON        S5PV210_PA_CFCON
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-clock.h b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
index ebaabe021af9..4c45b74def5f 100644
--- a/arch/arm/mach-s5pv210/include/mach/regs-clock.h
+++ b/arch/arm/mach-s5pv210/include/mach/regs-clock.h
@@ -161,7 +161,7 @@
 #define S5P_MDNIE_SEL           S5P_CLKREG(0x7008)
 #define S5P_MIPI_PHY_CON0       S5P_CLKREG(0x7200)
 #define S5P_MIPI_PHY_CON1       S5P_CLKREG(0x7204)
-#define S5P_MIPI_CONTROL        S5P_CLKREG(0xE814)
+#define S5P_MIPI_DPHY_CONTROL   S5P_CLKREG(0xE814)
 
 #define S5P_IDLE_CFG_TL_MASK    (3 << 30)
 #define S5P_IDLE_CFG_TM_MASK    (3 << 28)
@@ -195,9 +195,6 @@
 #define S5P_OTHERS_RET_UART             (1 << 28)
 #define S5P_OTHERS_USB_SIG_MASK         (1 << 16)
 
-/* MIPI */
-#define S5P_MIPI_DPHY_EN                (3)
-
 /* S5P_DAC_CONTROL */
 #define S5P_DAC_ENABLE                  (1)
 #define S5P_DAC_DISABLE                 (0)
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 5dd1681c069e..bb20a14da100 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -94,6 +94,7 @@ static struct platform_device *smdkc110_devices[] __initdata = {
 
 static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
         { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
+        { I2C_BOARD_INFO("wm8580", 0x1b), },
 };
 
 static struct i2c_board_info smdkc110_i2c_devs1[] __initdata = {
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 2196c231cfd2..88e45223c8af 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/serial_core.h>
 #include <linux/sysdev.h>
+#include <linux/dm9000.h>
 #include <linux/fb.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
@@ -30,6 +31,8 @@
 #include <mach/regs-fb.h>
 
 #include <plat/regs-serial.h>
+#include <plat/regs-srom.h>
+#include <plat/gpio-cfg.h>
 #include <plat/s5pv210.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
@@ -109,6 +112,39 @@ static struct samsung_keypad_platdata smdkv210_keypad_data __initdata = {
         .cols           = 8,
 };
 
+static struct resource smdkv210_dm9000_resources[] = {
+        [0] = {
+                .start  = S5PV210_PA_SROM_BANK5,
+                .end    = S5PV210_PA_SROM_BANK5,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = S5PV210_PA_SROM_BANK5 + 2,
+                .end    = S5PV210_PA_SROM_BANK5 + 2,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start  = IRQ_EINT(9),
+                .end    = IRQ_EINT(9),
+                .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
+        },
+};
+
+static struct dm9000_plat_data smdkv210_dm9000_platdata = {
+        .flags          = DM9000_PLATF_16BITONLY | DM9000_PLATF_NO_EEPROM,
+        .dev_addr       = { 0x00, 0x09, 0xc0, 0xff, 0xec, 0x48 },
+};
+
+struct platform_device smdkv210_dm9000 = {
+        .name           = "dm9000",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smdkv210_dm9000_resources),
+        .resource       = smdkv210_dm9000_resources,
+        .dev            = {
+                .platform_data  = &smdkv210_dm9000_platdata,
+        },
+};
+
 static void smdkv210_lte480wv_set_power(struct plat_lcd_data *pd,
                                         unsigned int power)
 {
@@ -173,9 +209,6 @@ static struct s3c_fb_platdata smdkv210_lcd0_pdata __initdata = {
 };
 
 static struct platform_device *smdkv210_devices[] __initdata = {
-        &s5pv210_device_iis0,
-        &s5pv210_device_ac97,
-        &s5pv210_device_spdif,
         &s3c_device_adc,
         &s3c_device_cfcon,
         &s3c_device_fb,
@@ -186,15 +219,37 @@ static struct platform_device *smdkv210_devices[] __initdata = {
         &s3c_device_i2c0,
         &s3c_device_i2c1,
         &s3c_device_i2c2,
-        &samsung_device_keypad,
         &s3c_device_rtc,
         &s3c_device_ts,
         &s3c_device_wdt,
+        &s5pv210_device_ac97,
+        &s5pv210_device_iis0,
+        &s5pv210_device_spdif,
+        &samsung_device_keypad,
+        &smdkv210_dm9000,
         &smdkv210_lcd_lte480wv,
 };
 
+static void __init smdkv210_dm9000_init(void)
+{
+        unsigned int tmp;
+
+        gpio_request(S5PV210_MP01(5), "nCS5");
+        s3c_gpio_cfgpin(S5PV210_MP01(5), S3C_GPIO_SFN(2));
+        gpio_free(S5PV210_MP01(5));
+
+        tmp = (5 << S5P_SROM_BCX__TACC__SHIFT);
+        __raw_writel(tmp, S5P_SROM_BC5);
+
+        tmp = __raw_readl(S5P_SROM_BW);
+        tmp &= (S5P_SROM_BW__CS_MASK << S5P_SROM_BW__NCS5__SHIFT);
+        tmp |= (1 << S5P_SROM_BW__NCS5__SHIFT);
+        __raw_writel(tmp, S5P_SROM_BW);
+}
+
 static struct i2c_board_info smdkv210_i2c_devs0[] __initdata = {
         { I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
+        { I2C_BOARD_INFO("wm8580", 0x1b), },
 };
 
 static struct i2c_board_info smdkv210_i2c_devs1[] __initdata = {
@@ -222,6 +277,8 @@ static void __init smdkv210_machine_init(void)
 {
         s3c_pm_init();
 
+        smdkv210_dm9000_init();
+
         samsung_keypad_set_platdata(&smdkv210_keypad_data);
         s3c24xx_ts_set_platdata(&s3c_ts_platform);