Skip to contentSkip to conversation

ARM: dts: mxs: Add muxing options for the SSP2 MMC

PATCH New Marek Vasut 2 participants 4 messages Sep 26, 2013 – Sep 27, 2013

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ARM: dts: mxs: Add muxing options for the SSP2 MMC

Add pinmux for 4-bit SD card connected to SSP2.

---
 arch/arm/boot/dts/imx28.dtsi | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
arch/arm/boot/dts/imx28.dtsi +31 -0
index 8b5ad60..69f4ea4 100644
@@ -473,6 +473,37 @@
 					fsl,pull-up = <MXS_PULL_DISABLE>;
 				};
 
+				mmc2_4bit_pins_a: mmc2-4bit at 0 {
+					reg = <0>;
+					fsl,pinmux-ids = <
+						MX28_PAD_SSP0_DATA4__SSP2_D0
+						MX28_PAD_SSP1_SCK__SSP2_D1
+						MX28_PAD_SSP1_CMD__SSP2_D2
+						MX28_PAD_SSP0_DATA5__SSP2_D3
+						MX28_PAD_SSP0_DATA6__SSP2_CMD
+						MX28_PAD_AUART1_RX__SSP2_CARD_DETECT
+						MX28_PAD_SSP0_DATA7__SSP2_SCK
+					>;
+					fsl,drive-strength = <MXS_DRIVE_8mA>;
+					fsl,voltage = <MXS_VOLTAGE_HIGH>;
+					fsl,pull-up = <MXS_PULL_ENABLE>;
+				};
+
+				mmc2_cd_cfg: mmc2-cd-cfg {
+					fsl,pinmux-ids = <
+						MX28_PAD_AUART1_RX__SSP2_CARD_DETECT
+					>;
+					fsl,pull-up = <MXS_PULL_DISABLE>;
+				};
+
+				mmc2_sck_cfg: mmc2-sck-cfg {
+					fsl,pinmux-ids = <
+						MX28_PAD_SSP0_DATA7__SSP2_SCK
+					>;
+					fsl,drive-strength = <MXS_DRIVE_12mA>;
+					fsl,pull-up = <MXS_PULL_DISABLE>;
+				};
+
 				i2c0_pins_a: i2c0 at 0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
Signature · 1 line
1.8.4.rc3
#1 lore raw

PATCH 2/2 ARM: dts: mxs: Add MSR M28CU3 board

This board is based on the M28 SoM with custom baseboard. Supported are LEDs, ethernet, PWM, LCD, SD slots.

---
 arch/arm/boot/dts/Makefile         |   1 +
 arch/arm/boot/dts/imx28-m28cu3.dts | 266 +++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mxs/mach-mxs.c       |   9 ++
 3 files changed, 276 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx28-m28cu3.dts
arch/arm/boot/dts/Makefile +1 -0
index cf75889..275af9b 100644
@@ -159,6 +159,7 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
 	imx28-cfa10057.dtb \
 	imx28-cfa10058.dtb \
 	imx28-evk.dtb \
+	imx28-m28cu3.dtb \
 	imx28-m28evk.dtb \
 	imx28-sps1.dtb \
 	imx28-tx28.dtb
arch/arm/boot/dts/imx28-m28cu3.dts new file +266 -0

266 lines not on this page · raw message

arch/arm/mach-mxs/mach-mxs.c +9 -0
index 98f6e2a..b5a709e 100644
@@ -332,6 +332,13 @@ static void __init crystalfontz_init(void)
 	update_fec_mac_prop(OUI_CRYSTALFONTZ);
 }
 
+static void __init m28cu3_init(void)
+{
+	enable_clk_enet_out();
+
+	update_fec_mac_prop(OUI_DENX);
+}
+
 static const char __init *mxs_get_soc_id(void)
 {
 	struct device_node *np;
@@ -459,6 +466,8 @@ static void __init mxs_machine_init(void)
 		apx4devkit_init();
 	else if (of_machine_is_compatible("crystalfontz,cfa10036"))
 		crystalfontz_init();
+	else if (of_machine_is_compatible("msr,m28cu3"))
+		m28cu3_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     NULL, parent);
Signature · 1 line
1.8.4.rc3
#2 lore raw

PATCH 2/2 ARM: dts: mxs: Add MSR M28CU3 board

arch/arm/mach-mxs/mach-mxs.c static void __init crystalfontz_init(void) · line 337

Quoted 11 lines · Marek Vasut
arch/arm/mach-mxs/mach-mxs.c +3 -0
index 98f6e2a..b5a709e 100644
@@ -332,6 +332,13 @@ static void __init crystalfontz_init(void)
 	update_fec_mac_prop(OUI_CRYSTALFONTZ);
 }
 
+static void __init m28cu3_init(void)
+{
+	enable_clk_enet_out();

Since commit daa7d39 (net: freescale: fec: add support for optional enet_out clk), we can have fec driver enable the clock if you do not need the clock at the platform initialization.

Shawn

Quoted 19 lines
arch/arm/mach-mxs/mach-mxs.c +6 -0
+
+	update_fec_mac_prop(OUI_DENX);
+}
+
 static const char __init *mxs_get_soc_id(void)
 {
 	struct device_node *np;
@@ -459,6 +466,8 @@ static void __init mxs_machine_init(void)
 		apx4devkit_init();
 	else if (of_machine_is_compatible("crystalfontz,cfa10036"))
 		crystalfontz_init();
+	else if (of_machine_is_compatible("msr,m28cu3"))
+		m28cu3_init();
 
 	of_platform_populate(NULL, of_default_bus_match_table,
 			     NULL, parent);
Signature · 1 line
1.8.4.rc3