diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-24 12:18:36 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-24 12:18:36 -0800 |
| commit | 53a7aa0b4974890e19a81c505182c40392d327af (patch) | |
| tree | f01747aad911bbbd4d216649201df0101afa277e /arch/arm/boot/dts/armada-370-mirabox.dts | |
| parent | 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (diff) | |
| parent | 5dda254d0cc5cbdcc81dbce0985c35b68dd5e3b1 (diff) | |
| download | talos-op-linux-53a7aa0b4974890e19a81c505182c40392d327af.tar.gz talos-op-linux-53a7aa0b4974890e19a81c505182c40392d327af.zip | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370-mirabox.dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-mirabox.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts index 3aa980ad64f0..d5e19cd4d256 100644 --- a/arch/arm/boot/dts/armada-370-mirabox.dts +++ b/arch/arm/boot/dts/armada-370-mirabox.dts @@ -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 { |
