1 files changed, 3 insertions, 18 deletions

diff --git a/arch/arm/plat-s3c24xx/s3c2410-clock.c b/arch/arm/plat-s3c24xx/s3c2410-clock.c
index 9ecc5d913679..def76aa3825a 100644
--- a/arch/arm/plat-s3c24xx/s3c2410-clock.c
+++ b/arch/arm/plat-s3c24xx/s3c2410-clock.c
@@ -90,37 +90,31 @@ static int s3c2410_upll_enable(struct clk *clk, int enable)
 static struct clk init_clocks_off[] = {
         {
                 .name           = "nand",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_NAND,
         }, {
                 .name           = "sdi",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_SDI,
         }, {
                 .name           = "adc",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_ADC,
         }, {
                 .name           = "i2c",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_IIC,
         }, {
                 .name           = "iis",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_IIS,
         }, {
                 .name           = "spi",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_SPI,
@@ -130,70 +124,61 @@ static struct clk init_clocks_off[] = {
 static struct clk init_clocks[] = {
         {
                 .name           = "lcd",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_LCDC,
         }, {
                 .name           = "gpio",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_GPIO,
         }, {
                 .name           = "usb-host",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_USBH,
         }, {
                 .name           = "usb-device",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_USBD,
         }, {
                 .name           = "timers",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_PWMT,
         }, {
                 .name           = "uart",
-                .id             = 0,
+                .devname        = "s3c2410-uart.0",
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_UART0,
         }, {
                 .name           = "uart",
-                .id             = 1,
+                .devname        = "s3c2410-uart.1",
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_UART1,
         }, {
                 .name           = "uart",
-                .id             = 2,
+                .devname        = "s3c2410-uart.2",
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_UART2,
         }, {
                 .name           = "rtc",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2410_clkcon_enable,
                 .ctrlbit        = S3C2410_CLKCON_RTC,
         }, {
                 .name           = "watchdog",
-                .id             = -1,
                 .parent         = &clk_p,
                 .ctrlbit        = 0,
         }, {
                 .name           = "usb-bus-host",
-                .id             = -1,
                 .parent         = &clk_usb_bus,
         }, {
                 .name           = "usb-bus-gadget",
-                .id             = -1,
                 .parent         = &clk_usb_bus,
         },
 };