Skip to contentSkip to conversation

ARM: dts: Add support for sbc-3xxx with cm-t3730

PATCH New Tony Lindgren 2 participants 9 messages Dec 13, 2013 – Dec 19, 2013

Subsystems (5)
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

This adds support for CompuLab SBC-T3530, also known as cm-t3730:

http://compulab.co.il/products/sbcs/sbc-t3530/

It seems that with the sbc-3xxx mainboard is also used on SBC-T3517 and SBC-T3730 with just a different CPU module:

http://compulab.co.il/products/sbcs/sbc-t3517/
http://compulab.co.il/products/sbcs/sbc-t3730/

So let's add a common omap3-sb-t35.dtsi and then separate SoC specific omap3-sbc-t3730.dts, omap3-sbc-t3530.dts and omap3-sbc-t3517.dts.

I've tested this with SBC-T3730 as that's the only one I have. At least serial, both Ethernet controllers, MMC, and wl12xx WLAN work.

Note that WLAN seems to be different for SBC-T3530. And SBC-T3517 may need some changes for the EMAC Ethernet if that's used instead of the smsc911x.

Cc devicetree at vger.kernel.org
Cc Igor Grinberg <[email protected]>
Cc Mike Rapoport <[email protected]>
---
 arch/arm/boot/dts/Makefile            |   3 +
 arch/arm/boot/dts/omap3-sb-t35.dtsi   | 135 ++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-sbc-t3517.dts |  18 +++++
 arch/arm/boot/dts/omap3-sbc-t3530.dts |  18 +++++
 arch/arm/boot/dts/omap3-sbc-t3730.dts | 130 ++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/pdata-quirks.c    |   7 ++
 6 files changed, 311 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap3-sb-t35.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3517.dts
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3530.dts
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3730.dts
arch/arm/boot/dts/Makefile +3 -0
index fc37bca..41370d2 100644
@@ -179,6 +179,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap2420-n810-wimax.dtb \
 	omap3430-sdp.dtb \
 	omap3-beagle.dtb \
+	omap3-sbc-t3530.dtb \
+	omap3-sbc-t3730.dtb \
+	omap3-sbc-t3517.dtb \
 	omap3-devkit8000.dtb \
 	omap3-beagle-xm.dtb \
 	omap3-evm.dtb \
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +135 -0

135 lines not on this page · raw message

arch/arm/boot/dts/omap3-sbc-t3517.dts new file +18 -0
new file mode 100644
index 0000000..2df885b
@@ -0,0 +1,18 @@
+/*
+ * Suppport for CompuLab SBC-T3517 with CM-T3517
+ */
+/dts-v1/;
+
+#include "am3517.dtsi"
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3517 with CM-T3517";
+	compatible = "compulab,omap3-sbc-t3517", "ti,am3517", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+};
arch/arm/boot/dts/omap3-sbc-t3530.dts new file +18 -0
new file mode 100644
index 0000000..5156147
@@ -0,0 +1,18 @@
+/*
+ * Suppport for CompuLab SBC-T3530 with CM-T3530
+ */
+/dts-v1/;
+
+#include "omap34xx.dtsi"
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3530 with CM-T3530";
+	compatible = "compulab,omap3-sbc-t3530", "ti,omap34xx", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+};
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +130 -0

130 lines not on this page · raw message

arch/arm/mach-omap2/pdata-quirks.c +7 -0
index 78c6233..1a1bfc0 100644
@@ -93,6 +93,12 @@ static void __init hsmmc2_internal_input_clk(void)
 	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
 }
 
+static void __init omap3_sbc_t3730_legacy_init(void)
+{
+	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
+	omap_ads7846_init(1, 57, 0, NULL);
+}
+
 static void __init omap3_igep0020_legacy_init(void)
 {
 	omap3_igep2_display_init_of();
@@ -229,6 +235,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
  */
 static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP3
+	{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_legacy_init, },
 	{ "nokia,omap3-n900", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
Signature · 1 line
1.8.1.1
#1 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Hi Tony,

Quoted 14 lines · Tony Lindgren

This adds support for CompuLab SBC-T3530, also known as cm-t3730:

http://compulab.co.il/products/sbcs/sbc-t3530/

It seems that with the sbc-3xxx mainboard is also used on SBC-T3517 and SBC-T3730 with just a different CPU module:

http://compulab.co.il/products/sbcs/sbc-t3517/
http://compulab.co.il/products/sbcs/sbc-t3730/

So let's add a common omap3-sb-t35.dtsi and then separate SoC specific omap3-sbc-t3730.dts, omap3-sbc-t3530.dts and omap3-sbc-t3517.dts.

Quoted 5 lines

I've tested this with SBC-T3730 as that's the only one I have. At least serial, both Ethernet controllers, MMC, and wl12xx WLAN work.

Note that WLAN seems to be different for SBC-T3530.

Yes, it is Marvell 8686 chipset using the libertas driver.

Quoted 8 lines

And SBC-T3517
may need some changes for the EMAC Ethernet if that's used instead of the smsc911x.

Cc devicetree at vger.kernel.org
Cc Igor Grinberg <[email protected]>
Cc Mike Rapoport <[email protected]>

Great job!
I'm sorry I couldn't make it in time with the conversion... :-(

Quoted 33 lines
---
 arch/arm/boot/dts/Makefile            |   3 +
 arch/arm/boot/dts/omap3-sb-t35.dtsi   | 135 ++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/omap3-sbc-t3517.dts |  18 +++++
 arch/arm/boot/dts/omap3-sbc-t3530.dts |  18 +++++
 arch/arm/boot/dts/omap3-sbc-t3730.dts | 130 ++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/pdata-quirks.c    |   7 ++
 6 files changed, 311 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap3-sb-t35.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3517.dts
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3530.dts
 create mode 100644 arch/arm/boot/dts/omap3-sbc-t3730.dts
arch/arm/boot/dts/Makefile +3 -0
index fc37bca..41370d2 100644
@@ -179,6 +179,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap2420-n810-wimax.dtb \
 	omap3430-sdp.dtb \
 	omap3-beagle.dtb \
+	omap3-sbc-t3530.dtb \
+	omap3-sbc-t3730.dtb \
+	omap3-sbc-t3517.dtb \
 	omap3-devkit8000.dtb \
 	omap3-beagle-xm.dtb \
 	omap3-evm.dtb \
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +0 -0
new file mode 100644
index 0000000..fc676c5

arch/arm/boot/dts/omap3-sb-t35.dtsi line 9

Quoted 9 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +9 -0
@@ -0,0 +1,135 @@
+/*
+ * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730
+ */
+
+/ {
+	aliases {
+		ethernet0 = &smsc1;
+		ethernet1 = &smsc2;
+	};

SB-T35 has only one SMSC Ethernet on-board (smsc2),
while the first one is on the cm-t3530 and cm-t3730 modules. SBC-T3517 has only one _SMSC_ Ethernet and it is on the SB-T35 base board. cm-t3517 has EMAC Ethernet on-board instead of the SMSC.

There is also another base board - CB-T3, which turns into EM-T3530 and EM-T3730 once you plug the cm-t3530 or cm-t3730 into CB-T3.

http://compulab.co.il/products/handheld-computers/em-t3730/
http://compulab.co.il/products/handheld-computers/em-t3530/

The CB-T3 base board does not have any Ethernet controllers on it, so the EM-T3x systems have only one Ethernet controller - the one on the CPU board - SMSC.

This makes it four boards:
sb-t35 - base board has only one Ethernet controller (SMSC)
cb-t3 - base board has no Ethernet controllers
cm-t3530 - CPU board (plugged into sb-t35) has only one Ethernet controller (SMSC) cm-t3730 - CPU board (plugged into sb-t35) has only one Ethernet controller (SMSC) cm-t3537 - CPU board (plugged into sb-t35) has only one Ethernet controller (EMAC)

The SBC-Txxx and EM-Txxx- means both boards connected (base board with CPU board).

arch/arm/boot/dts/omap3-sb-t35.dtsi line 22

Quoted 13 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +13 -0
+
+	cpus {
+		cpu at 0 {
+			cpu0-supply = <&vcc>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		ledb {
+			label = "cm-t35:green";
+			gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>;  /* gpio186 */
+			linux,default-trigger = "heartbeat";

Although all CPU boards have the same GPIO routed to the heartbeat LED, this property is related to the CPU board and not to the base (mother) board. The same GPIO is used intensionally for s/w simplicity.
If we are about to save code duplication, I'd like to have a common to CPU boards file, say omap3-cm-t3x.dtsi - that way it will better reflect the actual hardware.

Quoted 42 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +42 -0
+		};
+	};
+
+	vddvario: regulator-vddvario {
+		compatible = "regulator-fixed";
+		regulator-name = "vddvario";
+		regulator-always-on;
+	};
+
+	vdd33a: regulator-vdd33a {
+		compatible = "regulator-fixed";
+		regulator-name = "vdd33a";
+		regulator-always-on;
+	};
+};
+
+&gpmc {
+	ranges = <5 0 0x2c000000 0x01000000>,
+		 <4 0 0x2d000000 0x01000000>;
+
+	smsc1: ethernet at 5,0 {
+		compatible = "smsc,lan9221", "smsc,lan9115";
+		interrupt-parent = <&gpio6>;
+		interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+		reg = <5 0 0xff>;
+		bank-width = <2>;
+		gpmc,mux-add-data;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <186>;
+		gpmc,cs-wr-off-ns = <186>;
+		gpmc,adv-on-ns = <12>;
+		gpmc,adv-rd-off-ns = <48>;
+		gpmc,adv-wr-off-ns = <48>;
+		gpmc,oe-on-ns = <54>;
+		gpmc,oe-off-ns = <168>;
+		gpmc,we-on-ns = <54>;
+		gpmc,we-off-ns = <168>;
+		gpmc,rd-cycle-ns = <186>;
+		gpmc,wr-cycle-ns = <186>;
+		gpmc,access-ns = <114>;
+		gpmc,page-burst-access-ns = <6>;
+		gpmc,bus-turnaround-ns = <12>;

arch/arm/boot/dts/omap3-sb-t35.dtsi line 74

Quoted 10 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +10 -0
+		gpmc,cycle2cycle-delay-ns = <18>;
+		gpmc,wr-data-mux-bus-ns = <90>;
+		gpmc,wr-access-ns = <186>;
+		gpmc,cycle2cycle-samecsen;
+		gpmc,cycle2cycle-diffcsen;
+		vddvario-supply = <&vddvario>;
+		vdd33a-supply = <&vdd33a>;
+		reg-io-width = <4>;
+		smsc,save-mac-address;
+	};

This one also should be a part of CPU board file or the common file.

Quoted 34 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +34 -0
+
+	smsc2: ethernet at 4,0 {
+		compatible = "smsc,lan9221", "smsc,lan9115";
+		interrupt-parent = <&gpio3>;
+		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+		reg = <4 0 0xff>;
+		bank-width = <2>;
+		gpmc,mux-add-data;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <186>;
+		gpmc,cs-wr-off-ns = <186>;
+		gpmc,adv-on-ns = <12>;
+		gpmc,adv-rd-off-ns = <48>;
+		gpmc,adv-wr-off-ns = <48>;
+		gpmc,oe-on-ns = <54>;
+		gpmc,oe-off-ns = <168>;
+		gpmc,we-on-ns = <54>;
+		gpmc,we-off-ns = <168>;
+		gpmc,rd-cycle-ns = <186>;
+		gpmc,wr-cycle-ns = <186>;
+		gpmc,access-ns = <114>;
+		gpmc,page-burst-access-ns = <6>;
+		gpmc,bus-turnaround-ns = <12>;
+		gpmc,cycle2cycle-delay-ns = <18>;
+		gpmc,wr-data-mux-bus-ns = <90>;
+		gpmc,wr-access-ns = <186>;
+		gpmc,cycle2cycle-samecsen;
+		gpmc,cycle2cycle-diffcsen;
+		vddvario-supply = <&vddvario>;
+		vdd33a-supply = <&vdd33a>;
+		reg-io-width = <4>;
+		smsc,save-mac-address;
+	};
+};

arch/arm/boot/dts/omap3-sb-t35.dtsi line 118

Quoted 10 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +10 -0
+
+&i2c1 {
+	clock-frequency = <2600000>;
+
+	twl: twl at 48 {
+		reg = <0x48>;
+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+		interrupt-parent = <&intc>;
+	};
+};

This one should be a part of the common file.

arch/arm/boot/dts/omap3-sb-t35.dtsi line 129

Quoted 11 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +11 -0
+
+#include "twl4030.dtsi"
+#include "twl4030_omap3.dtsi"
+
+&i2c3 {
+	clock-frequency = <400000>;
+};
+
+&mmc1 {
+	vmmc-supply = <&vmmc1>;
+	vmmc_aux-supply = <&vsim>;

Is it essential to always provide vmmc_aux-supply property? In fact, the TPS65930 does not have the VSIM supply...
It is a mistake in the upstream board file.
I fixed this locally a while ago, but haven't submitted upstream... So we should either leave this property unpopulated (if we can...) or provide a fixed regulator to populate it.

arch/arm/boot/dts/omap3-sb-t35.dtsi line 130

Quoted 1 line
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +1 -0
+	bus-width = <8>;

I'm not sure what this property should reflect.
Both cm-t3530 and cm-t3730 use 4 bit MMC1 bus.

Quoted 17 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +5 -0
+};
+
+&twl_gpio {
+	ti,use-leds;
+};
arch/arm/boot/dts/omap3-sbc-t3517.dts new file +6 -0
new file mode 100644
index 0000000..2df885b
@@ -0,0 +1,18 @@
+/*
+ * Suppport for CompuLab SBC-T3517 with CM-T3517
+ */
+/dts-v1/;
+
+#include "am3517.dtsi"

arch/arm/boot/dts/omap3-sbc-t3517.dts line 16

Quoted 10 lines
arch/arm/boot/dts/omap3-sbc-t3517.dts new file +10 -0
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3517 with CM-T3517";
+	compatible = "compulab,omap3-sbc-t3517", "ti,am3517", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */

Can we support multiple memory sizes through static DT, or the only way is to update this property in the bootloader?

Quoted 77 lines
arch/arm/boot/dts/omap3-sbc-t3517.dts new file +2 -0
+	};
+};
arch/arm/boot/dts/omap3-sbc-t3530.dts new file +18 -0
new file mode 100644
index 0000000..5156147
@@ -0,0 +1,18 @@
+/*
+ * Suppport for CompuLab SBC-T3530 with CM-T3530
+ */
+/dts-v1/;
+
+#include "omap34xx.dtsi"
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3530 with CM-T3530";
+	compatible = "compulab,omap3-sbc-t3530", "ti,omap34xx", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+};
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +45 -0
new file mode 100644
index 0000000..836f742
@@ -0,0 +1,130 @@
+/*
+ * Suppport for CompuLab SBC-T3730 with CM-T3730
+ */
+/dts-v1/;
+
+#include "omap36xx.dtsi"
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3730 with CM-T3730";
+	compatible = "compulab,omap3-sbc-t3730", "ti,omap36xx", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+
+	wl12xx_vmmc2: wl12xx_vmmc2 {
+		compatible = "regulator-fixed";
+		regulator-name = "vw1271";
+		pinctrl-names = "default";
+		pinctrl-0 = <&wl12xx_gpio>;
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		gpio = <&gpio3 9 GPIO_ACTIVE_HIGH>;   /* gpio73 */
+		startup-delay-us = <20000>;
+		enable-active-high;
+	};
+
+	wl12xx_vaux2: wl12xx_vaux2 {
+		compatible = "regulator-fixed";
+		regulator-name = "vwl1271_vaux2";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		gpio = <&twl_gpio 2 GPIO_ACTIVE_HIGH>;
+		startup-delay-us = <70000>;
+		enable-active-high;
+		vin-supply = <&vaux2>;
+	};
+};
+
+&omap3_pmx_core {
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <

arch/arm/boot/dts/omap3-sbc-t3730.dts line 55

Quoted 10 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +10 -0
+			0x114 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */
+			0x116 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */
+			0x118 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat0.sdmmc1_dat0 */
+			0x11a (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat1.sdmmc1_dat1 */
+			0x11c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat2.sdmmc1_dat2 */
+			0x11e (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat3.sdmmc1_dat3 */
+			0x120 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat4.sdmmc1_dat4 */
+			0x122 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat5.sdmmc1_dat5 */
+			0x124 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat6.sdmmc1_dat6 */
+			0x126 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat7.sdmmc1_dat7 */

The dat{4,5,6,7} pins are not used either on cm-t3530, or cm-t3730.

arch/arm/boot/dts/omap3-sbc-t3730.dts line 66

Quoted 11 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +11 -0
+		>;
+	};
+
+	mmc2_pins: pinmux_mmc2_pins {
+		pinctrl-single,pins = <
+			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */
+			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */
+			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */
+			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */
+			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */
+			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

Here the following is missing:
0x134 (PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */

arch/arm/boot/dts/omap3-sbc-t3730.dts line 69

Quoted 3 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +3 -0
+			0x136 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat5.sdmmc2_dir_dat1 */
+			0x138 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat6.sdmmc2_dir_cmd */
+			0x13a (PIN_INPUT | MUX_MODE1)		/* sdmmc2_dat7.sdmmc2_clkin */

All four above pins (dat{4,5,6,7}) should be muxed only on cm-t3530. cm-t3730 uses the sdmmc2_dat4 (gpio136) for wl12xx irq, and does nor use the rest (dat{5,6,7}) at all.

Quoted 87 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +61 -0
+		>;
+	};
+
+	smsc1_pins: pinmux_smsc1_pins {
+		pinctrl-single,pins = <
+			0x88 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_ncs5.gpmc_ncs5 */
+			0x16a (PIN_INPUT_PULLUP | MUX_MODE4)	/* uart3_cts_rctx.gpio_163 */
+		>;
+	};
+
+	smsc2_pins: pinmux_smsc2_pins {
+		pinctrl-single,pins = <
+			0x86 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_ncs4.gpmc_ncs4 */
+			0xa2 (PIN_INPUT_PULLUP | MUX_MODE4)	/* gpmc_wait3.gpio_65 */
+		>;
+	};
+
+	uart3_pins: pinmux_uart3_pins {
+		pinctrl-single,pins = <
+			0x16e (PIN_INPUT | MUX_MODE0)		/* uart3_rx_irrx.uart3_rx_irrx */
+			0x170 (PIN_OUTPUT | MUX_MODE0)		/* uart3_tx_irtx.uart3_tx_irtx */
+		>;
+	};
+
+	wl12xx_gpio: pinmux_wl12xx_gpio {
+		pinctrl-single,pins = <
+			0xb2 (PIN_OUTPUT | MUX_MODE4)		/* dss_data3.gpio_73 */
+			0x134 (PIN_INPUT | MUX_MODE4)		/* sdmmc2_dat4.gpio_136 */
+		>;
+	};
+};
+
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+};
+
+&mmc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc2_pins>;
+	vmmc-supply = <&wl12xx_vmmc2>;
+	vmmc_aux-supply = <&wl12xx_vaux2>;
+	non-removable;
+	bus-width = <4>;
+	cap-power-off-card;
+};
+
+&smsc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&smsc1_pins>;
+};
+
+&smsc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&smsc2_pins>;
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>;
+};
arch/arm/mach-omap2/pdata-quirks.c +7 -0
index 78c6233..1a1bfc0 100644
@@ -93,6 +93,12 @@ static void __init hsmmc2_internal_input_clk(void)
 	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
 }
 
+static void __init omap3_sbc_t3730_legacy_init(void)
+{
+	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
+	omap_ads7846_init(1, 57, 0, NULL);
+}
+
 static void __init omap3_igep0020_legacy_init(void)
 {
 	omap3_igep2_display_init_of();
@@ -229,6 +235,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
  */
 static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP3
+	{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_legacy_init, },
 	{ "nokia,omap3-n900", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
Signature · 2 lines
Regards,
Igor.
author maintainer
#2 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Quoted 6 lines · Igor Grinberg

On 12/13/13 21:22, Tony Lindgren wrote:

SB-T35 has only one SMSC Ethernet on-board (smsc2),
while the first one is on the cm-t3530 and cm-t3730 modules. SBC-T3517 has only one _SMSC_ Ethernet and it is on the SB-T35 base board. cm-t3517 has EMAC Ethernet on-board instead of the SMSC.

OK, I'll move that.

Quoted 9 lines

There is also another base board - CB-T3, which turns into EM-T3530 and EM-T3730 once you plug the cm-t3530 or cm-t3730 into CB-T3.

http://compulab.co.il/products/handheld-computers/em-t3730/
http://compulab.co.il/products/handheld-computers/em-t3530/

The CB-T3 base board does not have any Ethernet controllers on it, so the EM-T3x systems have only one Ethernet controller - the one on the CPU board - SMSC.

OK

Quoted 8 lines

This makes it four boards:
sb-t35 - base board has only one Ethernet controller (SMSC)
cb-t3 - base board has no Ethernet controllers
cm-t3530 - CPU board (plugged into sb-t35) has only one Ethernet controller (SMSC) cm-t3730 - CPU board (plugged into sb-t35) has only one Ethernet controller (SMSC) cm-t3537 - CPU board (plugged into sb-t35) has only one Ethernet controller (EMAC)

The SBC-Txxx and EM-Txxx- means both boards connected (base board with CPU board).

OK

Quoted 12 lines
Quoted 12 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +12 -0
+
+	cpus {
+		cpu at 0 {
+			cpu0-supply = <&vcc>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		ledb {
+			label = "cm-t35:green";
+			gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>;  /* gpio186 */
Quoted 8 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 22

Quoted 1 line
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +1 -0
+			linux,default-trigger = "heartbeat";

Although all CPU boards have the same GPIO routed to the heartbeat LED, this property is related to the CPU board and not to the base (mother) board. The same GPIO is used intensionally for s/w simplicity.
If we are about to save code duplication, I'd like to have a common to CPU boards file, say omap3-cm-t3x.dtsi - that way it will better reflect the actual hardware.

OK will move.

Quoted 11 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 118

Quoted 9 lines

+&i2c1 {

arch/arm/boot/dts/omap3-sb-t35.dtsi new file +8 -0
+	clock-frequency = <2600000>;
+
+	twl: twl at 48 {
+		reg = <0x48>;
+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+		interrupt-parent = <&intc>;
+	};
+};

This one should be a part of the common file.

OK

Quoted 6 lines
Quoted 6 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +6 -0
+#include "twl4030.dtsi"
+#include "twl4030_omap3.dtsi"
+
+&i2c3 {
+	clock-frequency = <400000>;
+};
Quoted 8 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 129

Quoted 4 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +4 -0
+
+&mmc1 {
+	vmmc-supply = <&vmmc1>;
+	vmmc_aux-supply = <&vsim>;

Is it essential to always provide vmmc_aux-supply property? In fact, the TPS65930 does not have the VSIM supply... It is a mistake in the upstream board file.

OK

Quoted 8 lines

I fixed this locally a while ago, but haven't submitted upstream... So we should either leave this property unpopulated (if we can...) or provide a fixed regulator to populate it.

arch/arm/boot/dts/omap3-sb-t35.dtsi line 130

Quoted 1 line
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +1 -0
+	bus-width = <8>;

I'm not sure what this property should reflect.
Both cm-t3530 and cm-t3730 use 4 bit MMC1 bus.

Hmm except with the muxing it seems to work just fine with 8-bit :) I noticed that by accident as I copied the entry from omap3-evm.

So it seems that all the 8 lines are available for the MMC1, but can be optionally also routed somewhere else?

Quoted 13 lines
Quoted 13 lines

+++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts

arch/arm/boot/dts/omap3-sbc-t3517.dts new file +11 -0
@@ -0,0 +1,18 @@
+/*
+ * Suppport for CompuLab SBC-T3517 with CM-T3517
+ */
+/dts-v1/;
+
+#include "am3517.dtsi"
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3517 with CM-T3517";
Quoted 8 lines

arch/arm/boot/dts/omap3-sbc-t3517.dts line 16

Quoted 5 lines
arch/arm/boot/dts/omap3-sbc-t3517.dts new file +5 -0
+	compatible = "compulab,omap3-sbc-t3517", "ti,am3517", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */

Can we support multiple memory sizes through static DT, or the only way is to update this property in the bootloader?

Well we should probably have a minimal .dts file for the variants too that can include omap3-cm-t37.dts and so on. I guess some bootloaders are capable of rewriting the .dtb too.

Quoted 6 lines
Quoted 6 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +6 -0
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <
+			0x114 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */
+			0x116 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */
+			0x118 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat0.sdmmc1_dat0 */
+			0x11a (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat1.sdmmc1_dat1 */
Quoted 8 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 55

Quoted 6 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +6 -0
+			0x11c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat2.sdmmc1_dat2 */
+			0x11e (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat3.sdmmc1_dat3 */
+			0x120 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat4.sdmmc1_dat4 */
+			0x122 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat5.sdmmc1_dat5 */
+			0x124 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat6.sdmmc1_dat6 */
+			0x126 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat7.sdmmc1_dat7 */

The dat{4,5,6,7} pins are not used either on cm-t3530, or cm-t3730.

But it seems to work and makes MMC1 faster :) Might be worth checking though, maybe those pins have multiple optional routings available?

Quoted 11 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 66

Quoted 8 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +8 -0
+	mmc2_pins: pinmux_mmc2_pins {
+		pinctrl-single,pins = <
+			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */
+			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */
+			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */
+			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */
+			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */
+			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

Here the following is missing:
0x134 (PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */

That seems to be used for the wl12xx GPIO, so it's listed at wl12xx_gpio below.

Quoted 7 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 69

Quoted 3 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +3 -0
+			0x136 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat5.sdmmc2_dir_dat1 */
+			0x138 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat6.sdmmc2_dir_cmd */
+			0x13a (PIN_INPUT | MUX_MODE1)		/* sdmmc2_dat7.sdmmc2_clkin */

All four above pins (dat{4,5,6,7}) should be muxed only on cm-t3530. cm-t3730 uses the sdmmc2_dat4 (gpio136) for wl12xx irq, and does nor use the rest (dat{5,6,7}) at all.

Hmm OK, maybe those extra pins also have alternative routings available?

Quoted 7 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 100

Quoted 7 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +7 -0
+	wl12xx_gpio: pinmux_wl12xx_gpio {
+		pinctrl-single,pins = <
+			0xb2 (PIN_OUTPUT | MUX_MODE4)		/* dss_data3.gpio_73 */
+			0x134 (PIN_INPUT | MUX_MODE4)		/* sdmmc2_dat4.gpio_136 */
+		>;
+	};
+};

Regards,

Tony

#3 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Quoted 91 lines · Tony Lindgren
Quoted 6 lines · Igor Grinberg

On 12/13/13 21:22, Tony Lindgren wrote:

SB-T35 has only one SMSC Ethernet on-board (smsc2),
while the first one is on the cm-t3530 and cm-t3730 modules. SBC-T3517 has only one _SMSC_ Ethernet and it is on the SB-T35 base board. cm-t3517 has EMAC Ethernet on-board instead of the SMSC.

OK, I'll move that.

Quoted 9 lines

There is also another base board - CB-T3, which turns into EM-T3530 and EM-T3730 once you plug the cm-t3530 or cm-t3730 into CB-T3.

http://compulab.co.il/products/handheld-computers/em-t3730/
http://compulab.co.il/products/handheld-computers/em-t3530/

The CB-T3 base board does not have any Ethernet controllers on it, so the EM-T3x systems have only one Ethernet controller - the one on the CPU board - SMSC.

OK

Quoted 8 lines

This makes it four boards:
sb-t35 - base board has only one Ethernet controller (SMSC)
cb-t3 - base board has no Ethernet controllers
cm-t3530 - CPU board (plugged into sb-t35) has only one Ethernet controller (SMSC) cm-t3730 - CPU board (plugged into sb-t35) has only one Ethernet controller (SMSC) cm-t3537 - CPU board (plugged into sb-t35) has only one Ethernet controller (EMAC)

The SBC-Txxx and EM-Txxx- means both boards connected (base board with CPU board).

OK

Quoted 12 lines
Quoted 12 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +12 -0
+
+	cpus {
+		cpu at 0 {
+			cpu0-supply = <&vcc>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		ledb {
+			label = "cm-t35:green";
+			gpios = <&gpio6 26 GPIO_ACTIVE_HIGH>;  /* gpio186 */
Quoted 8 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 22

Quoted 1 line
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +1 -0
+			linux,default-trigger = "heartbeat";

Although all CPU boards have the same GPIO routed to the heartbeat LED, this property is related to the CPU board and not to the base (mother) board. The same GPIO is used intensionally for s/w simplicity.
If we are about to save code duplication, I'd like to have a common to CPU boards file, say omap3-cm-t3x.dtsi - that way it will better reflect the actual hardware.

OK will move.

Quoted 11 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 118

Quoted 9 lines

+&i2c1 {

arch/arm/boot/dts/omap3-sb-t35.dtsi new file +8 -0
+	clock-frequency = <2600000>;
+
+	twl: twl at 48 {
+		reg = <0x48>;
+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+		interrupt-parent = <&intc>;
+	};
+};

This one should be a part of the common file.

OK

Quoted 6 lines
Quoted 6 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +6 -0
+#include "twl4030.dtsi"
+#include "twl4030_omap3.dtsi"
+
+&i2c3 {
+	clock-frequency = <400000>;
+};
Quoted 8 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 129

Quoted 4 lines
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +4 -0
+
+&mmc1 {
+	vmmc-supply = <&vmmc1>;
+	vmmc_aux-supply = <&vsim>;

Is it essential to always provide vmmc_aux-supply property? In fact, the TPS65930 does not have the VSIM supply... It is a mistake in the upstream board file.

OK

Quoted 4 lines

I fixed this locally a while ago, but haven't submitted upstream... So we should either leave this property unpopulated (if we can...) or provide a fixed regulator to populate it.

Quoted 6 lines
Quoted 4 lines

arch/arm/boot/dts/omap3-sb-t35.dtsi line 130

Quoted 1 line
arch/arm/boot/dts/omap3-sb-t35.dtsi new file +1 -0
+	bus-width = <8>;

I'm not sure what this property should reflect.
Both cm-t3530 and cm-t3730 use 4 bit MMC1 bus.

Hmm except with the muxing it seems to work just fine with 8-bit :)

Yes, this is because they are just not connected on sb-t35.

Quoted 4 lines

I noticed that by accident as I copied the entry from omap3-evm.

So it seems that all the 8 lines are available for the MMC1, but can be optionally also routed somewhere else?

The concept of having CPU board and base (mother) board implies that our customers build a base board of their own. This way, the customer decides what to do with those lines. cm-t3x just makes them available on the connector, while neither sb-t35, nor cb-t3 uses them.

Quoted 23 lines
Quoted 14 lines
Quoted 14 lines

+++ b/arch/arm/boot/dts/omap3-sbc-t3517.dts

arch/arm/boot/dts/omap3-sbc-t3517.dts new file +11 -0
@@ -0,0 +1,18 @@
+/*
+ * Suppport for CompuLab SBC-T3517 with CM-T3517
+ */
+/dts-v1/;
+
+#include "am3517.dtsi"
+#include "omap3-sb-t35.dtsi"
+
+
+/ {
+	model = "CompuLab SBC-T3517 with CM-T3517";
Quoted 8 lines

arch/arm/boot/dts/omap3-sbc-t3517.dts line 16

Quoted 5 lines
arch/arm/boot/dts/omap3-sbc-t3517.dts new file +5 -0
+	compatible = "compulab,omap3-sbc-t3517", "ti,am3517", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */

Can we support multiple memory sizes through static DT, or the only way is to update this property in the bootloader?

Quoted 3 lines

Well we should probably have a minimal .dts file for the variants too that can include omap3-cm-t37.dts and so on. I guess some bootloaders are capable of rewriting the .dtb too.

Ok. So what do you think, is it fine to have something like:
omap3-cm-t3x.dtsi - common to cm-t3x cpu boards
omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dtsi - cm-t3730 specific
omap3-cm-t3530.dtsi - cm-t3530 specific
omap3-cm-t3517.dtsi - cm-t3517 specific
omap3-sb-t35.dtsi - sb-t35 specific
omap3-cb-t3.dtsi - cb-t3 specific
omap3-sbc-t3730-256mb.dts - sb-t35 with cm-t3730 and 256MB memory size
omap3-sbc-t3730-128mb.dts - sb-t35 with cm-t3730 and 128MB memory size
omap3-sbc-t3730-64mb.dts - sb-t35 with cm-t3730 and 64MB memory size
omap3-sbc-t3530-256mb.dts - sb-t35 with cm-t3530 and 256MB memory size
omap3-sbc-t3530-128mb.dts - sb-t35 with cm-t3530 and 128MB memory size
omap3-sbc-t3530-64mb.dts - sb-t35 with cm-t3530 and 64MB memory size
omap3-sbc-t3517-256mb.dts - sb-t35 with cm-t3517 and 256MB memory size
omap3-sbc-t3517-128mb.dts - sb-t35 with cm-t3517 and 128MB memory size
omap3-em-t3730-256mb.dts - cb-t3 with cm-t3730 and 256MB memory size
omap3-em-t3730-128mb.dts - cb-t3 with cm-t3730 and 128MB memory size
omap3-em-t3730-64mb.dts - cb-t3 with cm-t3730 and 64MB memory size
omap3-em-t3530-256mb.dts - cb-t3 with cm-t3530 and 256MB memory size
omap3-em-t3530-128mb.dts - cb-t3 with cm-t3530 and 128MB memory size
omap3-em-t3530-64mb.dts - cb-t3 with cm-t3530 and 64MB memory size

or is it too much... ;-)))
The above gives the full coverage of the 2x3 boards.

I think we can drop the different memory sizes and
let boot loader adjust the blob. This will make the list shorter:
omap3-cm-t3x.dtsi - common to cm-t3x cpu boards
omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dtsi - cm-t3730 specific
omap3-cm-t3530.dtsi - cm-t3530 specific
omap3-cm-t3517.dtsi - cm-t3517 specific
omap3-sb-t35.dtsi - sb-t35 specific
omap3-cb-t3.dtsi - cb-t3 specific
omap3-sbc-t3730.dts - sb-t35 with cm-t3730 and default memory size
omap3-sbc-t3530.dts - sb-t35 with cm-t3530 and default memory size
omap3-sbc-t3517.dts - sb-t35 with cm-t3517 and default memory size
omap3-em-t3730.dts - cb-t3 with cm-t3730 and default memory size
omap3-em-t3530.dts - cb-t3 with cm-t3530 and default memory size

So what do you think?

Quoted 16 lines
Quoted 15 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 55

Quoted 13 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +12 -0
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <
+			0x114 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */
+			0x116 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */
+			0x118 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat0.sdmmc1_dat0 */
+			0x11a (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat1.sdmmc1_dat1 */
+			0x11c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat2.sdmmc1_dat2 */
+			0x11e (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat3.sdmmc1_dat3 */
+			0x120 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat4.sdmmc1_dat4 */
+			0x122 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat5.sdmmc1_dat5 */
+			0x124 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat6.sdmmc1_dat6 */
+			0x126 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat7.sdmmc1_dat7 */

The dat{4,5,6,7} pins are not used either on cm-t3530, or cm-t3730.

Quoted 2 lines

But it seems to work and makes MMC1 faster :) Might be worth checking though, maybe those pins have multiple optional routings available?

They are routed to the connector of the base board and then... just not connected...
Interesting, how that can make the MMC1 faster? Are you sure?

Quoted 13 lines
Quoted 12 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 66

Quoted 9 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +8 -0
+	mmc2_pins: pinmux_mmc2_pins {
+		pinctrl-single,pins = <
+			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */
+			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */
+			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */
+			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */
+			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */
+			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

Here the following is missing:
0x134 (PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */

Quoted 2 lines

That seems to be used for the wl12xx GPIO, so it's listed at wl12xx_gpio below.

Yes, but only on cm-t3730 (and actually starting from revision 1.2), not cm-t3530...

Quoted 10 lines
Quoted 8 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 69

Quoted 4 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +3 -0
+			0x136 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat5.sdmmc2_dir_dat1 */
+			0x138 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat6.sdmmc2_dir_cmd */
+			0x13a (PIN_INPUT | MUX_MODE1)		/* sdmmc2_dat7.sdmmc2_clkin */

All four above pins (dat{4,5,6,7}) should be muxed only on cm-t3530. cm-t3730 uses the sdmmc2_dat4 (gpio136) for wl12xx irq, and does nor use the rest (dat{5,6,7}) at all.

Hmm OK, maybe those extra pins also have alternative routings available?

The same as with MMC1, they are routed to the connector and not routed at all on sb-t35.

Quoted 13 lines
Quoted 8 lines

arch/arm/boot/dts/omap3-sbc-t3730.dts line 100

Quoted 8 lines
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +7 -0
+	wl12xx_gpio: pinmux_wl12xx_gpio {
+		pinctrl-single,pins = <
+			0xb2 (PIN_OUTPUT | MUX_MODE4)		/* dss_data3.gpio_73 */
+			0x134 (PIN_INPUT | MUX_MODE4)		/* sdmmc2_dat4.gpio_136 */
+		>;
+	};
+};

Regards,

Tony

Signature · 2 lines
Regards,
Igor.
author maintainer
#4 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Quoted 27 lines · Igor Grinberg
Quoted 2 lines · Tony Lindgren
Quoted 1 line · Igor Grinberg

On 12/13/13 21:22, Tony Lindgren wrote:

Ok. So what do you think, is it fine to have something like:
omap3-cm-t3x.dtsi - common to cm-t3x cpu boards
omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dtsi - cm-t3730 specific
omap3-cm-t3530.dtsi - cm-t3530 specific
omap3-cm-t3517.dtsi - cm-t3517 specific
omap3-sb-t35.dtsi - sb-t35 specific
omap3-cb-t3.dtsi - cb-t3 specific
omap3-sbc-t3730-256mb.dts - sb-t35 with cm-t3730 and 256MB memory size
omap3-sbc-t3730-128mb.dts - sb-t35 with cm-t3730 and 128MB memory size
omap3-sbc-t3730-64mb.dts - sb-t35 with cm-t3730 and 64MB memory size
omap3-sbc-t3530-256mb.dts - sb-t35 with cm-t3530 and 256MB memory size
omap3-sbc-t3530-128mb.dts - sb-t35 with cm-t3530 and 128MB memory size
omap3-sbc-t3530-64mb.dts - sb-t35 with cm-t3530 and 64MB memory size
omap3-sbc-t3517-256mb.dts - sb-t35 with cm-t3517 and 256MB memory size
omap3-sbc-t3517-128mb.dts - sb-t35 with cm-t3517 and 128MB memory size
omap3-em-t3730-256mb.dts - cb-t3 with cm-t3730 and 256MB memory size
omap3-em-t3730-128mb.dts - cb-t3 with cm-t3730 and 128MB memory size
omap3-em-t3730-64mb.dts - cb-t3 with cm-t3730 and 64MB memory size
omap3-em-t3530-256mb.dts - cb-t3 with cm-t3530 and 256MB memory size
omap3-em-t3530-128mb.dts - cb-t3 with cm-t3530 and 128MB memory size
omap3-em-t3530-64mb.dts - cb-t3 with cm-t3530 and 64MB memory size

Quoted 2 lines

or is it too much... ;-)))
The above gives the full coverage of the 2x3 boards.

Yeah probably best to patch in the size of the RAM in u-boot :)

Quoted 15 lines

I think we can drop the different memory sizes and
let boot loader adjust the blob. This will make the list shorter:
omap3-cm-t3x.dtsi - common to cm-t3x cpu boards
omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dtsi - cm-t3730 specific
omap3-cm-t3530.dtsi - cm-t3530 specific
omap3-cm-t3517.dtsi - cm-t3517 specific
omap3-sb-t35.dtsi - sb-t35 specific
omap3-cb-t3.dtsi - cb-t3 specific
omap3-sbc-t3730.dts - sb-t35 with cm-t3730 and default memory size
omap3-sbc-t3530.dts - sb-t35 with cm-t3530 and default memory size
omap3-sbc-t3517.dts - sb-t35 with cm-t3517 and default memory size
omap3-em-t3730.dts - cb-t3 with cm-t3730 and default memory size
omap3-em-t3530.dts - cb-t3 with cm-t3530 and default memory size

Quoted 1 line

So what do you think?

Makes sense to me. I've updated the patch below to use the following:

omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dts - cm-t3730 specific, should work on it's own too, not a .dtsi
omap3-sb-t35.dtsi - sb-t35 specific
omap3-sbc-t3730.dts - sb-t35 with cm-t3730 and default memory size

So the only changes compared to your naming are to not use .dtsi extension for omap3-cm-t3730.dts, and I did not add omap3-cm-t3x.dtsi as I don't know the details.

It's probably best that you guys take over this patch from here and add omap3-cm-t3x30.dtsi if needed.

I got the basic stuff working for what I need right now for my router to work, which is MMC, both Ethernet controllers and wl12xx. So I'm not going to tweak this patch further. Of course having the battery charging working would be nice for a router to have a backup battery :)

There are still some issues I've noticed:

1. Removing and reinserting the wl12xx modules seems to kill the WLAN

2. Ethernet interfaces only come up if there's a cable connected

Quoted 15 lines
Quoted 15 lines
Quoted 14 lines

Review

Quoted 12 lines
(quoted diff) +12 -0
+	mmc1_pins: pinmux_mmc1_pins {
+		pinctrl-single,pins = <
+			0x114 (PIN_OUTPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */
+			0x116 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */
+			0x118 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat0.sdmmc1_dat0 */
+			0x11a (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat1.sdmmc1_dat1 */
+			0x11c (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat2.sdmmc1_dat2 */
+			0x11e (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat3.sdmmc1_dat3 */
+			0x120 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat4.sdmmc1_dat4 */
+			0x122 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat5.sdmmc1_dat5 */
+			0x124 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat6.sdmmc1_dat6 */
+			0x126 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat7.sdmmc1_dat7 */

The dat{4,5,6,7} pins are not used either on cm-t3530, or cm-t3730.

Quoted 6 lines
Quoted 2 lines

But it seems to work and makes MMC1 faster :) Might be worth checking though, maybe those pins have multiple optional routings available?

They are routed to the connector of the base board and then... just not connected...
Interesting, how that can make the MMC1 faster? Are you sure?

Nope :) I did a read test with dd, no difference in speed. So they must not be connected like you said. It's weird that MMC works at all with bus-width = <8> though, go figure..

Quoted 12 lines
Quoted 12 lines
Quoted 11 lines

Review

Quoted 8 lines
(quoted diff) +8 -0
+	mmc2_pins: pinmux_mmc2_pins {
+		pinctrl-single,pins = <
+			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */
+			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */
+			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */
+			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */
+			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */
+			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

Here the following is missing:
0x134 (PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */

Quoted 5 lines
Quoted 2 lines

That seems to be used for the wl12xx GPIO, so it's listed at wl12xx_gpio below.

Yes, but only on cm-t3730 (and actually starting from revision 1.2), not cm-t3530...

Sounds like that needs another set of .dts files, or patching in the bootloader.

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

Review

Quoted 3 lines
(quoted diff) +3 -0
+			0x136 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat5.sdmmc2_dir_dat1 */
+			0x138 (PIN_OUTPUT | MUX_MODE1)		/* sdmmc2_dat6.sdmmc2_dir_cmd */
+			0x13a (PIN_INPUT | MUX_MODE1)		/* sdmmc2_dat7.sdmmc2_clkin */

All four above pins (dat{4,5,6,7}) should be muxed only on cm-t3530. cm-t3730 uses the sdmmc2_dat4 (gpio136) for wl12xx irq, and does nor use the rest (dat{5,6,7}) at all.

Quoted 4 lines
Quoted 1 line

Hmm OK, maybe those extra pins also have alternative routings available?

The same as with MMC1, they are routed to the connector and not routed at all on sb-t35.

Left out the extra mmc2 pins too.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

Review

Quoted 7 lines
(quoted diff) +7 -0
+	wl12xx_gpio: pinmux_wl12xx_gpio {
+		pinctrl-single,pins = <
+			0xb2 (PIN_OUTPUT | MUX_MODE4)		/* dss_data3.gpio_73 */
+			0x134 (PIN_INPUT | MUX_MODE4)		/* sdmmc2_dat4.gpio_136 */
+		>;
+	};
+};

And I added pdata-quirks.c support for dealing with the TWL GPIO for now.

Regards,

Tony

8< ----------------------------------
From: Tony Lindgren <[email protected]>
Date: Tue, 10 Dec 2013 15:03:34 -0800
Subject: [PATCH] ARM: dts: Add support for sbc-3xxx with cm-t3730

This adds support for CompuLab SBC-T3530, also known as cm-t3730:

http://compulab.co.il/products/sbcs/sbc-t3530/

It seems that with the sbc-3xxx mainboard is also used on SBC-T3517 and SBC-T3730 with just a different CPU module:

http://compulab.co.il/products/sbcs/sbc-t3517/
http://compulab.co.il/products/sbcs/sbc-t3730/

So let's add a common omap3-sb-t35.dtsi and then separate SoC specific omap3-sbc-t3730.dts, omap3-sbc-t3530.dts and omap3-sbc-t3517.dts.

I've tested this with SBC-T3730 as that's the only one I have. At least serial, both Ethernet controllers, MMC, and wl12xx WLAN work.

Note that WLAN seems to be different for SBC-T3530. And SBC-T3517 may need some changes for the EMAC Ethernet if that's used instead of the smsc911x.

Cc devicetree at vger.kernel.org
Cc Igor Grinberg <[email protected]>
Cc Mike Rapoport <[email protected]>
arch/arm/boot/dts/Makefile +2 -0
index fc37bca..b7af502 100644
@@ -179,6 +179,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap2420-n810-wimax.dtb \
 	omap3430-sdp.dtb \
 	omap3-beagle.dtb \
+	omap3-cm-t3730.dtb \
+	omap3-sbc-t3730.dtb \
 	omap3-devkit8000.dtb \
 	omap3-beagle-xm.dtb \
 	omap3-evm.dtb \
arch/arm/boot/dts/omap3-cm-t3730.dts new file +105 -0

105 lines not on this page · raw message

arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +95 -0

95 lines not on this page · raw message

arch/arm/boot/dts/omap3-sb-t35.dtsi new file +40 -0
new file mode 100644
index 0000000..b9a2fed
@@ -0,0 +1,40 @@
+/*
+ * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730
+ */
+
+&gpmc {
+	ranges = <4 0 0x2d000000 0x01000000>;
+
+	smsc2: ethernet at 4,0 {
+		compatible = "smsc,lan9221", "smsc,lan9115";
+		interrupt-parent = <&gpio3>;
+		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+		reg = <4 0 0xff>;
+		bank-width = <2>;
+		gpmc,mux-add-data;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <186>;
+		gpmc,cs-wr-off-ns = <186>;
+		gpmc,adv-on-ns = <12>;
+		gpmc,adv-rd-off-ns = <48>;
+		gpmc,adv-wr-off-ns = <48>;
+		gpmc,oe-on-ns = <54>;
+		gpmc,oe-off-ns = <168>;
+		gpmc,we-on-ns = <54>;
+		gpmc,we-off-ns = <168>;
+		gpmc,rd-cycle-ns = <186>;
+		gpmc,wr-cycle-ns = <186>;
+		gpmc,access-ns = <114>;
+		gpmc,page-burst-access-ns = <6>;
+		gpmc,bus-turnaround-ns = <12>;
+		gpmc,cycle2cycle-delay-ns = <18>;
+		gpmc,wr-data-mux-bus-ns = <90>;
+		gpmc,wr-access-ns = <186>;
+		gpmc,cycle2cycle-samecsen;
+		gpmc,cycle2cycle-diffcsen;
+		vddvario-supply = <&vddvario>;
+		vdd33a-supply = <&vdd33a>;
+		reg-io-width = <4>;
+		smsc,save-mac-address;
+	};
+};
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +30 -0
new file mode 100644
index 0000000..c119bd5
@@ -0,0 +1,30 @@
+/*
+ * Suppport for CompuLab SBC-T3730 with CM-T3730
+ */
+
+#include "omap3-cm-t3730.dts"
+#include "omap3-sb-t35.dtsi"
+
+/ {
+	model = "CompuLab SBC-T3730 with CM-T3730";
+	compatible = "compulab,omap3-sbc-t3730", "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";
+};
+
+&gpmc {
+	ranges = <5 0 0x2c000000 0x01000000>,
+		 <4 0 0x2d000000 0x01000000>;
+};
+
+&smsc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&smsc2_pins>;
+};
+
+&omap3_pmx_core {
+	smsc2_pins: pinmux_smsc2_pins {
+		pinctrl-single,pins = <
+			0x86 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_ncs4.gpmc_ncs4 */
+			0xa2 (PIN_INPUT_PULLUP | MUX_MODE4)	/* gpmc_wait3.gpio_65 */
+		>;
+	};
+};
\ No newline at end of file
arch/arm/mach-omap2/pdata-quirks.c +31 -0
index 78c6233..6cc7521 100644
@@ -93,6 +93,33 @@ static void __init hsmmc2_internal_input_clk(void)
 	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
 }
 
+static int omap3_sbc_t3730_twl_callback(struct device *dev,
+					   unsigned gpio,
+					   unsigned ngpio)
+{
+	int res;
+
+	res = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
+			       "wlan rst");
+	if (res)
+		return res;
+
+	gpio_export(gpio, 0);
+
+	return 0;
+}
+
+static void __init omap3_sbc_t3730_twl_init(void)
+{
+	twl_gpio_auxdata.setup = omap3_sbc_t3730_twl_callback;
+}
+
+static void __init omap3_sbc_t3730_legacy_init(void)
+{
+	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
+	omap_ads7846_init(1, 57, 0, NULL);
+}
+
 static void __init omap3_igep0020_legacy_init(void)
 {
 	omap3_igep2_display_init_of();
@@ -201,6 +228,9 @@ static struct pdata_init auxdata_quirks[] __initdata = {
 	{ "nokia,n810", omap2420_n8x0_legacy_init, },
 	{ "nokia,n810-wimax", omap2420_n8x0_legacy_init, },
 #endif
+#ifdef CONFIG_ARCH_OMAP3
+	{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_twl_init, },
+#endif
 	{ /* sentinel */ },
 };
 
@@ -229,6 +259,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
  */
 static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP3
+	{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_legacy_init, },
 	{ "nokia,omap3-n900", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
#5 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Quoted 4 lines · Tony Lindgren
Quoted 3 lines · Igor Grinberg
Quoted 2 lines · Tony Lindgren
Quoted 1 line · Igor Grinberg

On 12/13/13 21:22, Tony Lindgren wrote:

[...]

Quoted 20 lines
Quoted 16 lines

I think we can drop the different memory sizes and
let boot loader adjust the blob. This will make the list shorter:
omap3-cm-t3x.dtsi - common to cm-t3x cpu boards
omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dtsi - cm-t3730 specific
omap3-cm-t3530.dtsi - cm-t3530 specific
omap3-cm-t3517.dtsi - cm-t3517 specific
omap3-sb-t35.dtsi - sb-t35 specific
omap3-cb-t3.dtsi - cb-t3 specific
omap3-sbc-t3730.dts - sb-t35 with cm-t3730 and default memory size
omap3-sbc-t3530.dts - sb-t35 with cm-t3530 and default memory size
omap3-sbc-t3517.dts - sb-t35 with cm-t3517 and default memory size
omap3-em-t3730.dts - cb-t3 with cm-t3730 and default memory size
omap3-em-t3530.dts - cb-t3 with cm-t3530 and default memory size

Quoted 1 line

So what do you think?

Makes sense to me. I've updated the patch below to use the following:

Quoted 8 lines

omap3-cm-t3x30.dtsi - common to cm-t3730 and cm-t3530
omap3-cm-t3730.dts - cm-t3730 specific, should work on it's own too, not a .dtsi
omap3-sb-t35.dtsi - sb-t35 specific
omap3-sbc-t3730.dts - sb-t35 with cm-t3730 and default memory size

So the only changes compared to your naming are to not use .dtsi extension for omap3-cm-t3730.dts, and I did not add omap3-cm-t3x.dtsi as I don't know the details.

Ok.

Quoted 3 lines

It's probably best that you guys take over this patch from here and add omap3-cm-t3x30.dtsi if needed.

Ok.

Quoted 6 lines

I got the basic stuff working for what I need right now for my router to work, which is MMC, both Ethernet controllers and wl12xx. So I'm not going to tweak this patch further. Of course having the battery charging working would be nice for a router to have a backup battery :)

Quoted 6 lines

There are still some issues I've noticed:

1. Removing and reinserting the wl12xx modules seems to kill the WLAN

2. Ethernet interfaces only come up if there's a cable connected

I see. Ok then, we'll try to figure those things out.

[...]

Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
Quoted 11 lines

arch/arm/boot/dts/omap3-cm-t3730.dts line 53

Quoted 8 lines
arch/arm/boot/dts/omap3-cm-t3730.dts new file +8 -0
+	mmc2_pins: pinmux_mmc2_pins {
+		pinctrl-single,pins = <
+			0x128 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_clk.sdmmc2_clk */
+			0x12a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_cmd.sdmmc2_cmd */
+			0x12c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat0.sdmmc2_dat0 */
+			0x12e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat1.sdmmc2_dat1 */
+			0x130 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat2.sdmmc2_dat2 */
+			0x132 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc2_dat3.sdmmc2_dat3 */

Here the following is missing:
0x134 (PIN_OUTPUT | MUX_MODE1) /* sdmmc2_dat4.sdmmc2_dir_dat0 */

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

That seems to be used for the wl12xx GPIO, so it's listed at wl12xx_gpio below.

Yes, but only on cm-t3730 (and actually starting from revision 1.2), not cm-t3530...

Sounds like that needs another set of .dts files, or patching in the bootloader.

Yep, IMO, .dts will be better, as I think pinmux is something the kernel should be aware of...

[...]

Quoted 23 lines

8< ----------------------------------
From: Tony Lindgren <[email protected]>
Date: Tue, 10 Dec 2013 15:03:34 -0800
Subject: [PATCH] ARM: dts: Add support for sbc-3xxx with cm-t3730

This adds support for CompuLab SBC-T3530, also known as cm-t3730:

http://compulab.co.il/products/sbcs/sbc-t3530/

It seems that with the sbc-3xxx mainboard is also used on SBC-T3517 and SBC-T3730 with just a different CPU module:

http://compulab.co.il/products/sbcs/sbc-t3517/
http://compulab.co.il/products/sbcs/sbc-t3730/

So let's add a common omap3-sb-t35.dtsi and then separate SoC specific omap3-sbc-t3730.dts, omap3-sbc-t3530.dts and omap3-sbc-t3517.dts.

I've tested this with SBC-T3730 as that's the only one I have. At least serial, both Ethernet controllers, MMC, and wl12xx WLAN work.

Quoted 8 lines

Note that WLAN seems to be different for SBC-T3530. And SBC-T3517 may need some changes for the EMAC Ethernet if that's used instead of the smsc911x.

Cc devicetree at vger.kernel.org
Cc Igor Grinberg <[email protected]>
Cc Mike Rapoport <[email protected]>

This one looks great!
Really minor comments below (we can fix those later)

[...]

Quoted 5 lines
arch/arm/boot/dts/omap3-cm-t3730.dts new file +0 -0
new file mode 100644
index 0000000..80cf668

[...]

arch/arm/boot/dts/omap3-cm-t3730.dts line 81

Quoted 3 lines

+&mmc1 {

arch/arm/boot/dts/omap3-cm-t3730.dts new file +2 -0
+	vmmc-supply = <&vmmc1>;
+	vmmc_aux-supply = <&vsim>;

vsim is not present in TPS65930...
can be just left empty or set to a fixed voltage regulator.

Quoted 4 lines
arch/arm/boot/dts/omap3-cm-t3730.dts new file +4 -0
+	bus-width = <4>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+};

[...]

Quoted 5 lines
arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +0 -0
new file mode 100644
index 0000000..bf1b72c

[...]

arch/arm/boot/dts/omap3-cm-t3x30.dtsi line 77

Quoted 2 lines

+&i2c1 {

arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +1 -0
+	clock-frequency = <2600000>;

There is also an EEPROM on this bus, although we still don't have it registered in the dts, but it can be registered from userspace and is also accessible using i2c-tools. This should be 400KHz max for the EEPROM to work.

Quoted 7 lines
arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +7 -0
+
+	twl: twl at 48 {
+		reg = <0x48>;
+		interrupts = <7>; /* SYS_NIRQ cascaded to intc */
+		interrupt-parent = <&intc>;
+	};
+};

[...]

Signature · 2 lines
Regards,
Igor.
author maintainer
#6 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Quoted 5 lines · Igor Grinberg

This one looks great!
Really minor comments below (we can fix those later)

Updated patch below, then signing it off to you guys :)

Quoted 11 lines
Quoted 2 lines
arch/arm/boot/dts/omap3-cm-t3730.dts new file +0 -0

[...]

arch/arm/boot/dts/omap3-cm-t3730.dts

Quoted 3 lines

+&mmc1 {

arch/arm/boot/dts/omap3-cm-t3730.dts new file +2 -0
+	vmmc-supply = <&vmmc1>;
+	vmmc_aux-supply = <&vsim>;

vsim is not present in TPS65930...
can be just left empty or set to a fixed voltage regulator.

Oops right if the pins 4 - 8 are not connected, no aux regulator is needed.

Quoted 5 lines
Quoted 2 lines
arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +0 -0

[...]

Quoted 7 lines

arch/arm/boot/dts/omap3-cm-t3x30.dtsi

Quoted 2 lines

+&i2c1 {

arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +1 -0
+	clock-frequency = <2600000>;

There is also an EEPROM on this bus, although we still don't have it registered in the dts, but it can be registered from userspace and is also accessible using i2c-tools. This should be 400KHz max for the EEPROM to work.

OK updated that too below.

I've kept your Ack as the changes were minor. If no other comments, I will apply this into omap-for-v3.14/dt probably on Thursday.

Regards,

Tony

8< ----------------------------
From: Tony Lindgren <[email protected]>
Date: Wed, 18 Dec 2013 13:13:21 -0800
Subject: [PATCH] ARM: dts: Add support for sbc-3xxx with cm-t3730

This adds support for CompuLab SBC-T3530, also known as cm-t3730:

http://compulab.co.il/products/sbcs/sbc-t3530/

It seems that with the sbc-3xxx mainboard is also used on SBC-T3517 and SBC-T3730 with just a different CPU module:

http://compulab.co.il/products/sbcs/sbc-t3517/
http://compulab.co.il/products/sbcs/sbc-t3730/

So let's add a common omap3-sb-t35.dtsi and then separate SoC specific omap3-sbc-t3730.dts, omap3-sbc-t3530.dts and omap3-sbc-t3517.dts.

I've tested this with SBC-T3730 as that's the only one I have. At least serial, both Ethernet controllers, MMC, and wl12xx WLAN work.

Note that WLAN seems to be different for SBC-T3530. And SBC-T3517 may need some changes for the EMAC Ethernet if that's used instead of the smsc911x.

Cc devicetree at vger.kernel.org
Cc Mike Rapoport <[email protected]>
arch/arm/boot/dts/Makefile +2 -0
index fc37bca..b7af502 100644
@@ -179,6 +179,8 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap2420-n810-wimax.dtb \
 	omap3430-sdp.dtb \
 	omap3-beagle.dtb \
+	omap3-cm-t3730.dtb \
+	omap3-sbc-t3730.dtb \
 	omap3-devkit8000.dtb \
 	omap3-beagle-xm.dtb \
 	omap3-evm.dtb \
arch/arm/boot/dts/omap3-cm-t3730.dts new file +104 -0

104 lines not on this page · raw message

arch/arm/boot/dts/omap3-cm-t3x30.dtsi new file +95 -0

95 lines not on this page · raw message

arch/arm/boot/dts/omap3-sb-t35.dtsi new file +40 -0
new file mode 100644
index 0000000..b9a2fed
@@ -0,0 +1,40 @@
+/*
+ * Common support for CompuLab SB-T35 used on SBC-T3530, SBC-T3517 and SBC-T3730
+ */
+
+&gpmc {
+	ranges = <4 0 0x2d000000 0x01000000>;
+
+	smsc2: ethernet at 4,0 {
+		compatible = "smsc,lan9221", "smsc,lan9115";
+		interrupt-parent = <&gpio3>;
+		interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
+		reg = <4 0 0xff>;
+		bank-width = <2>;
+		gpmc,mux-add-data;
+		gpmc,cs-on-ns = <0>;
+		gpmc,cs-rd-off-ns = <186>;
+		gpmc,cs-wr-off-ns = <186>;
+		gpmc,adv-on-ns = <12>;
+		gpmc,adv-rd-off-ns = <48>;
+		gpmc,adv-wr-off-ns = <48>;
+		gpmc,oe-on-ns = <54>;
+		gpmc,oe-off-ns = <168>;
+		gpmc,we-on-ns = <54>;
+		gpmc,we-off-ns = <168>;
+		gpmc,rd-cycle-ns = <186>;
+		gpmc,wr-cycle-ns = <186>;
+		gpmc,access-ns = <114>;
+		gpmc,page-burst-access-ns = <6>;
+		gpmc,bus-turnaround-ns = <12>;
+		gpmc,cycle2cycle-delay-ns = <18>;
+		gpmc,wr-data-mux-bus-ns = <90>;
+		gpmc,wr-access-ns = <186>;
+		gpmc,cycle2cycle-samecsen;
+		gpmc,cycle2cycle-diffcsen;
+		vddvario-supply = <&vddvario>;
+		vdd33a-supply = <&vdd33a>;
+		reg-io-width = <4>;
+		smsc,save-mac-address;
+	};
+};
arch/arm/boot/dts/omap3-sbc-t3730.dts new file +30 -0
new file mode 100644
index 0000000..c119bd5
@@ -0,0 +1,30 @@
+/*
+ * Suppport for CompuLab SBC-T3730 with CM-T3730
+ */
+
+#include "omap3-cm-t3730.dts"
+#include "omap3-sb-t35.dtsi"
+
+/ {
+	model = "CompuLab SBC-T3730 with CM-T3730";
+	compatible = "compulab,omap3-sbc-t3730", "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";
+};
+
+&gpmc {
+	ranges = <5 0 0x2c000000 0x01000000>,
+		 <4 0 0x2d000000 0x01000000>;
+};
+
+&smsc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&smsc2_pins>;
+};
+
+&omap3_pmx_core {
+	smsc2_pins: pinmux_smsc2_pins {
+		pinctrl-single,pins = <
+			0x86 (PIN_OUTPUT | MUX_MODE0)		/* gpmc_ncs4.gpmc_ncs4 */
+			0xa2 (PIN_INPUT_PULLUP | MUX_MODE4)	/* gpmc_wait3.gpio_65 */
+		>;
+	};
+};
\ No newline at end of file
arch/arm/mach-omap2/pdata-quirks.c +31 -0
index 5aaf720..3d5b24d 100644
@@ -92,6 +92,33 @@ static void __init hsmmc2_internal_input_clk(void)
 	omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1);
 }
 
+static int omap3_sbc_t3730_twl_callback(struct device *dev,
+					   unsigned gpio,
+					   unsigned ngpio)
+{
+	int res;
+
+	res = gpio_request_one(gpio + 2, GPIOF_OUT_INIT_HIGH,
+			       "wlan rst");
+	if (res)
+		return res;
+
+	gpio_export(gpio, 0);
+
+	return 0;
+}
+
+static void __init omap3_sbc_t3730_twl_init(void)
+{
+	twl_gpio_auxdata.setup = omap3_sbc_t3730_twl_callback;
+}
+
+static void __init omap3_sbc_t3730_legacy_init(void)
+{
+	legacy_init_wl12xx(WL12XX_REFCLOCK_38, 0, 136);
+	omap_ads7846_init(1, 57, 0, NULL);
+}
+
 static void __init omap3_igep0020_legacy_init(void)
 {
 	omap3_igep2_display_init_of();
@@ -200,6 +227,9 @@ static struct pdata_init auxdata_quirks[] __initdata = {
 	{ "nokia,n810", omap2420_n8x0_legacy_init, },
 	{ "nokia,n810-wimax", omap2420_n8x0_legacy_init, },
 #endif
+#ifdef CONFIG_ARCH_OMAP3
+	{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_twl_init, },
+#endif
 	{ /* sentinel */ },
 };
 
@@ -228,6 +258,7 @@ struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
  */
 static struct pdata_init pdata_quirks[] __initdata = {
 #ifdef CONFIG_ARCH_OMAP3
+	{ "compulab,omap3-sbc-t3730", omap3_sbc_t3730_legacy_init, },
 	{ "nokia,omap3-n900", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n9", hsmmc2_internal_input_clk, },
 	{ "nokia,omap3-n950", hsmmc2_internal_input_clk, },
#7 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

On 12/18/13 23:16, Tony Lindgren wrote:

[...]

Quoted 4 lines

I've kept your Ack as the changes were minor. If no other comments, I will apply this into omap-for-v3.14/dt probably on Thursday.

Looks great! Thanks!

Signature · 2 lines
Regards,
Igor.
author maintainer
#8 lore raw

PATCH 1/1 ARM: dts: Add support for sbc-3xxx with cm-t3730

Quoted 10 lines · Igor Grinberg

On 12/18/13 23:16, Tony Lindgren wrote:

[...]

Quoted 4 lines

I've kept your Ack as the changes were minor. If no other comments, I will apply this into omap-for-v3.14/dt probably on Thursday.

Looks great! Thanks!

Thanks for your comments, I've pushed it out to omap-for-v3.14/dt now.

Regards,

Tony