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

Commit d0815dfd authored Apr 19, 2017 by Olof Johansson

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

mvebu dt64 for 4.12 (part 2)

- crypto engine description for the Armada 7k/8k SoCs and the boards
  using it
- SDHCI description for the Armada 37xx and 7k/8k SoCs and the boards
  using it

* tag 'mvebu-dt64-4.12-2' of git://git.infradead.org/linux-mvebu

:
  arm64: marvell: dts: enable the crypto engine on the Armada 8040 DB
  arm64: marvell: dts: enable the crypto engine on the Armada 7040 DB
  arm64: marvell: dts: add crypto engine description for 7k/8k
  arm64: dts: marvell: add sdhci support for Armada 7K/8K
  arm64: dts: marvell: add eMMC support for Armada 37xx

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 08fd8c95 7ba2ef7c

arch/arm64/boot/dts/marvell/armada-3720-db.dts

+9 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,15 @@
		status = "okay";
		};

		&sdhci0 {
		non-removable;
		bus-width = <8>;
		mmc-ddr-1_8v;
		mmc-hs400-1_8v;
		marvell,pad-type = "fixed-1-8v";
		status = "okay";
		};

		/* CON31 */
		&usb3 {
		status = "okay";

arch/arm64/boot/dts/marvell/armada-37xx.dtsi

+11 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,17 @@
		};
		};

		sdhci0: sdhci@d8000 {
		compatible = "marvell,armada-3700-sdhci",
		"marvell,sdhci-xenon";
		reg = <0xd8000 0x300
		0x17808 0x4>;
		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
		clocks = <&nb_periph_clk 0>;
		clock-names = "core";
		status = "disabled";
		};

		sata: sata@e0000 {
		compatible = "marvell,armada-3700-ahci";
		reg = <0xe0000 0x2000>;

arch/arm64/boot/dts/marvell/armada-7040-db.dts

+18 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,20 @@
		status = "okay";
		};

		&ap_sdhci0 {
		status = "okay";
		bus-width = <4>;
		no-1-8-v;
		non-removable;
		};

		&cpm_sdhci0 {
		status = "okay";
		bus-width = <4>;
		no-1-8-v;
		non-removable;
		};

		&cpm_mdio {
		phy0: ethernet-phy@0 {
		reg = <0>;
		@@ -171,3 +185,7 @@
		phy = <&phy1>;
		phy-mode = "rgmii-id";
		};

		&cpm_crypto {
		status = "okay";
		};

arch/arm64/boot/dts/marvell/armada-8040-db.dts

+16 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,10 @@
		phy-mode = "rgmii-id";
		};

		&cpm_crypto {
		status = "okay";
		};

		/* CON5 on CP1 expansion */
		&cps_pcie2 {
		status = "okay";
		@@ -164,3 +168,15 @@
		&cps_usb3_1 {
		status = "okay";
		};

		&ap_sdhci0 {
		status = "okay";
		bus-width = <4>;
		non-removable;
		};

		&cpm_sdhci0 {
		status = "okay";
		bus-width = <8>;
		non-removable;
		};

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

+11 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,17 @@

		};

		ap_sdhci0: sdhci@6e0000 {
		compatible = "marvell,armada-ap806-sdhci";
		reg = <0x6e0000 0x300>;
		interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
		clock-names = "core";
		clocks = <&ap_syscon 4>;
		dma-coherent;
		marvell,xenon-phy-slow-mode;
		status = "disabled";
		};

		ap_syscon: system-controller@6f4000 {
		compatible = "marvell,ap806-system-controller",
		"syscon";