Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8916e0b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A smallish batch of fixes, a little more than expected this late, but
  all fixes are contained to their platforms and seem reasonably low
  risk:

   - a somewhat large SMP fix for ux500 that still seemed warranted to
     include here
   - OMAP DT fixes for pbias regulator specification that broke due to
     some DT reshuffling
   - PCIe IRQ routing bugfix for i.MX
   - networking fixes for keystone
   - runtime PM for OMAP GPMC
   - a couple of error path bug fixes for exynos"

* tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: keystone: Fix the mdio bindings by moving it to soc specific file
  ARM: dts: keystone: fix the clock node for mdio
  memory: omap-gpmc: Don't try to save uninitialized GPMC context
  ARM: imx6: correct i.MX6 PCIe interrupt routing
  ARM: ux500: add an SMP enablement type and move cpu nodes
  ARM: dts: dra7: Fix broken pbias device creation
  ARM: dts: OMAP5: Fix broken pbias device creation
  ARM: dts: OMAP4: Fix broken pbias device creation
  ARM: dts: omap243x: Fix broken pbias device creation
  ARM: EXYNOS: fix double of_node_put() on error path
  ARM: EXYNOS: Fix potentian kfree() of ro memory
parents 0f405bf7 02149517

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ nodes to be present and contain the properties described below. 
			    "qcom,kpss-acc-v1"

			    "qcom,kpss-acc-v2"

			    "rockchip,rk3066-smp"

			    "ste,dbx500-smp"



	- cpu-release-addr

		Usage: required for systems that have an "enable-method"

arch/arm/boot/dts/dra7.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ 
				ranges = <0 0x2000 0x2000>;



				scm_conf: scm_conf@0 {

					compatible = "syscon";

					compatible = "syscon", "simple-bus";

					reg = <0x0 0x1400>;

					#address-cells = <1>;

					#size-cells = <1>;

arch/arm/boot/dts/imx6qdl.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -181,10 +181,10 @@ 
			interrupt-names = "msi";

			#interrupt-cells = <1>;

			interrupt-map-mask = <0 0 0 0x7>;

			interrupt-map = <0 0 0 1 &intc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 2 &intc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 3 &intc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 4 &intc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 1 &gpc GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 2 &gpc GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 3 &gpc GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,

			                <0 0 0 4 &gpc GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clks IMX6QDL_CLK_PCIE_AXI>,

				 <&clks IMX6QDL_CLK_LVDS1_GATE>,

				 <&clks IMX6QDL_CLK_PCIE_REF_125M>;

arch/arm/boot/dts/k2e.dtsi

+11 −4
Original line number Diff line number Diff line
@@ -131,10 +131,17 @@ 
					<GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;

			};

		};

		/include/ "k2e-netcp.dtsi"

	};

};



&mdio {

		mdio: mdio@24200f00 {

			compatible	= "ti,keystone_mdio", "ti,davinci_mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x24200f00 0x100>;

			status = "disabled";

			clocks = <&clkcpgmac>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};

		/include/ "k2e-netcp.dtsi"

	};

};

arch/arm/boot/dts/k2hk.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -98,6 +98,17 @@ 
			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x25c>;

		};



		mdio: mdio@02090300 {

			compatible	= "ti,keystone_mdio", "ti,davinci_mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x02090300 0x100>;

			status = "disabled";

			clocks = <&clkcpgmac>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};

		/include/ "k2hk-netcp.dtsi"

	};

};