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

Pull ARM SoC driver updates from Olof Johansson:
 "Misc driver updates for platforms, many of them power related.

   - Rockchip adds power domain support for rk3066 and rk3188

   - Amlogic adds a power measurement driver

   - Allwinner adds SRAM support for three platforms (F1C100, H5, A64
     C1)

   - Wakeup and ti-sysc (platform bus) fixes for OMAP/DRA7

   - Broadcom fixes suspend/resume with Thumb2 kernels, and improves
     stability of a handful of firmware/platform interfaces

   - PXA completes their conversion to dmaengine framework

   - Renesas does a bunch of PM cleanups across many platforms

   - Tegra adds support for suspend/resume on T186/T194, which includes
     some driver cleanups and addition of wake events

   - Tegra also adds a driver for memory controller (EMC) on Tegra2

   - i.MX tweaks power domain bindings, and adds support for i.MX8MQ in
     GPC

   - Atmel adds identifiers and LPDDR2 support for a new SoC, SAM9X60

  and misc cleanups across several platforms"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
  ARM: at91: add support in soc driver for new SAM9X60
  ARM: at91: add support in soc driver for LPDDR2 SiP
  memory: omap-gpmc: Use of_node_name_eq for node name comparisons
  bus: ti-sysc: Check for no-reset and no-idle flags at the child level
  ARM: OMAP2+: Check also the first dts child for hwmod flags
  soc: amlogic: meson-clk-measure: Add missing REGMAP_MMIO dependency
  soc: imx: gpc: Increase GPC_CLK_MAX to 7
  soc: renesas: rcar-sysc: Fix power domain control after system resume
  soc: renesas: rcar-sysc: Merge PM Domain registration and linking
  soc: renesas: rcar-sysc: Remove rcar_sysc_power_{down,up}() helpers
  soc: renesas: r8a77990-sysc: Fix initialization order of 3DG-{A,B}
  dt-bindings: sram: sunxi: Add compatible for the A64 SRAM C1
  dt-bindings: sram: sunxi: Add bindings for the H5 with SRAM C1
  dt-bindings: sram: Add Allwinner suniv F1C100s
  soc: sunxi: sram: Add support for the H5 SoC system control
  soc: sunxi: sram: Enable EMAC clock access for H3 variant
  soc: imx: gpcv2: add support for i.MX8MQ SoC
  soc: imx: gpcv2: move register access table to domain data
  soc: imx: gpcv2: prefix i.MX7 specific defines
  dmaengine: pxa: make the filter function internal
  ...

2 files changed, 50 insertions, 17 deletions

diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c
index 68ac3e93b600..f58ff67e97ac 100644
--- a/drivers/bus/brcmstb_gisb.c
+++ b/drivers/bus/brcmstb_gisb.c
@@ -150,8 +150,7 @@ static ssize_t gisb_arb_get_timeout(struct device *dev,
                                     struct device_attribute *attr,
                                     char *buf)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev);
+        struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev);
         u32 timeout;
 
         mutex_lock(&gdev->lock);
@@ -165,8 +164,7 @@ static ssize_t gisb_arb_set_timeout(struct device *dev,
                                     struct device_attribute *attr,
                                     const char *buf, size_t count)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev);
+        struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev);
         int val, ret;
 
         ret = kstrtoint(buf, 10, &val);
@@ -418,8 +416,7 @@ static int __init brcmstb_gisb_arb_probe(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int brcmstb_gisb_arb_suspend(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev);
+        struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev);
 
         gdev->saved_timeout = gisb_read(gdev, ARB_TIMER);
 
@@ -431,8 +428,7 @@ static int brcmstb_gisb_arb_suspend(struct device *dev)
  */
 static int brcmstb_gisb_arb_resume_noirq(struct device *dev)
 {
-        struct platform_device *pdev = to_platform_device(dev);
-        struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev);
+        struct brcmstb_gisb_arb_device *gdev = dev_get_drvdata(dev);
 
         gisb_write(gdev, gdev->saved_timeout, ARB_TIMER);
 
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index a3a2d39280d9..f94d33525771 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -91,6 +91,9 @@ struct sysc {
         struct delayed_work idle_work;
 };
 
+static void sysc_parse_dts_quirks(struct sysc *ddata, struct device_node *np,
+                                  bool is_child);
+
 void sysc_write(struct sysc *ddata, int offset, u32 value)
 {
         writel_relaxed(value, ddata->module_va + offset);
@@ -214,8 +217,13 @@ static int sysc_get_clocks(struct sysc *ddata)
         if (!ddata->clocks)
                 return -ENOMEM;
 
-        for (i = 0; i < ddata->nr_clocks; i++) {
-                error = sysc_get_one_clock(ddata, ddata->clock_roles[i]);
+        for (i = 0; i < SYSC_MAX_CLOCKS; i++) {
+                const char *name = ddata->clock_roles[i];
+
+                if (!name)
+                        continue;
+
+                error = sysc_get_one_clock(ddata, name);
                 if (error && error != -ENOENT)
                         return error;
         }
@@ -374,6 +382,7 @@ static int sysc_check_one_child(struct sysc *ddata,
                 dev_warn(ddata->dev, "really a child ti,hwmods property?");
 
         sysc_check_quirk_stdout(ddata, np);
+        sysc_parse_dts_quirks(ddata, np, true);
 
         return 0;
 }
@@ -815,6 +824,7 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
         SYSC_QUIRK("ocp2scp", 0, 0, 0x10, 0x14, 0x50060005, 0xfffffff0, 0),
         SYSC_QUIRK("ocp2scp", 0, 0, -1, -1, 0x50060007, 0xffffffff, 0),
         SYSC_QUIRK("padconf", 0, 0, 0x10, -1, 0x4fff0800, 0xffffffff, 0),
+        SYSC_QUIRK("padconf", 0, 0, -1, -1, 0x40001100, 0xffffffff, 0),
         SYSC_QUIRK("prcm", 0, 0, -1, -1, 0x40000100, 0xffffffff, 0),
         SYSC_QUIRK("prcm", 0, 0, -1, -1, 0x00004102, 0xffffffff, 0),
         SYSC_QUIRK("prcm", 0, 0, -1, -1, 0x40000400, 0xffffffff, 0),
@@ -833,7 +843,9 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
         SYSC_QUIRK("rtc", 0, 0x74, 0x78, -1, 0x4eb01908, 0xffff00f0, 0),
         SYSC_QUIRK("timer32k", 0, 0, 0x4, -1, 0x00000060, 0xffffffff, 0),
         SYSC_QUIRK("usbhstll", 0, 0, 0x10, 0x14, 0x00000004, 0xffffffff, 0),
+        SYSC_QUIRK("usbhstll", 0, 0, 0x10, 0x14, 0x00000008, 0xffffffff, 0),
         SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, 0x14, 0x50700100, 0xffffffff, 0),
+        SYSC_QUIRK("usb_host_hs", 0, 0, 0x10, -1, 0x50700101, 0xffffffff, 0),
         SYSC_QUIRK("usb_otg_hs", 0, 0x400, 0x404, 0x408, 0x00000050,
                    0xffffffff, 0),
         SYSC_QUIRK("wdt", 0, 0, 0x10, 0x14, 0x502a0500, 0xfffff0f0, 0),
@@ -1271,23 +1283,37 @@ static const struct sysc_dts_quirk sysc_dts_quirks[] = {
           .mask = SYSC_QUIRK_NO_RESET_ON_INIT, },
 };
 
-static int sysc_init_dts_quirks(struct sysc *ddata)
+static void sysc_parse_dts_quirks(struct sysc *ddata, struct device_node *np,
+                                  bool is_child)
 {
-        struct device_node *np = ddata->dev->of_node;
         const struct property *prop;
-        int i, len, error;
-        u32 val;
-
-        ddata->legacy_mode = of_get_property(np, "ti,hwmods", NULL);
+        int i, len;
 
         for (i = 0; i < ARRAY_SIZE(sysc_dts_quirks); i++) {
-                prop = of_get_property(np, sysc_dts_quirks[i].name, &len);
+                const char *name = sysc_dts_quirks[i].name;
+
+                prop = of_get_property(np, name, &len);
                 if (!prop)
                         continue;
 
                 ddata->cfg.quirks |= sysc_dts_quirks[i].mask;
+                if (is_child) {
+                        dev_warn(ddata->dev,
+                                 "dts flag should be at module level for %s\n",
+                                 name);
+                }
         }
+}
 
+static int sysc_init_dts_quirks(struct sysc *ddata)
+{
+        struct device_node *np = ddata->dev->of_node;
+        int error;
+        u32 val;
+
+        ddata->legacy_mode = of_get_property(np, "ti,hwmods", NULL);
+
+        sysc_parse_dts_quirks(ddata, np, false);
         error = of_property_read_u32(np, "ti,sysc-delay-us", &val);
         if (!error) {
                 if (val > 255) {
@@ -1498,6 +1524,16 @@ static const struct sysc_regbits sysc_regbits_omap4_mcasp = {
 static const struct sysc_capabilities sysc_omap4_mcasp = {
         .type = TI_SYSC_OMAP4_MCASP,
         .regbits = &sysc_regbits_omap4_mcasp,
+        .mod_quirks = SYSC_QUIRK_OPT_CLKS_NEEDED,
+};
+
+/*
+ * McASP found on dra7 and later
+ */
+static const struct sysc_capabilities sysc_dra7_mcasp = {
+        .type = TI_SYSC_OMAP4_SIMPLE,
+        .regbits = &sysc_regbits_omap4_simple,
+        .mod_quirks = SYSC_QUIRK_OPT_CLKS_NEEDED,
 };
 
 /*
@@ -1726,6 +1762,7 @@ static const struct of_device_id sysc_match[] = {
         { .compatible = "ti,sysc-omap3-sham", .data = &sysc_omap3_sham, },
         { .compatible = "ti,sysc-omap-aes", .data = &sysc_omap3_aes, },
         { .compatible = "ti,sysc-mcasp", .data = &sysc_omap4_mcasp, },
+        { .compatible = "ti,sysc-dra7-mcasp", .data = &sysc_dra7_mcasp, },
         { .compatible = "ti,sysc-usb-host-fs",
           .data = &sysc_omap4_usb_host_fs, },
         { .compatible = "ti,sysc-dra7-mcan", .data = &sysc_dra7_mcan, },