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

Pull ARM SoC fixes from Arnd Bergmann:
 "We have various small DT fixes, and one important regression fix:

  The recent device tree bugfixes that were intended to address issues
  that 'dtc' started warning about in 4.15 fixed various USB PHY device
  nodes, but it turns out that we had code that depended on those nodes
  being incorrect and the probe failing with a particular error code.
  With the workaround we can also deal with correct device nodes.

  The DT fixes include:

   - Allwinner A10 and A20 had the display pipeline set up incorrectly
     (introduced in v4.15)

   - The Altera PMU lacked an interrupt-parent (never worked)

   - Pin muxing on the Openblocks A7 (never worked)

   - Clocks might get set up wrong on Armada 7K/8K (4.15 regression)

  We now have additional device tree patches to address all the
  remaining warnings introduced in 4.15, but decided to queue them for
  4.16 instead, to avoid risking another regression like the USB PHY
  thing mentioned above.

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  phy: work around 'phys' references to usb-nop-xceiv devices
  ARM: sunxi_defconfig: Enable CMA
  arm64: dts: socfpga: add missing interrupt-parent
  ARM: dts: sun[47]i: Fix display backend 1 output to TCON0 remote endpoint
  ARM64: dts: marvell: armada-cp110: Fix clock resources for various node
  ARM: dts: da850-lcdk: Remove leading 0x and 0s from unit address
  ARM: dts: kirkwood: fix pin-muxing of MPP7 on OpenBlocks A7

9 files changed, 33 insertions, 14 deletions

diff --git a/arch/arm/boot/dts/da850-lcdk.dts b/arch/arm/boot/dts/da850-lcdk.dts
index eed89e659143..a1f4d6d5a569 100644
--- a/arch/arm/boot/dts/da850-lcdk.dts
+++ b/arch/arm/boot/dts/da850-lcdk.dts
@@ -293,12 +293,12 @@
                                         label = "u-boot env";
                                         reg = <0 0x020000>;
                                 };
-                                partition@0x020000 {
+                                partition@20000 {
                                         /* The LCDK defaults to booting from this partition */
                                         label = "u-boot";
                                         reg = <0x020000 0x080000>;
                                 };
-                                partition@0x0a0000 {
+                                partition@a0000 {
                                         label = "free space";
                                         reg = <0x0a0000 0>;
                                 };
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
index cf2f5240e176..27cc913ca0f5 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a7.dts
@@ -53,7 +53,8 @@
                 };
 
                 pinctrl: pin-controller@10000 {
-                        pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;
+                        pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header
+                                     &pmx_gpio_header_gpo>;
                         pinctrl-names = "default";
 
                         pmx_uart0: pmx-uart0 {
@@ -85,11 +86,16 @@
                          * ground.
                          */
                         pmx_gpio_header: pmx-gpio-header {
-                                marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",
+                                marvell,pins = "mpp17", "mpp29", "mpp28",
                                                "mpp35", "mpp34", "mpp40";
                                 marvell,function = "gpio";
                         };
 
+                        pmx_gpio_header_gpo: pxm-gpio-header-gpo {
+                                marvell,pins = "mpp7";
+                                marvell,function = "gpo";
+                        };
+
                         pmx_gpio_init: pmx-init {
                                 marvell,pins = "mpp38";
                                 marvell,function = "gpio";
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 5840f5c75c3b..4f2f2eea0755 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -1104,7 +1104,7 @@
 
                                         be1_out_tcon0: endpoint@0 {
                                                 reg = <0>;
-                                                remote-endpoint = <&tcon1_in_be0>;
+                                                remote-endpoint = <&tcon0_in_be1>;
                                         };
 
                                         be1_out_tcon1: endpoint@1 {
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 59655e42e4b0..bd0cd3204273 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -1354,7 +1354,7 @@
 
                                         be1_out_tcon0: endpoint@0 {
                                                 reg = <0>;
-                                                remote-endpoint = <&tcon1_in_be0>;
+                                                remote-endpoint = <&tcon0_in_be1>;
                                         };
 
                                         be1_out_tcon1: endpoint@1 {
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 5caaf971fb50..df433abfcb02 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -10,6 +10,7 @@ CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
+CONFIG_CMA=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
@@ -33,6 +34,7 @@ CONFIG_CAN_SUN4I=y
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_DMA_CMA=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 CONFIG_AHCI_SUNXI=y
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
index 7c9bdc7ab50b..9db19314c60c 100644
--- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
@@ -66,6 +66,7 @@
                                      <&cpu1>,
                                      <&cpu2>,
                                      <&cpu3>;
+                interrupt-parent = <&intc>;
         };
 
         psci {
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index e3b64d03fbd8..9c7724e82aff 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -63,8 +63,10 @@
                         cpm_ethernet: ethernet@0 {
                                 compatible = "marvell,armada-7k-pp22";
                                 reg = <0x0 0x100000>, <0x129000 0xb000>;
-                                clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>, <&cpm_clk 1 5>;
-                                clock-names = "pp_clk", "gop_clk", "mg_clk";
+                                clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>,
+                                         <&cpm_clk 1 5>, <&cpm_clk 1 18>;
+                                clock-names = "pp_clk", "gop_clk",
+                                              "mg_clk","axi_clk";
                                 marvell,system-controller = <&cpm_syscon0>;
                                 status = "disabled";
                                 dma-coherent;
@@ -155,7 +157,8 @@
                                 #size-cells = <0>;
                                 compatible = "marvell,orion-mdio";
                                 reg = <0x12a200 0x10>;
-                                clocks = <&cpm_clk 1 9>, <&cpm_clk 1 5>;
+                                clocks = <&cpm_clk 1 9>, <&cpm_clk 1 5>,
+                                         <&cpm_clk 1 6>, <&cpm_clk 1 18>;
                                 status = "disabled";
                         };
 
@@ -338,8 +341,8 @@
                                 compatible = "marvell,armada-cp110-sdhci";
                                 reg = <0x780000 0x300>;
                                 interrupts = <ICU_GRP_NSR 27 IRQ_TYPE_LEVEL_HIGH>;
-                                clock-names = "core";
-                                clocks = <&cpm_clk 1 4>;
+                                clock-names = "core","axi";
+                                clocks = <&cpm_clk 1 4>, <&cpm_clk 1 18>;
                                 dma-coherent;
                                 status = "disabled";
                         };
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index 0d51096c69f8..87ac68b2cf37 100644
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -63,8 +63,10 @@
                         cps_ethernet: ethernet@0 {
                                 compatible = "marvell,armada-7k-pp22";
                                 reg = <0x0 0x100000>, <0x129000 0xb000>;
-                                clocks = <&cps_clk 1 3>, <&cps_clk 1 9>, <&cps_clk 1 5>;
-                                clock-names = "pp_clk", "gop_clk", "mg_clk";
+                                clocks = <&cps_clk 1 3>, <&cps_clk 1 9>,
+                                         <&cps_clk 1 5>, <&cps_clk 1 18>;
+                                clock-names = "pp_clk", "gop_clk",
+                                              "mg_clk", "axi_clk";
                                 marvell,system-controller = <&cps_syscon0>;
                                 status = "disabled";
                                 dma-coherent;
@@ -155,7 +157,8 @@
                                 #size-cells = <0>;
                                 compatible = "marvell,orion-mdio";
                                 reg = <0x12a200 0x10>;
-                                clocks = <&cps_clk 1 9>, <&cps_clk 1 5>;
+                                clocks = <&cps_clk 1 9>, <&cps_clk 1 5>,
+                                         <&cps_clk 1 6>, <&cps_clk 1 18>;
                                 status = "disabled";
                         };
 
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index b4964b067aec..8f6e8e28996d 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -410,6 +410,10 @@ static struct phy *_of_phy_get(struct device_node *np, int index)
         if (ret)
                 return ERR_PTR(-ENODEV);
 
+        /* This phy type handled by the usb-phy subsystem for now */
+        if (of_device_is_compatible(args.np, "usb-nop-xceiv"))
+                return ERR_PTR(-ENODEV);
+
         mutex_lock(&phy_provider_mutex);
         phy_provider = of_phy_provider_lookup(args.np);
         if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) {