ARM: am335x: phyFLEX-AM335x: Split DT and add MLO DT

To support different module variants, this patch splits the phyFLEX DT
in dts and dtsi.

And we are also adding a DT for the MLO, which has all bootable devices
disabled. The bootsource is checked in the board file and only the needed
device is enabled and registered.

Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

4 files changed, 56 insertions, 41 deletions

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 7b3db8ce48..0793bcfb31 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -30,7 +30,7 @@ pbl-dtb-$(CONFIG_MACH_PCA100) += imx27-phytec-phycard-s-rdk-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCAAXL3) += imx6q-phytec-pbaa03.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCM038) += imx27-phytec-phycore-rdk.dtb.o
 pbl-dtb-$(CONFIG_MACH_PCM051) += am335x-phytec-phycore-som.dtb.o am335x-phytec-phycore-som-no-spi.dtb.o am335x-phytec-phycore-som-mlo.dtb.o
-pbl-dtb-$(CONFIG_MACH_PFLA03) += am335x-phytec-phyflex.dtb.o
+pbl-dtb-$(CONFIG_MACH_PFLA03) += am335x-phytec-phyflex-som.dtb.o am335x-phytec-phyflex-som-mlo.dtb.o
 pbl-dtb-$(CONFIG_MACH_PHYTEC_PFLA02) += imx6s-phytec-pbab01.dtb.o imx6dl-phytec-pbab01.dtb.o imx6q-phytec-pbab01.dtb.o imx6q-phytec-phyboard-alcor.dtb.o imx6dl-phytec-phyboard-subra.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += armada-xp-openblocks-ax3-4-bb.dtb.o
 pbl-dtb-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_A6) += kirkwood-openblocks_a6-bb.dtb.o
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts b/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
new file mode 100644
index 0000000000..ab9a9ecf42
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015 Wadim Egorov <w.egorov@phytec.de> PHYTEC Messtechnik GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phyflex-som.dtsi"
+
+/ {
+	model = "Phytec phyFLEX AM335x";
+	compatible = "phytec,phyflex-am335x-som", "ti,am33xx";
+};
+
+/* Keep all bootsources disabled, we enable and register them
+ * later while booting.
+ */
+
+&mmc1 {
+	status = "disabled";
+};
+
+&gpmc {
+	status = "disabled";
+};
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som.dts b/arch/arm/dts/am335x-phytec-phyflex-som.dts
new file mode 100644
index 0000000000..2239f07e56
--- /dev/null
+++ b/arch/arm/dts/am335x-phytec-phyflex-som.dts
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 Wadim Egorov <w.egorov@phytec.de> PHYTEC Messtechnik GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-phytec-phyflex-som.dtsi"
+
+/ {
+	model = "Phytec phyFLEX AM335x";
+	compatible = "phytec,phyflex-am335x-som", "ti,am33xx";
+};
+
+&spi0 {
+	status = "okay";
+};
+
+&at24c32 {
+	status = "okay";
+};
diff --git a/arch/arm/dts/am335x-phytec-phyflex.dts b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
index 5459cd24db..1837636bab 100644
--- a/arch/arm/dts/am335x-phytec-phyflex.dts
+++ b/arch/arm/dts/am335x-phytec-phyflex-som.dtsi
@@ -1,11 +1,4 @@
-/dts-v1/;
-
-#include "am33xx.dtsi"
-
 / {
-	model = "Phytec phyFLEX AM335x";
-	compatible = "phytec,phyflex-am335x-som", "ti,am33xx";
-
 	chosen {
 		linux,stdout-path = &uart0;
 
@@ -36,16 +29,10 @@
 		regulator-max-microvolt = <3300000>;
 		regulator-boot-on;
 	};
+
 };
 
 &am33xx_pinmux {
-	usb_pins: pinmux_usb {
-		pinctrl-single,pins = <
-			0x21c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb0_drvvbus.usb0_drvvbus */
-			0x234 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb1_drvvbus.usb1_drvvbus */
-		>;
-	};
-
 	i2c0_pins: pinmux_i2c0_pins {
 			pinctrl-single,pins = <
 			0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda */
@@ -77,7 +64,7 @@
 			0x0fc (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_dat0 */
 			0x100 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_clk */
 			0x104 (PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc0_cmd */
-			>;
+		>;
 	};
 
 	emac_rgmii1_pins: pinmux_emac_rgmii1_pins {
@@ -136,30 +123,6 @@
 	};
 };
 
-&cppi41dma {
-        status = "okay";
-};
-
-
-&usb_ctrl_mod {
-        status = "okay";
-};
-
-&usb {
-        pinctrl-names = "default";
-        pinctrl-0 = <&usb_pins>;
-        status = "okay";
-};
-
-&usb1 {
-        dr_mode = "host";
-        status = "okay";
-};
-
-&usb1_phy {
-        status = "okay";
-};
-
 &i2c0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
@@ -187,7 +150,7 @@
 &spi0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spi0_pins>;
-	status = "okay";
+	status = "disabled";
 	flash: m25p80 {
 		compatible = "m25p80";
 		spi-max-frequency = <48000000>;