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

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

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

Pull "mvebu dt for 4.12 (part 1)" from Gregory CLEMENT:

- Add node lable for Armada 38x
- Add support for Synology DS116 NAS and Linksys WRT1900ACS
- Update mbus controller description on Armada 38x allowing entering in standby
- Add default trigger for sata led on various linksys boards
- Update newly added armada-xp-98dx3236
- Enable hardware buffer manager support for the devices in the
  Linksys WRT AC Serie

* tag 'mvebu-dt-4.12-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: mvebu: linksys: enable buffer manager support
  ARM: dts: mvebu: remove unnecessary PCI range from 98dx3236
  ARM: dts: mvebu: Move mv98dx3236 clock bindings
  ARM: dts: Use armada-370-xp as a base for armada-xp-98dx3236
  ARM: dts: armada-xp-98dx3236: combine dfx server nodes
  ARM: dts: armada: Add default trigger for sata led
  ARM: dts: armada-38x: Adjust mbus controller description on Armada 38x
  ARM: dts: armada-385: add support for the Linksys WRT1900ACS (Shelby)
  ARM: dts: armada-385-synology-ds116: add support for Synology DS116 NAS
  ARM: dts: armada-38x add node labels
parents 2c5ad976 cd2f0d0d

Documentation/devicetree/bindings/clock/mvebu-core-clock.txt

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ The following is a list of provided IDs and clock names on Armada 39x: 
 4 = dclk    (SDRAM Interface Clock)

 5 = refclk  (Reference Clock)



The following is a list of provided IDs and clock names on 98dx3236:

 0 = tclk    (Internal Bus clock)

 1 = cpuclk  (CPU clock)

 2 = ddrclk   (DDR clock)

 3 = mpll    (MPLL Clock)



The following is a list of provided IDs and clock names on Kirkwood and Dove:

 0 = tclk   (Internal Bus clock)

 1 = cpuclk (CPU0 clock)
@@ -49,6 +55,7 @@ Required properties: 
	"marvell,armada-380-core-clock" - For Armada 380/385 SoC core clocks

	"marvell,armada-390-core-clock" - For Armada 39x SoC core clocks

	"marvell,armada-xp-core-clock" - For Armada XP SoC core clocks

	"marvell,mv98dx3236-core-clock" - For 98dx3236 family SoC core clocks

	"marvell,dove-core-clock" - for Dove SoC core clocks

	"marvell,kirkwood-core-clock" - for Kirkwood SoC (except mv88f6180)

	"marvell,mv88f6180-core-clock" - for Kirkwood MV88f6180 SoC

Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt

+11 −0
Original line number Diff line number Diff line
@@ -119,6 +119,16 @@ ID Clock Peripheral 
29	sata1lnk

30	sata1	SATA Host 1



The following is a list of provided IDs for 98dx3236:

ID	Clock	Peripheral

-----------------------------------

3	ge1	Gigabit Ethernet 1

4	ge0	Gigabit Ethernet 0

5	pex0	PCIe Cntrl 0

17	sdio	SDHCI Host

18	usb0	USB Host 0

22	xor0	XOR DMA 0



The following is a list of provided IDs for Dove:

ID	Clock	Peripheral

-----------------------------------
@@ -169,6 +179,7 @@ Required properties: 
	"marvell,armada-380-gating-clock" - for Armada 380/385 SoC clock gating

	"marvell,armada-390-gating-clock" - for Armada 39x SoC clock gating

	"marvell,armada-xp-gating-clock" - for Armada XP SoC clock gating

	"marvell,mv98dx3236-gating-clock" - for 98dx3236 SoC clock gating

	"marvell,dove-gating-clock" - for Dove SoC clock gating

	"marvell,kirkwood-gating-clock" - for Kirkwood SoC clock gating

- reg : shall be the register address of the Clock Gating Control register

Documentation/devicetree/bindings/net/marvell,prestera.txt

+5 −8
Original line number Diff line number Diff line
@@ -32,19 +32,16 @@ DFX Server bindings 
-------------------



Required properties:

- compatible: must be "marvell,dfx-server"

- compatible: must be "marvell,dfx-server", "simple-bus"

- ranges: describes the address mapping of a memory-mapped bus.

- reg: address and length of the register set for the device.



Example:



dfx-registers {

	compatible = "simple-bus";

dfx-server {

	compatible = "marvell,dfx-server", "simple-bus";

	#address-cells = <1>;

	#size-cells = <1>;

	ranges = <0 MBUS_ID(0x08, 0x00) 0 0x100000>;



	dfx: dfx@0 {

		compatible = "marvell,dfx-server";

		reg = <0 0x100000>;

	};

	reg = <MBUS_ID(0x08, 0x00) 0 0x100000>;

};

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -976,6 +976,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ 
	armada-385-db-ap.dtb \

	armada-385-linksys-caiman.dtb \

	armada-385-linksys-cobra.dtb \

	armada-385-linksys-shelby.dtb \

	armada-385-synology-ds116.dtb \

	armada-385-turris-omnia.dtb \

	armada-388-clearfog.dtb \

	armada-388-clearfog-base.dtb \

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 


		sata {

			label = "caiman:white:sata";

			linux,default-trigger = "disk-activity";

		};

	};

};