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

Commit 53a7aa0b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu dt for 4.6 (part 1)

- Improve Armada 38x device tree (SATA and XHCI)
- Fix SD Card and audio support for OpenRD board
- Provide template for RS-232/485 configuration for the same board
- Use a common dtsi file for linkstation boards
- Add support for Buffalo Linkstation LS-QVL

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

:
  ARM: dts: kirkwood: add device tree for buffalo linkstation ls-qvl
  ARM: dts: kirkwood: fix audio for OpenRD clients
  ARM: dts: kirkwood: provide template for RS-232/485 configuration for OpenRD
  ARM: dts: kirkwood: split lswvl dts to linkstation lsvl and lswvl
  ARM: dts: kirkwood: split lswxl dts to linkstation lswsxl and lswxl
  ARM: dts: kirkwood: relicense dts of ls-wvl/vl and ls-wxl/wsxl under GPLv2/X11
  ARM: dts: kirkwood: fix SD slot default configuration for OpenRD
  ARM: dts: kirkwood: fix pin names for UART/SD selection for OpenRD
  ARM: dts: armada-370: Update the mpp63 function in the device tree on Armada 370
  ARM: dts: armada-38x: use usb-nop-xceiv PHY for the xhci nodes on Armada 388 GP
  ARM: dts: armada-38x: use regulator-boot-on for SATA regulators on Armada 388 GP
  ARM: dts: armada-38x: adjust board name and compatible for Armada 388 GP

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 388f7b1d 5dda254d

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

+5 −2
Original line number Diff line number Diff line
@@ -19,9 +19,12 @@ SoC. Currently known SoC compatibles are: 
And in addition, the compatible shall be extended with the specific

board. Currently known boards are:



"buffalo,linkstation-lsqvl"

"buffalo,linkstation-lsvl"

"buffalo,linkstation-lswsxl"

"buffalo,linkstation-lswxl"

"buffalo,linkstation-lswvl"

"buffalo,lschlv2"

"buffalo,lswvl"

"buffalo,lswxl"

"buffalo,lsxhl"

"buffalo,lsxl"

"cloudengines,pogo02"

Documentation/devicetree/bindings/pinctrl/marvell,armada-370-pinctrl.txt

+4 −1
Original line number Diff line number Diff line
@@ -91,6 +91,9 @@ mpp60 60 gpio, dev(ale1), uart1(rxd), sata0(prsnt), pcie(rstout), 
mpp61         61       gpo, dev(we1), uart1(txd), audio(lrclk)

mpp62         62       gpio, dev(a2), uart1(cts), tdm(drx), pcie(clkreq0),

                       audio(mclk), uart0(cts)

mpp63         63       gpo, spi0(sck), tclk

mpp63         63       gpio, spi0(sck), tclk

mpp64         64       gpio, spi0(miso), spi0(cs1)

mpp65         65       gpio, spi0(mosi), spi0(cs2)



Note: According to the datasheet mpp63 is a gpo but there is at least

one example of a gpio usage on the board D-Link DNS-327L

arch/arm/boot/dts/Makefile

+5 −2
Original line number Diff line number Diff line
@@ -189,9 +189,12 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \ 
	kirkwood-is2.dtb \

	kirkwood-km_kirkwood.dtb \

	kirkwood-laplug.dtb \

	kirkwood-linkstation-lsqvl.dtb \

	kirkwood-linkstation-lsvl.dtb \

	kirkwood-linkstation-lswsxl.dtb \

	kirkwood-linkstation-lswvl.dtb \

	kirkwood-linkstation-lswxl.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-370-mirabox.dts

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ 
&pinctrl {

	pwr_led_pin: pwr-led-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpo";

		marvell,function = "gpio";

	};



	stat_led_pins: stat-led-pins {

arch/arm/boot/dts/armada-370-netgear-rn104.dts

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ 


	backup_led_pin: backup-led-pin {

		marvell,pins = "mpp63";

		marvell,function = "gpo";

		marvell,function = "gpio";

	};



	power_led_pin: power-led-pin {