Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: mvebu: split SolidRun CuBox into variants

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>

authored by

Sebastian Hesselbarth and committed by
Jason Cooper
133cea66 481ff165

+13 -3
+1
arch/arm/boot/dts/Makefile
··· 444 444 armada-xp-openblocks-ax3-4.dtb 445 445 dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ 446 446 dove-cubox.dtb \ 447 + dove-cubox-es.dtb \ 447 448 dove-d2plug.dtb \ 448 449 dove-d3plug.dtb \ 449 450 dove-dove-db.dtb
+12
arch/arm/boot/dts/dove-cubox-es.dts
··· 1 + #include "dove-cubox.dts" 2 + 3 + / { 4 + model = "SolidRun CuBox (Engineering Sample)"; 5 + compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove"; 6 + }; 7 + 8 + &sdio0 { 9 + /* sdio0 card detect is connected to wrong pin on CuBox ES */ 10 + cd-gpios = <&gpio0 12 1>; 11 + pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>; 12 + };
-3
arch/arm/boot/dts/dove-cubox.dts
··· 111 111 112 112 &sdio0 { 113 113 status = "okay"; 114 - /* sdio0 card detect is connected to wrong pin on CuBox */ 115 - cd-gpios = <&gpio0 12 1>; 116 - pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>; 117 114 }; 118 115 119 116 &spi0 {