redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

mvebu fixes for 4.4 (part 1) 

- Fix QNAP TS219 power-off in dts
 - Fix legacy get_irqnr_and_base for dove and orion5x
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZXby8ACgkQCwYYjhRyO9WVEACeJmILyNwnLvuKiz438oUUIVNl
 fJgAoJmoowxW96hdIA/KohktJhnN/9Mx
 =9igy
 -----END PGP SIGNATURE-----

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
hifive-unleashed-5.1
Arnd Bergmann 2015-11-27 17:28:41 +01:00
parent 97a586d2e3 4d2ec7e206
commit 5530f85171
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -40,7 +40,7 @@
}; };
poweroff@12100 { poweroff@12100 {
compatible = "qnap,power-off"; compatible = "qnap,power-off";
reg = <0x12000 0x100>; reg = <0x12100 0x100>;
clocks = <&gate_clk 7>; clocks = <&gate_clk 7>;
}; };
spi@10600 { spi@10600 {

4
arch/arm/mach-dove/include/mach/entry-macro.S
View File

@ -18,13 +18,13 @@
@ check low interrupts @ check low interrupts
ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF] ldr \irqstat, [\base, #IRQ_CAUSE_LOW_OFF]
ldr \tmp, [\base, #IRQ_MASK_LOW_OFF] ldr \tmp, [\base, #IRQ_MASK_LOW_OFF]
mov \irqnr, #31 mov \irqnr, #32
ands \irqstat, \irqstat, \tmp ands \irqstat, \irqstat, \tmp
@ if no low interrupts set, check high interrupts @ if no low interrupts set, check high interrupts
ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF] ldreq \irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]
ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF] ldreq \tmp, [\base, #IRQ_MASK_HIGH_OFF]
moveq \irqnr, #63 moveq \irqnr, #64
andeqs \irqstat, \irqstat, \tmp andeqs \irqstat, \irqstat, \tmp
@ find first active interrupt source @ find first active interrupt source

2
arch/arm/mach-orion5x/include/mach/entry-macro.S
View File

@ -21,5 +21,5 @@
@ find cause bits that are unmasked @ find cause bits that are unmasked
ands \irqstat, \irqstat, \tmp @ clear Z flag if any ands \irqstat, \irqstat, \tmp @ clear Z flag if any
clzne \irqnr, \irqstat @ calc irqnr clzne \irqnr, \irqstat @ calc irqnr
rsbne \irqnr, \irqnr, #31 rsbne \irqnr, \irqnr, #32
.endm .endm