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

Commit ff9e0e3b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical 

mvebu fixes for 4.12 (part 2)

Fix Openblock A6 (kirkwood base board) nand partition overlap

* tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
  arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
parents 0281bafa 4fcee14d

arch/arm/boot/dts/kirkwood-openblocks_a6.dts

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 


	partition@d4000 {

		label = "test";

		reg = <0xd4000 0x24000>;

		reg = <0xd4000 0x20000>;

	};



	partition@f4000 {

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -231,8 +231,7 @@ 
			cpm_crypto: crypto@800000 {

				compatible = "inside-secure,safexcel-eip197";

				reg = <0x800000 0x200000>;

				interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING

				| IRQ_TYPE_LEVEL_HIGH)>,

				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -221,8 +221,7 @@ 
			cps_crypto: crypto@800000 {

				compatible = "inside-secure,safexcel-eip197";

				reg = <0x800000 0x200000>;

				interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING

				| IRQ_TYPE_LEVEL_HIGH)>,

				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,

					     <GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,