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

Pull ARM SoC platform changes from Arnd Bergmann:
 "New and updated SoC support, notable changes include:

   - bcm:
        brcmstb SMP support
        initial iproc/cygnus support
   - exynos:
        Exynos4415 SoC support
        PMU and suspend support for Exynos5420
        PMU support for Exynos3250
        pm related maintenance
   - imx:
        new LS1021A SoC support
        vybrid 610 global timer support
   - integrator:
        convert to using multiplatform configuration
   - mediatek:
        earlyprintk support for mt8127/mt8135
   - meson:
        meson8 soc and l2 cache controller support
   - mvebu:
        Armada 38x CPU hotplug support
        drop support for prerelease Armada 375 Z1 stepping
        extended suspend support, now works on Armada 370/XP
   - omap:
        hwmod related maintenance
        prcm cleanup
   - pxa:
        initial pxa27x DT handling
   - rockchip:
        SMP support for rk3288
        add cpu frequency scaling support
   - shmobile:
        r8a7740 power domain support
        various small restart, timer, pci apmu changes
   - sunxi:
        Allwinner A80 (sun9i) earlyprintk support
   - ux500:
        power domain support

  Overall, a significant chunk of changes, coming mostly from the usual
  suspects: omap, shmobile, samsung and mvebu, all of which already
  contain a lot of platform specific code in arch/arm"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (187 commits)
  ARM: mvebu: use the cpufreq-dt platform_data for independent clocks
  soc: integrator: Add terminating entry for integrator_cm_match
  ARM: mvebu: add SDRAM controller description for Armada XP
  ARM: mvebu: adjust mbus controller description on Armada 370/XP
  ARM: mvebu: add suspend/resume DT information for Armada XP GP
  ARM: mvebu: synchronize secondary CPU clocks on resume
  ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume
  ARM: mvebu: Armada XP GP specific suspend/resume code
  ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume
  ARM: mvebu: implement suspend/resume support for Armada XP
  clk: mvebu: add suspend/resume for gatable clocks
  bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
  bus: mvebu-mbus: suspend/resume support
  clocksource: time-armada-370-xp: add suspend/resume support
  irqchip: armada-370-xp: Add suspend/resume support
  ARM: add lolevel debug support for asm9260
  ARM: add mach-asm9260
  ARM: EXYNOS: use u8 for val[] in struct exynos_pmu_conf
  power: reset: imx-snvs-poweroff: add power off driver for i.mx6
  ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A
  ...

15 files changed, 107 insertions, 105 deletions

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index e6690a44917d..83efe914bf7d 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -4,6 +4,17 @@ menu "Intel PXA2xx/PXA3xx Implementations"
 
 comment "Intel/Marvell Dev Platforms (sorted by hardware release time)"
 
+config MACH_PXA27X_DT
+        bool "Support PXA27x platforms from device tree"
+        select CPU_PXA27x
+        select POWER_SUPPLY
+        select PXA27x
+        select USE_OF
+        help
+          Include support for Marvell PXA27x based platforms using
+          the device tree. Needn't select any other machine while
+          MACH_PXA27X_DT is enabled.
+
 config MACH_PXA3XX_DT
         bool "Support PXA3xx platforms from device tree"
         select CPU_PXA300
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index 2fe1824c6dcb..eb0bf7678a99 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -21,6 +21,7 @@ obj-$(CONFIG_CPU_PXA930)	+= pxa930.o
 
 # Device Tree support
 obj-$(CONFIG_MACH_PXA3XX_DT)    += pxa-dt.o
+obj-$(CONFIG_MACH_PXA27X_DT)    += pxa-dt.o
 
 # Intel/Marvell Dev Platforms
 obj-$(CONFIG_ARCH_LUBBOCK)      += lubbock.o
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 6915a9f6b3a3..51531ecffca8 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -378,7 +378,7 @@ static void __init em_x270_init_nand(void)
 
         err = gpio_request(GPIO11_NAND_CS, "NAND CS");
         if (err) {
-                pr_warning("EM-X270: failed to request NAND CS gpio\n");
+                pr_warn("EM-X270: failed to request NAND CS gpio\n");
                 return;
         }
 
@@ -386,7 +386,7 @@ static void __init em_x270_init_nand(void)
 
         err = gpio_request(nand_rb, "NAND R/B");
         if (err) {
-                pr_warning("EM-X270: failed to request NAND R/B gpio\n");
+                pr_warn("EM-X270: failed to request NAND R/B gpio\n");
                 gpio_free(GPIO11_NAND_CS);
                 return;
         }
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h
index 8963984d1f43..7a9fa1aa4e41 100644
--- a/arch/arm/mach-pxa/generic.h
+++ b/arch/arm/mach-pxa/generic.h
@@ -13,11 +13,11 @@
 
 struct irq_data;
 
-extern void pxa_timer_init(void);
-
-extern void __init pxa_map_io(void);
-
 extern unsigned int get_clk_frequency_khz(int info);
+extern void __init pxa_dt_irq_init(int (*fn)(struct irq_data *,
+                                             unsigned int));
+extern void __init pxa_map_io(void);
+extern void pxa_timer_init(void);
 
 #define SET_BANK(__nr,__start,__size) \
         mi->bank[__nr].start = (__start), \
@@ -25,6 +25,43 @@ extern unsigned int get_clk_frequency_khz(int info);
 
 #define ARRAY_AND_SIZE(x)       (x), ARRAY_SIZE(x)
 
+#define pxa25x_handle_irq icip_handle_irq
+extern void __init pxa25x_init_irq(void);
+extern void __init pxa25x_map_io(void);
+extern void __init pxa26x_init_irq(void);
+
+#define pxa27x_handle_irq ichp_handle_irq
+extern void __init pxa27x_dt_init_irq(void);
+extern unsigned pxa27x_get_clk_frequency_khz(int);
+extern void __init pxa27x_init_irq(void);
+extern void __init pxa27x_map_io(void);
+
+#define pxa3xx_handle_irq ichp_handle_irq
+extern void __init pxa3xx_dt_init_irq(void);
+extern void __init pxa3xx_init_irq(void);
+extern void __init pxa3xx_map_io(void);
+
+extern struct syscore_ops pxa_irq_syscore_ops;
+extern struct syscore_ops pxa2xx_mfp_syscore_ops;
+extern struct syscore_ops pxa3xx_mfp_syscore_ops;
+
+void __init pxa_set_ffuart_info(void *info);
+void __init pxa_set_btuart_info(void *info);
+void __init pxa_set_stuart_info(void *info);
+void __init pxa_set_hwuart_info(void *info);
+
+void pxa_restart(enum reboot_mode, const char *);
+
+#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
+extern void pxa2xx_clear_reset_status(unsigned int);
+#else
+static inline void pxa2xx_clear_reset_status(unsigned int mask) {}
+#endif
+
+/*
+ * Once fully converted to the clock framework, all these functions should be
+ * removed, and replaced with a clk_get(NULL, "core").
+ */
 #ifdef CONFIG_PXA25x
 extern unsigned pxa25x_get_clk_frequency_khz(int);
 #else
@@ -32,30 +69,12 @@ extern unsigned pxa25x_get_clk_frequency_khz(int);
 #endif
 
 #ifdef CONFIG_PXA27x
-extern unsigned pxa27x_get_clk_frequency_khz(int);
 #else
 #define pxa27x_get_clk_frequency_khz(x)         (0)
 #endif
 
-#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
-extern void pxa2xx_clear_reset_status(unsigned int);
-#else
-static inline void pxa2xx_clear_reset_status(unsigned int mask) {}
-#endif
-
 #ifdef CONFIG_PXA3xx
-extern unsigned pxa3xx_get_clk_frequency_khz(int);
+extern unsigned pxa3xx_get_clk_frequency_khz(int);
 #else
 #define pxa3xx_get_clk_frequency_khz(x)         (0)
 #endif
-
-extern struct syscore_ops pxa_irq_syscore_ops;
-extern struct syscore_ops pxa2xx_mfp_syscore_ops;
-extern struct syscore_ops pxa3xx_mfp_syscore_ops;
-
-void __init pxa_set_ffuart_info(void *info);
-void __init pxa_set_btuart_info(void *info);
-void __init pxa_set_stuart_info(void *info);
-void __init pxa_set_hwuart_info(void *info);
-
-void pxa_restart(enum reboot_mode, const char *);
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index 00b92dad7b81..f6c76a3ee3b2 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -140,8 +140,7 @@ static void gumstix_setup_bt_clock(void)
         int timeout = 500;
 
         if (!(OSCC & OSCC_OOK))
-                pr_warning("32kHz clock was not on. Bootloader may need to "
-                                "be updated\n");
+                pr_warn("32kHz clock was not on. Bootloader may need to be updated\n");
         else
                 return;
 
diff --git a/arch/arm/mach-pxa/include/mach/pxa25x.h b/arch/arm/mach-pxa/include/mach/pxa25x.h
index 3ac0baac7350..5a341752e32c 100644
--- a/arch/arm/mach-pxa/include/mach/pxa25x.h
+++ b/arch/arm/mach-pxa/include/mach/pxa25x.h
@@ -6,12 +6,4 @@
 #include <mach/mfp-pxa25x.h>
 #include <mach/irqs.h>
 
-extern void __init pxa25x_map_io(void);
-extern void __init pxa25x_init_irq(void);
-#ifdef CONFIG_CPU_PXA26x
-extern void __init pxa26x_init_irq(void);
-#endif
-
-#define pxa25x_handle_irq       icip_handle_irq
-
 #endif /* __MACH_PXA25x_H */
diff --git a/arch/arm/mach-pxa/include/mach/pxa27x.h b/arch/arm/mach-pxa/include/mach/pxa27x.h
index 7cff640582b8..599b925a657c 100644
--- a/arch/arm/mach-pxa/include/mach/pxa27x.h
+++ b/arch/arm/mach-pxa/include/mach/pxa27x.h
@@ -19,11 +19,7 @@
 #define ARB_CORE_PARK           (1<<24)    /* Be parked with core when idle */
 #define ARB_LOCK_FLAG           (1<<23)    /* Only Locking masters gain access to the bus */
 
-extern void __init pxa27x_map_io(void);
-extern void __init pxa27x_init_irq(void);
 extern int __init pxa27x_set_pwrmode(unsigned int mode);
 extern void pxa27x_cpu_pm_enter(suspend_state_t state);
 
-#define pxa27x_handle_irq       ichp_handle_irq
-
 #endif /* __MACH_PXA27x_H */
diff --git a/arch/arm/mach-pxa/include/mach/pxa3xx.h b/arch/arm/mach-pxa/include/mach/pxa3xx.h
index 6dd7fa163e29..b4143fb6631f 100644
--- a/arch/arm/mach-pxa/include/mach/pxa3xx.h
+++ b/arch/arm/mach-pxa/include/mach/pxa3xx.h
@@ -5,9 +5,4 @@
 #include <mach/pxa3xx-regs.h>
 #include <mach/irqs.h>
 
-extern void __init pxa3xx_map_io(void);
-extern void __init pxa3xx_init_irq(void);
-
-#define pxa3xx_handle_irq       ichp_handle_irq
-
 #endif /* __MACH_PXA3XX_H */
diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c
index ef0426a159d4..666b78972c40 100644
--- a/arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/arch/arm/mach-pxa/mfp-pxa2xx.c
@@ -93,8 +93,8 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)
                 break;
         default:
                 /* warning and fall through, treat as MFP_LPM_DEFAULT */
-                pr_warning("%s: GPIO%d: unsupported low power mode\n",
-                                __func__, gpio);
+                pr_warn("%s: GPIO%d: unsupported low power mode\n",
+                        __func__, gpio);
                 break;
         }
 
@@ -107,14 +107,12 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)
          * configurations of those pins not able to wakeup
          */
         if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) {
-                pr_warning("%s: GPIO%d unable to wakeup\n",
-                                __func__, gpio);
+                pr_warn("%s: GPIO%d unable to wakeup\n", __func__, gpio);
                 return -EINVAL;
         }
 
         if ((c & MFP_LPM_CAN_WAKEUP) && is_out) {
-                pr_warning("%s: output GPIO%d unable to wakeup\n",
-                                __func__, gpio);
+                pr_warn("%s: output GPIO%d unable to wakeup\n", __func__, gpio);
                 return -EINVAL;
         }
 
@@ -126,7 +124,7 @@ static inline int __mfp_validate(int mfp)
         int gpio = mfp_to_gpio(mfp);
 
         if ((mfp > MFP_PIN_GPIO127) || !gpio_desc[gpio].valid) {
-                pr_warning("%s: GPIO%d is invalid pin\n", __func__, gpio);
+                pr_warn("%s: GPIO%d is invalid pin\n", __func__, gpio);
                 return -1;
         }
 
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 131991629116..29019beae591 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -446,7 +446,7 @@ static void __init poodle_init(void)
 
         ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         if (ret)
-                pr_warning("poodle: Unable to register LoCoMo device\n");
+                pr_warn("poodle: Unable to register LoCoMo device\n");
 
         pxa_set_fb_info(&poodle_locomo_device.dev, &poodle_fb_info);
         pxa_set_udc_info(&udc_info);
diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c
index f6a2c4b1c1dc..7e0e5bd0c9de 100644
--- a/arch/arm/mach-pxa/pxa-dt.c
+++ b/arch/arm/mach-pxa/pxa-dt.c
@@ -15,13 +15,10 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <mach/irqs.h>
-#include <mach/pxa3xx.h>
 
 #include "generic.h"
 
 #ifdef CONFIG_PXA3xx
-extern void __init pxa3xx_dt_init_irq(void);
-
 static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst = {
         OF_DEV_AUXDATA("mrvl,pxa-uart",         0x40100000, "pxa2xx-uart.0", NULL),
         OF_DEV_AUXDATA("mrvl,pxa-uart",         0x40200000, "pxa2xx-uart.1", NULL),
@@ -61,3 +58,18 @@ DT_MACHINE_START(PXA_DT, "Marvell PXA3xx (Device Tree Support)")
         .dt_compat      = pxa3xx_dt_board_compat,
 MACHINE_END
 #endif
+
+#ifdef CONFIG_PXA27x
+static const char * const pxa27x_dt_board_compat[] __initconst = {
+        "marvell,pxa270",
+        NULL,
+};
+
+DT_MACHINE_START(PXA27X_DT, "Marvell PXA2xx (Device Tree Support)")
+        .map_io         = pxa27x_map_io,
+        .init_irq       = pxa27x_dt_init_irq,
+        .handle_irq     = pxa27x_handle_irq,
+        .restart        = pxa_restart,
+        .dt_compat      = pxa27x_dt_board_compat,
+MACHINE_END
+#endif
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index b040d7d14888..af423a48c2e3 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -398,6 +398,12 @@ void __init pxa27x_init_irq(void)
         pxa_init_irq(34, pxa27x_set_wake);
 }
 
+void __init pxa27x_dt_init_irq(void)
+{
+        if (IS_ENABLED(CONFIG_OF))
+                pxa_dt_irq_init(pxa27x_set_wake);
+}
+
 static struct map_desc pxa27x_io_desc[] __initdata = {
         {       /* Mem Ctl */
                 .virtual        = (unsigned long)SMEMC_VIRT,
diff --git a/arch/arm/mach-pxa/pxa3xx-ulpi.c b/arch/arm/mach-pxa/pxa3xx-ulpi.c
index e329ccefd364..614003e8b081 100644
--- a/arch/arm/mach-pxa/pxa3xx-ulpi.c
+++ b/arch/arm/mach-pxa/pxa3xx-ulpi.c
@@ -74,7 +74,7 @@ static int pxa310_ulpi_poll(void)
                 cpu_relax();
         }
 
-        pr_warning("%s: ULPI access timed out!\n", __func__);
+        pr_warn("%s: ULPI access timed out!\n", __func__);
 
         return -ETIMEDOUT;
 }
@@ -84,7 +84,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
         int err;
 
         if (pxa310_ulpi_get_phymode() != SYNCH) {
-                pr_warning("%s: PHY is not in SYNCH mode!\n", __func__);
+                pr_warn("%s: PHY is not in SYNCH mode!\n", __func__);
                 return -EBUSY;
         }
 
@@ -101,7 +101,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)
 static int pxa310_ulpi_write(struct usb_phy *otg, u32 val, u32 reg)
 {
         if (pxa310_ulpi_get_phymode() != SYNCH) {
-                pr_warning("%s: PHY is not in SYNCH mode!\n", __func__);
+                pr_warn("%s: PHY is not in SYNCH mode!\n", __func__);
                 return -EBUSY;
         }
 
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 8386dc30b3e4..a762b23ac830 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -521,7 +521,7 @@ static void __init raumfeld_w1_init(void)
                                 "W1 external pullup enable");
 
         if (ret < 0)
-                pr_warning("Unable to request GPIO_W1_PULLUP_ENABLE\n");
+                pr_warn("Unable to request GPIO_W1_PULLUP_ENABLE\n");
         else
                 gpio_direction_output(GPIO_W1_PULLUP_ENABLE, 0);
 
@@ -600,7 +600,7 @@ static void __init raumfeld_lcd_init(void)
 
         ret = gpio_request(GPIO_TFT_VA_EN, "display VA enable");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_TFT_VA_EN\n");
+                pr_warn("Unable to request GPIO_TFT_VA_EN\n");
         else
                 gpio_direction_output(GPIO_TFT_VA_EN, 1);
 
@@ -608,7 +608,7 @@ static void __init raumfeld_lcd_init(void)
 
         ret = gpio_request(GPIO_DISPLAY_ENABLE, "display enable");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_DISPLAY_ENABLE\n");
+                pr_warn("Unable to request GPIO_DISPLAY_ENABLE\n");
         else
                 gpio_direction_output(GPIO_DISPLAY_ENABLE, 1);
 
@@ -814,17 +814,17 @@ static void __init raumfeld_power_init(void)
         /* Set PEN2 high to enable maximum charge current */
         ret = gpio_request(GPIO_CHRG_PEN2, "CHRG_PEN2");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_CHRG_PEN2\n");
+                pr_warn("Unable to request GPIO_CHRG_PEN2\n");
         else
                 gpio_direction_output(GPIO_CHRG_PEN2, 1);
 
         ret = gpio_request(GPIO_CHARGE_DC_OK, "CABLE_DC_OK");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_CHARGE_DC_OK\n");
+                pr_warn("Unable to request GPIO_CHARGE_DC_OK\n");
 
         ret = gpio_request(GPIO_CHARGE_USB_SUSP, "CHARGE_USB_SUSP");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_CHARGE_USB_SUSP\n");
+                pr_warn("Unable to request GPIO_CHARGE_USB_SUSP\n");
         else
                 gpio_direction_output(GPIO_CHARGE_USB_SUSP, 0);
 
@@ -976,19 +976,19 @@ static void __init raumfeld_audio_init(void)
 
         ret = gpio_request(GPIO_CODEC_RESET, "cs4270 reset");
         if (ret < 0)
-                pr_warning("unable to request GPIO_CODEC_RESET\n");
+                pr_warn("unable to request GPIO_CODEC_RESET\n");
         else
                 gpio_direction_output(GPIO_CODEC_RESET, 1);
 
         ret = gpio_request(GPIO_SPDIF_RESET, "ak4104 s/pdif reset");
         if (ret < 0)
-                pr_warning("unable to request GPIO_SPDIF_RESET\n");
+                pr_warn("unable to request GPIO_SPDIF_RESET\n");
         else
                 gpio_direction_output(GPIO_SPDIF_RESET, 1);
 
         ret = gpio_request(GPIO_MCLK_RESET, "MCLK reset");
         if (ret < 0)
-                pr_warning("unable to request GPIO_MCLK_RESET\n");
+                pr_warn("unable to request GPIO_MCLK_RESET\n");
         else
                 gpio_direction_output(GPIO_MCLK_RESET, 1);
 
@@ -1019,20 +1019,20 @@ static void __init raumfeld_common_init(void)
 
         ret = gpio_request(GPIO_W2W_RESET, "Wi2Wi reset");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_W2W_RESET\n");
+                pr_warn("Unable to request GPIO_W2W_RESET\n");
         else
                 gpio_direction_output(GPIO_W2W_RESET, 0);
 
         ret = gpio_request(GPIO_W2W_PDN, "Wi2Wi powerup");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_W2W_PDN\n");
+                pr_warn("Unable to request GPIO_W2W_PDN\n");
         else
                 gpio_direction_output(GPIO_W2W_PDN, 0);
 
         /* this can be used to switch off the device */
         ret = gpio_request(GPIO_SHUTDOWN_SUPPLY, "supply shutdown");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
+                pr_warn("Unable to request GPIO_SHUTDOWN_SUPPLY\n");
         else
                 gpio_direction_output(GPIO_SHUTDOWN_SUPPLY, 0);
 
@@ -1051,7 +1051,7 @@ static void __init raumfeld_controller_init(void)
 
         ret = gpio_request(GPIO_SHUTDOWN_BATT, "battery shutdown");
         if (ret < 0)
-                pr_warning("Unable to request GPIO_SHUTDOWN_BATT\n");
+                pr_warn("Unable to request GPIO_SHUTDOWN_BATT\n");
         else
                 gpio_direction_output(GPIO_SHUTDOWN_BATT, 0);
 
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index c158a6e3e0aa..7780d1faa06f 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -30,7 +30,7 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
-#include <linux/pda_power.h>
+#include <linux/power/gpio-charger.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/input/matrix_keypad.h>
@@ -361,44 +361,17 @@ static struct pxaficp_platform_data tosa_ficp_platform_data = {
 /*
  * Tosa AC IN
  */
-static int tosa_power_init(struct device *dev)
-{
-        int ret = gpio_request(TOSA_GPIO_AC_IN, "ac in");
-        if (ret)
-                goto err_gpio_req;
-
-        ret = gpio_direction_input(TOSA_GPIO_AC_IN);
-        if (ret)
-                goto err_gpio_in;
-
-        return 0;
-
-err_gpio_in:
-        gpio_free(TOSA_GPIO_AC_IN);
-err_gpio_req:
-        return ret;
-}
-
-static void tosa_power_exit(struct device *dev)
-{
-        gpio_free(TOSA_GPIO_AC_IN);
-}
-
-static int tosa_power_ac_online(void)
-{
-        return gpio_get_value(TOSA_GPIO_AC_IN) == 0;
-}
-
 static char *tosa_ac_supplied_to[] = {
         "main-battery",
         "backup-battery",
         "jacket-battery",
 };
 
-static struct pda_power_pdata tosa_power_data = {
-        .init                   = tosa_power_init,
-        .is_ac_online           = tosa_power_ac_online,
-        .exit                   = tosa_power_exit,
+static struct gpio_charger_platform_data tosa_power_data = {
+        .name                   = "charger",
+        .type                   = POWER_SUPPLY_TYPE_MAINS,
+        .gpio                   = TOSA_GPIO_AC_IN,
+        .gpio_active_low        = 1,
         .supplied_to            = tosa_ac_supplied_to,
         .num_supplicants        = ARRAY_SIZE(tosa_ac_supplied_to),
 };
@@ -415,7 +388,7 @@ static struct resource tosa_power_resource[] = {
 };
 
 static struct platform_device tosa_power_device = {
-        .name                   = "pda-power",
+        .name                   = "gpio-charger",
         .id                     = -1,
         .dev.platform_data      = &tosa_power_data,
         .resource               = tosa_power_resource,