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

Pull ARM SoC driver changes from Olof Johansson:
 "A handful of driver-related changes.  We've had a bunch of them going
  in through other branches as well, so it's only a part of what we
  really have this release.

  Larger pieces are:

   - Removal of a now unused PWM driver for atmel
     [ This includes AVR32 changes that have been appropriately acked ]
   - Performance counter support for the arm CCN interconnect
   - OMAP mailbox driver cleanups and consolidation
   - PCI and SATA PHY drivers for SPEAr 13xx platforms
   - Redefinition (with backwards compatibility!) of PCI DT bindings for
     Tegra to better model regulators/power"

Note: this merge also fixes up the semantic conflict with the new
calling convention for devm_phy_create(), see commit f0ed817638b5 ("phy:
core: Let node ptr of PHY point to PHY and not of PHY provider") that
came in through Greg's USB tree.

Semantic merge patch by Stephen Rothwell <sfr@canb.auug.org.au> through
the next tree.

* tag 'drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (38 commits)
  bus: arm-ccn: Fix error handling at event allocation
  mailbox/omap: add a parent structure for every IP instance
  mailbox/omap: remove the private mailbox structure
  mailbox/omap: consolidate OMAP mailbox driver
  mailbox/omap: simplify the fifo assignment by using macros
  mailbox/omap: remove omap_mbox_type_t from mailbox ops
  mailbox/omap: remove OMAP1 mailbox driver
  mailbox/omap: use devm_* interfaces
  bus: ARM CCN: add PERF_EVENTS dependency
  bus: ARM CCN PMU driver
  PCI: spear: Remove spear13xx_pcie_remove()
  PCI: spear: Fix Section mismatch compilation warning for probe()
  ARM: tegra: Remove legacy PCIe power supply properties
  PCI: tegra: Remove deprecated power supply properties
  PCI: tegra: Implement accurate power supply scheme
  ARM: SPEAr13xx: Update defconfigs
  ARM: SPEAr13xx: Add pcie and miphy DT nodes
  ARM: SPEAr13xx: Add bindings and dt node for misc block
  ARM: SPEAr13xx: Fix static mapping table
  phy: Add drivers for PCIe and SATA phy on SPEAr13xx
  ...

3 files changed, 73 insertions, 43 deletions

diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c
index 1ba09e4c02b1..91146b416cdb 100644
--- a/arch/avr32/boards/atngw100/mrmt.c
+++ b/arch/avr32/boards/atngw100/mrmt.c
@@ -17,6 +17,8 @@
 #include <linux/types.h>
 #include <linux/fb.h>
 #include <linux/leds.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
 #include <linux/input.h>
 #include <linux/gpio_keys.h>
 #include <linux/atmel_serial.h>
@@ -155,21 +157,28 @@ static struct platform_device rmt_ts_device = {
 
 #ifdef CONFIG_BOARD_MRMT_BL_PWM
 /* PWM LEDs: LCD Backlight, etc */
-static struct gpio_led rmt_pwm_led[] = {
-        /* here the "gpio" is actually a PWM channel */
-        { .name = "backlight",  .gpio = PWM_CH_BL, },
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", PWM_CH_BL, "leds_pwm", "ds1",
+                   5000, PWM_POLARITY_INVERSED),
 };
 
-static struct gpio_led_platform_data rmt_pwm_led_data = {
-        .num_leds       = ARRAY_SIZE(rmt_pwm_led),
-        .leds           = rmt_pwm_led,
+static struct led_pwm pwm_leds[] = {
+        {
+                .name = "backlight",
+                .max_brightness = 255,
+        },
+};
+
+static struct led_pwm_platform_data pwm_data = {
+        .num_leds       = ARRAY_SIZE(pwm_leds),
+        .leds           = pwm_leds,
 };
 
-static struct platform_device rmt_pwm_led_dev = {
-        .name           = "leds-atmel-pwm",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &rmt_pwm_led_data,
+static struct platform_device leds_pwm = {
+        .name   = "leds_pwm",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &pwm_data,
         },
 };
 #endif
@@ -325,7 +334,8 @@ static int __init mrmt1_init(void)
 #ifdef CONFIG_BOARD_MRMT_BL_PWM
         /* Use PWM for Backlight controls */
         at32_add_device_pwm(1 << PWM_CH_BL);
-        platform_device_register(&rmt_pwm_led_dev);
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+        platform_device_register(&leds_pwm);
 #else
         /* Backlight always on */
         udelay( 1 );
diff --git a/arch/avr32/boards/favr-32/setup.c b/arch/avr32/boards/favr-32/setup.c
index 1f121497b517..234cb071c601 100644
--- a/arch/avr32/boards/favr-32/setup.c
+++ b/arch/avr32/boards/favr-32/setup.c
@@ -18,7 +18,10 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/atmel-mci.h>
-#include <linux/atmel-pwm-bl.h>
+#include <linux/pwm.h>
+#include <linux/pwm_backlight.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
@@ -33,6 +36,8 @@
 #include <mach/board.h>
 #include <mach/portmux.h>
 
+#define PWM_BL_CH 2
+
 /* Oscillator frequencies. These are board-specific */
 unsigned long at32_board_osc_rates[3] = {
         [0] = 32768,    /* 32.768 kHz on RTC osc */
@@ -227,29 +232,36 @@ void __init favr32_setup_leds(void)
         platform_device_register(&favr32_led_dev);
 }
 
-static struct atmel_pwm_bl_platform_data atmel_pwm_bl_pdata = {
-        .pwm_channel            = 2,
-        .pwm_frequency          = 200000,
-        .pwm_compare_max        = 345,
-        .pwm_duty_max           = 345,
-        .pwm_duty_min           = 90,
-        .pwm_active_low         = 1,
-        .gpio_on                = GPIO_PIN_PA(28),
-        .on_active_low          = 0,
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", PWM_BL_CH, "pwm-backlight.0", NULL,
+                   5000, PWM_POLARITY_INVERSED),
 };
 
-static struct platform_device atmel_pwm_bl_dev = {
-        .name           = "atmel-pwm-bl",
-        .id             = 0,
-        .dev            = {
-                .platform_data = &atmel_pwm_bl_pdata,
+static struct regulator_consumer_supply fixed_power_consumers[] = {
+        REGULATOR_SUPPLY("power", "pwm-backlight.0"),
+};
+
+static struct platform_pwm_backlight_data pwm_bl_data = {
+        .enable_gpio            = GPIO_PIN_PA(28),
+        .max_brightness         = 255,
+        .dft_brightness         = 255,
+        .lth_brightness         = 50,
+};
+
+static struct platform_device pwm_bl_device = {
+        .name = "pwm-backlight",
+        .dev = {
+                .platform_data = &pwm_bl_data,
         },
 };
 
 static void __init favr32_setup_atmel_pwm_bl(void)
 {
-        platform_device_register(&atmel_pwm_bl_dev);
-        at32_select_gpio(atmel_pwm_bl_pdata.gpio_on, 0);
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
+        regulator_register_always_on(0, "fixed", fixed_power_consumers,
+                                    ARRAY_SIZE(fixed_power_consumers), 3300000);
+        platform_device_register(&pwm_bl_device);
+        at32_select_gpio(pwm_bl_data.enable_gpio, 0);
 }
 
 void __init setup_board(void)
@@ -339,7 +351,7 @@ static int __init favr32_init(void)
 
         set_abdac_rate(at32_add_device_abdac(0, &abdac0_data));
 
-        at32_add_device_pwm(1 << atmel_pwm_bl_pdata.pwm_channel);
+        at32_add_device_pwm(1 << PWM_BL_CH);
         at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));
         at32_add_device_mci(0, &mci0_data);
         at32_add_device_usba(0, NULL);
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index ed137e335796..83d896cc2aed 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -22,6 +22,8 @@
 #include <linux/irq.h>
 #include <linux/fb.h>
 #include <linux/atmel-mci.h>
+#include <linux/pwm.h>
+#include <linux/leds_pwm.h>
 
 #include <asm/io.h>
 #include <asm/setup.h>
@@ -167,24 +169,29 @@ static struct i2c_board_info __initdata i2c_info[] = {
         },
 };
 
-#ifdef CONFIG_LEDS_ATMEL_PWM
-static struct gpio_led stk_pwm_led[] = {
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("at91sam9rl-pwm", 0, "leds_pwm", "backlight",
+                   5000, PWM_POLARITY_NORMAL),
+};
+
+static struct led_pwm pwm_leds[] = {
         {
                 .name   = "backlight",
-                .gpio   = 0,            /* PWM channel 0 (LCD backlight) */
+                .max_brightness = 255,
         },
 };
 
-static struct gpio_led_platform_data stk_pwm_led_data = {
-        .num_leds       = ARRAY_SIZE(stk_pwm_led),
-        .leds           = stk_pwm_led,
+static struct led_pwm_platform_data pwm_data = {
+        .num_leds       = ARRAY_SIZE(pwm_leds),
+        .leds           = pwm_leds,
 };
 
-static struct platform_device stk_pwm_led_dev = {
-        .name   = "leds-atmel-pwm",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &stk_pwm_led_data,
+static struct platform_device leds_pwm = {
+        .name   = "leds_pwm",
+        .id     = -1,
+        .dev    = {
+                .platform_data = &pwm_data,
         },
 };
 #endif
@@ -278,9 +285,10 @@ static int __init merisc_init(void)
 
         at32_add_device_mci(0, &mci0_data);
 
-#ifdef CONFIG_LEDS_ATMEL_PWM
+#if IS_ENABLED(CONFIG_LEDS_PWM)
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
         at32_add_device_pwm((1 << 0) | (1 << 2));
-        platform_device_register(&stk_pwm_led_dev);
+        platform_device_register(&leds_pwm);
 #else
         at32_add_device_pwm((1 << 2));
 #endif