Commit e59bff9a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu into next/dt 

Merge "mvebu dt changes for v4.2 (part #2)" from Gregory CLEMENT:

Add 2 new set boards:
- Armada 385 based Linksys boards
- DLink DNS-327L

Update the spi-nor flash compatible strings

Use improved armada spi device tree compatible name for each mvebu SoC

* tag 'mvebu-dt-4.2-2' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: use improved armada spi device tree compatible name for each SoC
  ARM: mvebu: dts: Add dts file for DLink DNS-327L
  ARM: mvebu: add "jedec,spi-nor" flash compatible binding
  ARM: kirkwood: add "jedec,spi-nor" flash compatible binding
  ARM: mvebu: add support for the new Armada 385 based Linksys boards
parents ad01f311 2d295928

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -652,6 +652,7 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ 
	zynq-zybo.dtb

dtb-$(CONFIG_MACH_ARMADA_370) += \

	armada-370-db.dtb \

	armada-370-dlink-dns327l.dtb \

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \

	armada-370-netgear-rn104.dtb \
@@ -661,6 +662,8 @@ dtb-$(CONFIG_MACH_ARMADA_375) += \ 
	armada-375-db.dtb

dtb-$(CONFIG_MACH_ARMADA_38X) += \

	armada-385-db-ap.dtb \

	armada-385-linksys-caiman.dtb \

	armada-385-linksys-cobra.dtb \

	armada-388-db.dtb \

	armada-388-gp.dtb \

	armada-388-rd.dtb

arch/arm/boot/dts/armada-370-db.dts

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ 
				spi-flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "mx25l25635e";

					compatible = "mx25l25635e", "jedec,spi-nor";

					reg = <0>; /* Chip select 0 */

					spi-max-frequency = <50000000>;

				};

arch/arm/boot/dts/armada-370-dlink-dns327l.dts

0 → 100644
+357 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for D-Link DNS-327L

 *

 * Copyright (C) 2015, Andrew Andrianov <andrew@ncrmnt.org>

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPL or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This file is distributed in the hope that it will be useful

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/* Remaining unsolved:

 * There's still some unknown device on i2c address 0x13

 */



/dts-v1/;



#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include "armada-370.dtsi"



/ {

	model = "D-Link DNS-327L";

	compatible = "dlink,dns327l",

		"marvell,armada370",

		"marvell,armada-370-xp";



	chosen {

		stdout-path = &uart0;

	};



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>; /* 512 MiB */

	};



	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000

			MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;



		pcie-controller {

			status = "okay";



			pcie@1,0 {

				/* Port 0, Lane 0 */

				status = "okay";

			};



			pcie@2,0 {

				/* Port 1, Lane 0 */

				status = "okay";

			};

		};



		internal-regs {

			sata@a0000 {

				nr-ports = <2>;

				status = "okay";

			};



			usb@50000 {

				status = "okay";

			};



			nand@d0000 {

				status = "okay";

				num-cs = <1>;

				marvell,nand-keep-config;

				marvell,nand-enable-arbiter;

				nand-on-flash-bbt;

				nand-ecc-strength = <4>;

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



				partition@0 {

					label = "u-boot";

					/* 1.0 MiB */

					reg = <0x0000000 0x100000>;

					read-only;

				};



				partition@100000 {

					label = "u-boot-env";

					/* 128 KiB */

					reg = <0x100000 0x20000>;

					read-only;

				};



				partition@120000 {

					label = "uImage";

					/* 7 MiB */

					reg = <0x120000 0x700000>;

				};



				partition@820000 {

					label = "ubifs";

					/* ~ 84 MiB */

					reg = <0x820000 0x54e0000>;

				};



				/* Hardcoded into stock bootloader */

				partition@5d00000 {

					label = "failsafe-uImage";

					/* 5 MiB */

					reg = <0x5d00000 0x500000>;

				};



				partition@6200000 {

					label = "failsafe-fs";

					/* 29 MiB */

					reg = <0x6200000 0x1d00000>;

				};



				partition@7f00000 {

					label = "bbt";

					/* 1 MiB for BBT */

					reg = <0x7f00000 0x100000>;

				};

			};

		};

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-0 = <

			&backup_button_pin

			&power_button_pin

			&reset_button_pin>;

		pinctrl-names = "default";



		power-button {

			label = "Power Button";

			linux,code = <KEY_POWER>;

			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;

		};



		backup-button {

			label = "Backup Button";

			linux,code = <KEY_COPY>;

			gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;

		};



		reset-button {

			label = "Reset Button";

			linux,code = <KEY_RESTART>;

			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";

		pinctrl-0 = <

			&sata_l_amber_pin

			&sata_r_amber_pin

			&backup_led_pin

			/* Ensure these are managed by hardware */

			&sata_l_white_pin

			&sata_r_white_pin>;



		pinctrl-names = "default";



		sata-r-amber-pin {

			label = "dns327l:amber:sata-r";

			gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;

			default-state = "keep";

		};



		sata-l-amber-pin {

			label = "dns327l:amber:sata-l";

			gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;

			default-state = "keep";

		};



		backup-led-pin {

			label = "dns327l:white:usb";

			gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;

			default-state = "keep";

		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		usb_power: regulator@1 {

			compatible = "regulator-fixed";

			reg = <1>;

			pinctrl-0 = <&xhci_pwr_pin>;

			pinctrl-names = "default";

			regulator-name = "USB3.0 Port Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			regulator-boot-on;

			regulator-always-on;

			gpio = <&gpio0 13 GPIO_ACTIVE_HIGH>;

		};



		sata_r_power: regulator@2 {

			compatible = "regulator-fixed";

			reg = <2>;

			pinctrl-0 = <&sata_r_pwr_pin>;

			pinctrl-names = "default";

			regulator-name = "SATA-R Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			startup-delay-us = <2000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio1 22 GPIO_ACTIVE_HIGH>;

		};



		sata_l_power: regulator@3 {

			compatible = "regulator-fixed";

			reg = <3>;

			pinctrl-0 = <&sata_l_pwr_pin>;

			pinctrl-names = "default";

			regulator-name = "SATA-L Power";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			startup-delay-us = <4000000>;

			enable-active-high;

			regulator-always-on;

			regulator-boot-on;

			gpio = <&gpio1 24 GPIO_ACTIVE_HIGH>;

		};

	};

};



&pinctrl {

	sata_l_white_pin: sata-l-white-pin {

		marvell,pins = "mpp57";

		marvell,function = "sata0";

	};



	sata_r_white_pin: sata-r-white-pin {

		marvell,pins = "mpp55";

		marvell,function = "sata1";

	};



	sata_r_amber_pin: sata-r-amber-pin {

		marvell,pins = "mpp52";

		marvell,function = "gpio";

	};



	sata_l_amber_pin: sata-l-amber-pin {

		marvell,pins = "mpp53";

		marvell,function = "gpio";

	};



	backup_led_pin: backup-led-pin {

		marvell,pins = "mpp61";

		marvell,function = "gpo";

	};



	xhci_pwr_pin: xhci-pwr-pin {

		marvell,pins = "mpp13";

		marvell,function = "gpio";

	};



	sata_r_pwr_pin: sata-r-pwr-pin {

		marvell,pins = "mpp54";

		marvell,function = "gpio";

	};



	sata_l_pwr_pin: sata-l-pwr-pin {

		marvell,pins = "mpp56";

		marvell,function = "gpio";

	};



	uart1_pins: uart1-pins {

		marvell,pins = "mpp60", "mpp61";

		marvell,function = "uart1";

	};



	power_button_pin: power-button-pin {

		marvell,pins = "mpp65";

		marvell,function = "gpio";

	};



	backup_button_pin: backup-button-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpio";

	};



	reset_button_pin: reset-button-pin {

		marvell,pins = "mpp64";

		marvell,function = "gpio";

	};

};



/* Serial console */

&uart0 {

	status = "okay";

};



/* Connected to Weltrend MCU */

&uart1 {

	pinctrl-0 = <&uart1_pins>;

	pinctrl-names = "default";

	status = "okay";

};



&mdio {

	phy0: ethernet-phy@0 { /* Marvell 88E1318 */

		reg = <0>;

		marvell,reg-init = <0x0 0x16 0x0 0x0002>,

				<0x0 0x19 0x0 0x0077>,

				<0x0 0x18 0x0 0x5747>;

	};

};



&eth1 {

	phy = <&phy0>;

	phy-mode = "rgmii-id";

	status = "okay";

};



&i2c0 {

	compatible = "marvell,mv64xxx-i2c";

	clock-frequency = <100000>;

	status = "okay";

};

arch/arm/boot/dts/armada-370-synology-ds213j.dts

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
				spi-flash@0 {

					#address-cells = <1>;

					#size-cells = <1>;

					compatible = "micron,n25q064";

					compatible = "micron,n25q064", "jedec,spi-nor";

					reg = <0>; /* Chip select 0 */

					spi-max-frequency = <20000000>;

arch/arm/boot/dts/armada-370-xp.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
			};



			spi0: spi@10600 {

				compatible = "marvell,armada-370-spi", "marvell,orion-spi";

				reg = <0x10600 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;
@@ -160,7 +159,6 @@ 
			};



			spi1: spi@10680 {

				compatible = "marvell,armada-370-spi", "marvell,orion-spi";

				reg = <0x10680 0x28>;

				#address-cells = <1>;

				#size-cells = <0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE