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

Commit ae1d2663 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu dt for 4.13 (part 1)

- Add Linksys WRT3200ACM (Rango) support
- Add PWM properties for gpio on Aramda XP and 38x
- A couple of minor updates for the 98dx3236 and 98dx4251

* tag 'mvebu-dt-4.13-1' of git://git.infradead.org/linux-mvebu

:
  ARM: dts: turris-omnia: Add generic compatible string for I2C EEPROM
  ARM: dts: mvebu: add support for Linksys WRT3200ACM (Rango)
  ARM: dts: armada-385-linksys: fixup button node names
  ARM: dts: armada-385-linksys: group pins in pinctrl
  ARM: dts: armada-385-linksys: partition layout is board specific
  ARM: dts: armada-385-linksys: use binary unit prefixes
  ARM: dts: armada-385-linksys: drop legacy DSA bindings
  ARM: dts: armada-385-linksys: usb3 label cleanup
  ARM: dts: armada-385-linksys: bm pools by label order
  ARM: dts: armada-385-linksys: drop redundant properties in dependants
  ARM: dts: armada-385-linksys: flatten dependants
  ARM: dts: armada-385-linksys: label nodes
  ARM: dts: armada-385-linksys: flatten dtsi
  ARM: dts: mvebu: disable the rtc on 98dx3236 SoC
  ARM: dts: mvebu: add missing interrupt to 98dx4251 switch
  ARM: dts: armada-xp: Use pwm-fan rather than gpio-fan
  ARM: dts: mvebu: Add PWM properties for armada-38x
  ARM: dts: mvebu: Add PWM properties to .dtsi files

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c9487f03 97800cf8

arch/arm/boot/dts/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -1008,6 +1008,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ 
	armada-385-db-ap.dtb \

	armada-385-db-ap.dtb \

	armada-385-linksys-caiman.dtb \

	armada-385-linksys-caiman.dtb \

	armada-385-linksys-cobra.dtb \

	armada-385-linksys-cobra.dtb \

	armada-385-linksys-rango.dtb \

	armada-385-linksys-shelby.dtb \

	armada-385-linksys-shelby.dtb \

	armada-385-synology-ds116.dtb \

	armada-385-synology-ds116.dtb \

	armada-385-turris-omnia.dtb \

	armada-385-turris-omnia.dtb \

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

+14 −5
Original line number Original line Diff line number Diff line
@@ -137,29 +137,38 @@ 
			};

			};





			gpio0: gpio@18100 {

			gpio0: gpio@18100 {

				compatible = "marvell,orion-gpio";

				compatible = "marvell,armada-370-gpio",

				reg = <0x18100 0x40>;

					     "marvell,orion-gpio";

				reg = <0x18100 0x40>, <0x181c0 0x08>;

				reg-names = "gpio", "pwm";

				ngpios = <32>;

				ngpios = <32>;

				gpio-controller;

				gpio-controller;

				#gpio-cells = <2>;

				#gpio-cells = <2>;

				#pwm-cells = <2>;

				interrupt-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

				#interrupt-cells = <2>;

				interrupts = <82>, <83>, <84>, <85>;

				interrupts = <82>, <83>, <84>, <85>;

				clocks = <&coreclk 0>;

			};

			};





			gpio1: gpio@18140 {

			gpio1: gpio@18140 {

				compatible = "marvell,orion-gpio";

				compatible = "marvell,armada-370-gpio",

				reg = <0x18140 0x40>;

					     "marvell,orion-gpio";

				reg = <0x18140 0x40>, <0x181c8 0x08>;

				reg-names = "gpio", "pwm";

				ngpios = <32>;

				ngpios = <32>;

				gpio-controller;

				gpio-controller;

				#gpio-cells = <2>;

				#gpio-cells = <2>;

				#pwm-cells = <2>;

				interrupt-controller;

				interrupt-controller;

				#interrupt-cells = <2>;

				#interrupt-cells = <2>;

				interrupts = <87>, <88>, <89>, <90>;

				interrupts = <87>, <88>, <89>, <90>;

				clocks = <&coreclk 0>;

			};

			};





			gpio2: gpio@18180 {

			gpio2: gpio@18180 {

				compatible = "marvell,orion-gpio";

				compatible = "marvell,armada-370-gpio",

					     "marvell,orion-gpio";

				reg = <0x18180 0x40>;

				reg = <0x18180 0x40>;

				ngpios = <2>;

				ngpios = <2>;

				gpio-controller;

				gpio-controller;

arch/arm/boot/dts/armada-385-linksys-caiman.dts

+122 −65
Original line number Original line Diff line number Diff line
@@ -44,15 +44,9 @@ 
	model = "Linksys WRT1200AC";

	model = "Linksys WRT1200AC";

	compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",

	compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",

		     "marvell,armada380";

		     "marvell,armada380";

};





	soc {

&expander0 {

		internal-regs{

			i2c@11000 {



				pca9635@68 {

				#address-cells = <1>;

				#size-cells = <0>;



	wan_amber@0 {

	wan_amber@0 {

		label = "caiman:amber:wan";

		label = "caiman:amber:wan";

		reg = <0x0>;

		reg = <0x0>;
@@ -98,11 +92,8 @@ 
		reg = <0x9>;

		reg = <0x9>;

	};

	};

};

};

			};

		};

	};





	gpio-leds {

&gpio_leds {

	power {

	power {

		label = "caiman:white:power";

		label = "caiman:white:power";

	};

	};
@@ -111,4 +102,70 @@ 
		label = "caiman:white:sata";

		label = "caiman:white:sata";

	};

	};

};

};



&nand {

	/* 128MiB */



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@100000 {

		label = "u_env";

		reg = <0x200000 0x40000>;    /* 256KiB */

	};



	partition@140000 {

		label = "s_env";

		reg = <0x240000 0x40000>;    /* 256KiB */

	};



	partition@900000 {

		label = "devinfo";

		reg = <0x900000 0x100000>;   /* 1MiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x2800000>;  /* 40MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x2200000>;  /* 34MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@3200000 {

		label = "kernel2";

		reg = <0x3200000 0x2800000>; /* 40MiB */

	};



	partition@3800000 {

		label = "rootfs2";

		reg = <0x3800000 0x2200000>; /* 34MiB */

	};



	/*

	 * 38MiB, last MiB is for the BBT, not writable

	 */

	partition@5a00000 {

		label = "syscfg";

		reg = <0x5a00000 0x2600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x280000 0x680000>;   /* 6.5MiB */

	};

};
 
};

arch/arm/boot/dts/armada-385-linksys-cobra.dts

+122 −65
Original line number Original line Diff line number Diff line
@@ -44,15 +44,9 @@ 
	model = "Linksys WRT1900ACv2";

	model = "Linksys WRT1900ACv2";

	compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",

	compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",

		     "marvell,armada380";

		     "marvell,armada380";

};





	soc {

&expander0 {

		internal-regs{

			i2c@11000 {



				pca9635@68 {

				#address-cells = <1>;

				#size-cells = <0>;



	wan_amber@0 {

	wan_amber@0 {

		label = "cobra:amber:wan";

		label = "cobra:amber:wan";

		reg = <0x0>;

		reg = <0x0>;
@@ -98,11 +92,8 @@ 
		reg = <0x9>;

		reg = <0x9>;

	};

	};

};

};

			};

		};

	};





	gpio-leds {

&gpio_leds {

	power {

	power {

		label = "cobra:white:power";

		label = "cobra:white:power";

	};

	};
@@ -111,4 +102,70 @@ 
		label = "cobra:white:sata";

		label = "cobra:white:sata";

	};

	};

};

};



&nand {

	/* 128MiB */



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@100000 {

		label = "u_env";

		reg = <0x200000 0x40000>;    /* 256KiB */

	};



	partition@140000 {

		label = "s_env";

		reg = <0x240000 0x40000>;    /* 256KiB */

	};



	partition@900000 {

		label = "devinfo";

		reg = <0x900000 0x100000>;   /* 1MiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x2800000>;  /* 40MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x2200000>;  /* 34MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@3200000 {

		label = "kernel2";

		reg = <0x3200000 0x2800000>; /* 40MiB */

	};



	partition@3800000 {

		label = "rootfs2";

		reg = <0x3800000 0x2200000>; /* 34MiB */

	};



	/*

	 * 38MiB, last MiB is for the BBT, not writable

	 */

	partition@5a00000 {

		label = "syscfg";

		reg = <0x5a00000 0x2600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x280000 0x680000>;   /* 6.5MiB */

	};

};
 
};

arch/arm/boot/dts/armada-385-linksys-rango.dts

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

 * Device Tree file for the Linksys WRT3200ACM (Rango)

 *

 * Copyright (C) 2016 Imre Kaloz <kaloz@openwrt.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 licensed under the terms of the GNU General Public

 *     License version 2.  This program is licensed "as is" without

 *     any warranty of any kind, whether express or implied.

 *

 * 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 "AS IS", 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.

 */



/dts-v1/;

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

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

#include "armada-385-linksys.dtsi"



/ {

	model = "Linksys WRT3200ACM";

	compatible = "linksys,rango", "linksys,armada385", "marvell,armada385",

		     "marvell,armada380";

};



&expander0 {

	wan_amber@0 {

		label = "rango:amber:wan";

		reg = <0x0>;

	};



	wan_white@1 {

		label = "rango:white:wan";

		reg = <0x1>;

	};



	usb2@5 {

		label = "rango:white:usb2";

		reg = <0x5>;

	};



	usb3_1@6 {

		label = "rango:white:usb3_1";

		reg = <0x6>;

	};



	usb3_2@7 {

		label = "rango:white:usb3_2";

		reg = <0x7>;

	};



	wps_white@8 {

		label = "rango:white:wps";

		reg = <0x8>;

	};



	wps_amber@9 {

		label = "rango:amber:wps";

		reg = <0x9>;

	};

};



&gpio_leds {

	power {

		gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;

		label = "rango:white:power";

	};



	sata {

		gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;

		label = "rango:white:sata";

	};



	wlan_2g {

		gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;

		label = "rango:white:wlan_2g";

	};



	wlan_5g {

		gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;

		label = "rango:white:wlan_5g";

	};

};



&gpio_leds_pins {

	marvell,pins = "mpp21", "mpp45", "mpp46", "mpp56";

};



&nand {

	/* AMD/Spansion S34ML02G2 256MiB, OEM Layout */



	partition@0 {

		label = "u-boot";

		reg = <0x0000000 0x200000>;  /* 2MiB */

		read-only;

	};



	partition@200000 {

		label = "u_env";

		reg = <0x200000 0x20000>;    /* 128KiB */

	};



	partition@220000 {

		label = "s_env";

		reg = <0x220000 0x40000>;    /* 256KiB */

	};



	partition@7e0000 {

		label = "devinfo";

		reg = <0x7e0000 0x40000>;   /* 256KiB */

		read-only;

	};



	partition@820000 {

		label = "sysdiag";

		reg = <0x820000 0x1e0000>;   /* 1920KiB */

		read-only;

	};



	/* kernel1 overlaps with rootfs1 by design */

	partition@a00000 {

		label = "kernel1";

		reg = <0xa00000 0x5000000>;  /* 80MiB */

	};



	partition@1000000 {

		label = "rootfs1";

		reg = <0x1000000 0x4a00000>;  /* 74MiB */

	};



	/* kernel2 overlaps with rootfs2 by design */

	partition@5a00000 {

		label = "kernel2";

		reg = <0x5a00000 0x5000000>; /* 80MiB */

	};



	partition@6000000 {

		label = "rootfs2";

		reg = <0x6000000 0x4a00000>; /* 74MiB */

	};



	/*

	 * 86MiB, last MiB is for the BBT, not writable

	 */

	partition@aa00000 {

		label = "syscfg";

		reg = <0xaa00000 0x5600000>;

	};



	/*

	 * Unused area between "s_env" and "devinfo".

	 * Moved here because otherwise the renumbered

	 * partitions would break the bootloader

	 * supplied bootargs

	 */

	partition@180000 {

		label = "unused_area";

		reg = <0x260000 0x5c0000>;   /* 5.75MiB */

	};

};



&sdhci {

	pinctrl-names = "default";

	pinctrl-0 = <&sdhci_pins>;

	no-1-8-v;

	non-removable;

	wp-inverted;

	bus-width = <8>;

	status = "okay";

};



&usb3_1_vbus {

	gpio = <&gpio1 12 GPIO_ACTIVE_HIGH>;

};



&usb3_1_vbus_pins {

	marvell,pins = "mpp44";

};