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

Commit 840907f9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu into fixes 

Pull "mvebu fixes for 4.14 (part 2)" from Gregory CLEMENT

Two device tree related fixes:

- One on Armada 38x using a other compatible string for I2C in order
  to cover an errata.

- One for Armada 7K/8K fixing a typo on interrupt-map property for
  PCIe leading to fail PME and AER root port service initialization

And the last one for the mbus fixing the window size calculation when
it exceed 32bits

* tag 'mvebu-fixes-4.14-2' of git://git.infradead.org/linux-mvebu:
  bus: mbus: fix window size calculation for 4GB windows
  ARM: dts: Fix I2C repeated start issue on Armada-38x
  arm64: dts: marvell: fix interrupt-map property for Armada CP110 PCIe controller
parents ca7325a2 2bbbd963

arch/arm/boot/dts/armada-38x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ 
			};



			i2c0: i2c@11000 {

				compatible = "marvell,mv64xxx-i2c";

				compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11000 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;
@@ -189,7 +189,7 @@ 
			};



			i2c1: i2c@11100 {

				compatible = "marvell,mv64xxx-i2c";

				compatible = "marvell,mv78230-a0-i2c", "marvell,mv64xxx-i2c";

				reg = <0x11100 0x20>;

				#address-cells = <1>;

				#size-cells = <0>;

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

+3 −3
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ 
				/* non-prefetchable memory */

				0x82000000 0 0xf6000000 0  0xf6000000 0 0xf00000>;

			interrupt-map-mask = <0 0 0 0>;

			interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;

			num-lanes = <1>;

			clocks = <&cpm_clk 1 13>;
@@ -362,7 +362,7 @@ 
				/* non-prefetchable memory */

				0x82000000 0 0xf7000000 0  0xf7000000 0 0xf00000>;

			interrupt-map-mask = <0 0 0 0>;

			interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;



			num-lanes = <1>;
@@ -389,7 +389,7 @@ 
				/* non-prefetchable memory */

				0x82000000 0 0xf8000000 0  0xf8000000 0 0xf00000>;

			interrupt-map-mask = <0 0 0 0>;

			interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;



			num-lanes = <1>;

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

+3 −3
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ 
				/* non-prefetchable memory */

				0x82000000 0 0xfa000000 0  0xfa000000 0 0xf00000>;

			interrupt-map-mask = <0 0 0 0>;

			interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;

			num-lanes = <1>;

			clocks = <&cps_clk 1 13>;
@@ -361,7 +361,7 @@ 
				/* non-prefetchable memory */

				0x82000000 0 0xfb000000 0  0xfb000000 0 0xf00000>;

			interrupt-map-mask = <0 0 0 0>;

			interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;



			num-lanes = <1>;
@@ -388,7 +388,7 @@ 
				/* non-prefetchable memory */

				0x82000000 0 0xfc000000 0  0xfc000000 0 0xf00000>;

			interrupt-map-mask = <0 0 0 0>;

			interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;



			num-lanes = <1>;

drivers/bus/mvebu-mbus.c

+1 −1
Original line number Diff line number Diff line
@@ -720,7 +720,7 @@ mvebu_mbus_default_setup_cpu_target(struct mvebu_mbus_state *mbus) 
			if (mbus->hw_io_coherency)

				w->mbus_attr |= ATTR_HW_COHERENCY;

			w->base = base & DDR_BASE_CS_LOW_MASK;

			w->size = (size | ~DDR_SIZE_MASK) + 1;

			w->size = (u64)(size | ~DDR_SIZE_MASK) + 1;

		}

	}

	mvebu_mbus_dram_info.num_cs = cs;

include/linux/mbus.h

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ struct mbus_dram_target_info 
	struct mbus_dram_window {

		u8	cs_index;

		u8	mbus_attr;

		u32	base;

		u32	size;

		u64	base;

		u64	size;

	} cs[4];

};