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

Commit 5530f851 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 97a586d2 4d2ec7e2

arch/arm/boot/dts/kirkwood-ts219.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
		};

		poweroff@12100 {

			compatible = "qnap,power-off";

			reg = <0x12000 0x100>;

			reg = <0x12100 0x100>;

			clocks = <&gate_clk 7>;

		};

		spi@10600 {

arch/arm/mach-dove/include/mach/entry-macro.S

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ 
	@ check low interrupts

	ldr	\irqstat, [\base, #IRQ_CAUSE_LOW_OFF]

	ldr	\tmp, [\base, #IRQ_MASK_LOW_OFF]

	mov	\irqnr, #31

	mov	\irqnr, #32

	ands	\irqstat, \irqstat, \tmp



	@ if no low interrupts set, check high interrupts

	ldreq	\irqstat, [\base, #IRQ_CAUSE_HIGH_OFF]

	ldreq	\tmp, [\base, #IRQ_MASK_HIGH_OFF]

	moveq	\irqnr, #63

	moveq	\irqnr, #64

	andeqs	\irqstat, \irqstat, \tmp



	@ find first active interrupt source

arch/arm/mach-orion5x/include/mach/entry-macro.S

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ 
	@ find cause bits that are unmasked

	ands	\irqstat, \irqstat, \tmp	@ clear Z flag if any

	clzne	\irqnr,	\irqstat		@ calc irqnr

	rsbne	\irqnr, \irqnr, #31

	rsbne	\irqnr, \irqnr, #32

	.endm