diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-11-27 19:28:41 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-11-27 19:28:41 +0300 |
| commit | 5530f8517129150bf915592ed7654ec7fbd72943 (patch) | |
| tree | 2e4ae7544dd7092ee19e792252714ca73572b1c0 /arch/arm/boot | |
| parent | 97a586d2e3e177d62e4bc67b83bf2a840ca68530 (diff) | |
| parent | 4d2ec7e206ae03a51dfbdedc120ce88d403ec926 (diff) | |
| download | linux-5530f8517129150bf915592ed7654ec7fbd72943.tar.xz | |
Merge tag 'mvebu-fixes-4.4-1' of git://git.infradead.org/linux-mvebu into fixes
Merge "mvebu fixes for 4.4 (part 1)" from Jason Cooper:
- Fix QNAP TS219 power-off in dts
- Fix legacy get_irqnr_and_base for dove and orion5x
* tag 'mvebu-fixes-4.4-1' of git://git.infradead.org/linux-mvebu:
ARM: orion5x: Fix legacy get_irqnr_and_base
ARM: dove: Fix legacy get_irqnr_and_base
ARM: dts: Kirkwood: Fix QNAP TS219 power-off
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi index c56ab6bbfe3c..0e46560551f4 100644 --- a/arch/arm/boot/dts/kirkwood-ts219.dtsi +++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi @@ -40,7 +40,7 @@ }; poweroff@12100 { compatible = "qnap,power-off"; - reg = <0x12000 0x100>; + reg = <0x12100 0x100>; clocks = <&gate_clk 7>; }; spi@10600 { |