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

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

Merge tag 'berlin-fixes-for-4.4-rc1-1' of... 

Merge tag 'berlin-fixes-for-4.4-rc1-1' of git://git.infradead.org/users/hesselba/linux-berlin into fixes

Merge "Marvell Berlin fixes for 4.4-rc1 (round 1)" from Sebastian Hesselbarth:

- fix wrong SDIO DT clocks on BG2Q

* tag 'berlin-fixes-for-4.4-rc1-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: dts: berlin: add 2nd clock for BG2Q sdhci0 and sdhci1
  ARM: dts: berlin: correct BG2Q's sdhci2 2nd clock
parents 9421a145 b5010d20

arch/arm/boot/dts/berlin2q.dtsi

+5 −3
Original line number Diff line number Diff line
@@ -118,7 +118,8 @@ 
		sdhci0: sdhci@ab0000 {

			compatible = "mrvl,pxav3-mmc";

			reg = <0xab0000 0x200>;

			clocks = <&chip_clk CLKID_SDIO1XIN>;

			clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;

			clock-names = "io", "core";

			interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};
@@ -126,7 +127,8 @@ 
		sdhci1: sdhci@ab0800 {

			compatible = "mrvl,pxav3-mmc";

			reg = <0xab0800 0x200>;

			clocks = <&chip_clk CLKID_SDIO1XIN>;

			clocks = <&chip_clk CLKID_SDIO1XIN>, <&chip_clk CLKID_SDIO>;

			clock-names = "io", "core";

			interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;

			status = "disabled";

		};
@@ -135,7 +137,7 @@ 
			compatible = "mrvl,pxav3-mmc";

			reg = <0xab1000 0x200>;

			interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_NFC>;

			clocks = <&chip_clk CLKID_NFC_ECC>, <&chip_clk CLKID_SDIO>;

			clock-names = "io", "core";

			status = "disabled";

		};