arm: dts: add initial support for TBS2910 Matrix ARM mini PC

PATCH New Soeren Moch 4 participants 12 messages Oct 18, 2014 – Oct 26, 2014

Subsystems (3)

Device tree bindings Arm i.MX and Layerscape Arm and arm64 SoC sub-architectures (common parts)

lore

Share & tools

lore

Soeren Moch

author

2014-10-18 12:27 UTC #0 lore raw

PATCH 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html

Signed-off-by Soeren Moch <[email protected]>

---
 arch/arm/boot/dts/Makefile          |   1 +
 arch/arm/boot/dts/imx6q-tbs2910.dts | 415 ++++++++++++++++++++++++++++++++++++
 2 files changed, 416 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts

arch/arm/boot/dts/Makefile +1 -0

index b8c5cd3..f6ad478 100644
@@ -230,6 +230,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-sbc6x.dtb \
+	imx6q-tbs2910.dtb \
 	imx6q-udoo.dtb \
 	imx6q-wandboard.dtb \
 	imx6q-wandboard-revb1.dtb \

arch/arm/boot/dts/imx6q-tbs2910.dts new file +415 -0

415 lines not on this page · raw message

Signature · 1 line

1.9.1

Sebastian Hesselbarth

2014-10-21 07:40 UTC #1 lore raw

PATCH 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

[Adding IMX maintainers to Cc]

S?ren,

Quoted 38 lines · Soeren Moch

TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html

Signed-off-by Soeren Moch <[email protected]>

---
  arch/arm/boot/dts/Makefile          |   1 +
  arch/arm/boot/dts/imx6q-tbs2910.dts | 415 ++++++++++++++++++++++++++++++++++++
  2 files changed, 416 insertions(+)

create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts

arch/arm/boot/dts/Makefile +1 -0

index b8c5cd3..f6ad478 100644
@@ -230,6 +230,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
  	imx6q-sabrelite.dtb \
  	imx6q-sabresd.dtb \
  	imx6q-sbc6x.dtb \
+	imx6q-tbs2910.dtb \
  	imx6q-udoo.dtb \
  	imx6q-wandboard.dtb \
  	imx6q-wandboard-revb1.dtb \

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

new file mode 100644
index 0000000..1033cbd
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2014 Soeren Moch <[email protected]>
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html

arch/arm/boot/dts/imx6q-tbs2910.dts line 20

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+

nit: remove extra empty line.

arch/arm/boot/dts/imx6q-tbs2910.dts line 23

Quoted 3 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +3 -0
+/ {
+	model = "TBS2910 Matrix ARM mini PC";
+	compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";

"tbs" isn't documented in "Documentation/devicetree/bindings/vendor-prefixes.txt". You need to add a line for it.

Also, board compatible should only be "tbs,tbs2910".

Quoted 4 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +4 -0
+
+	chosen {
+		stdout-path = &uart1;
+	};

arch/arm/boot/dts/imx6q-tbs2910.dts line 37

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+
+	memory {
+		reg = <0x10000000 0x80000000>;
+	};
+
+	fan {
+		compatible = "gpio-fan";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_fan>;
+		gpios = <&gpio3 28 0>;

You already include gpio.h, use GPIO_ACTIVE_{HIGH,LOW} for all gpios properties.

Quoted 9 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +9 -0

+		gpio-fan,speed-map = <0    0
+				      3000 1>;
+	};
+
+	ir_recv {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio3 18 1>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ir>;

arch/arm/boot/dts/imx6q-tbs2910.dts line 56

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
+
+		blue {
+		        gpios = <&gpio1 2 0>;
+		        default-state = "on";

I'd say default-state = "keep". Also give the LED a more meaningful name like "power" and add a label = "power:blue".

And: There is whitespaces instead of TABs in the last level of indentation.

Besides the comments above, this looks good to me from a DT point-of-view, so you can add my

Reviewed-by Sebastian Hesselbarth <[email protected]>

and don't forget to add Shawn and Sascha when sending a v2.

Sebastian

Quoted 360 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +359 -0

+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg_2p5v: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "2P5V";
+			regulator-min-microvolt = <2500000>;
+			regulator-max-microvolt = <2500000>;
+			regulator-always-on;
+		};
+
+		reg_3p3v: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+
+		reg_5p0v: regulator at 2 {
+			compatible = "regulator-fixed";
+			reg = <2>;
+			regulator-name = "5P0V";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-always-on;
+		};
+	};
+
+	sound-sgtl5000 {
+		audio-codec = <&sgtl5000>;
+		audio-routing =
+			"MIC_IN", "Mic Jack",
+			"Mic Jack", "Mic Bias",
+			"Headphone Jack", "HP_OUT";
+		compatible = "fsl,imx-audio-sgtl5000";
+		model = "On-board Codec";
+		mux-ext-port = <3>;
+		mux-int-port = <1>;
+		ssi-controller = <&ssi1>;
+	};
+
+	sound-spdif {
+		compatible = "fsl,imx-audio-spdif";
+		model = "On-board SPDIF";
+		spdif-controller = <&spdif>;
+		spdif-out;
+	};
+};
+
+&audmux {
+	status = "okay";
+};
+
+&fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio1 25 0>;
+	status = "okay";
+};
+
+&hdmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hdmi>;
+	ddc-i2c-bus = <&i2c2>;
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c1>;
+	status = "okay";
+
+	sgtl5000: sgtl5000 at 0a {
+		clocks = <&clks 201>;
+		compatible = "fsl,sgtl5000";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_sgtl5000>;
+		reg = <0x0a>;
+		VDDA-supply = <&reg_2p5v>;
+		VDDIO-supply = <&reg_3p3v>;
+	};
+};
+
+&i2c2 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c2>;
+	status = "okay";
+};
+
+&i2c3 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3>;
+	status = "okay";
+
+	rtc: ds1307 at 68 {
+		compatible = "dallas,ds1307";
+		reg = <0x68>;
+	};
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	imx6q-tbs2910 {
+		pinctrl_hog: hoggrp {
+			fsl,pins = <
+				MX6QDL_PAD_NANDF_D0__GPIO2_IO00       0x80000000
+				MX6QDL_PAD_NANDF_D1__GPIO2_IO01       0x80000000
+				MX6QDL_PAD_NANDF_D2__GPIO2_IO02       0x80000000
+				MX6QDL_PAD_NANDF_D3__GPIO2_IO03       0x80000000
+				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07      0x80000000
+				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29      0x80000000
+				MX6QDL_PAD_EIM_D22__GPIO3_IO22        0x80000000
+				MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25    0x80000000
+			>;
+		};
+
+		pinctrl_enet: enetgrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
+				MX6QDL_PAD_ENET_MDC__ENET_MDC         0x1b0b0
+				MX6QDL_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
+				MX6QDL_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
+				MX6QDL_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
+				MX6QDL_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
+				MX6QDL_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
+				MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
+				MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
+				MX6QDL_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
+				MX6QDL_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
+				MX6QDL_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
+				MX6QDL_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
+				MX6QDL_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
+				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+				MX6QDL_PAD_GPIO_16__ENET_REF_CLK      0x4001b0a8
+			>;
+		};
+
+		pinctrl_hdmi: hdmigrp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+			>;
+		};
+
+		pinctrl_i2c1: i2c1grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT9__I2C1_SCL        0x4001b8b1
+				MX6QDL_PAD_CSI0_DAT8__I2C1_SDA        0x4001b8b1
+			>;
+		};
+
+		pinctrl_i2c2: i2c2grp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_COL3__I2C2_SCL         0x4001b8b1
+				MX6QDL_PAD_KEY_ROW3__I2C2_SDA         0x4001b8b1
+			>;
+		};
+
+		pinctrl_i2c3: i2c3grp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_3__I2C3_SCL           0x4001b8b1
+				MX6QDL_PAD_GPIO_6__I2C3_SDA           0x4001b8b1
+			>;
+		};
+
+		pinctrl_ir: irgrp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D18__GPIO3_IO18        0x80000000
+			>;
+		};
+
+		pinctrl_pcie: pciegrp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_17__GPIO7_IO12        0x80000000
+			>;
+		};
+
+		pinctrl_sgtl5000: sgtl5000grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD        0x130b0
+				MX6QDL_PAD_CSI0_DAT4__AUD3_TXC        0x130b0
+				MX6QDL_PAD_CSI0_DAT5__AUD3_TXD        0x110b0
+				MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS       0x130b0
+				MX6QDL_PAD_GPIO_0__CCM_CLKO1          0x130b0
+			>;
+		};
+
+		pinctrl_spdif: spdifgrp {
+			fsl,pins = <MX6QDL_PAD_GPIO_19__SPDIF_OUT     0x13091
+			>;
+		};
+
+		pinctrl_uart1: uart1grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA  0x1b0b1
+				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA  0x1b0b1
+			>;
+		};
+
+		pinctrl_uart2: uart2grp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D26__UART2_TX_DATA     0x1b0b1
+				MX6QDL_PAD_EIM_D27__UART2_RX_DATA     0x1b0b1
+			>;
+		};
+
+		pinctrl_usbotg: usbotggrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID     0x17059
+			>;
+		};
+
+		pinctrl_usdhc2: usdhc2grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD           0x17059
+				MX6QDL_PAD_SD2_CLK__SD2_CLK           0x10059
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0        0x17059
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1        0x17059
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2        0x17059
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3        0x17059
+			>;
+		};
+
+		pinctrl_usdhc3: usdhc3grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD3_CMD__SD3_CMD           0x17059
+				MX6QDL_PAD_SD3_CLK__SD3_CLK           0x10059
+				MX6QDL_PAD_SD3_DAT0__SD3_DATA0        0x17059
+				MX6QDL_PAD_SD3_DAT1__SD3_DATA1        0x17059
+				MX6QDL_PAD_SD3_DAT2__SD3_DATA2        0x17059
+				MX6QDL_PAD_SD3_DAT3__SD3_DATA3        0x17059
+			>;
+		};
+
+		pinctrl_usdhc4: usdhc4grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD4_CMD__SD4_CMD           0x17059
+				MX6QDL_PAD_SD4_CLK__SD4_CLK           0x10059
+				MX6QDL_PAD_SD4_DAT0__SD4_DATA0        0x17059
+				MX6QDL_PAD_SD4_DAT1__SD4_DATA1        0x17059
+				MX6QDL_PAD_SD4_DAT2__SD4_DATA2        0x17059
+				MX6QDL_PAD_SD4_DAT3__SD4_DATA3        0x17059
+				MX6QDL_PAD_SD4_DAT4__SD4_DATA4        0x17059
+				MX6QDL_PAD_SD4_DAT5__SD4_DATA5        0x17059
+				MX6QDL_PAD_SD4_DAT6__SD4_DATA6        0x17059
+				MX6QDL_PAD_SD4_DAT7__SD4_DATA7        0x17059
+			>;
+		};
+	};
+
+	gpio_fan {
+		pinctrl_gpio_fan: gpiofangrp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D28__GPIO3_IO28        0x80000000
+			>;
+		};
+	};
+
+	gpio_leds {
+		pinctrl_gpio_leds: gpioledsgrp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_2__GPIO1_IO02         0x80000000
+			>;
+		};
+	};
+};
+
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pcie>;
+	reset-gpio = <&gpio7 12 0>;
+	status = "okay";
+};
+
+&sata {
+	status = "okay";
+};
+
+&snvs_poweroff {
+	status = "okay";
+};
+
+&spdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spdif>;
+	status = "okay";
+};
+
+&ssi1 {
+	fsl,mode = "i2s-slave";
+	status = "okay";
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
+	status = "okay";
+};
+
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart2>;
+	status = "okay";
+};
+
+&usbh1 {
+	vbus-supply = <&reg_5p0v>;
+	status = "okay";
+};
+
+&usbotg {
+	vbus-supply = <&reg_5p0v>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usbotg>;
+	disable-over-current;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2>;
+	bus-width = <4>;
+	cd-gpios = <&gpio2 2 0>;
+	wp-gpios = <&gpio2 3 0>;
+	vmmc-supply = <&reg_3p3v>;
+	status = "okay";
+};
+
+&usdhc3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	bus-width = <4>;
+	cd-gpios = <&gpio2 0 0>;
+	wp-gpios = <&gpio2 1 0>;
+	vmmc-supply = <&reg_3p3v>;
+	status = "okay";
+};
+
+&usdhc4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc4>;
+	bus-width = <8>;
+	non-removable;
+	no-1-8-v;
+	status = "okay";
+};

Sören Moch

author

2014-10-21 11:57 UTC #2 lore raw

PATCH 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Sebastian,

Thanks for your review.

Quoted 6 lines

arch/arm/boot/dts/imx6q-tbs2910.dts line 23
Quoted 3 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +3 -0
+/ {
+    model = "TBS2910 Matrix ARM mini PC";
+    compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
[...]
Also, board compatible should only be "tbs,tbs2910".

Similar boards use e.g.

	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
	compatible = "udoo,imx6q-udoo", "fsl,imx6q";
	compatible = "wand,imx6q-wandboard", "fsl,imx6q";

So is it really better to use only "tbs,tbs2910" here?

Soeren

Sebastian Hesselbarth

2014-10-21 12:03 UTC #3 lore raw

PATCH 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Quoted 7 lines · S?ren Moch

Quoted 6 lines
arch/arm/boot/dts/imx6q-tbs2910.dts line 23
Quoted 3 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +3 -0
+/ {
+    model = "TBS2910 Matrix ARM mini PC";
+    compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
[...]
Also, board compatible should only be "tbs,tbs2910".

Quoted 6 lines

Similar boards use e.g.
     compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
     compatible = "udoo,imx6q-udoo", "fsl,imx6q";
     compatible = "wand,imx6q-wandboard", "fsl,imx6q";
So is it really better to use only "tbs,tbs2910" here?

Hmm, having the SoC name again in the board compatible seems odd to me, e.g. we have "google,chromecast" without the SoC name in it.

Anyway, it is just a compatible and if it is common for imx- based boards or Shawn/Sascha like to have it this way you should stick with that, of course.

Sebastian

Sascha Hauer

maintainer

2014-10-21 14:17 UTC #4 lore raw

PATCH 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Quoted 13 lines · Sebastian Hesselbarth

Quoted 12 lines · S?ren Moch
Quoted 6 lines
arch/arm/boot/dts/imx6q-tbs2910.dts line 23
Quoted 3 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +3 -0
+/ {
+    model = "TBS2910 Matrix ARM mini PC";
+    compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
[...]
Also, board compatible should only be "tbs,tbs2910".
Similar boards use e.g.
    compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
    compatible = "udoo,imx6q-udoo", "fsl,imx6q";
    compatible = "wand,imx6q-wandboard", "fsl,imx6q";

Quoted 5 lines

Quoted 1 line
So is it really better to use only "tbs,tbs2910" here?
Hmm, having the SoC name again in the board compatible seems odd to me, e.g. we have "google,chromecast" without the SoC name in it.

No. My vanilla 3.17 kernel has this:

arch/arm/boot/dts/berlin2cd-google-chromecast.dts:17: compatible = "google,chromecast", "marvell,berlin2cd", "marvell,berlin";

Quoted 4 lines

Anyway, it is just a compatible and if it is common for imx- based boards or Shawn/Sascha like to have it this way you should stick with that, of course.

It has to be that way, because the kernel matches to "marvell,berlin", not the board name. Otherwise we would have to compile in all board compatible strings into the kernel or the kernel would refuse to start.

Sascha

Signature · 4 lines

Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Sebastian Hesselbarth

2014-10-21 18:25 UTC #5 lore raw

PATCH 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Quoted 16 lines · Sascha Hauer

Quoted 15 lines · Sebastian Hesselbarth
Quoted 13 lines · S?ren Moch
Quoted 6 lines
arch/arm/boot/dts/imx6q-tbs2910.dts line 23
Quoted 3 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +3 -0
+/ {
+    model = "TBS2910 Matrix ARM mini PC";
+    compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
[...]
Also, board compatible should only be "tbs,tbs2910".
Similar boards use e.g.
     compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
     compatible = "udoo,imx6q-udoo", "fsl,imx6q";
     compatible = "wand,imx6q-wandboard", "fsl,imx6q";
So is it really better to use only "tbs,tbs2910" here?

Quoted 7 lines

Quoted 3 lines
Hmm, having the SoC name again in the board compatible seems odd to me, e.g. we have "google,chromecast" without the SoC name in it.
No. My vanilla 3.17 kernel has this:
arch/arm/boot/dts/berlin2cd-google-chromecast.dts:17: compatible = "google,chromecast", "marvell,berlin2cd", "marvell,berlin";

Right, I didn't question that there should be "fsl,imx6q" at the end of the array of compatibles. But there is no need for another "imx6q" in the board name, e.g. "tbs,tbs2910" instead of "tbs,imx6q-tbs2910".

Quoted 7 lines

Quoted 3 lines
Anyway, it is just a compatible and if it is common for imx- based boards or Shawn/Sascha like to have it this way you should stick with that, of course.
It has to be that way, because the kernel matches to "marvell,berlin", not the board name. Otherwise we would have to compile in all board compatible strings into the kernel or the kernel would refuse to start.

Yup. No doubt, it was just about imx6q in the board's compatible.

Sebastian

Soeren Moch

author

2014-10-21 20:23 UTC #6 lore raw

PATCH v2 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

In reply to Soeren Moch

TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html

Reviewed-by Sebastian Hesselbarth <[email protected]>

Signed-off-by Soeren Moch <[email protected]>

---
Cc: Sebastian Hesselbarth <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>

Changes for v2:
- add tbs vendor prefix to vendor-prefixes.txt
- use GPIO_ACTIVE_{HIGH,LOW}
- add led label and default-state="keep"
- whitespace cleanup

---
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/imx6q-tbs2910.dts                | 415 +++++++++++++++++++++
 3 files changed, 417 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0

index ac7269f..2204b49 100644
@@ -133,6 +133,7 @@ st	STMicroelectronics
 ste	ST-Ericsson
 stericsson	ST-Ericsson
 synology	Synology, Inc.
+tbs	Turbosight (TBS) Technologies
 ti	Texas Instruments
 tlm	Trusted Logic Mobility
 toradex	Toradex AG

arch/arm/boot/dts/Makefile +1 -0

index b8c5cd3..f6ad478 100644
@@ -230,6 +230,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-sbc6x.dtb \
+	imx6q-tbs2910.dtb \
 	imx6q-udoo.dtb \
 	imx6q-wandboard.dtb \
 	imx6q-wandboard-revb1.dtb \

arch/arm/boot/dts/imx6q-tbs2910.dts new file +415 -0

415 lines not on this page · raw message

Signature · 1 line

1.9.1

Shawn Guo

2014-10-25 15:33 UTC #7 lore raw

PATCH v2 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Hi Soeren,

Very neat patch! A couple of minor comments below ...

Quoted 10 lines · Soeren Moch

TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html
Reviewed-by Sebastian Hesselbarth <[email protected]>
Signed-off-by Soeren Moch <[email protected]>
---
Cc: Sebastian Hesselbarth <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>

Quoted 7 lines

Changes for v2:
- add tbs vendor prefix to vendor-prefixes.txt
- use GPIO_ACTIVE_{HIGH,LOW}
- add led label and default-state="keep"
- whitespace cleanup
---
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +

This is not an i.MX change. It should go through DT tree or we need an ACK from DT maintainers.

Quoted 37 lines

 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/imx6q-tbs2910.dts                | 415 +++++++++++++++++++++
 3 files changed, 417 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0

index ac7269f..2204b49 100644
@@ -133,6 +133,7 @@ st	STMicroelectronics
 ste	ST-Ericsson
 stericsson	ST-Ericsson
 synology	Synology, Inc.
+tbs	Turbosight (TBS) Technologies
 ti	Texas Instruments
 tlm	Trusted Logic Mobility
 toradex	Toradex AG

arch/arm/boot/dts/Makefile +1 -0

index b8c5cd3..f6ad478 100644
@@ -230,6 +230,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-sbc6x.dtb \
+	imx6q-tbs2910.dtb \
 	imx6q-udoo.dtb \
 	imx6q-wandboard.dtb \
 	imx6q-wandboard-revb1.dtb \

arch/arm/boot/dts/imx6q-tbs2910.dts new file +2 -0

new file mode 100644
index 0000000..60a91ee
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2014 Soeren Moch <[email protected]>

arch/arm/boot/dts/imx6q-tbs2910.dts line 12

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */

It's been discussed that GPL is not a proper licence for device tree source, which might be used on other system like FreeBSD. So for new DTS files, it's recommended to use copyright in the following example.

http://www.spinics.net/lists/devicetree/msg54551.html

Quoted 147 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +147 -0

+
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	model = "TBS2910 Matrix ARM mini PC";
+	compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
+
+	chosen {
+		stdout-path = &uart1;
+	};
+
+	memory {
+		reg = <0x10000000 0x80000000>;
+	};
+
+	fan {
+		compatible = "gpio-fan";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_fan>;
+		gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
+		gpio-fan,speed-map = <0    0
+				      3000 1>;
+	};
+
+	ir_recv {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ir>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
+
+		blue {
+		        label = "blue_status_led";
+		        gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+		        default-state = "keep";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg_2p5v: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "2P5V";
+			regulator-min-microvolt = <2500000>;
+			regulator-max-microvolt = <2500000>;
+			regulator-always-on;
+		};
+
+		reg_3p3v: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+
+		reg_5p0v: regulator at 2 {
+			compatible = "regulator-fixed";
+			reg = <2>;
+			regulator-name = "5P0V";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-always-on;
+		};
+	};
+
+	sound-sgtl5000 {
+		audio-codec = <&sgtl5000>;
+		audio-routing =
+			"MIC_IN", "Mic Jack",
+			"Mic Jack", "Mic Bias",
+			"Headphone Jack", "HP_OUT";
+		compatible = "fsl,imx-audio-sgtl5000";
+		model = "On-board Codec";
+		mux-ext-port = <3>;
+		mux-int-port = <1>;
+		ssi-controller = <&ssi1>;
+	};
+
+	sound-spdif {
+		compatible = "fsl,imx-audio-spdif";
+		model = "On-board SPDIF";
+		spdif-controller = <&spdif>;
+		spdif-out;
+	};
+};
+
+&audmux {
+	status = "okay";
+};
+
+&fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&hdmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hdmi>;
+	ddc-i2c-bus = <&i2c2>;
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c1>;
+	status = "okay";
+
+	sgtl5000: sgtl5000 at 0a {
+		clocks = <&clks 201>;
+		compatible = "fsl,sgtl5000";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_sgtl5000>;
+		reg = <0x0a>;
+		VDDA-supply = <&reg_2p5v>;
+		VDDIO-supply = <&reg_3p3v>;
+	};
+};
+
+&i2c2 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c2>;
+	status = "okay";
+};
+
+&i2c3 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";

arch/arm/boot/dts/imx6q-tbs2910.dts line 169

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+	pinctrl-0 = <&pinctrl_i2c3>;
+	status = "okay";
+
+	rtc: ds1307 at 68 {
+		compatible = "dallas,ds1307";
+		reg = <0x68>;
+	};
+};
+
+&iomuxc {

We do sort nodes alphabetically, but this one is a little special. Moving it to the bottom of the file will slightly improve the readability of the file.

Quoted 171 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +171 -0

+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	imx6q-tbs2910 {
+		pinctrl_hog: hoggrp {
+			fsl,pins = <
+				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
+				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
+				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
+				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
+				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
+				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
+				MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000
+				MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
+			>;
+		};
+
+		pinctrl_enet: enetgrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
+				MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+				MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
+				MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
+				MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
+				MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
+				MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
+				MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
+				MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
+				MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
+				MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
+				MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
+				MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
+				MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
+				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+				MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
+			>;
+		};
+
+		pinctrl_hdmi: hdmigrp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+			>;
+		};
+
+		pinctrl_i2c1: i2c1grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+				MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_i2c2: i2c2grp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+				MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_i2c3: i2c3grp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
+				MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_ir: irgrp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x80000000
+			>;
+		};
+
+		pinctrl_pcie: pciegrp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+			>;
+		};
+
+		pinctrl_sgtl5000: sgtl5000grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
+				MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0
+				MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0
+				MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
+				MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
+			>;
+		};
+
+		pinctrl_spdif: spdifgrp {
+			fsl,pins = <MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x13091
+			>;
+		};
+
+		pinctrl_uart1: uart1grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
+				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+			>;
+		};
+
+		pinctrl_uart2: uart2grp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
+				MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
+			>;
+		};
+
+		pinctrl_usbotg: usbotggrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+			>;
+		};
+
+		pinctrl_usdhc2: usdhc2grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
+				MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
+			>;
+		};
+
+		pinctrl_usdhc3: usdhc3grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
+				MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
+				MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+				MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+				MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+				MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+			>;
+		};
+
+		pinctrl_usdhc4: usdhc4grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
+				MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
+				MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
+				MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
+				MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
+				MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
+				MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
+				MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
+				MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
+				MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
+			>;
+		};
+	};
+
+	gpio_fan {
+		pinctrl_gpio_fan: gpiofangrp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x80000000
+			>;
+		};
+	};
+
+	gpio_leds {
+		pinctrl_gpio_leds: gpioledsgrp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
+			>;
+		};
+	};
+};
+
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pcie>;
+	reset-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/imx6q-tbs2910.dts line 350

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+	status = "okay";
+};
+
+&sata {
+	status = "okay";
+};
+
+&snvs_poweroff {
+	status = "okay";
+};

Is snvs_poweroff already available in <soc>.dtsi?

Shawn

Quoted 68 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +65 -0

+
+&spdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spdif>;
+	status = "okay";
+};
+
+&ssi1 {
+	fsl,mode = "i2s-slave";
+	status = "okay";
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
+	status = "okay";
+};
+
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart2>;
+	status = "okay";
+};
+
+&usbh1 {
+	vbus-supply = <&reg_5p0v>;
+	status = "okay";
+};
+
+&usbotg {
+	vbus-supply = <&reg_5p0v>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usbotg>;
+	disable-over-current;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2>;
+	bus-width = <4>;
+	cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+	wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
+	vmmc-supply = <&reg_3p3v>;
+	status = "okay";
+};
+
+&usdhc3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	bus-width = <4>;
+	cd-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+	wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+	vmmc-supply = <&reg_3p3v>;
+	status = "okay";
+};
+
+&usdhc4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc4>;
+	bus-width = <8>;
+	non-removable;
+	no-1-8-v;
+	status = "okay";
+};

Signature · 1 line

1.9.1

Soeren Moch

author

2014-10-25 17:50 UTC #8 lore raw

PATCH v2 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Hi Shawn,

thanks for your comments.

Quoted 23 lines

Hi Soeren,
Very neat patch! A couple of minor comments below ...
Quoted 10 lines · Soeren Moch
TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html
Reviewed-by Sebastian Hesselbarth <[email protected]>
Signed-off-by Soeren Moch <[email protected]>
---
Cc: Sebastian Hesselbarth <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Quoted 7 lines
Changes for v2:
- add tbs vendor prefix to vendor-prefixes.txt
- use GPIO_ACTIVE_{HIGH,LOW}
- add led label and default-state="keep"
- whitespace cleanup
---
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +

Quoted 2 lines

This is not an i.MX change. It should go through DT tree or we need an ACK from DT maintainers.

This was not part of the original patch and came in due to review comments. If it is not required I can remove it.

If you suggest some other way to handle this, was exactly should I do? I'm not very experienced in kernel development.

Quoted 53 lines

Quoted 38 lines

 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/imx6q-tbs2910.dts                | 415 +++++++++++++++++++++
 3 files changed, 417 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts

Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0

index ac7269f..2204b49 100644
@@ -133,6 +133,7 @@ st	STMicroelectronics
 ste	ST-Ericsson
 stericsson	ST-Ericsson
 synology	Synology, Inc.
+tbs	Turbosight (TBS) Technologies
 ti	Texas Instruments
 tlm	Trusted Logic Mobility
 toradex	Toradex AG

arch/arm/boot/dts/Makefile +1 -0

index b8c5cd3..f6ad478 100644
@@ -230,6 +230,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
 	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-sbc6x.dtb \
+	imx6q-tbs2910.dtb \
 	imx6q-udoo.dtb \
 	imx6q-wandboard.dtb \
 	imx6q-wandboard-revb1.dtb \

arch/arm/boot/dts/imx6q-tbs2910.dts new file +2 -0

new file mode 100644
index 0000000..60a91ee
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2014 Soeren Moch <[email protected]>

arch/arm/boot/dts/imx6q-tbs2910.dts line 12

Quoted 10 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +10 -0

+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */

Quoted 1 line

http://www.spinics.net/lists/devicetree/msg54551.html

Ok, I will modify the copyright.

Quoted 153 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +153 -0

+
+/dts-v1/;
+
+#include "imx6q.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	model = "TBS2910 Matrix ARM mini PC";
+	compatible = "tbs,imx6q-tbs2910", "fsl,imx6q";
+
+	chosen {
+		stdout-path = &uart1;
+	};
+
+	memory {
+		reg = <0x10000000 0x80000000>;
+	};
+
+	fan {
+		compatible = "gpio-fan";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_fan>;
+		gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
+		gpio-fan,speed-map = <0    0
+				      3000 1>;
+	};
+
+	ir_recv {
+		compatible = "gpio-ir-receiver";
+		gpios = <&gpio3 18 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_ir>;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
+
+		blue {
+		        label = "blue_status_led";
+		        gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
+		        default-state = "keep";
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg_2p5v: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "2P5V";
+			regulator-min-microvolt = <2500000>;
+			regulator-max-microvolt = <2500000>;
+			regulator-always-on;
+		};
+
+		reg_3p3v: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "3P3V";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			regulator-always-on;
+		};
+
+		reg_5p0v: regulator at 2 {
+			compatible = "regulator-fixed";
+			reg = <2>;
+			regulator-name = "5P0V";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-always-on;
+		};
+	};
+
+	sound-sgtl5000 {
+		audio-codec = <&sgtl5000>;
+		audio-routing =
+			"MIC_IN", "Mic Jack",
+			"Mic Jack", "Mic Bias",
+			"Headphone Jack", "HP_OUT";
+		compatible = "fsl,imx-audio-sgtl5000";
+		model = "On-board Codec";
+		mux-ext-port = <3>;
+		mux-int-port = <1>;
+		ssi-controller = <&ssi1>;
+	};
+
+	sound-spdif {
+		compatible = "fsl,imx-audio-spdif";
+		model = "On-board SPDIF";
+		spdif-controller = <&spdif>;
+		spdif-out;
+	};
+};
+
+&audmux {
+	status = "okay";
+};
+
+&fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet>;
+	phy-mode = "rgmii";
+	phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&hdmi {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hdmi>;
+	ddc-i2c-bus = <&i2c2>;
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c1>;
+	status = "okay";
+
+	sgtl5000: sgtl5000 at 0a {
+		clocks = <&clks 201>;
+		compatible = "fsl,sgtl5000";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_sgtl5000>;
+		reg = <0x0a>;
+		VDDA-supply = <&reg_2p5v>;
+		VDDIO-supply = <&reg_3p3v>;
+	};
+};
+
+&i2c2 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c2>;
+	status = "okay";
+};
+
+&i2c3 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c3>;
+	status = "okay";
+
+	rtc: ds1307 at 68 {
+		compatible = "dallas,ds1307";
+		reg = <0x68>;

Quoted 8 lines

arch/arm/boot/dts/imx6q-tbs2910.dts line 169
Quoted 4 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +4 -0
+	};
+};
+
+&iomuxc {
We do sort nodes alphabetically, but this one is a little special. Moving it to the bottom of the file will slightly improve the readability of the file.

OK, I will move this node to the bottom.

When talking about readability, in my original patch I used spaces to align the pin configuration values to preserve human readability while obeying the line length limits. Is it really desired to drop human readability in favor of avoiding spaces?

Quoted 175 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +175 -0

+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	imx6q-tbs2910 {
+		pinctrl_hog: hoggrp {
+			fsl,pins = <
+				MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
+				MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
+				MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
+				MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
+				MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
+				MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
+				MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000
+				MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25 0x80000000
+			>;
+		};
+
+		pinctrl_enet: enetgrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
+				MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
+				MX6QDL_PAD_RGMII_TXC__RGMII_TXC 0x1b0b0
+				MX6QDL_PAD_RGMII_TD0__RGMII_TD0 0x1b0b0
+				MX6QDL_PAD_RGMII_TD1__RGMII_TD1 0x1b0b0
+				MX6QDL_PAD_RGMII_TD2__RGMII_TD2 0x1b0b0
+				MX6QDL_PAD_RGMII_TD3__RGMII_TD3 0x1b0b0
+				MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
+				MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK 0x1b0b0
+				MX6QDL_PAD_RGMII_RXC__RGMII_RXC 0x1b0b0
+				MX6QDL_PAD_RGMII_RD0__RGMII_RD0 0x1b0b0
+				MX6QDL_PAD_RGMII_RD1__RGMII_RD1 0x1b0b0
+				MX6QDL_PAD_RGMII_RD2__RGMII_RD2 0x1b0b0
+				MX6QDL_PAD_RGMII_RD3__RGMII_RD3 0x1b0b0
+				MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+				MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
+			>;
+		};
+
+		pinctrl_hdmi: hdmigrp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+			>;
+		};
+
+		pinctrl_i2c1: i2c1grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+				MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_i2c2: i2c2grp {
+			fsl,pins = <
+				MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+				MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_i2c3: i2c3grp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
+				MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
+			>;
+		};
+
+		pinctrl_ir: irgrp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D18__GPIO3_IO18 0x80000000
+			>;
+		};
+
+		pinctrl_pcie: pciegrp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000
+			>;
+		};
+
+		pinctrl_sgtl5000: sgtl5000grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT7__AUD3_RXD 0x130b0
+				MX6QDL_PAD_CSI0_DAT4__AUD3_TXC 0x130b0
+				MX6QDL_PAD_CSI0_DAT5__AUD3_TXD 0x110b0
+				MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x130b0
+				MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
+			>;
+		};
+
+		pinctrl_spdif: spdifgrp {
+			fsl,pins = <MX6QDL_PAD_GPIO_19__SPDIF_OUT 0x13091
+			>;
+		};
+
+		pinctrl_uart1: uart1grp {
+			fsl,pins = <
+				MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
+				MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+			>;
+		};
+
+		pinctrl_uart2: uart2grp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
+				MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
+			>;
+		};
+
+		pinctrl_usbotg: usbotggrp {
+			fsl,pins = <
+				MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+			>;
+		};
+
+		pinctrl_usdhc2: usdhc2grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD2_CMD__SD2_CMD 0x17059
+				MX6QDL_PAD_SD2_CLK__SD2_CLK 0x10059
+				MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+				MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+				MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+				MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
+			>;
+		};
+
+		pinctrl_usdhc3: usdhc3grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059
+				MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
+				MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+				MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+				MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+				MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+			>;
+		};
+
+		pinctrl_usdhc4: usdhc4grp {
+			fsl,pins = <
+				MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17059
+				MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10059
+				MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
+				MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
+				MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
+				MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
+				MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
+				MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
+				MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
+				MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
+			>;
+		};
+	};
+
+	gpio_fan {
+		pinctrl_gpio_fan: gpiofangrp {
+			fsl,pins = <
+				MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x80000000
+			>;
+		};
+	};
+
+	gpio_leds {
+		pinctrl_gpio_leds: gpioledsgrp {
+			fsl,pins = <
+				MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
+			>;
+		};
+	};
+};
+
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pcie>;
+	reset-gpio = <&gpio7 12 GPIO_ACTIVE_HIGH>;
+	status = "okay";
+};
+
+&sata {

Quoted 8 lines

arch/arm/boot/dts/imx6q-tbs2910.dts line 350
Quoted 6 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +6 -0
+	status = "okay";
+};
+
+&snvs_poweroff {
+	status = "okay";
+};
Is snvs_poweroff already available in <soc>.dtsi?

I read some discussions about it and thought it is or at least will be there before my patch is applied. But I'm very sure that you know this better than me.
Do you suggest to remove this node?

Soeren

Quoted 71 lines

Shawn

Quoted 68 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +65 -0

+
+&spdif {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_spdif>;
+	status = "okay";
+};
+
+&ssi1 {
+	fsl,mode = "i2s-slave";
+	status = "okay";
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
+	status = "okay";
+};
+
+&uart2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart2>;
+	status = "okay";
+};
+
+&usbh1 {
+	vbus-supply = <&reg_5p0v>;
+	status = "okay";
+};
+
+&usbotg {
+	vbus-supply = <&reg_5p0v>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usbotg>;
+	disable-over-current;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2>;
+	bus-width = <4>;
+	cd-gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
+	wp-gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
+	vmmc-supply = <&reg_3p3v>;
+	status = "okay";
+};
+
+&usdhc3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	bus-width = <4>;
+	cd-gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
+	wp-gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
+	vmmc-supply = <&reg_3p3v>;
+	status = "okay";
+};
+
+&usdhc4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc4>;
+	bus-width = <8>;
+	non-removable;
+	no-1-8-v;
+	status = "okay";
+};

Signature · 1 line

1.9.1

Sebastian Hesselbarth

2014-10-25 18:51 UTC #9 lore raw

PATCH v2 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

Quoted 23 lines · Soeren Moch

thanks for your comments.
Quoted 22 lines
Very neat patch! A couple of minor comments below ...
Quoted 17 lines · Soeren Moch
TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html
Reviewed-by Sebastian Hesselbarth <[email protected]>
Signed-off-by Soeren Moch <[email protected]>
---
Cc: Sebastian Hesselbarth <[email protected]>
Cc: Shawn Guo <[email protected]>
Cc: Sascha Hauer <[email protected]>
Changes for v2:
- add tbs vendor prefix to vendor-prefixes.txt
- use GPIO_ACTIVE_{HIGH,LOW}
- add led label and default-state="keep"
- whitespace cleanup
---
  .../devicetree/bindings/vendor-prefixes.txt        |   1 +

Quoted 8 lines

Quoted 2 lines
This is not an i.MX change. It should go through DT tree or we need an ACK from DT maintainers.
This was not part of the original patch and came in due to review comments. If it is not required I can remove it.
If you suggest some other way to handle this, was exactly should I do? I'm not very experienced in kernel development.

Split the changes for vendor-prefixes.txt into a separate patch. When you resend, run ./scripts/get_maintainer.pl on each of the patches. It will give you people and lists to put into Cc (you can leave out committers, make sure to add Maintainers and the corresponding lists).

Once read by a DT maintainer, he will either pick it up or give an Acked-by.

[...]

Quoted 18 lines

arch/arm/boot/dts/imx6q-tbs2910.dts new file +12 -0

new file mode 100644
index 0000000..60a91ee
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2014 Soeren Moch <[email protected]>
+ * Copyright 2012 Freescale Semiconductor, Inc.
+ * Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */

[...]

Quoted 12 lines

Quoted 11 lines
arch/arm/boot/dts/imx6q-tbs2910.dts line 169
Quoted 7 lines
arch/arm/boot/dts/imx6q-tbs2910.dts new file +7 -0
+	rtc: ds1307 at 68 {
+		compatible = "dallas,ds1307";
+		reg = <0x68>;
+	};
+};
+
+&iomuxc {
We do sort nodes alphabetically, but this one is a little special. Moving it to the bottom of the file will slightly improve the readability of the file.

Quoted 6 lines

OK, I will move this node to the bottom.
When talking about readability, in my original patch I used spaces to align the pin configuration values to preserve human readability while obeying the line length limits. Is it really desired to drop human readability in favor of avoiding spaces?

IIRC, there has been no strict 80-column rule for dts{i} files in the past. In general, I'd prefer readability before 80-column rule if it is just about some few chars. But that is a matter of taste, I guess.

BTW, the comment I made about indentation on your patch was about <TAB><TAB><SPACES> instead of <TAB><TAB><TAB> in blue led node. I agree that once you reached the property indent with TABs, use spaces to align multi-line properties for readability.

Sebastian

Shawn Guo

2014-10-26 00:15 UTC #10 lore raw

PATCH v2 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

In reply to Soeren Moch

Thanks Sebastian for clarifying things. This leaves me only one to reply.

Quoted 10 lines · Soeren Moch

Quoted 5 lines
Review
Quoted 3 lines
+&snvs_poweroff {
(quoted diff) +2 -0
+	status = "okay";
+};
Is snvs_poweroff already available in <soc>.dtsi?
I read some discussions about it and thought it is or at least will be there before my patch is applied. But I'm very sure that you know this better than me.
Do you suggest to remove this node?

We have to remove this node, because if I apply the patch on my tree, I get the following error when compiling the DTS.

DTC arch/arm/boot/dts/imx6q-tbs2910.dtb
Error: ../arch/arm/boot/dts/imx6q-tbs2910.dts:350.2-3 label or path, 'snvs_poweroff', not found FATAL ERROR: Syntax error parsing input tree
make[2]: *** [arch/arm/boot/dts/imx6q-tbs2910.dtb] Error 1
make[1]: *** [dtbs] Error 2

I'm saying snvs_poweroff node is not available on mainline tree yet. You must have generated the patch against some tree without additional patches applied?

Shawn

Shawn Guo

2014-10-26 00:55 UTC #11 lore raw

PATCH v2 1/1 arm: dts: add initial support for TBS2910 Matrix ARM mini PC

In reply to Soeren Moch

Quoted 5 lines · Soeren Moch

TBS2910 is a i.MX6Q based board. For additional details refer to
http://www.tbsdtv.com/products/tbs2910-matrix-arm-mini-pc.html
Reviewed-by Sebastian Hesselbarth <[email protected]>
Signed-off-by Soeren Moch <[email protected]>

When you resend v3, please change patch prefix to "ARM: dts: ..."

Shawn