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

Commit 3a005c1d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "mvebu dt64 for 4.7" from Gregory CLEMENT:

- switch to label in the mvebu arm64 device tree
- use new clock binding on Armada 7K/8K
- improve SPI and I2C description on Armada 7K/8k
- add CP110 block adding PCIe, SATA and USB3
- add XOR support on Armada 3700
- few more little fix

* tag 'mvebu-dt64-4.7-1' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: add XOR node for Armada 3700 SoC
  arm64: dts: marvell: Use a SoC-specific compatible for xHCI on Armada37xx
  arm64: dts: marvell: Rename armada-37xx USB node
  arm64: dts: marvell: Clean up armada-3720-db
  arm64: dts: marvell: enable several CP interfaces on Armada 7040-DB
  arm64: dts: marvell: initial DT description of Armada 7K/8K CP110 master
  arm64: dts: marvell: use the proper I2C controller compatible string for 7K/8K
  arm64: dts: marvell: improve SPI flash description on Armada 7040-DB
  arm64: dts: marvell: use new clock binding on Armada AP806
  arm64: dts: marvell: add UART aliases and define stdout-path
  arm64: dts: marvell: rename armada-ap806 XOR nodes
  arm64: dts: marvell: clean up armada-7040-db
parents f1c09c3e 19b67d5c

Documentation/devicetree/bindings/usb/usb-xhci.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
  - compatible: should be one or more of



    - "generic-xhci" for generic XHCI device

    - "marvell,armada3700-xhci" for Armada 37xx SoCs

    - "marvell,armada-375-xhci" for Armada 375 SoCs

    - "marvell,armada-380-xhci" for Armada 38x SoCs

    - "renesas,xhci-r8a7790" for r8a7790 SoC

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

+12 −20
Original line number Diff line number Diff line
@@ -60,27 +60,19 @@ 
		device_type = "memory";

		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;

	};

};



	soc {

		internal-regs {

			/*

			* Exported on the micro USB connector CON32

			* through an FTDI

			*/

			uart0: serial@12000 {

/* CON3 */

&sata {

	status = "okay";

};



			/* CON31 */

			usb3@58000 {

/* Exported on the micro USB connector CON32 through an FTDI */

&uart0 {

	status = "okay";

};



			/* CON3 */

			sata@e0000 {

/* CON31 */

&usb3 {

	status = "okay";

};
 
		};

	};

};

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

+0 −1
Original line number Diff line number Diff line
@@ -59,5 +59,4 @@ 
			enable-method = "psci";

		};

	};



};

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

+17 −3
Original line number Diff line number Diff line
@@ -105,14 +105,28 @@ 
				status = "disabled";

			};



			usb3@58000 {

				compatible = "generic-xhci";

			usb3: usb@58000 {

				compatible = "marvell,armada3700-xhci",

				"generic-xhci";

				reg = <0x58000 0x4000>;

				interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

			};



			sata@e0000 {

			xor@60900 {

				compatible = "marvell,armada-3700-xor";

				reg = <0x60900 0x100

				       0x60b00 0x100>;



				xor10 {

					interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

				};

				xor11 {

					interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

				};

			};



			sata: sata@e0000 {

				compatible = "marvell,armada-3700-ahci";

				reg = <0xe0000 0x2000>;

				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;

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

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
 */



#include "armada-ap806-dual.dtsi"

#include "armada-cp110-master.dtsi"



/ {

	model = "Marvell Armada 7020";