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

Pull ARM SoC cleanups from Olof Johansson:
 "A large cleanup branch this release, with a healthy 10k negative line
  delta.

  Most of this is removal of legacy (non-DT) support of shmobile
  platforms.  There is also removal of two non-DT platforms on OMAP, and
  the plat-samsung directory is cleaned out by moving most of the
  previously shared-location-but-not-actually-shared files from there to
  the appropriate mach directories instead.

  There are other sets of changes in here as well:

   - Rob Herring removed use of set_irq_flags under all platforms and
     moved to genirq alternatives

   - a series of timer API conversions to set-state interface

   - ep93xx, nomadik and ux500 cleanups from Linus Walleij

   - __init annotation fixes from Nicolas Pitre

   + a bunch of other changes that all add up to a nice set of cleanups"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (108 commits)
  ARM/fb: ep93xx: switch framebuffer to use modedb only
  ARM: gemini: Setup timer3 as free running timer
  ARM: gemini: Use timer1 for clockevent
  ARM: gemini: Add missing register definitions for gemini timer
  ARM: ep93xx/timer: Migrate to new 'set-state' interface
  ARM: nomadik: push accelerometer down to boards
  ARM: nomadik: move l2x0 setup to device tree
  ARM: nomadik: selectively enable UART0 on boards
  ARM: nomadik: move hog code to use DT hogs
  ARM: shmobile: Fix mismerges
  ARM: ux500: simplify secondary CPU boot
  ARM: SAMSUNG: remove keypad-core header in plat-samsung
  ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
  ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
  ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
  ARM: SAMSUNG: local backlight header in mach-s3c64xx
  ARM: SAMSUNG: local ata-core header in mach-s3c64xx
  ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
  ARM: SAMSUNG: local spi-core header in mach-s3c24xx
  ARM: SAMSUNG: local nand-core header in mach-s3c24xx
  ...

4 files changed, 35 insertions, 29 deletions

diff --git a/arch/arm/mach-davinci/cp_intc.c b/arch/arm/mach-davinci/cp_intc.c
index 006dae8dfe44..bf12ce64407a 100644
--- a/arch/arm/mach-davinci/cp_intc.c
+++ b/arch/arm/mach-davinci/cp_intc.c
@@ -112,7 +112,7 @@ static int cp_intc_host_map(struct irq_domain *h, unsigned int virq,
         pr_debug("cp_intc_host_map(%d, 0x%lx)\n", virq, hw);
 
         irq_set_chip(virq, &cp_intc_irq_chip);
-        set_irq_flags(virq, IRQF_VALID | IRQF_PROBE);
+        irq_set_probe(virq);
         irq_set_handler(virq, handle_edge_irq);
         return 0;
 }
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 3b8740c083c4..676997895e13 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -715,7 +715,7 @@ const short da850_lcdcntl_pins[] __initconst = {
         -1
 };
 
-const short da850_vpif_capture_pins[] __initdata = {
+const short da850_vpif_capture_pins[] __initconst = {
         DA850_VPIF_DIN0, DA850_VPIF_DIN1, DA850_VPIF_DIN2, DA850_VPIF_DIN3,
         DA850_VPIF_DIN4, DA850_VPIF_DIN5, DA850_VPIF_DIN6, DA850_VPIF_DIN7,
         DA850_VPIF_DIN8, DA850_VPIF_DIN9, DA850_VPIF_DIN10, DA850_VPIF_DIN11,
@@ -725,7 +725,7 @@ const short da850_vpif_capture_pins[] __initdata = {
         -1
 };
 
-const short da850_vpif_display_pins[] __initdata = {
+const short da850_vpif_display_pins[] __initconst = {
         DA850_VPIF_DOUT0, DA850_VPIF_DOUT1, DA850_VPIF_DOUT2, DA850_VPIF_DOUT3,
         DA850_VPIF_DOUT4, DA850_VPIF_DOUT5, DA850_VPIF_DOUT6, DA850_VPIF_DOUT7,
         DA850_VPIF_DOUT8, DA850_VPIF_DOUT9, DA850_VPIF_DOUT10,
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 438f68547f4c..06b6451225c1 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -20,7 +20,7 @@
 
 #define DA8XX_NUM_UARTS 3
 
-static const struct of_device_id da8xx_irq_match[] __initconst = {
+static const struct of_device_id const da8xx_irq_match[] __initconst = {
         { .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
         { }
 };
@@ -59,7 +59,7 @@ static void __init da850_init_machine(void)
 
 }
 
-static const char *da850_boards_compat[] __initdata = {
+static const char *const da850_boards_compat[] __initconst = {
         "enbw,cmc",
         "ti,da850-evm",
         "ti,da850",
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 160c9602f490..6c18445a4639 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -303,36 +303,42 @@ static int davinci_set_next_event(unsigned long cycles,
         return 0;
 }
 
-static void davinci_set_mode(enum clock_event_mode mode,
-                             struct clock_event_device *evt)
+static int davinci_shutdown(struct clock_event_device *evt)
 {
         struct timer_s *t = &timers[TID_CLOCKEVENT];
 
-        switch (mode) {
-        case CLOCK_EVT_MODE_PERIODIC:
-                t->period = davinci_clock_tick_rate / (HZ);
-                t->opts &= ~TIMER_OPTS_STATE_MASK;
-                t->opts |= TIMER_OPTS_PERIODIC;
-                timer32_config(t);
-                break;
-        case CLOCK_EVT_MODE_ONESHOT:
-                t->opts &= ~TIMER_OPTS_STATE_MASK;
-                t->opts |= TIMER_OPTS_ONESHOT;
-                break;
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-                t->opts &= ~TIMER_OPTS_STATE_MASK;
-                t->opts |= TIMER_OPTS_DISABLED;
-                break;
-        case CLOCK_EVT_MODE_RESUME:
-                break;
-        }
+        t->opts &= ~TIMER_OPTS_STATE_MASK;
+        t->opts |= TIMER_OPTS_DISABLED;
+        return 0;
+}
+
+static int davinci_set_oneshot(struct clock_event_device *evt)
+{
+        struct timer_s *t = &timers[TID_CLOCKEVENT];
+
+        t->opts &= ~TIMER_OPTS_STATE_MASK;
+        t->opts |= TIMER_OPTS_ONESHOT;
+        return 0;
+}
+
+static int davinci_set_periodic(struct clock_event_device *evt)
+{
+        struct timer_s *t = &timers[TID_CLOCKEVENT];
+
+        t->period = davinci_clock_tick_rate / (HZ);
+        t->opts &= ~TIMER_OPTS_STATE_MASK;
+        t->opts |= TIMER_OPTS_PERIODIC;
+        timer32_config(t);
+        return 0;
 }
 
 static struct clock_event_device clockevent_davinci = {
-        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .set_next_event = davinci_set_next_event,
-        .set_mode       = davinci_set_mode,
+        .features               = CLOCK_EVT_FEAT_PERIODIC |
+                                  CLOCK_EVT_FEAT_ONESHOT,
+        .set_next_event         = davinci_set_next_event,
+        .set_state_shutdown     = davinci_shutdown,
+        .set_state_periodic     = davinci_set_periodic,
+        .set_state_oneshot      = davinci_set_oneshot,
 };