Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 8 years ago
parent
a3c0d2fb08 8d45141732
commit
75f4e38131
2 changed files with 3 additions and 3 deletions
Split View Show Diff Stats
  1. 2 2
      arch/arm/boot/dts/armada-388-gp.dts
  2. 1 1
      arch/arm/mach-mvebu/platsmp.c

+ 2 - 2
arch/arm/boot/dts/armada-388-gp.dts
View File 

@@ -75,7 +75,7 @@
 
 					pinctrl-names = "default";
 
 					pinctrl-0 = <&pca0_pins>;
 
 					interrupt-parent = <&gpio0>;
 
-					interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
 
+					interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
 
 					gpio-controller;
 
 					#gpio-cells = <2>;
 
 					interrupt-controller;
 
@@ -87,7 +87,7 @@
 
 					compatible = "nxp,pca9555";
 
 					pinctrl-names = "default";
 
 					interrupt-parent = <&gpio0>;
 
-					interrupts = <18 IRQ_TYPE_EDGE_FALLING>;
 
+					interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
 
 					gpio-controller;
 
 					#gpio-cells = <2>;
 
 					interrupt-controller;

+ 1 - 1
arch/arm/mach-mvebu/platsmp.c
View File 

@@ -211,7 +211,7 @@ static int mv98dx3236_resume_set_cpu_boot_addr(int hw_cpu, void *boot_addr)
 
 		return PTR_ERR(base);
 
 
 	writel(0, base + MV98DX3236_CPU_RESUME_CTRL_REG);
 
-	writel(virt_to_phys(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
 
+	writel(__pa_symbol(boot_addr), base + MV98DX3236_CPU_RESUME_ADDR_REG);
 
 
 	iounmap(base);