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

Commit 75f4e381 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents a3c0d2fb 8d451417

arch/arm/boot/dts/armada-388-gp.dts

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-mvebu/platsmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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);