Merge tag 'pxa-for-4.4' of https://github.com/rjarzmik/linux into next/cleanup

This is the pxa changes for v4.4 cycle.

This cycle is bigger than usual :
 - magician was greatly enhanced (new IPs discovered, ...)
 - almost all legacy board files have been updated to the
   new PWM API (mostly for backlight control)
 - some minor fixes in raumfeld, z2 and mioa701

* tag 'pxa-for-4.4' of https://github.com/rjarzmik/linux: (44 commits)
  ARM: pxa: remove incorrect __init annotation on pxa27x_set_pwrmode
  ARM: pxa: raumfeld: make some variables static
  ARM: pxa: magician: Remove pdata for pasic3-leds
  ARM: pxa: magician: Add support for PXA27x UDC
  ARM: pxa: magician: Add support for MAX1587A Vcore regulator
  ARM: pxa: magician: Change comments to be more informative
  ARM: pxa: magician: Move platform_add_devices() to the end of magician_init()
  ARM: pxa: magician: Add missing regulator for PWM backlight
  ARM: pxa: magician: Add debug message for backlight brightness function
  ARM: pxa: magician: Remove definition of the STUART port
  ARM: pxa: magician: Fix wrongly enabled USB host ports
  ARM: pxa: magician: Fix support for Intel Strata NOR Flash
  ARM: pxa: magician: Fix redundant GPIO request for pxaficp_ir
  ARM: pxa: magician: Fix platform data for both PXA27x I2C controllers
  ARM: pxa: magician: Fix and add charging detection functions
  ARM: pxa: magician: Optimize Samsung LCD refresh to 50Hz
  ARM: pxa: magician: Rename charger cable detection EGPIOs
  ARM: pxa: magician: Optimize powerup delays for Samsung LCD
  ARM: pxa: magician: Rename abstract LCD GPIOs
  ARM: pxa: magician: Add new discovered EGPIO pins
  ...

Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/mach-pxa/lpd270.c
index 4823d972e64745dd4ae10dbfed0138eb46d10311,ab4e84f4ee0c497ce5a66b6a8140993410f6cfaa..5fcd4f094900b810b6fd902903c53fe27fb672ec
--- 1/arch/arm/mach-pxa/lpd270.c
--- 2/arch/arm/mach-pxa/lpd270.c
+++ b/arch/arm/mach-pxa/lpd270.c
@@@ -23,6 -23,7 +23,7 @@@
  #include <linux/ioport.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
+ #include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/smc91x.h>
  
@@@ -120,7 -121,7 +121,7 @@@ static struct irq_chip lpd270_irq_chip 
        .irq_unmask     = lpd270_unmask_irq,
  };
  
 -static void lpd270_irq_handler(unsigned int __irq, struct irq_desc *desc)
 +static void lpd270_irq_handler(struct irq_desc *desc)
  {
        unsigned int irq;
        unsigned long pending;
@@@ -271,11 -272,14 +272,14 @@@ static struct platform_device lpd270_fl
        },
  };
  
+ static struct pwm_lookup lpd270_pwm_lookup[] = {
+       PWM_LOOKUP("pxa27x-pwm.0", 0, "pwm-backlight.0", NULL, 78770,
+                  PWM_POLARITY_NORMAL),
+ };
+ 
  static struct platform_pwm_backlight_data lpd270_backlight_data = {
-       .pwm_id         = 0,
        .max_brightness = 1,
        .dft_brightness = 1,
-       .pwm_period_ns  = 78770,
        .enable_gpio    = -1,
  };
  
@@@ -474,6 -478,7 +478,7 @@@ static void __init lpd270_init(void
         */
        ARB_CNTRL = ARB_CORE_PARK | 0x234;
  
+       pwm_add_table(lpd270_pwm_lookup, ARRAY_SIZE(lpd270_pwm_lookup));
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
  
        pxa_set_ac97_info(NULL);

diff --combined arch/arm/mach-pxa/pcm990-baseboard.c
index d8319b54299a571d223321a53cd7776aa71ccece,1453fd95ced5d38489127c4054f9b46d5731c2ab..b71c96f614f935317bfeb5d5b74b39a616aa64bd
--- 1/arch/arm/mach-pxa/pcm990-baseboard.c
--- 2/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@@ -24,6 -24,7 +24,7 @@@
  #include <linux/platform_device.h>
  #include <linux/i2c.h>
  #include <linux/i2c/pxa-i2c.h>
+ #include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  
  #include <media/mt9v022.h>
@@@ -148,11 -149,14 +149,14 @@@ static struct pxafb_mach_info pcm990_fb
  };
  #endif
  
+ static struct pwm_lookup pcm990_pwm_lookup[] = {
+       PWM_LOOKUP("pxa27x-pwm.0", 0, "pwm-backlight.0", NULL, 78770,
+                  PWM_POLARITY_NORMAL),
+ };
+ 
  static struct platform_pwm_backlight_data pcm990_backlight_data = {
-       .pwm_id         = 0,
        .max_brightness = 1023,
        .dft_brightness = 1023,
-       .pwm_period_ns  = 78770,
        .enable_gpio    = -1,
  };
  
@@@ -284,7 -288,7 +288,7 @@@ static struct irq_chip pcm990_irq_chip 
        .irq_unmask     = pcm990_unmask_irq,
  };
  
 -static void pcm990_irq_handler(unsigned int __irq, struct irq_desc *desc)
 +static void pcm990_irq_handler(struct irq_desc *desc)
  {
        unsigned int irq;
        unsigned long pending;
@@@ -542,6 -546,7 +546,7 @@@ void __init pcm990_baseboard_init(void
  #ifndef CONFIG_PCM990_DISPLAY_NONE
        pxa_set_fb_info(NULL, &pcm990_fbinfo);
  #endif
+       pwm_add_table(pcm990_pwm_lookup, ARRAY_SIZE(pcm990_pwm_lookup));
        platform_device_register(&pcm990_backlight_device);
  
        /* MMC */

diff --combined arch/arm/mach-pxa/viper.c
index 8ab26370107ea5d0df2742b1ac0ab31aa18eb425,b09e8cadd41f8beef7007c215c93e489f508f80b..7ecc61ad2bed08bb976d1f6be31851e2bd75e5cf
--- 1/arch/arm/mach-pxa/viper.c
--- 2/arch/arm/mach-pxa/viper.c
+++ b/arch/arm/mach-pxa/viper.c
@@@ -39,6 -39,7 +39,7 @@@
  #include <linux/i2c/pxa-i2c.h>
  #include <linux/serial_8250.h>
  #include <linux/smc91x.h>
+ #include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/usb/isp116x.h>
  #include <linux/mtd/mtd.h>
@@@ -276,7 -277,7 +277,7 @@@ static inline unsigned long viper_irq_p
                        viper_irq_enabled_mask;
  }
  
 -static void viper_irq_handler(unsigned int __irq, struct irq_desc *desc)
 +static void viper_irq_handler(struct irq_desc *desc)
  {
        unsigned int irq;
        unsigned long pending;
@@@ -350,6 -351,11 +351,11 @@@ static struct pxafb_mach_info fb_info 
        .lcd_conn               = LCD_COLOR_TFT_16BPP | LCD_PCLK_EDGE_FALL,
  };
  
+ static struct pwm_lookup viper_pwm_lookup[] = {
+       PWM_LOOKUP("pxa25x-pwm.0", 0, "pwm-backlight.0", NULL, 1000000,
+                  PWM_POLARITY_NORMAL),
+ };
+ 
  static int viper_backlight_init(struct device *dev)
  {
        int ret;
@@@ -398,10 -404,8 +404,8 @@@ static void viper_backlight_exit(struc
  }
  
  static struct platform_pwm_backlight_data viper_backlight_data = {
-       .pwm_id         = 0,
        .max_brightness = 100,
        .dft_brightness = 100,
-       .pwm_period_ns  = 1000000,
        .enable_gpio    = -1,
        .init           = viper_backlight_init,
        .notify         = viper_backlight_notify,
@@@ -939,6 -943,7 +943,7 @@@ static void __init viper_init(void
                smc91x_device.num_resources--;
  
        pxa_set_i2c_info(NULL);
+       pwm_add_table(viper_pwm_lookup, ARRAY_SIZE(viper_pwm_lookup));
        platform_add_devices(viper_devs, ARRAY_SIZE(viper_devs));
  
        viper_init_vcore_gpios();