Merge remote-tracking branch 'korg_arm-soc/timer/cleanup' into cleanup
Stephen Warren [Tue, 15 Jan 2013 04:44:27 +0000 (21:44 -0700)]
1  2 
arch/arm/mach-davinci/board-dm646x-evm.c
arch/arm/mach-highbank/highbank.c
arch/arm/mach-kirkwood/board-dt.c
arch/arm/mach-ks8695/board-acs5k.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-sunxi/sunxi.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/plat-samsung/include/plat/cpu.h

@@@ -358,7 -358,7 +358,7 @@@ static int cpld_video_probe(struct i2c_
        return 0;
  }
  
 -static int __devexit cpld_video_remove(struct i2c_client *client)
 +static int cpld_video_remove(struct i2c_client *client)
  {
        cpld_client = NULL;
        return 0;
@@@ -818,7 -818,7 +818,7 @@@ MACHINE_START(DAVINCI_DM6467_EVM, "DaVi
        .atag_offset  = 0x100,
        .map_io       = davinci_map_io,
        .init_irq     = davinci_irq_init,
-       .timer        = &davinci_timer,
+       .init_time      = davinci_timer_init,
        .init_machine = evm_init,
        .init_late      = davinci_init_late,
        .dma_zone_size  = SZ_128M,
@@@ -829,7 -829,7 +829,7 @@@ MACHINE_START(DAVINCI_DM6467TEVM, "DaVi
        .atag_offset  = 0x100,
        .map_io       = davinci_map_io,
        .init_irq     = davinci_irq_init,
-       .timer        = &davinci_timer,
+       .init_time      = davinci_timer_init,
        .init_machine = evm_init,
        .init_late      = davinci_init_late,
        .dma_zone_size  = SZ_128M,
@@@ -129,13 -129,9 +129,9 @@@ static void __init highbank_timer_init(
        arch_timer_sched_clock_init();
  }
  
- static struct sys_timer highbank_timer = {
-       .init = highbank_timer_init,
- };
  static void highbank_power_off(void)
  {
 -      hignbank_set_pwr_shutdown();
 +      highbank_set_pwr_shutdown();
  
        while (1)
                cpu_do_idle();
@@@ -209,7 -205,7 +205,7 @@@ DT_MACHINE_START(HIGHBANK, "Highbank"
        .smp            = smp_ops(highbank_smp_ops),
        .map_io         = debug_ll_io_init,
        .init_irq       = highbank_init_irq,
-       .timer          = &highbank_timer,
+       .init_time      = highbank_timer_init,
        .handle_irq     = gic_handle_irq,
        .init_machine   = highbank_init,
        .dt_compat      = highbank_match,
@@@ -67,10 -67,6 +67,10 @@@ static void __init kirkwood_legacy_clk_
        orion_clkdev_add(NULL, "mv643xx_eth_port.1",
                         of_clk_get_from_provider(&clkspec));
  
 +      clkspec.args[0] = CGC_BIT_SDIO;
 +      orion_clkdev_add(NULL, "mvsdio",
 +                       of_clk_get_from_provider(&clkspec));
 +
  }
  
  static void __init kirkwood_of_clk_init(void)
@@@ -183,7 -179,7 +183,7 @@@ DT_MACHINE_START(KIRKWOOD_DT, "Marvell 
        .map_io         = kirkwood_map_io,
        .init_early     = kirkwood_init_early,
        .init_irq       = orion_dt_init_irq,
-       .timer          = &kirkwood_timer,
+       .init_time      = kirkwood_timer_init,
        .init_machine   = kirkwood_dt_init,
        .restart        = kirkwood_restart,
        .dt_compat      = kirkwood_dt_board_compat,
@@@ -92,7 -92,7 +92,7 @@@ static struct i2c_board_info acs5k_i2c_
        },
  };
  
 -static void __devinit acs5k_i2c_init(void)
 +static void acs5k_i2c_init(void)
  {
        /* The gpio interface */
        platform_device_register(&acs5k_i2c_device);
@@@ -227,6 -227,6 +227,6 @@@ MACHINE_START(ACS5K, "Brivo Systems LL
        .map_io         = ks8695_map_io,
        .init_irq       = ks8695_init_irq,
        .init_machine   = acs5k_init,
-       .timer          = &ks8695_timer,
+       .init_time      = ks8695_timer_init,
        .restart        = ks8695_restart,
  MACHINE_END
@@@ -27,6 -27,7 +27,6 @@@
  #include <linux/pinctrl/machine.h>
  #include <linux/platform_data/pinctrl-nomadik.h>
  #include <linux/platform_data/clocksource-nomadik-mtu.h>
 -#include <linux/platform_data/mtd-nomadik-nand.h>
  #include <asm/hardware/vic.h>
  #include <asm/sizes.h>
  #include <asm/mach-types.h>
@@@ -267,10 -268,6 +267,6 @@@ static void __init nomadik_timer_init(v
        nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE), IRQ_MTU0);
  }
  
- static struct sys_timer nomadik_timer = {
-       .init   = nomadik_timer_init,
- };
  static struct i2c_board_info __initdata nhk8815_i2c0_devices[] = {
        {
                I2C_BOARD_INFO("stw4811", 0x2d),
@@@ -353,7 -350,7 +349,7 @@@ MACHINE_START(NOMADIK, "NHK8815"
        .map_io         = cpu8815_map_io,
        .init_irq       = cpu8815_init_irq,
        .handle_irq     = vic_handle_irq,
-       .timer          = &nomadik_timer,
+       .init_time      = nomadik_timer_init,
        .init_machine   = nhk8815_platform_init,
        .restart        = cpu8815_restart,
  MACHINE_END
@@@ -160,7 -160,7 +160,7 @@@ static struct omap_lcd_config ams_delta
        .ctrl_name      = "internal",
  };
  
 -static struct omap_usb_config ams_delta_usb_config = {
 +static struct omap_usb_config ams_delta_usb_config __initdata = {
        .register_host  = 1,
        .hmc_mode       = 16,
        .pins[0]        = 2,
@@@ -628,6 -628,6 +628,6 @@@ MACHINE_START(AMS_DELTA, "Amstrad E3 (D
        .init_irq       = omap1_init_irq,
        .init_machine   = ams_delta_init,
        .init_late      = ams_delta_init_late,
-       .timer          = &omap1_timer,
+       .init_time      = omap1_timer_init,
        .restart        = omap1_restart,
  MACHINE_END
@@@ -171,7 -171,7 +171,7 @@@ static struct fb_videomode crag6410_lcd
  };
  
  /* 405566 clocks per frame => 60Hz refresh requires 24333960Hz clock */
 -static struct s3c_fb_platdata crag6410_lcd_pdata __devinitdata = {
 +static struct s3c_fb_platdata crag6410_lcd_pdata = {
        .setup_gpio     = s3c64xx_fb_gpio_setup_24bpp,
        .vtiming        = &crag6410_lcd_timing,
        .win[0]         = &crag6410_fb_win0,
  
  /* 2x6 keypad */
  
 -static uint32_t crag6410_keymap[] __devinitdata = {
 +static uint32_t crag6410_keymap[] = {
        /* KEY(row, col, keycode) */
        KEY(0, 0, KEY_VOLUMEUP),
        KEY(0, 1, KEY_HOME),
        KEY(1, 5, KEY_CAMERA),
  };
  
 -static struct matrix_keymap_data crag6410_keymap_data __devinitdata = {
 +static struct matrix_keymap_data crag6410_keymap_data = {
        .keymap         = crag6410_keymap,
        .keymap_size    = ARRAY_SIZE(crag6410_keymap),
  };
  
 -static struct samsung_keypad_platdata crag6410_keypad_data __devinitdata = {
 +static struct samsung_keypad_platdata crag6410_keypad_data = {
        .keymap_data    = &crag6410_keymap_data,
        .rows           = 2,
        .cols           = 6,
@@@ -407,11 -407,11 +407,11 @@@ static struct wm831x_buckv_pdata vddarm
        .dvs_gpio = S3C64XX_GPK(0),
  };
  
 -static struct regulator_consumer_supply vddarm_consumers[] __devinitdata = {
 +static struct regulator_consumer_supply vddarm_consumers[] = {
        REGULATOR_SUPPLY("vddarm", NULL),
  };
  
 -static struct regulator_init_data vddarm __devinitdata = {
 +static struct regulator_init_data vddarm = {
        .constraints = {
                .name = "VDDARM",
                .min_uV = 1000000,
        .driver_data = &vddarm_pdata,
  };
  
 -static struct regulator_consumer_supply vddint_consumers[] __devinitdata = {
 +static struct regulator_consumer_supply vddint_consumers[] = {
        REGULATOR_SUPPLY("vddint", NULL),
  };
  
 -static struct regulator_init_data vddint __devinitdata = {
 +static struct regulator_init_data vddint = {
        .constraints = {
                .name = "VDDINT",
                .min_uV = 1000000,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddmem __devinitdata = {
 +static struct regulator_init_data vddmem = {
        .constraints = {
                .name = "VDDMEM",
                .always_on = 1,
        },
  };
  
 -static struct regulator_init_data vddsys __devinitdata = {
 +static struct regulator_init_data vddsys = {
        .constraints = {
                .name = "VDDSYS,VDDEXT,VDDPCM,VDDSS",
                .always_on = 1,
        },
  };
  
 -static struct regulator_consumer_supply vddmmc_consumers[] __devinitdata = {
 +static struct regulator_consumer_supply vddmmc_consumers[] = {
        REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
        REGULATOR_SUPPLY("vmmc", "s3c-sdhci.1"),
        REGULATOR_SUPPLY("vmmc", "s3c-sdhci.2"),
  };
  
 -static struct regulator_init_data vddmmc __devinitdata = {
 +static struct regulator_init_data vddmmc = {
        .constraints = {
                .name = "VDDMMC,UH",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddotgi __devinitdata = {
 +static struct regulator_init_data vddotgi = {
        .constraints = {
                .name = "VDDOTGi",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddotg __devinitdata = {
 +static struct regulator_init_data vddotg = {
        .constraints = {
                .name = "VDDOTG",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddhi __devinitdata = {
 +static struct regulator_init_data vddhi = {
        .constraints = {
                .name = "VDDHI",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddadc __devinitdata = {
 +static struct regulator_init_data vddadc = {
        .constraints = {
                .name = "VDDADC,VDDDAC",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddmem0 __devinitdata = {
 +static struct regulator_init_data vddmem0 = {
        .constraints = {
                .name = "VDDMEM0",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddpll __devinitdata = {
 +static struct regulator_init_data vddpll = {
        .constraints = {
                .name = "VDDPLL",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddlcd __devinitdata = {
 +static struct regulator_init_data vddlcd = {
        .constraints = {
                .name = "VDDLCD",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct regulator_init_data vddalive __devinitdata = {
 +static struct regulator_init_data vddalive = {
        .constraints = {
                .name = "VDDALIVE",
                .always_on = 1,
        .supply_regulator = "WALLVDD",
  };
  
 -static struct wm831x_backup_pdata banff_backup_pdata __devinitdata = {
 +static struct wm831x_backup_pdata banff_backup_pdata = {
        .charger_enable = 1,
        .vlim = 2500,  /* mV */
        .ilim = 200,   /* uA */
  };
  
 -static struct wm831x_status_pdata banff_red_led __devinitdata = {
 +static struct wm831x_status_pdata banff_red_led = {
        .name = "banff:red:",
        .default_src = WM831X_STATUS_MANUAL,
  };
  
 -static struct wm831x_status_pdata banff_green_led __devinitdata = {
 +static struct wm831x_status_pdata banff_green_led = {
        .name = "banff:green:",
        .default_src = WM831X_STATUS_MANUAL,
  };
  
 -static struct wm831x_touch_pdata touch_pdata __devinitdata = {
 +static struct wm831x_touch_pdata touch_pdata = {
        .data_irq = S3C_EINT(26),
        .pd_irq = S3C_EINT(27),
  };
  
 -static struct wm831x_pdata crag_pmic_pdata __devinitdata = {
 +static struct wm831x_pdata crag_pmic_pdata = {
        .wm831x_num = 1,
        .gpio_base = BANFF_PMIC_GPIO_BASE,
        .soft_shutdown = true,
        .touch = &touch_pdata,
  };
  
 -static struct i2c_board_info i2c_devs0[] __devinitdata = {
 +static struct i2c_board_info i2c_devs0[] = {
        { I2C_BOARD_INFO("24c08", 0x50), },
        { I2C_BOARD_INFO("tca6408", 0x20),
          .platform_data = &crag6410_pca_data,
@@@ -616,13 -616,13 +616,13 @@@ static struct s3c2410_platform_i2c i2c0
        .frequency = 400000,
  };
  
 -static struct regulator_consumer_supply pvdd_1v2_consumers[] __devinitdata = {
 +static struct regulator_consumer_supply pvdd_1v2_consumers[] = {
        REGULATOR_SUPPLY("DCVDD", "spi0.0"),
        REGULATOR_SUPPLY("AVDD", "spi0.0"),
        REGULATOR_SUPPLY("AVDD", "spi0.1"),
  };
  
 -static struct regulator_init_data pvdd_1v2 __devinitdata = {
 +static struct regulator_init_data pvdd_1v2 = {
        .constraints = {
                .name = "PVDD_1V2",
                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
        .num_consumer_supplies = ARRAY_SIZE(pvdd_1v2_consumers),
  };
  
 -static struct regulator_consumer_supply pvdd_1v8_consumers[] __devinitdata = {
 +static struct regulator_consumer_supply pvdd_1v8_consumers[] = {
        REGULATOR_SUPPLY("LDOVDD", "1-001a"),
        REGULATOR_SUPPLY("PLLVDD", "1-001a"),
        REGULATOR_SUPPLY("DBVDD", "1-001a"),
        REGULATOR_SUPPLY("CPVDD", "wm5110-codec"),
  };
  
 -static struct regulator_init_data pvdd_1v8 __devinitdata = {
 +static struct regulator_init_data pvdd_1v8 = {
        .constraints = {
                .name = "PVDD_1V8",
                .always_on = 1,
        .num_consumer_supplies = ARRAY_SIZE(pvdd_1v8_consumers),
  };
  
 -static struct regulator_consumer_supply pvdd_3v3_consumers[] __devinitdata = {
 +static struct regulator_consumer_supply pvdd_3v3_consumers[] = {
        REGULATOR_SUPPLY("MICVDD", "1-001a"),
        REGULATOR_SUPPLY("AVDD1", "1-001a"),
  };
  
 -static struct regulator_init_data pvdd_3v3 __devinitdata = {
 +static struct regulator_init_data pvdd_3v3 = {
        .constraints = {
                .name = "PVDD_3V3",
                .always_on = 1,
        .num_consumer_supplies = ARRAY_SIZE(pvdd_3v3_consumers),
  };
  
 -static struct wm831x_pdata glenfarclas_pmic_pdata __devinitdata = {
 +static struct wm831x_pdata glenfarclas_pmic_pdata = {
        .wm831x_num = 2,
        .irq_base = GLENFARCLAS_PMIC_IRQ_BASE,
        .gpio_base = GLENFARCLAS_PMIC_GPIO_BASE,
@@@ -721,7 -721,7 +721,7 @@@ static struct wm1250_ev1_pdata wm1250_e
        },
  };
  
 -static struct i2c_board_info i2c_devs1[] __devinitdata = {
 +static struct i2c_board_info i2c_devs1[] = {
        { I2C_BOARD_INFO("wm8311", 0x34),
          .irq = S3C_EINT(0),
          .platform_data = &glenfarclas_pmic_pdata },
@@@ -871,6 -871,6 +871,6 @@@ MACHINE_START(WLF_CRAGG_6410, "Wolfson 
        .map_io         = crag6410_map_io,
        .init_machine   = crag6410_machine_init,
        .init_late      = s3c64xx_init_late,
-       .timer          = &s3c24xx_timer,
+       .init_time      = s3c24xx_timer_init,
        .restart        = s3c64xx_restart,
  MACHINE_END
@@@ -80,8 -80,8 +80,8 @@@ static void __init sunxi_dt_init(void
  }
  
  static const char * const sunxi_board_dt_compat[] = {
 -      "allwinner,sun4i",
 -      "allwinner,sun5i",
 +      "allwinner,sun4i-a10",
 +      "allwinner,sun5i-a13",
        NULL,
  };
  
@@@ -91,6 -91,6 +91,6 @@@ DT_MACHINE_START(SUNXI_DT, "Allwinner A
        .init_irq       = sunxi_init_irq,
        .handle_irq     = sunxi_handle_irq,
        .restart        = sunxi_restart,
-       .timer          = &sunxi_timer,
+       .init_time      = &sunxi_timer_init,
        .dt_compat      = sunxi_board_dt_compat,
  MACHINE_END
@@@ -285,8 -285,7 +285,8 @@@ static struct of_dev_auxdata u8500_auxd
        OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),
        OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
        /* Requires device name bindings. */
 -      OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL),
 +      OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE,
 +              "pinctrl-db8500", NULL),
        /* Requires clock name and DMA bindings. */
        OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
                "ux500-msp-i2s.0", &msp0_platform_data),
@@@ -341,7 -340,7 +341,7 @@@ DT_MACHINE_START(U8500_DT, "ST-Ericsso
        .map_io         = u8500_map_io,
        .init_irq       = ux500_init_irq,
        /* we re-use nomadik timer here */
-       .timer          = &ux500_timer,
+       .init_time      = ux500_timer_init,
        .handle_irq     = gic_handle_irq,
        .init_machine   = u8500_init_machine,
        .init_late      = NULL,
@@@ -43,7 -43,7 +43,7 @@@ extern unsigned long samsung_cpu_id
  #define EXYNOS4_CPU_MASK      0xFFFE0000
  
  #define EXYNOS5250_SOC_ID     0x43520000
 -#define EXYNOS5440_SOC_ID     0x54400000
 +#define EXYNOS5440_SOC_ID     0xE5440000
  #define EXYNOS5_SOC_MASK      0xFFFFF000
  
  #define IS_SAMSUNG_CPU(name, id, mask)                \
@@@ -194,8 -194,7 +194,7 @@@ extern void s3c24xx_init_uartdevs(char 
  
  /* timer for 2410/2440 */
  
- struct sys_timer;
- extern struct sys_timer s3c24xx_timer;
+ extern void s3c24xx_timer_init(void);
  
  extern struct syscore_ops s3c2410_pm_syscore_ops;
  extern struct syscore_ops s3c2412_pm_syscore_ops;