Merge tag 'mvebu-dt64-4.11-1' of git://git.infradead.org/linux-mvebu into next/dt64 (f638d8f1) · Commits · e / devices / android_kernel_teracube_emerald

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

+5 −5

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

+39 −5

Original line number	Original line	Diff line number	Diff line
	@@ -15,17 +15,17 @@
	* published by the Free Software Foundation; either version 2 of the		* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.		* License, or (at your option) any later version.
	*		*
	* This file is distributed in the hope that it will be useful		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* Or, alternatively		* Or, alternatively,
	*		*
	* b) Permission is hereby granted, free of charge, to any person		* b) Permission is hereby granted, free of charge, to any person
	* obtaining a copy of this software and associated documentation		* obtaining a copy of this software and associated documentation
	* files (the "Software"), to deal in the Software without		* files (the "Software"), to deal in the Software without
	* restriction, including without limitation the rights to use		* restriction, including without limitation the rights to use,
	* copy, modify, merge, publish, distribute, sublicense, and/or		* copy, modify, merge, publish, distribute, sublicense, and/or
	* sell copies of the Software, and to permit persons to whom the		* sell copies of the Software, and to permit persons to whom the
	* Software is furnished to do so, subject to the following		* Software is furnished to do so, subject to the following
	@@ -34,11 +34,11 @@
	* The above copyright notice and this permission notice shall be		* The above copyright notice and this permission notice shall be
	* included in all copies or substantial portions of the Software.		* included in all copies or substantial portions of the Software.
	*		*
	* THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
	* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND		* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
	* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY		* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
	* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.		* OTHER DEALINGS IN THE SOFTWARE.
	@@ -62,11 +62,45 @@
	};		};
	};		};

			&i2c0 {
			status = "okay";
			};

	/* CON3 */		/* CON3 */
	&sata {		&sata {
	status = "okay";		status = "okay";
	};		};

			&spi0 {
			status = "okay";

			m25p80@0 {
			compatible = "jedec,spi-nor";
			reg = <0>;
			spi-max-frequency = <108000000>;
			spi-rx-bus-width = <4>;
			spi-tx-bus-width = <4>;

			partitions {
			compatible = "fixed-partitions";
			#address-cells = <1>;
			#size-cells = <1>;
			partition@0 {
			label = "bootloader";
			reg = <0x0 0x200000>;
			};
			partition@200000 {
			label = "U-boot Env";
			reg = <0x200000 0x10000>;
			};
			partition@210000 {
			label = "Linux";
			reg = <0x210000 0xDF0000>;
			};
			};
			};
			};

	/* Exported on the micro USB connector CON32 through an FTDI */		/* Exported on the micro USB connector CON32 through an FTDI */
	&uart0 {		&uart0 {
	status = "okay";		status = "okay";

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts

+71 −5

Original line number	Original line	Diff line number	Diff line
	@@ -14,17 +14,17 @@
	* published by the Free Software Foundation; either version 2 of the		* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.		* License, or (at your option) any later version.
	*		*
	* This file is distributed in the hope that it will be useful		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* Or, alternatively		* Or, alternatively,
	*		*
	* b) Permission is hereby granted, free of charge, to any person		* b) Permission is hereby granted, free of charge, to any person
	* obtaining a copy of this software and associated documentation		* obtaining a copy of this software and associated documentation
	* files (the "Software"), to deal in the Software without		* files (the "Software"), to deal in the Software without
	* restriction, including without limitation the rights to use		* restriction, including without limitation the rights to use,
	* copy, modify, merge, publish, distribute, sublicense, and/or		* copy, modify, merge, publish, distribute, sublicense, and/or
	* sell copies of the Software, and to permit persons to whom the		* sell copies of the Software, and to permit persons to whom the
	* Software is furnished to do so, subject to the following		* Software is furnished to do so, subject to the following
	@@ -33,11 +33,11 @@
	* The above copyright notice and this permission notice shall be		* The above copyright notice and this permission notice shall be
	* included in all copies or substantial portions of the Software.		* included in all copies or substantial portions of the Software.
	*		*
	* THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
	* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND		* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
	* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY		* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
	* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.		* OTHER DEALINGS IN THE SOFTWARE.
	@@ -80,3 +80,69 @@
	&usb3 {		&usb3 {
	status = "okay";		status = "okay";
	};		};

			&mdio {
			switch0: switch0@1 {
			compatible = "marvell,mv88e6085";
			#address-cells = <1>;
			#size-cells = <0>;
			reg = <1>;

			dsa,member = <0 0>;

			ports {
			#address-cells = <1>;
			#size-cells = <0>;

			port@0 {
			reg = <0>;
			label = "cpu";
			ethernet = <&eth0>;
			};

			port@1 {
			reg = <1>;
			label = "wan";
			phy-handle = <&switch0phy0>;
			};

			port@2 {
			reg = <2>;
			label = "lan0";
			phy-handle = <&switch0phy1>;
			};

			port@3 {
			reg = <3>;
			label = "lan1";
			phy-handle = <&switch0phy2>;
			};

			};

			mdio {
			#address-cells = <1>;
			#size-cells = <0>;

			switch0phy0: switch0phy0@11 {
			reg = <0x11>;
			};
			switch0phy1: switch0phy1@12 {
			reg = <0x12>;
			};
			switch0phy2: switch0phy2@13 {
			reg = <0x13>;
			};
			};
			};
			};

			&eth0 {
			phy-mode = "rgmii-id";
			status = "okay";

			fixed-link {
			speed = <1000>;
			full-duplex;
			};
			};

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

+5 −5

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

+34 −5

Original line number	Original line	Diff line number	Diff line
	@@ -15,17 +15,17 @@
	* published by the Free Software Foundation; either version 2 of the		* published by the Free Software Foundation; either version 2 of the
	* License, or (at your option) any later version.		* License, or (at your option) any later version.
	*		*
	* This file is distributed in the hope that it will be useful		* This file is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* Or, alternatively		* Or, alternatively,
	*		*
	* b) Permission is hereby granted, free of charge, to any person		* b) Permission is hereby granted, free of charge, to any person
	* obtaining a copy of this software and associated documentation		* obtaining a copy of this software and associated documentation
	* files (the "Software"), to deal in the Software without		* files (the "Software"), to deal in the Software without
	* restriction, including without limitation the rights to use		* restriction, including without limitation the rights to use,
	* copy, modify, merge, publish, distribute, sublicense, and/or		* copy, modify, merge, publish, distribute, sublicense, and/or
	* sell copies of the Software, and to permit persons to whom the		* sell copies of the Software, and to permit persons to whom the
	* Software is furnished to do so, subject to the following		* Software is furnished to do so, subject to the following
	@@ -34,11 +34,11 @@
	* The above copyright notice and this permission notice shall be		* The above copyright notice and this permission notice shall be
	* included in all copies or substantial portions of the Software.		* included in all copies or substantial portions of the Software.
	*		*
	* THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES		* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
	* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND		* OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT		* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
	* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY		* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
	* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING		* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
	* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR		* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
	* OTHER DEALINGS IN THE SOFTWARE.		* OTHER DEALINGS IN THE SOFTWARE.
	@@ -98,6 +98,35 @@
	/* 32M internal register @ 0xd000_0000 */		/* 32M internal register @ 0xd000_0000 */
	ranges = <0x0 0x0 0xd0000000 0x2000000>;		ranges = <0x0 0x0 0xd0000000 0x2000000>;

			spi0: spi@10600 {
			compatible = "marvell,armada-3700-spi";
			#address-cells = <1>;
			#size-cells = <0>;
			reg = <0x10600 0xA00>;
			clocks = <&nb_periph_clk 7>;
			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;
			num-cs = <4>;
			status = "disabled";
			};

			i2c0: i2c@11000 {
			compatible = "marvell,armada-3700-i2c";
			reg = <0x11000 0x24>;
			clocks = <&nb_periph_clk 10>;
			interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
			mrvl,i2c-fast-mode;
			status = "disabled";
			};

			i2c1: i2c@11080 {
			compatible = "marvell,armada-3700-i2c";
			reg = <0x11080 0x24>;
			clocks = <&nb_periph_clk 9>;
			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
			mrvl,i2c-fast-mode;
			status = "disabled";
			};

	uart0: serial@12000 {		uart0: serial@12000 {
	compatible = "marvell,armada-3700-uart";		compatible = "marvell,armada-3700-uart";
	reg = <0x12000 0x400>;		reg = <0x12000 0x400>;