tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'mvebu-fixes-4.13-1' of git://git.infradead.org/linux-mvebu into fixes

Pull "mvebu fixes for 4.13 (part 1)" from Gregory CLEMENT:

- Fix wrong irq type for gpio expeander on Armada 388 GP
- Use __pa_symbol instead of virt_to_phys in the mv98dx3236 platform
SMP code

* tag 'mvebu-fixes-4.13-1' of git://git.infradead.org/linux-mvebu:
ARM: dts: armada-38x: Fix irq type for pca955
ARM: mvebu: use __pa_symbol in the mv98dx3236 platform SMP code

Arnd Bergmann 75f4e381 a3c0d2fb

+3 -3
+2 -2
arch/arm/boot/dts/armada-388-gp.dts
··· 75 75 pinctrl-names = "default"; 76 76 pinctrl-0 = <&pca0_pins>; 77 77 interrupt-parent = <&gpio0>; 78 - interrupts = <18 IRQ_TYPE_EDGE_FALLING>; 78 + interrupts = <18 IRQ_TYPE_LEVEL_LOW>; 79 79 gpio-controller; 80 80 #gpio-cells = <2>; 81 81 interrupt-controller; ··· 87 87 compatible = "nxp,pca9555"; 88 88 pinctrl-names = "default"; 89 89 interrupt-parent = <&gpio0>; 90 - interrupts = <18 IRQ_TYPE_EDGE_FALLING>; 90 + interrupts = <18 IRQ_TYPE_LEVEL_LOW>; 91 91 gpio-controller; 92 92 #gpio-cells = <2>; 93 93 interrupt-controller;
+1 -1
arch/arm/mach-mvebu/platsmp.c
··· 211 211 return PTR_ERR(base); 212 212 213 213 writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG); 214 - writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG); 214 + writel(__pa_symbol(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG); 215 215 216 216 iounmap(base); 217 217