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

Pull ARM SoC driver specific changes from Arnd Bergmann:
 "These changes are all driver specific and cross over between arm-soc
  contents and some other subsystem, in these cases cpufreq, crypto,
  dma, pinctrl, mailbox and usb, and the subsystem owners agreed to have
  these changes merged through arm-soc.

  As we proceed to untangle the dependencies between platform code and
  driver code, the amount of changes in this category is fortunately
  shrinking, for 3.11 we have 16 branches here and 101 non-merge
  changesets, the majority of which are for the stedma40 dma engine
  driver used in the ux500 platform.  Cleaning up that code touches
  multiple subsystems, but gets rid of the dependency in the end.

  The mailbox code moved out from mach-omap2 to drivers/mailbox is an
  intermediate step and is still omap specific at the moment.  Patches
  exist to generalize the subsystem and add other drivers with the same
  API, but those did not make it for 3.11."

* tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (101 commits)
  crypto: ux500: use dmaengine_submit API
  crypto: ux500: use dmaengine_prep_slave_sg API
  crypto: ux500: use dmaengine_device_control API
  crypto: ux500/crypt: add missing __iomem qualifiers
  crypto: ux500/hash: add missing static qualifiers
  crypto: ux500/hash: use readl on iomem addresses
  dmaengine: ste_dma40: Declare memcpy config as static
  ARM: ux500: Remove mop500_snowball_ethernet_clock_enable()
  ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO
  ARM: ux500: Provide a AB8500 GPIO Device Tree node
  gpio: rcar: fix gpio_rcar_of_table
  gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections
  gpio-rcar: Reference core gpio documentation in the DT bindings
  clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2
  ARM: dts: Update Samsung I2S documentation
  ARM: dts: add clock provider information for i2s controllers in Exynos5250
  ARM: dts: add Exynos audio subsystem clock controller node
  clk: samsung: register audio subsystem clocks using common clock framework
  ARM: dts: use #include for all device trees for Samsung
  pinctrl: s3c24xx: use correct header for chained_irq functions
  ...

2 files changed, 57 insertions, 73 deletions

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index d173d56dbb8c..6ec82f76f019 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -51,6 +51,8 @@ struct gpio_rcar_priv {
 #define FILONOFF 0x28
 #define BOTHEDGE 0x4c
 
+#define RCAR_MAX_GPIO_PER_BANK          32
+
 static inline u32 gpio_rcar_read(struct gpio_rcar_priv *p, int offs)
 {
         return ioread32(p->base + offs);
@@ -274,9 +276,35 @@ static struct irq_domain_ops gpio_rcar_irq_domain_ops = {
         .map    = gpio_rcar_irq_domain_map,
 };
 
+static void gpio_rcar_parse_pdata(struct gpio_rcar_priv *p)
+{
+        struct gpio_rcar_config *pdata = p->pdev->dev.platform_data;
+        struct device_node *np = p->pdev->dev.of_node;
+        struct of_phandle_args args;
+        int ret;
+
+        if (pdata) {
+                p->config = *pdata;
+        } else if (IS_ENABLED(CONFIG_OF) && np) {
+                ret = of_parse_phandle_with_args(np, "gpio-ranges",
+                                "#gpio-range-cells", 0, &args);
+                p->config.number_of_pins = ret == 0 && args.args_count == 3
+                                         ? args.args[2]
+                                         : RCAR_MAX_GPIO_PER_BANK;
+                p->config.gpio_base = -1;
+        }
+
+        if (p->config.number_of_pins == 0 ||
+            p->config.number_of_pins > RCAR_MAX_GPIO_PER_BANK) {
+                dev_warn(&p->pdev->dev,
+                         "Invalid number of gpio lines %u, using %u\n",
+                         p->config.number_of_pins, RCAR_MAX_GPIO_PER_BANK);
+                p->config.number_of_pins = RCAR_MAX_GPIO_PER_BANK;
+        }
+}
+
 static int gpio_rcar_probe(struct platform_device *pdev)
 {
-        struct gpio_rcar_config *pdata = pdev->dev.platform_data;
         struct gpio_rcar_priv *p;
         struct resource *io, *irq;
         struct gpio_chip *gpio_chip;
@@ -291,14 +319,14 @@ static int gpio_rcar_probe(struct platform_device *pdev)
                 goto err0;
         }
 
-        /* deal with driver instance configuration */
-        if (pdata)
-                p->config = *pdata;
-
         p->pdev = pdev;
-        platform_set_drvdata(pdev, p);
         spin_lock_init(&p->lock);
 
+        /* Get device configuration from DT node or platform data. */
+        gpio_rcar_parse_pdata(p);
+
+        platform_set_drvdata(pdev, p);
+
         io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 
@@ -325,6 +353,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
         gpio_chip->set = gpio_rcar_set;
         gpio_chip->to_irq = gpio_rcar_to_irq;
         gpio_chip->label = name;
+        gpio_chip->dev = &pdev->dev;
         gpio_chip->owner = THIS_MODULE;
         gpio_chip->base = p->config.gpio_base;
         gpio_chip->ngpio = p->config.number_of_pins;
@@ -371,10 +400,12 @@ static int gpio_rcar_probe(struct platform_device *pdev)
                                  p->config.irq_base, ret);
         }
 
-        ret = gpiochip_add_pin_range(gpio_chip, p->config.pctl_name, 0,
-                                     gpio_chip->base, gpio_chip->ngpio);
-        if (ret < 0)
-                dev_warn(&pdev->dev, "failed to add pin range\n");
+        if (p->config.pctl_name) {
+                ret = gpiochip_add_pin_range(gpio_chip, p->config.pctl_name, 0,
+                                             gpio_chip->base, gpio_chip->ngpio);
+                if (ret < 0)
+                        dev_warn(&pdev->dev, "failed to add pin range\n");
+        }
 
         return 0;
 
@@ -397,11 +428,23 @@ static int gpio_rcar_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id gpio_rcar_of_table[] = {
+        {
+                .compatible = "renesas,gpio-rcar",
+        },
+        { },
+};
+
+MODULE_DEVICE_TABLE(of, gpio_rcar_of_table);
+#endif
+
 static struct platform_driver gpio_rcar_device_driver = {
         .probe          = gpio_rcar_probe,
         .remove         = gpio_rcar_remove,
         .driver         = {
                 .name   = "gpio_rcar",
+                .of_match_table = of_match_ptr(gpio_rcar_of_table),
         }
 };
 
diff --git a/drivers/gpio/gpio-samsung.c b/drivers/gpio/gpio-samsung.c
index b22ca7933745..a1392f47bbda 100644
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@ -933,67 +933,6 @@ static void __init samsung_gpiolib_add(struct samsung_gpio_chip *chip)
                 s3c_gpiolib_track(chip);
 }
 
-#if defined(CONFIG_PLAT_S3C24XX) && defined(CONFIG_OF)
-static int s3c24xx_gpio_xlate(struct gpio_chip *gc,
-                        const struct of_phandle_args *gpiospec, u32 *flags)
-{
-        unsigned int pin;
-
-        if (WARN_ON(gc->of_gpio_n_cells < 3))
-                return -EINVAL;
-
-        if (WARN_ON(gpiospec->args_count < gc->of_gpio_n_cells))
-                return -EINVAL;
-
-        if (gpiospec->args[0] > gc->ngpio)
-                return -EINVAL;
-
-        pin = gc->base + gpiospec->args[0];
-
-        if (s3c_gpio_cfgpin(pin, S3C_GPIO_SFN(gpiospec->args[1])))
-                pr_warn("gpio_xlate: failed to set pin function\n");
-        if (s3c_gpio_setpull(pin, gpiospec->args[2] & 0xffff))
-                pr_warn("gpio_xlate: failed to set pin pull up/down\n");
-
-        if (flags)
-                *flags = gpiospec->args[2] >> 16;
-
-        return gpiospec->args[0];
-}
-
-static const struct of_device_id s3c24xx_gpio_dt_match[] __initdata = {
-        { .compatible = "samsung,s3c24xx-gpio", },
-        {}
-};
-
-static __init void s3c24xx_gpiolib_attach_ofnode(struct samsung_gpio_chip *chip,
-                                                 u64 base, u64 offset)
-{
-        struct gpio_chip *gc =  &chip->chip;
-        u64 address;
-
-        if (!of_have_populated_dt())
-                return;
-
-        address = chip->base ? base + ((u32)chip->base & 0xfff) : base + offset;
-        gc->of_node = of_find_matching_node_by_address(NULL,
-                        s3c24xx_gpio_dt_match, address);
-        if (!gc->of_node) {
-                pr_info("gpio: device tree node not found for gpio controller"
-                        " with base address %08llx\n", address);
-                return;
-        }
-        gc->of_gpio_n_cells = 3;
-        gc->of_xlate = s3c24xx_gpio_xlate;
-}
-#else
-static __init void s3c24xx_gpiolib_attach_ofnode(struct samsung_gpio_chip *chip,
-                                                 u64 base, u64 offset)
-{
-        return;
-}
-#endif /* defined(CONFIG_PLAT_S3C24XX) && defined(CONFIG_OF) */
-
 static void __init s3c24xx_gpiolib_add_chips(struct samsung_gpio_chip *chip,
                                              int nr_chips, void __iomem *base)
 {
@@ -1018,8 +957,6 @@ static void __init s3c24xx_gpiolib_add_chips(struct samsung_gpio_chip *chip,
                         gc->direction_output = samsung_gpiolib_2bit_output;
 
                 samsung_gpiolib_add(chip);
-
-                s3c24xx_gpiolib_attach_ofnode(chip, S3C24XX_PA_GPIO, i * 0x10);
         }
 }
 
@@ -3026,6 +2963,10 @@ static __init int samsung_gpiolib_init(void)
         */
         struct device_node *pctrl_np;
         static const struct of_device_id exynos_pinctrl_ids[] = {
+                { .compatible = "samsung,s3c2412-pinctrl", },
+                { .compatible = "samsung,s3c2416-pinctrl", },
+                { .compatible = "samsung,s3c2440-pinctrl", },
+                { .compatible = "samsung,s3c2450-pinctrl", },
                 { .compatible = "samsung,exynos4210-pinctrl", },
                 { .compatible = "samsung,exynos4x12-pinctrl", },
                 { .compatible = "samsung,exynos5250-pinctrl", },