Commit 858ed8cb authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge "ARM: mvebu: dt changes for v4.3" from Gregory Clement:

mvebu dt changes for v4.3 (part #1)

- Update Armada 388 GP description
- Add Buffalo Linkstation  LS-WXL and LS-WSXL
- Fine-tune the L2 configuration for cortex A9 based SoC
- Update XOR definition for Armada 38x and 39x SoC

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

:
  ARM: mvebu: update EEPROM description of Armada 388 GP
  ARM: mvebu: fix description of pwr-sata0 regulator on Armada 388 GP
  ARM: dts: add buffalo linkstation ls-wvl/vl
  ARM: dts: add buffalo linkstation ls-wxl/wsxl
  ARM: mvebu: use DT properties to fine-tune the L2 configuration
  ARM: mvebu: use armada-380-xor on Armada 38x and 39x

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a7514f7 7e5308be

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ And in addition, the compatible shall be extended with the specific 
board. Currently known boards are:



"buffalo,lschlv2"

"buffalo,lswvl"

"buffalo,lswxl"

"buffalo,lsxhl"

"buffalo,lsxl"

"dlink,dns-320"

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-km_kirkwood.dtb \

	kirkwood-laplug.dtb \

	kirkwood-lschlv2.dtb \

	kirkwood-lswvl.dtb \

	kirkwood-lswxl.dtb \

	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-mv88f6281gtw-ge.dtb \

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

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				prefetch-data = <1>;

			};



			scu@c000 {

arch/arm/boot/dts/armada-388-gp.dts

+7 −5
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ 
				pinctrl-0 = <&i2c0_pins>;

				status = "okay";

				clock-frequency = <100000>;

				/*

				 * The EEPROM located at adresse 54 is needed

				 * for the boot - DO NOT ERASE IT -

				 */



				expander0: pca9555@20 {

					compatible = "nxp,pca9555";
@@ -111,6 +107,10 @@ 
					reg = <0x21>;

				};



				eeprom@57 {

					compatible = "atmel,24c64";

					reg = <0x57>;

				};

			};



			serial@12000 {
@@ -301,9 +301,11 @@ 
	reg_sata0: pwr-sata0 {

		compatible = "regulator-fixed";

		regulator-name = "pwr_en_sata0";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		enable-active-high;

		regulator-always-on;



		gpio = <&expander0 2 GPIO_ACTIVE_HIGH>;

	};



	reg_5v_sata0: v5-sata0 {

arch/arm/boot/dts/armada-38x.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				prefetch-data = <1>;

			};



			scu@c000 {
@@ -450,7 +454,7 @@ 
			};



			xor@60800 {

				compatible = "marvell,orion-xor";

				compatible = "marvell,armada-380-xor", "marvell,orion-xor";

				reg = <0x60800 0x100

				       0x60a00 0x100>;

				clocks = <&gateclk 22>;
@@ -470,7 +474,7 @@ 
			};



			xor@60900 {

				compatible = "marvell,orion-xor";

				compatible = "marvell,armada-380-xor", "marvell,orion-xor";

				reg = <0x60900 0x100

				       0x60b00 0x100>;

				clocks = <&gateclk 28>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE