Merge tag 'armsoc-cleanup' into test-merge

ARM: SoC cleanups for v4.2

A relatively small setup of cleanups this time around, and similar to last time
the bulk of it is removal of legacy board support:

- OMAP: removal of legacy (non-DT) booting for several platforms
- i.MX: remove some legacy board files

Conflicts: None

# gpg: Signature made Wed Jun 24 21:32:09 2015 PDT using RSA key ID D3FBC665
# gpg: Good signature from "Kevin Hilman <[email protected]>"
# gpg:                 aka "Kevin Hilman <[email protected]>"
# gpg:                 aka "Kevin Hilman <[email protected]>"

diff --combined arch/arm/boot/dts/tegra124.dtsi
index 13cc7ca5e031e5f1814697e8ead9546079f6d04e,0d9f9ae73149a5722759248f3b07f47d58270c5c..4db9be02399e7be8b45bfd00d8b5f9de6aa641bc
--- 1/arch/arm/boot/dts/tegra124.dtsi
--- 2/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@@ -300,7 -300,7 +300,7 @@@
        apbmisc@0,70000800 {
                compatible = "nvidia,tegra124-apbmisc", "nvidia,tegra20-apbmisc";
                reg = <0x0 0x70000800 0x0 0x64>,   /* Chip revision */
-                     <0x0 0x7000E864 0x0 0x04>;   /* Strapping options */
+                     <0x0 0x7000e864 0x0 0x04>;   /* Strapping options */
        };
  
        pinmux: pinmux@0,70000868 {
@@@ -826,7 -826,7 +826,7 @@@
                         <&tegra_car TEGRA124_CLK_PLL_U>,
                         <&tegra_car TEGRA124_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
 -              resets = <&tegra_car 59>, <&tegra_car 22>;
 +              resets = <&tegra_car 22>, <&tegra_car 22>;
                reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
@@@ -838,7 -838,6 +838,7 @@@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
 +              nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
  
@@@ -863,7 -862,7 +863,7 @@@
                         <&tegra_car TEGRA124_CLK_PLL_U>,
                         <&tegra_car TEGRA124_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
 -              resets = <&tegra_car 22>, <&tegra_car 22>;
 +              resets = <&tegra_car 58>, <&tegra_car 22>;
                reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;
@@@ -875,6 -874,7 +875,6 @@@
                nvidia,hssquelch-level = <2>;
                nvidia,hsdiscon-level = <5>;
                nvidia,xcvr-hsslew = <12>;
 -              nvidia,has-utmi-pad-registers;
                status = "disabled";
        };
  
@@@ -899,7 -899,7 +899,7 @@@
                         <&tegra_car TEGRA124_CLK_PLL_U>,
                         <&tegra_car TEGRA124_CLK_USBD>;
                clock-names = "reg", "pll_u", "utmi-pads";
 -              resets = <&tegra_car 58>, <&tegra_car 22>;
 +              resets = <&tegra_car 59>, <&tegra_car 22>;
                reset-names = "usb", "utmi-pads";
                nvidia,hssync-start-delay = <0>;
                nvidia,idle-wait-delay = <17>;

diff --combined arch/arm/mach-imx/gpc.c
index 6d0893a3828eb6b57322ddd0e0df26ac7e32bd85,c478a20c898e496be945e2816fdeb74a08632ea6..0ea77ed25b25a8cf45953fea587738f221421f1c
--- 1/arch/arm/mach-imx/gpc.c
--- 2/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@@ -280,15 -280,9 +280,15 @@@ void __init imx_gpc_check_dt(void
        struct device_node *np;
  
        np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-gpc");
 -      if (WARN_ON(!np ||
 -                  !of_find_property(np, "interrupt-controller", NULL)))
 -              pr_warn("Outdated DT detected, system is about to crash!!!\n");
 +      if (WARN_ON(!np))
 +              return;
 +
 +      if (WARN_ON(!of_find_property(np, "interrupt-controller", NULL))) {
 +              pr_warn("Outdated DT detected, suspend/resume will NOT work\n");
 +
 +              /* map GPC, so that at least CPUidle and WARs keep working */
 +              gpc_base = of_iomap(np, 0);
 +      }
  }
  
  #ifdef CONFIG_PM_GENERIC_DOMAINS
@@@ -449,10 -443,6 +449,10 @@@ static int imx_gpc_probe(struct platfor
        struct regulator *pu_reg;
        int ret;
  
 +      /* bail out if DT too old and doesn't provide the necessary info */
 +      if (!of_property_read_bool(pdev->dev.of_node, "#power-domain-cells"))
 +              return 0;
 +
        pu_reg = devm_regulator_get_optional(&pdev->dev, "pu");
        if (PTR_ERR(pu_reg) == -ENODEV)
                pu_reg = NULL;
@@@ -474,7 -464,6 +474,6 @@@ static const struct of_device_id imx_gp
  static struct platform_driver imx_gpc_driver = {
        .driver = {
                .name = "imx-gpc",
-               .owner = THIS_MODULE,
                .of_match_table = imx_gpc_dt_ids,
        },
        .probe = imx_gpc_probe,

diff --combined drivers/ata/Kconfig
index 9dca4b995be0792b6c4f1920b9786cb6517a2b5f,a3a13605a9c42d13baed5746f9f1bfb9bc30536c..f7bf7d9249e725e0740c9d1264d970a2bee84e28
--- 1/drivers/ata/Kconfig
--- 2/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@@ -270,7 -270,6 +270,7 @@@ config ATA_PII
  config SATA_DWC
        tristate "DesignWare Cores SATA support"
        depends on 460EX
 +      select DW_DMAC
        help
          This option enables support for the on-chip SATA controller of the
          AppliedMicro processor 460EX.
@@@ -730,6 -729,15 +730,6 @@@ config PATA_SC120
  
          If unsure, say N.
  
 -config PATA_SCC
 -      tristate "Toshiba's Cell Reference Set IDE support"
 -      depends on PCI && PPC_CELLEB
 -      help
 -        This option enables support for the built-in IDE controller on
 -        Toshiba Cell Reference Board.
 -
 -        If unsure, say N.
 -
  config PATA_SCH
        tristate "Intel SCH PATA support"
        depends on PCI
@@@ -827,7 -835,6 +827,6 @@@ config PATA_AT3
  config PATA_AT91
        tristate "PATA support for AT91SAM9260"
        depends on ARM && SOC_AT91SAM9
-       depends on !ARCH_MULTIPLATFORM
        help
          This option enables support for IDE devices on the Atmel AT91SAM9260 SoC.