Commit 8db4e1fa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt64-4.16-1' of git://git.infradead.org/linux-mvebu into next/dt 

mvebu dt64 for 4.16 (part 1)

Add the NAND support on the Marvell 8040-DB board
Add the thermal support for Martvell A7K/A8K Socs
Add nodes allowing cpufreq support on Aramda 3700 SoCs

* tag 'mvebu-dt64-4.16-1' of git://git.infradead.org/linux-mvebu

:
  ARM64: dts: marvell: Add thermal support for A7K/A8K
  arm64: dts: marvell: armada-37xx: add nodes allowing cpufreq support
  arm64: dts: marvell: add NAND support on the 8040-DB board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fb21a1a4 4cada038

arch/arm64/boot/dts/marvell/armada-372x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a53","arm,armv8";

			reg = <0x1>;

			clocks = <&nb_periph_clk 16>;

			enable-method = "psci";

		};

	};

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
			device_type = "cpu";

			compatible = "arm,cortex-a53", "arm,armv8";

			reg = <0>;

			clocks = <&nb_periph_clk 16>;

			enable-method = "psci";

		};

	};
@@ -234,6 +235,12 @@ 
				};

			};



			nb_pm: syscon@14000 {

				compatible = "marvell,armada-3700-nb-pm",

					     "syscon";

				reg = <0x14000 0x60>;

			};



			pinctrl_sb: pinctrl@18800 {

				compatible = "marvell,armada3710-sb-pinctrl",

					     "syscon", "simple-mfd";

arch/arm64/boot/dts/marvell/armada-8040-db.dts

+28 −0
Original line number Diff line number Diff line
@@ -268,6 +268,34 @@ 
	};

};



/*

 * Proper NAND usage will require DPR-76 to be in position 1-2, which disables

 * MDIO signal of CP1.

 */

&cps_nand {

	num-cs = <1>;

	pinctrl-0 = <&nand_pins>, <&nand_rb>;

	pinctrl-names = "default";

	nand-ecc-strength = <4>;

	nand-ecc-step-size = <512>;

	marvell,nand-enable-arbiter;

	marvell,system-controller = <&cps_syscon0>;

	nand-on-flash-bbt;



	partition@0 {

		label = "U-Boot";

		reg = <0 0x200000>;

	};

	partition@200000 {

		label = "Linux";

		reg = <0x200000 0xe00000>;

	};

	partition@1000000 {

		label = "Filesystem";

		reg = <0x1000000 0x3f000000>;

	};

};



/* CON4 on CP1 expansion */

&cps_sata0 {

	status = "okay";

arch/arm64/boot/dts/marvell/armada-80x0.dtsi

+17 −0
Original line number Diff line number Diff line
@@ -72,5 +72,22 @@ 
&cps_syscon0 {

	cps_pinctrl: pinctrl {

		compatible = "marvell,armada-8k-cps-pinctrl";



		nand_pins: nand-pins {

			marvell,pins =

			"mpp0", "mpp1", "mpp2", "mpp3",

			"mpp4", "mpp5", "mpp6", "mpp7",

			"mpp8", "mpp9", "mpp10", "mpp11",

			"mpp15", "mpp16", "mpp17", "mpp18",

			"mpp19", "mpp20", "mpp21", "mpp22",

			"mpp23", "mpp24", "mpp25", "mpp26",

			"mpp27";

			marvell,function = "dev";

		};



		nand_rb: nand-rb {

			marvell,pins = "mpp13", "mpp12";

			marvell,function = "nf";

		};

	};

};

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -285,6 +285,12 @@ 
					gpio-ranges = <&ap_pinctrl 0 0 20>;

				};

			};



			ap_thermal: thermal@6f808C {

				compatible = "marvell,armada-ap806-thermal";

				reg = <0x6f808C 0x4>,

				      <0x6f8084 0x8>;

			};

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE