ARM: dts: mvebu: split SolidRun CuBox into variants (133cea66) · Commits · 戴 / test

As Mainlining effort for SolidRun CuBox has been carried out on the Engineering Sample, the board DTS was reflecting this. Actually, SolidRun CuBox comes in three different variants: Engineering Sample (ES), production with 1GB RAM (1G), and production with 2GB RAM (2G). Therefore, we base current dove-cubox.dts on to the 1G production variant and add a ES dts to add required quirk for misrouted SDHCI card detect on top of dove-cubox.dts. For the 2G variant we rely on the bootloader to setup correct RAM size. Signed-off-by:

Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Link: https://lkml.kernel.org/r/1401228006-3212-1-git-send-email-sebastian.hesselbarth@gmail.com Signed-off-by:

Jason Cooper <jason@lakedaemon.net>

arch/arm/boot/dts/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -444,6 +444,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \
		armada-xp-openblocks-ax3-4.dtb
		dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
		dove-cubox.dtb \
		dove-cubox-es.dtb \
		dove-d2plug.dtb \
		dove-d3plug.dtb \
		dove-dove-db.dtb

arch/arm/boot/dts/dove-cubox-es.dts

0 → 100644

+12 −0

Original line number	Diff line number	Diff line
		#include "dove-cubox.dts"

		/ {
		model = "SolidRun CuBox (Engineering Sample)";
		compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove";
		};

		&sdio0 {
		/* sdio0 card detect is connected to wrong pin on CuBox ES */
		cd-gpios = <&gpio0 12 1>;
		pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
		};

arch/arm/boot/dts/dove-cubox.dts

+0 −3

Original line number	Diff line number	Diff line
		@@ -111,9 +111,6 @@

		&sdio0 {
		status = "okay";
		/* sdio0 card detect is connected to wrong pin on CuBox */
		cd-gpios = <&gpio0 12 1>;
		pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
		};

		&spi0 {

Admin message