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 split the current dove-cubox.dts into a common board include and one board dts for each of the above variants. Signed-off-by: Sebastian Hesselbarth <[email protected]> --- Cc: Rob Herring <[email protected]> Cc: Pawel Moll <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Ian Campbell <[email protected]> Cc: Kumar Gala <[email protected]> Cc: Russell King <[email protected]> Cc: Jason Cooper <[email protected]> Cc: Andrew Lunn <[email protected]> Cc: Gregory Clement <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] --- arch/arm/boot/dts/Makefile | 4 +++- arch/arm/boot/dts/dove-cubox-1g.dts | 17 ++++++++++++++++ arch/arm/boot/dts/dove-cubox-2g.dts | 17 ++++++++++++++++ arch/arm/boot/dts/dove-cubox-es.dts | 23 ++++++++++++++++++++++ .../boot/dts/{dove-cubox.dts => dove-cubox.dtsi} | 17 ---------------- 5 files changed, 60 insertions(+), 18 deletions(-) create mode 100644 arch/arm/boot/dts/dove-cubox-1g.dts create mode 100644 arch/arm/boot/dts/dove-cubox-2g.dts create mode 100644 arch/arm/boot/dts/dove-cubox-es.dts rename arch/arm/boot/dts/{dove-cubox.dts => dove-cubox.dtsi} (86%) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 35c146f31e46..40a008539c0c 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -404,7 +404,9 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ armada-xp-matrix.dtb \ armada-xp-openblocks-ax3-4.dtb dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \ - dove-cubox.dtb \ + dove-cubox-1g.dtb \ + dove-cubox-2g.dtb \ + dove-cubox-es.dtb \ dove-d2plug.dtb \ dove-d3plug.dtb \ dove-dove-db.dtb diff --git a/arch/arm/boot/dts/dove-cubox-1g.dts b/arch/arm/boot/dts/dove-cubox-1g.dts new file mode 100644 index 000000000000..eebd3f7ca7e6 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-1g.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "dove-cubox.dtsi" + +/ { + model = "SolidRun CuBox (1G)"; + compatible = "solidrun,cubox-1g", "solidrun,cubox", "marvell,dove"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x40000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + }; +}; diff --git a/arch/arm/boot/dts/dove-cubox-2g.dts b/arch/arm/boot/dts/dove-cubox-2g.dts new file mode 100644 index 000000000000..513b6a68eba3 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-2g.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "dove-cubox.dtsi" + +/ { + model = "SolidRun CuBox (2G)"; + compatible = "solidrun,cubox-2g", "solidrun,cubox", "marvell,dove"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x80000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + }; +}; diff --git a/arch/arm/boot/dts/dove-cubox-es.dts b/arch/arm/boot/dts/dove-cubox-es.dts new file mode 100644 index 000000000000..5fc17ce34c98 --- /dev/null +++ b/arch/arm/boot/dts/dove-cubox-es.dts @@ -0,0 +1,23 @@ +/dts-v1/; + +#include "dove-cubox.dtsi" + +/ { + model = "SolidRun CuBox (ES)"; + compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove"; + + memory { + device_type = "memory"; + reg = <0x00000000 0x40000000>; + }; + + chosen { + bootargs = "console=ttyS0,115200n8 earlyprintk"; + }; +}; + +&sdio0 { + /* sdio0 card detect is connected to wrong pin on CuBox */ + cd-gpios = <&gpio0 12 1>; + pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>; +}; diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dtsi similarity index 86% rename from arch/arm/boot/dts/dove-cubox.dts rename to arch/arm/boot/dts/dove-cubox.dtsi index 7a70f4ca502a..5752d729cc71 100644 --- a/arch/arm/boot/dts/dove-cubox.dts +++ b/arch/arm/boot/dts/dove-cubox.dtsi @@ -1,20 +1,6 @@ -/dts-v1/; - #include "dove.dtsi" / { - model = "SolidRun CuBox"; - compatible = "solidrun,cubox", "marvell,dove"; - - memory { - device_type = "memory"; - reg = <0x00000000 0x40000000>; - }; - - chosen { - bootargs = "console=ttyS0,115200n8 earlyprintk"; - }; - leds { compatible = "gpio-leds"; pinctrl-0 = <&pmx_gpio_18>; @@ -111,9 +97,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 { -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
