Merge branch 'mvebu/fixes' into HEAD

3 files changed, 22 insertions, 10 deletions

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/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index ecbc76d26dff..6206c1d3ac10 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";
                         };
 
@@ -344,8 +347,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 6a07c786b788..e98f92c32153 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";
                         };