Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
  ARM: EXYNOS4: Change devname for FIMD clkdev
  ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
  ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
  ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
  ARM: S3C24XX: Use generic s3c_set_platdata for devices
  ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
  ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
  ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
  ARM: SAMSUNG: Use generic s3c_set_platdata for FB
  ARM: SAMSUNG: Use generic s3c_set_platdata for TS
  ARM: S3C64XX: Add PWM backlight support on SMDK6410
  ARM: S5P64X0: Add PWM backlight support on SMDK6450
  ARM: S5P64X0: Add PWM backlight support on SMDK6440
  ARM: S5PC100: Add PWM backlight support on SMDKC100
  ARM: S5PV210: Add PWM backlight support on SMDKV210
  ARM: EXYNOS4: Add PWM backlight support on SMDKC210
  ARM: EXYNOS4: Add PWM backlight support on SMDKV310
  ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
  clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c

1 files changed, 3 insertions, 33 deletions

diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c
index 0c0505b025cb..140711db6c89 100644
--- a/arch/arm/mach-s3c2412/clock.c
+++ b/arch/arm/mach-s3c2412/clock.c
@@ -95,12 +95,10 @@ static int s3c2412_upll_enable(struct clk *clk, int enable)
 
 static struct clk clk_erefclk = {
         .name           = "erefclk",
-        .id             = -1,
 };
 
 static struct clk clk_urefclk = {
         .name           = "urefclk",
-        .id             = -1,
 };
 
 static int s3c2412_setparent_usysclk(struct clk *clk, struct clk *parent)
@@ -122,7 +120,6 @@ static int s3c2412_setparent_usysclk(struct clk *clk, struct clk *parent)
 
 static struct clk clk_usysclk = {
         .name           = "usysclk",
-        .id             = -1,
         .parent         = &clk_xtal,
         .ops            = &(struct clk_ops) {
                 .set_parent     = s3c2412_setparent_usysclk,
@@ -132,13 +129,11 @@ static struct clk clk_usysclk = {
 static struct clk clk_mrefclk = {
         .name           = "mrefclk",
         .parent         = &clk_xtal,
-        .id             = -1,
 };
 
 static struct clk clk_mdivclk = {
         .name           = "mdivclk",
         .parent         = &clk_xtal,
-        .id             = -1,
 };
 
 static int s3c2412_setparent_usbsrc(struct clk *clk, struct clk *parent)
@@ -200,7 +195,6 @@ static int s3c2412_setrate_usbsrc(struct clk *clk, unsigned long rate)
 
 static struct clk clk_usbsrc = {
         .name           = "usbsrc",
-        .id             = -1,
         .ops            = &(struct clk_ops) {
                 .get_rate       = s3c2412_getrate_usbsrc,
                 .set_rate       = s3c2412_setrate_usbsrc,
@@ -228,7 +222,6 @@ static int s3c2412_setparent_msysclk(struct clk *clk, struct clk *parent)
 
 static struct clk clk_msysclk = {
         .name           = "msysclk",
-        .id             = -1,
         .ops            = &(struct clk_ops) {
                 .set_parent     = s3c2412_setparent_msysclk,
         },
@@ -268,7 +261,6 @@ static int s3c2412_setparent_armclk(struct clk *clk, struct clk *parent)
 
 static struct clk clk_armclk = {
         .name           = "armclk",
-        .id             = -1,
         .parent         = &clk_msysclk,
         .ops            = &(struct clk_ops) {
                 .set_parent     = s3c2412_setparent_armclk,
@@ -344,7 +336,6 @@ static int s3c2412_setrate_uart(struct clk *clk, unsigned long rate)
 
 static struct clk clk_uart = {
         .name           = "uartclk",
-        .id             = -1,
         .ops            = &(struct clk_ops) {
                 .get_rate       = s3c2412_getrate_uart,
                 .set_rate       = s3c2412_setrate_uart,
@@ -397,7 +388,6 @@ static int s3c2412_setrate_i2s(struct clk *clk, unsigned long rate)
 
 static struct clk clk_i2s = {
         .name           = "i2sclk",
-        .id             = -1,
         .ops            = &(struct clk_ops) {
                 .get_rate       = s3c2412_getrate_i2s,
                 .set_rate       = s3c2412_setrate_i2s,
@@ -449,7 +439,6 @@ static int s3c2412_setrate_cam(struct clk *clk, unsigned long rate)
 
 static struct clk clk_cam = {
         .name           = "camif-upll", /* same as 2440 name */
-        .id             = -1,
         .ops            = &(struct clk_ops) {
                 .get_rate       = s3c2412_getrate_cam,
                 .set_rate       = s3c2412_setrate_cam,
@@ -463,37 +452,31 @@ static struct clk clk_cam = {
 static struct clk init_clocks_disable[] = {
         {
                 .name           = "nand",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_NAND,
         }, {
                 .name           = "sdi",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_SDI,
         }, {
                 .name           = "adc",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_ADC,
         }, {
                 .name           = "i2c",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_IIC,
         }, {
                 .name           = "iis",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_IIS,
         }, {
                 .name           = "spi",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_SPI,
@@ -503,96 +486,83 @@ static struct clk init_clocks_disable[] = {
 static struct clk init_clocks[] = {
         {
                 .name           = "dma",
-                .id             = 0,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_DMA0,
         }, {
                 .name           = "dma",
-                .id             = 1,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_DMA1,
         }, {
                 .name           = "dma",
-                .id             = 2,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_DMA2,
         }, {
                 .name           = "dma",
-                .id             = 3,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_DMA3,
         }, {
                 .name           = "lcd",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_LCDC,
         }, {
                 .name           = "gpio",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_GPIO,
         }, {
                 .name           = "usb-host",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_USBH,
         }, {
                 .name           = "usb-device",
-                .id             = -1,
                 .parent         = &clk_h,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_USBD,
         }, {
                 .name           = "timers",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_PWMT,
         }, {
                 .name           = "uart",
-                .id             = 0,
+                .devname        = "s3c2412-uart.0",
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_UART0,
         }, {
                 .name           = "uart",
-                .id             = 1,
+                .devname        = "s3c2412-uart.1",
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_UART1,
         }, {
                 .name           = "uart",
-                .id             = 2,
+                .devname        = "s3c2412-uart.2",
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_UART2,
         }, {
                 .name           = "rtc",
-                .id             = -1,
                 .parent         = &clk_p,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_RTC,
         }, {
                 .name           = "watchdog",
-                .id             = -1,
                 .parent         = &clk_p,
                 .ctrlbit        = 0,
         }, {
                 .name           = "usb-bus-gadget",
-                .id             = -1,
                 .parent         = &clk_usb_bus,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_USB_DEV48,
         }, {
                 .name           = "usb-bus-host",
-                .id             = -1,
                 .parent         = &clk_usb_bus,
                 .enable         = s3c2412_clkcon_enable,
                 .ctrlbit        = S3C2412_CLKCON_USB_HOST48,