ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Subsystems (2)
PATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
From: Adam Ford <[email protected]>
The system on module (SOM) specific portions are in the .dtsi while the baseboard specific portions are in the .dts file.
arch/arm/boot/dts/imx6q-logicpd.dts new file +389 -0
@@ -0,0 +1,389 @@ +/* + * Copyright 2016 Logic PD + * This file is adapted from imx6qdl-sabresd.dts. + * 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 + */ + +/dts-v1/; + + +#include "imx6qdl-logicpd.dtsi" + +/ { + model = "Logic PD Acuity SOM"; + compatible = "fsl,imx6q"; + + aliases { + display = &lcd_display; + }; + + leds { + compatible = "gpio-leds"; + gen_led0 { + label = "cpu0"; + gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu0"; + }; + gen_led1 { + label = "cpu1"; + gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu1"; + }; + gen_led2 { + label = "heartbeat"; + gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + gen_led3 { + label = "Always On"; + gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; + + reg_usb_otg_vbus: regulator at 0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_usb_h1_vbus: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; + }; + + reg_3v3: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "reg_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + power { + label = "Power Button"; + gpios = <&gpio3 28 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_POWER>; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEUP>; + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio3 30 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEDOWN>; + }; + + recovery-button { + label = "Recover"; + gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <0x198>; + }; + }; + + backlight_lcd: backlight-lcd { + compatible = "pwm-backlight"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight>; + enable-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; + pwms = <&pwm3 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <6>; + }; + + + lcd_display: display at di0 { + compatible = "fsl,imx-parallel-display"; + #address-cells = <1>; + #size-cells = <0>; + interface-pix-fmt = "rgb565"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd>; + status = "okay"; + display-timings { + native-mode = <&type15_timing>; + type15_timing: type_15 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hfront-porch = <3>; + hback-porch = <2>; + hsync-len = <42>; + vback-porch = <3>; + vfront-porch = <2>; + vsync-len = <11>; + hsync-active = <1>; + vsync-active = <1>; + de-active = <1>; + pixelclk-active = <0>; + }; + }; + + port at 0 { + reg = <0>; + display_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + }; + port at 1 { + reg = <1>; + display_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + + panel: panel { + compatible = "innolux,at043tn24", "simple-panel"; + enable-gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>; + backlight = <&backlight_lcd>; + port { + panel_in: endpoint { + remote-endpoint = <&display_out>; + }; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display_in>; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + status = "okay"; +}; + +&usbh1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh1>; + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbh2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh2>; + phy_type = "hsic"; + disable-over-current; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + /* TODO: Initialize Ref clock at 50MHz so the reset can work */ + /*phy-reset-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>; */ + /* phy-reset-duration = <2>; */ + phy-mode = "rmii"; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + no-1-8-v; + keep-power-in-suspend; + status = "okay"; +}; + +&i2c3 { + touchscreen: tsc2004 at 48 { + compatible = "ti,tsc2004"; + vio-supply = <®_3v3>; + reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touchscreen>; + reset-gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&gpio1 6 IRQ_TYPE_EDGE_RISING>; + + touchscreen-fuzz-x = <4>; + touchscreen-fuzz-y = <7>; + touchscreen-fuzz-pressure = <2>; + touchscreen-size-x = <4096>; + touchscreen-size-y = <4096>; + touchscreen-max-pressure = <2048>; + + ti,x-plate-ohms = <280>; + ti,esd-recovery-timeout-ms = <8000>; + }; +}; + +&iomuxc { + imx6qdl-logicpd-baseboard { + + pinctrl_uart3: uart3grp { + fsl,pins = < + MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0 /* USB_OTG_PWR_EN */ + >; + }; + + pinctrl_usbh1: usbh1grp { + fsl,pins = < + MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 /* USB_H1_PWR_EN */ + >; + }; + + pinctrl_usbh2: usbh2grp { + fsl,pins = < + MX6QDL_PAD_RGMII_TXC__USB_H2_DATA 0x13030 + MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x17030 + >; + }; + + 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_enet: enetgrp { + fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0 + MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x1b0b0 /* Ethernet Reset */ + >; + }; + + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x130b0 + MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x130b0 + MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x130b0 + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x130b0 + >; + }; + + pinctrl_gpio_keys: gpio_keysgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x1b0b0 + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b0 + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x1b0b0 + >; + }; + + pinctrl_touchscreen: touchscreengrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 + MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x1b0b0 + >; + }; + + pinctrl_lcd: lcdgrp { + fsl,pins = < + MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10 /* R_LCD_DCLK */ + MX6QDL_PAD_DI0_PIN15__GPIO4_IO17 0x100b0 /* R_LCD_PANEL_PWR */ + MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10 /* R_LCD_HSYNC */ + MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10 /* R_LCD_VSYNC */ + MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x10 /* R_LCD_MDISP */ + MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10 + MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10 + MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10 + MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10 + MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10 + MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10 + MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10 + MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10 + MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10 + MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10 + MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10 + MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10 + MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10 + MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10 + MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10 + MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10 + >; + }; + + pinctrl_backlight: backlightgrp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x100b0 /* R_LCD_BACKLIGHT_PWR */ + >; + }; + + pinctrl_pwm3: pwm3grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + }; +}; +
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +452 -0
452 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Quoted 16 lines · On Wed, Jul 20, 2016 at 11:06:26AM -0500, aford173 at gmail.com wrote:
From: Adam Ford <[email protected]>
The system on module (SOM) specific portions are in the .dtsi while the baseboard specific portions are in the .dts file.
Signed-off-by Adam Ford <[email protected]>arch/arm/boot/dts/imx6q-logicpd.dts new file +3
-0@@ -0,0 +1,389 @@ +/* + * Copyright 2016 Logic PD + * This file is adapted from imx6qdl-sabresd.dts.
arch/arm/boot/dts/imx6q-logicpd.dts line 13
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.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 + */
Please consider to use X11/GPL dual license. There are a lot of examples in arch/arm/boot/dts.
arch/arm/boot/dts/imx6q-logicpd.dts line 17
Quoted 4 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +4
-0+ +/dts-v1/; + +
Drop one newline.
arch/arm/boot/dts/imx6q-logicpd.dts line 29
Quoted 12 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +12
-0+#include "imx6qdl-logicpd.dtsi" + +/ { + model = "Logic PD Acuity SOM"; + compatible = "fsl,imx6q"; + + aliases { + display = &lcd_display; + }; + + leds { + compatible = "gpio-leds";
Have a new line between property list and sub-node.
arch/arm/boot/dts/imx6q-logicpd.dts line 34
Quoted 5 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +5
-0+ gen_led0 { + label = "cpu0"; + gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu0"; + };
Have a new line between nodes.
Quoted 11 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +11
-0+ gen_led1 { + label = "cpu1"; + gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu1"; + }; + gen_led2 { + label = "heartbeat"; + gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + gen_led3 {
arch/arm/boot/dts/imx6q-logicpd.dts line 55
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ label = "Always On"; + gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>;
Please drop this container node and put the fixed regulator nodes directly under root, with following naming schema:
reg_xxx: regulator-xxx {
...
};Quoted 25 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +25
-0+ + reg_usb_otg_vbus: regulator at 0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_usb_h1_vbus: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; + }; + + reg_3v3: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>;
arch/arm/boot/dts/imx6q-logicpd.dts line 90
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ regulator-name = "reg_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>;
Bad indentation.
Quoted 17 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +17
-0+ + power { + label = "Power Button"; + gpios = <&gpio3 28 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_POWER>; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEUP>; + }; + + volume-down { + label = "Volume Down";
arch/arm/boot/dts/imx6q-logicpd.dts line 117
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ gpios = <&gpio3 30 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEDOWN>; + }; + + recovery-button { + label = "Recover"; + gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <0x198>;
No KEY_XXX code for this one?
Quoted 12 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +12
-0+ }; + }; + + backlight_lcd: backlight-lcd { + compatible = "pwm-backlight"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight>; + enable-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; + pwms = <&pwm3 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <6>; + };
arch/arm/boot/dts/imx6q-logicpd.dts line 139
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ + + lcd_display: display at di0 { + compatible = "fsl,imx-parallel-display"; + #address-cells = <1>; + #size-cells = <0>; + interface-pix-fmt = "rgb565"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd>; + status = "okay";
Have a newline here.
Quoted 15 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +15
-0+ display-timings { + native-mode = <&type15_timing>; + type15_timing: type_15 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hfront-porch = <3>; + hback-porch = <2>; + hsync-len = <42>; + vback-porch = <3>; + vfront-porch = <2>; + vsync-len = <11>; + hsync-active = <1>; + vsync-active = <1>; + de-active = <1>;
arch/arm/boot/dts/imx6q-logicpd.dts line 164
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ pixelclk-active = <0>; + }; + }; + + port at 0 { + reg = <0>; + display_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + };
Ditto
Quoted 55 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +55
-0+ port at 1 { + reg = <1>; + display_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + + panel: panel { + compatible = "innolux,at043tn24", "simple-panel"; + enable-gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>; + backlight = <&backlight_lcd>; + port { + panel_in: endpoint { + remote-endpoint = <&display_out>; + }; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display_in>; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + status = "okay"; +}; + +&usbh1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh1>; + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbh2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh2>; + phy_type = "hsic"; + disable-over-current; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default";
arch/arm/boot/dts/imx6q-logicpd.dts line 229
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + /* TODO: Initialize Ref clock at 50MHz so the reset can work */ + /*phy-reset-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>; */
The fec driver ignores the polarity flags of the references in phy-reset-gpios and assumes them to be active low unless there is a property phy-reset-active-high. So if the reset is truly active high, you should have a phy-reset-active-high property here.
Quoted 14 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +14
-0+ /* phy-reset-duration = <2>; */ + phy-mode = "rmii"; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + no-1-8-v; + keep-power-in-suspend; + status = "okay"; +}; +
arch/arm/boot/dts/imx6q-logicpd.dts line 253
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+&i2c3 { + touchscreen: tsc2004 at 48 { + compatible = "ti,tsc2004"; + vio-supply = <®_3v3>; + reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touchscreen>; + reset-gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&gpio1 6 IRQ_TYPE_EDGE_RISING>; +
Drop this newline.
arch/arm/boot/dts/imx6q-logicpd.dts line 260
Quoted 7 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +7
-0+ touchscreen-fuzz-x = <4>; + touchscreen-fuzz-y = <7>; + touchscreen-fuzz-pressure = <2>; + touchscreen-size-x = <4096>; + touchscreen-size-y = <4096>; + touchscreen-max-pressure = <2048>; +
Ditto
arch/arm/boot/dts/imx6q-logicpd.dts line 268
Quoted 8 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +8
-0+ ti,x-plate-ohms = <280>; + ti,esd-recovery-timeout-ms = <8000>; + }; +}; + +&iomuxc { + imx6qdl-logicpd-baseboard { +
Drop this container node and put the following pinctrl nodes directly under &iomuxc.
Quoted 4 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +4
-0+ pinctrl_uart3: uart3grp { + fsl,pins = < + MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
arch/arm/boot/dts/imx6q-logicpd.dts line 282
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0 /* USB_OTG_PWR_EN */ + >;
Bad indentation.
Quoted 17 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +17
-0+ }; + + pinctrl_usbh1: usbh1grp { + fsl,pins = < + MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 /* USB_H1_PWR_EN */ + >; + }; + + pinctrl_usbh2: usbh2grp { + fsl,pins = < + MX6QDL_PAD_RGMII_TXC__USB_H2_DATA 0x13030 + MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x17030 + >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = <
arch/arm/boot/dts/imx6q-logicpd.dts line 309
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ 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_enet: enetgrp {
Please sort these pinctrl entries alphabetically in node name.
Quoted 15 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +15
-0+ fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0 + MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x1b0b0 /* Ethernet Reset */ + >; + }; +
arch/arm/boot/dts/imx6q-logicpd.dts line 334
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x130b0 + MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x130b0 + MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x130b0 + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x130b0 + >; + }; + + pinctrl_gpio_keys: gpio_keysgrp {
No underscore in the node name, and use hyphen instead. In this particular case, gpiokeysgrp should be fine.
Quoted 122 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +55
-0+ fsl,pins = < + MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x1b0b0 + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b0 + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x1b0b0 + >; + }; + + pinctrl_touchscreen: touchscreengrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 + MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x1b0b0 + >; + }; + + pinctrl_lcd: lcdgrp { + fsl,pins = < + MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10 /* R_LCD_DCLK */ + MX6QDL_PAD_DI0_PIN15__GPIO4_IO17 0x100b0 /* R_LCD_PANEL_PWR */ + MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10 /* R_LCD_HSYNC */ + MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10 /* R_LCD_VSYNC */ + MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x10 /* R_LCD_MDISP */ + MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10 + MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10 + MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10 + MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10 + MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10 + MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10 + MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10 + MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10 + MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10 + MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10 + MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10 + MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10 + MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10 + MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10 + MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10 + MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10 + >; + }; + + pinctrl_backlight: backlightgrp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x100b0 /* R_LCD_BACKLIGHT_PWR */ + >; + }; + + pinctrl_pwm3: pwm3grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + }; +}; +arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +61
-0@@ -0,0 +1,452 @@ +/* + * Copyright 2016 Logic PD + * This file is adapted from imx6qdl-sabresd.dtsi. + * 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 + */ + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include "imx6q.dtsi" + +/ { + chosen { + stdout-path = &uart1; + }; + + memory { + reg = <0x10000000 0x80000000>; + }; + + +}; + +/* Reroute power feeding the CPU to come from the external PMIC */ +&cpu0 { + arm-supply = <&sw1a_reg>; + soc-supply = <&sw1c_reg>; +}; + +®_arm +{ + vin-supply = <&sw1a_reg>; +}; + +®_soc +{ + vin-supply = <&sw1c_reg>; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>; +}; + +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + status = "okay"; +}; + +&i2c3 { + clock-frequency = <100000>;
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 71
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; + + pmic: pfuze100 at 08 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { +
Drop this newline.
Quoted 25 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +25
-0+ sw1a_reg: sw1ab { + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1450000>; + regulator-name = "vddcore"; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1450000>; + regulator-name = "vddsoc"; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "gen_3v3"; + regulator-boot-on; + regulator-always-on; + };
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 106
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-name = "sw3a_vddr"; + regulator-boot-on; + regulator-always-on; + }; + +
One newline is good enough.
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +12
-0+ sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-name = "sw3b_vddr"; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-name = "gen_rgmii";
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 128
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ }; + + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + regulator-name = "gen_5v0"; + }; + +
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 137
Quoted 9 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +9
-0+ snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "gen_vsns"; + regulator-boot-on; + regulator-always-on; + }; + +
Ditto
Quoted 48 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +48
-0+ vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "gen_1v5"; + }; + + vgen2_reg: vgen2 { + regulator-name = "vgen2"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-name = "gen_vadj_0"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + vgen4_reg: vgen4 { + regulator-name = "gen_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-name = "gen_adj_1"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-name = "gen_2v5"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; + }; + }; + }; + + user_eeprom: at24 at 52 { + compatible = "atmel,24c64";
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 195
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pagesize = <32>; + reg = <0x52>; + }; + + mfg_eeprom: at24 at 51 { + compatible = "atmel,24c64"; + pagesize = <32>; + read-only; + reg = <0x51>; + };
Please sort the devices on I2C bus in order of slave address.
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +4
-0+ + temp_sense0: tmp102 at 4a { + compatible = "ti,tmp102"; + reg = <0x4a>;
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 209
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_tempsense>; + interrupt-parent = <&gpio6>; + interrupts = <15 IRQ_TYPE_LEVEL_LOW>; + #thermal-sensor-cells = <1>; + }; + + temp_sense1: tmp102 at 40 { + compatible = "ti,tmp102"; + reg = <0x49>;
'reg' doesn't match unit-address of node name.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 221
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +12
-0+ interrupt-parent = <&gpio6>; + interrupts = <15 IRQ_TYPE_LEVEL_LOW>; + #thermal-sensor-cells = <1>; + }; + +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx6qdl-acuity {
Drop this container node.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 223
Quoted 2 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +2
-0+ pinctrl_hog: hoggrp { + fsl,pins = <
The hog group should be used limitedly to pins that do not have a clear owner. Most of pins are used by particular client device, and should be set up in client device's pinctrl entry.
Quoted 48 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +48
-0+ MX6QDL_PAD_CSI0_MCLK__ARM_TRACE_CTL 0x1b0b0 + MX6QDL_PAD_CSI0_DATA_EN__ARM_TRACE_CLK 0x1b0b0 + MX6QDL_PAD_CSI0_VSYNC__ARM_TRACE00 0x1b0b0 + MX6QDL_PAD_CSI0_DAT4__ARM_TRACE01 0x1b0b0 + MX6QDL_PAD_CSI0_DAT5__ARM_TRACE02 0x1b0b0 + MX6QDL_PAD_CSI0_DAT6__ARM_TRACE03 0x1b0b0 + MX6QDL_PAD_CSI0_DAT7__ARM_TRACE04 0x1b0b0 + MX6QDL_PAD_CSI0_DAT8__ARM_TRACE05 0x1b0b0 + MX6QDL_PAD_CSI0_DAT9__ARM_TRACE06 0x1b0b0 + MX6QDL_PAD_CSI0_DAT10__ARM_TRACE07 0x1b0b0 + MX6QDL_PAD_CSI0_DAT11__ARM_TRACE08 0x1b0b0 + MX6QDL_PAD_CSI0_DAT12__ARM_TRACE09 0x1b0b0 + MX6QDL_PAD_CSI0_DAT13__ARM_TRACE10 0x1b0b0 + MX6QDL_PAD_CSI0_DAT14__ARM_TRACE11 0x1b0b0 + MX6QDL_PAD_CSI0_DAT15__ARM_TRACE12 0x1b0b0 + MX6QDL_PAD_CSI0_DAT16__ARM_TRACE13 0x1b0b0 + MX6QDL_PAD_CSI0_DAT17__ARM_TRACE14 0x1b0b0 + MX6QDL_PAD_CSI0_DAT18__ARM_TRACE15 0x1b0b0 + MX6QDL_PAD_CSI0_DAT19__GPIO6_IO05 0x1b0b0 + + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x80000000 + MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000 + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x80000000 + MX6QDL_PAD_EIM_CS0__GPIO2_IO23 0x80000000 + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x80000000 + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000 + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000 + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000 + MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 + MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000 + MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x80000000 + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x80000000 + MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x80000000 + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x80000000 + MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000 + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x80000000 + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x80000000 + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x80000000 + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x80000000 + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000 + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000 + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x80000000 + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x80000000 + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000 + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x80000000 + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x80000000 + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x80000000
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 281
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x80000000 + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x80000000 + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x80000000 + MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x80000000 + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 + MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x80000000 + MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x80000000 + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 + MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x80000000 + MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x80000000
Do not rely on bootloader or reset value, and please use a proper config value instead.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 285
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +4
-0+ + + +
Drop these newlines.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 292
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +7
-0+ MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x80000000 + MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x80000000 + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x80000000 + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x80000000 + MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x80000000 + +
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 295
Quoted 3 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +3
-0+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 +
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 302
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +7
-0+ MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x80000000 + MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x80000000 + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000 + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 + MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 + MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x80000000 +
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 309
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +7
-0+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 + MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x80000000 + MX6QDL_PAD_KEY_COL1__GPIO4_IO08 0x80000000 + + + +
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 312
Quoted 3 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +3
-0+ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000 + MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x80000000 +
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 321
Quoted 9 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +9
-0+ MX6QDL_PAD_RGMII_TD0__GPIO6_IO20 0x80000000 + MX6QDL_PAD_RGMII_TD1__GPIO6_IO21 0x80000000 + MX6QDL_PAD_RGMII_TD2__GPIO6_IO22 0x80000000 + MX6QDL_PAD_RGMII_TD3__GPIO6_IO23 0x80000000 + MX6QDL_PAD_RGMII_RD0__GPIO6_IO25 0x80000000 + MX6QDL_PAD_RGMII_RD1__GPIO6_IO27 0x80000000 + MX6QDL_PAD_RGMII_RD2__GPIO6_IO28 0x80000000 + MX6QDL_PAD_RGMII_RD3__GPIO6_IO29 0x80000000 +
Ditto
Quoted 44 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +44
-0+ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* WL_IRQ */ + MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1f0b0 /* WLAN_EN */ + MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x1f0b0 /* BT_EN */ + MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 + MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 + >; + }; + + pinctrl_gpmi_nand: gpminandgrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CLE__NAND_CLE 0x0b0b1 + MX6QDL_PAD_NANDF_ALE__NAND_ALE 0x0b0b1 + MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0x0b0b1 + MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0x0b000 + MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0x0b0b1 + MX6QDL_PAD_SD4_CMD__NAND_RE_B 0x0b0b1 + MX6QDL_PAD_SD4_CLK__NAND_WE_B 0x0b0b1 + MX6QDL_PAD_NANDF_D0__NAND_DATA00 0x0b0b1 + MX6QDL_PAD_NANDF_D1__NAND_DATA01 0x0b0b1 + MX6QDL_PAD_NANDF_D2__NAND_DATA02 0x0b0b1 + MX6QDL_PAD_NANDF_D3__NAND_DATA03 0x0b0b1 + MX6QDL_PAD_NANDF_D4__NAND_DATA04 0x0b0b1 + MX6QDL_PAD_NANDF_D5__NAND_DATA05 0x0b0b1 + MX6QDL_PAD_NANDF_D6__NAND_DATA06 0x0b0b1 + MX6QDL_PAD_NANDF_D7__NAND_DATA07 0x0b0b1 + >; + }; + + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_uart1: uart1grp { + fsl,pins = < + MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1 + MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 + >; + }; + + pinctrl_uart2: uart2grp {
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 375
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ fsl,pins = < + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1 + MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1 + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 + >; + }; + + +
One newline is good enough.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 388
Quoted 13 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +13
-0+ pinctrl_usdhc1: usdhc1grp { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071 + >; + }; + + +
Ditto
Quoted 14 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +14
-0+ 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_tempsense: tempsensegrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x1b0b0 /* Temp Sense Alert */
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 412
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ >; + }; + }; +}; + +&snvs_poweroff { + status = "okay"; +}; + +
Ditto
Quoted 8 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +8
-0+&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default";
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 430
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pinctrl-0 = <&pinctrl_uart2>; + status = "okay"; +}; + +&usdhc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc1>; + cd-gpios = <&gpio6 16 GPIO_ACTIVE_HIGH>; + keep-power-in-suspend; + enable-sdio-wakeup;
Property enable-sdio-wakeup is deprecated. Use wakeup-source instead.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 439
Quoted 9 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +9
-0+ status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + non-removable; + keep-power-in-suspend; + enable-sdio-wakeup;
Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 443
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +4
-0+ vmmc-supply = <&sw2_reg>; + status = "okay"; + #address-cells = <1>; + #size-cells = <0>;
Have a new line between property list and child node. Also, we generally end the property list with property 'status'.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 446
Quoted 3 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +3
-0+ wlcore: wlcore at 0 { + compatible = "ti,wl1837"; + reg = <2>;
'reg' doesn't match the unit-address in node name.
Shawn
Quoted 14 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +6
-0+ interrupt-parent = <&gpio7>; + interrupts = <1 GPIO_ACTIVE_HIGH>; + }; +}; + +Signature · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Quoted 22 lines · Shawn Guo
Quoted 21 lines · On Wed, Jul 20, 2016 at 11:06:26AM -0500, aford173 at gmail.com wrote:
From: Adam Ford <[email protected]>
The system on module (SOM) specific portions are in the .dtsi while the baseboard specific portions are in the .dts file.
Signed-off-by Adam Ford <[email protected]>arch/arm/boot/dts/imx6q-logicpd.dts new file +8
-0@@ -0,0 +1,389 @@ +/* + * Copyright 2016 Logic PD + * This file is adapted from imx6qdl-sabresd.dts. + * 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
Quoted 9 lines
arch/arm/boot/dts/imx6q-logicpd.dts line 13
Quoted 5 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +5
-0+ * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */Please consider to use X11/GPL dual license. There are a lot of examples in
arch/arm/boot/dts.
Not a problem. I found another example and I integrated it in.
Quoted 52 lines
arch/arm/boot/dts/imx6q-logicpd.dts line 17
Quoted 4 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +4
-0+ +/dts-v1/; + +Drop one newline.
arch/arm/boot/dts/imx6q-logicpd.dts line 29
Quoted 12 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +12
-0+#include "imx6qdl-logicpd.dtsi" + +/ { + model = "Logic PD Acuity SOM"; + compatible = "fsl,imx6q"; + + aliases { + display = &lcd_display; + }; + + leds { + compatible = "gpio-leds";Have a new line between property list and sub-node.
arch/arm/boot/dts/imx6q-logicpd.dts line 34
Quoted 5 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +5
-0+ gen_led0 { + label = "cpu0"; + gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu0"; + };Have a new line between nodes.
Quoted 11 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +11
-0+ gen_led1 { + label = "cpu1"; + gpios = <&gpio3 20 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "cpu1"; + }; + gen_led2 { + label = "heartbeat"; + gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + }; + gen_led3 {arch/arm/boot/dts/imx6q-logicpd.dts line 55
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ label = "Always On"; + gpios = <&gpio3 22 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "default-on"; + }; + }; + + regulators { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>;
Quoted 7 lines
Please drop this container node and put the fixed regulator nodes directly under root, with following naming schema:
reg_xxx: regulator-xxx { ... };
I renamed the regulators using your schema, however any attempts to remove the connector and placing the regulator directly under the root fail upon boot and the #address cells, #size-cells also seem important and fail when removed.
Quoted 59 lines
Quoted 25 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +25
-0+ + reg_usb_otg_vbus: regulator at 0 { + compatible = "regulator-fixed"; + reg = <0>; + regulator-name = "usb_otg_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + + reg_usb_h1_vbus: regulator at 1 { + compatible = "regulator-fixed"; + reg = <1>; + regulator-name = "usb_h1_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; + }; + + reg_3v3: regulator at 2 { + compatible = "regulator-fixed"; + reg = <2>;arch/arm/boot/dts/imx6q-logicpd.dts line 90
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ regulator-name = "reg_3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>;Bad indentation.
Quoted 21 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +21
-0+ + power { + label = "Power Button"; + gpios = <&gpio3 28 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_POWER>; + }; + + volume-up { + label = "Volume Up"; + gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEUP>; + }; + + volume-down { + label = "Volume Down"; + gpios = <&gpio3 30 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <KEY_VOLUMEDOWN>; + };
Quoted 8 lines
arch/arm/boot/dts/imx6q-logicpd.dts line 117
Quoted 6 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +6
-0+ + recovery-button { + label = "Recover"; + gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; + wakeup-source; + linux,code = <0x198>;No
KEY_XXXcode for this one?
I copy-pasted some random key stuff. Since I don't have an explicit use for the keys, I'll just remove them from the device tree until we have a better use. I was more using them to test when the keys were pressed.
Quoted 161 lines
Quoted 12 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +12
-0+ }; + }; + + backlight_lcd: backlight-lcd { + compatible = "pwm-backlight"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_backlight>; + enable-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; + pwms = <&pwm3 0 5000000>; + brightness-levels = <0 4 8 16 32 64 128 255>; + default-brightness-level = <6>; + };arch/arm/boot/dts/imx6q-logicpd.dts line 139
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ + + lcd_display: display at di0 { + compatible = "fsl,imx-parallel-display"; + #address-cells = <1>; + #size-cells = <0>; + interface-pix-fmt = "rgb565"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd>; + status = "okay";Have a newline here.
Quoted 15 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +15
-0+ display-timings { + native-mode = <&type15_timing>; + type15_timing: type_15 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hfront-porch = <3>; + hback-porch = <2>; + hsync-len = <42>; + vback-porch = <3>; + vfront-porch = <2>; + vsync-len = <11>; + hsync-active = <1>; + vsync-active = <1>; + de-active = <1>;arch/arm/boot/dts/imx6q-logicpd.dts line 164
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ pixelclk-active = <0>; + }; + }; + + port at 0 { + reg = <0>; + display_in: endpoint { + remote-endpoint = <&ipu1_di0_disp0>; + }; + };Ditto
Quoted 55 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +55
-0+ port at 1 { + reg = <1>; + display_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + + panel: panel { + compatible = "innolux,at043tn24", "simple-panel"; + enable-gpios = <&gpio4 17 GPIO_ACTIVE_HIGH>; + backlight = <&backlight_lcd>; + port { + panel_in: endpoint { + remote-endpoint = <&display_out>; + }; + }; + }; +}; + +&ipu1_di0_disp0 { + remote-endpoint = <&display_in>; +}; + +&pwm3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm3>; + status = "okay"; +}; + + +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + status = "okay"; +}; + +&usbh1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh1>; + vbus-supply = <®_usb_h1_vbus>; + status = "okay"; +}; + +&usbh2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh2>; + phy_type = "hsic"; + disable-over-current; + status = "okay"; +}; + +&usbotg { + vbus-supply = <®_usb_otg_vbus>; + pinctrl-names = "default";arch/arm/boot/dts/imx6q-logicpd.dts line 229
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ pinctrl-0 = <&pinctrl_usbotg>; + disable-over-current; + status = "okay"; +}; + +&fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_enet>; + /* TODO: Initialize Ref clock at 50MHz so the reset can work */ + /*phy-reset-gpios = <&gpio4 9 GPIO_ACTIVE_HIGH>; */The fec driver ignores the polarity flags of the references in phy-reset-gpios and assumes them to be active low unless there is a property phy-reset-active-high. So if the reset is truly active high, you should have a phy-reset-active-high property here.
Quoted 14 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +14
-0+ /* phy-reset-duration = <2>; */ + phy-mode = "rmii"; + status = "okay"; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + no-1-8-v; + keep-power-in-suspend; + status = "okay"; +}; +arch/arm/boot/dts/imx6q-logicpd.dts line 253
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+&i2c3 { + touchscreen: tsc2004 at 48 { + compatible = "ti,tsc2004"; + vio-supply = <®_3v3>; + reg = <0x48>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touchscreen>; + reset-gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; + interrupts-extended = <&gpio1 6 IRQ_TYPE_EDGE_RISING>; +Drop this newline.
arch/arm/boot/dts/imx6q-logicpd.dts line 260
Quoted 7 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +7
-0+ touchscreen-fuzz-x = <4>; + touchscreen-fuzz-y = <7>; + touchscreen-fuzz-pressure = <2>; + touchscreen-size-x = <4096>; + touchscreen-size-y = <4096>; + touchscreen-max-pressure = <2048>; +Ditto
Quoted 12 lines
arch/arm/boot/dts/imx6q-logicpd.dts line 268
Quoted 8 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +8
-0+ ti,x-plate-ohms = <280>; + ti,esd-recovery-timeout-ms = <8000>; + }; +}; + +&iomuxc { + imx6qdl-logicpd-baseboard { +Drop this container node and put the following pinctrl nodes directly under &iomuxc.
Like the regulators above, if I remove this connector, the system won't boot. I compared both the regulator and the iomuxc containers in this device tree with other imx6q boards, and I seem to be consistent with what other boards are doing.
Quoted 650 lines
Quoted 4 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +4
-0+ pinctrl_uart3: uart3grp { + fsl,pins = < + MX6QDL_PAD_EIM_D23__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1arch/arm/boot/dts/imx6q-logicpd.dts line 282
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 + MX6QDL_PAD_EIM_EB3__UART3_RTS_B 0x1b0b1 + >; + }; + + pinctrl_usbotg: usbotggrp { + fsl,pins = < + MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 + MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0 /* USB_OTG_PWR_EN */ + >;Bad indentation.
Quoted 17 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +17
-0+ }; + + pinctrl_usbh1: usbh1grp { + fsl,pins = < + MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 /* USB_H1_PWR_EN */ + >; + }; + + pinctrl_usbh2: usbh2grp { + fsl,pins = < + MX6QDL_PAD_RGMII_TXC__USB_H2_DATA 0x13030 + MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x17030 + >; + }; + + pinctrl_usdhc2: usdhc2grp { + fsl,pins = <arch/arm/boot/dts/imx6q-logicpd.dts line 309
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ 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_enet: enetgrp {Please sort these pinctrl entries alphabetically in node name.
Quoted 15 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +15
-0+ fsl,pins = < + MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0 + MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0 + MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN 0x1b0b0 + MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1 0x1b0b0 + MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER 0x1b0b0 + MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0 0x1b0b0 + MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1 0x1b0b0 + MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8 + MX6QDL_PAD_KEY_ROW1__GPIO4_IO09 0x1b0b0 /* Ethernet Reset */ + >; + }; +arch/arm/boot/dts/imx6q-logicpd.dts line 334
Quoted 10 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +10
-0+ pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = < + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x130b0 + MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x130b0 + MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x130b0 + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x130b0 + >; + }; + + pinctrl_gpio_keys: gpio_keysgrp {No underscore in the node name, and use hyphen instead. In this particular case, gpiokeysgrp should be fine.
Quoted 122 lines
arch/arm/boot/dts/imx6q-logicpd.dts new file +55
-0+ fsl,pins = < + MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x1b0b0 + MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x1b0b0 + MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x1b0b0 + MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x1b0b0 + >; + }; + + pinctrl_touchscreen: touchscreengrp { + fsl,pins = < + MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 + MX6QDL_PAD_GPIO_6__GPIO1_IO06 0x1b0b0 + >; + }; + + pinctrl_lcd: lcdgrp { + fsl,pins = < + MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10 /* R_LCD_DCLK */ + MX6QDL_PAD_DI0_PIN15__GPIO4_IO17 0x100b0 /* R_LCD_PANEL_PWR */ + MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02 0x10 /* R_LCD_HSYNC */ + MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03 0x10 /* R_LCD_VSYNC */ + MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04 0x10 /* R_LCD_MDISP */ + MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01 0x10 + MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02 0x10 + MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03 0x10 + MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04 0x10 + MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05 0x10 + MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06 0x10 + MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07 0x10 + MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08 0x10 + MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09 0x10 + MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10 0x10 + MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11 0x10 + MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12 0x10 + MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13 0x10 + MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14 0x10 + MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15 0x10 + MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16 0x10 + >; + }; + + pinctrl_backlight: backlightgrp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x100b0 /* R_LCD_BACKLIGHT_PWR */ + >; + }; + + pinctrl_pwm3: pwm3grp { + fsl,pins = < + MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1 + >; + }; + }; +}; +arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +61
-0@@ -0,0 +1,452 @@ +/* + * Copyright 2016 Logic PD + * This file is adapted from imx6qdl-sabresd.dtsi. + * 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 + */ + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include "imx6q.dtsi" + +/ { + chosen { + stdout-path = &uart1; + }; + + memory { + reg = <0x10000000 0x80000000>; + }; + + +}; + +/* Reroute power feeding the CPU to come from the external PMIC */ +&cpu0 { + arm-supply = <&sw1a_reg>; + soc-supply = <&sw1c_reg>; +}; + +®_arm +{ + vin-supply = <&sw1a_reg>; +}; + +®_soc +{ + vin-supply = <&sw1c_reg>; +}; + +&clks { + assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>, + <&clks IMX6QDL_CLK_LDB_DI1_SEL>; + assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>, + <&clks IMX6QDL_CLK_PLL3_USB_OTG>; +}; + +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + status = "okay"; +}; + +&i2c3 { + clock-frequency = <100000>;arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 71
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; + status = "okay"; + + pmic: pfuze100 at 08 { + compatible = "fsl,pfuze100"; + reg = <0x08>; + + regulators { +Drop this newline.
Quoted 25 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +25
-0+ sw1a_reg: sw1ab { + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1450000>; + regulator-name = "vddcore"; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw1c_reg: sw1c { + regulator-min-microvolt = <725000>; + regulator-max-microvolt = <1450000>; + regulator-name = "vddsoc"; + regulator-boot-on; + regulator-always-on; + regulator-ramp-delay = <6250>; + }; + + sw2_reg: sw2 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "gen_3v3"; + regulator-boot-on; + regulator-always-on; + };arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 106
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ + sw3a_reg: sw3a { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-name = "sw3a_vddr"; + regulator-boot-on; + regulator-always-on; + }; + +One newline is good enough.
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +12
-0+ sw3b_reg: sw3b { + regulator-min-microvolt = <400000>; + regulator-max-microvolt = <1975000>; + regulator-name = "sw3b_vddr"; + regulator-boot-on; + regulator-always-on; + }; + + sw4_reg: sw4 { + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <3300000>; + regulator-name = "gen_rgmii";arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 128
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ }; + + + swbst_reg: swbst { + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5150000>; + regulator-name = "gen_5v0"; + }; + +Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 137
Quoted 9 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +9
-0+ snvs_reg: vsnvs { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <3000000>; + regulator-name = "gen_vsns"; + regulator-boot-on; + regulator-always-on; + }; + +Ditto
Quoted 48 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +48
-0+ vref_reg: vrefddr { + regulator-boot-on; + regulator-always-on; + }; + + vgen1_reg: vgen1 { + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "gen_1v5"; + }; + + vgen2_reg: vgen2 { + regulator-name = "vgen2"; + regulator-min-microvolt = <800000>; + regulator-max-microvolt = <1550000>; + }; + + vgen3_reg: vgen3 { + regulator-name = "gen_vadj_0"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + vgen4_reg: vgen4 { + regulator-name = "gen_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; + }; + + vgen5_reg: vgen5 { + regulator-name = "gen_adj_1"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + vgen6_reg: vgen6 { + regulator-name = "gen_2v5"; + regulator-min-microvolt = <2500000>; + regulator-max-microvolt = <2500000>; + regulator-always-on; + }; + }; + }; + + user_eeprom: at24 at 52 { + compatible = "atmel,24c64";arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 195
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pagesize = <32>; + reg = <0x52>; + }; + + mfg_eeprom: at24 at 51 { + compatible = "atmel,24c64"; + pagesize = <32>; + read-only; + reg = <0x51>; + };Please sort the devices on I2C bus in order of slave address.
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +4
-0+ + temp_sense0: tmp102 at 4a { + compatible = "ti,tmp102"; + reg = <0x4a>;arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 209
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_tempsense>; + interrupt-parent = <&gpio6>; + interrupts = <15 IRQ_TYPE_LEVEL_LOW>; + #thermal-sensor-cells = <1>; + }; + + temp_sense1: tmp102 at 40 { + compatible = "ti,tmp102"; + reg = <0x49>;'reg' doesn't match unit-address of node name.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 221
Quoted 12 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +12
-0+ interrupt-parent = <&gpio6>; + interrupts = <15 IRQ_TYPE_LEVEL_LOW>; + #thermal-sensor-cells = <1>; + }; + +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + imx6qdl-acuity {Drop this container node.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 223
Quoted 2 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +2
-0+ pinctrl_hog: hoggrp { + fsl,pins = <The hog group should be used limitedly to pins that do not have a clear owner. Most of pins are used by particular client device, and should be set up in client device's pinctrl entry.
Quoted 48 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +48
-0+ MX6QDL_PAD_CSI0_MCLK__ARM_TRACE_CTL 0x1b0b0 + MX6QDL_PAD_CSI0_DATA_EN__ARM_TRACE_CLK 0x1b0b0 + MX6QDL_PAD_CSI0_VSYNC__ARM_TRACE00 0x1b0b0 + MX6QDL_PAD_CSI0_DAT4__ARM_TRACE01 0x1b0b0 + MX6QDL_PAD_CSI0_DAT5__ARM_TRACE02 0x1b0b0 + MX6QDL_PAD_CSI0_DAT6__ARM_TRACE03 0x1b0b0 + MX6QDL_PAD_CSI0_DAT7__ARM_TRACE04 0x1b0b0 + MX6QDL_PAD_CSI0_DAT8__ARM_TRACE05 0x1b0b0 + MX6QDL_PAD_CSI0_DAT9__ARM_TRACE06 0x1b0b0 + MX6QDL_PAD_CSI0_DAT10__ARM_TRACE07 0x1b0b0 + MX6QDL_PAD_CSI0_DAT11__ARM_TRACE08 0x1b0b0 + MX6QDL_PAD_CSI0_DAT12__ARM_TRACE09 0x1b0b0 + MX6QDL_PAD_CSI0_DAT13__ARM_TRACE10 0x1b0b0 + MX6QDL_PAD_CSI0_DAT14__ARM_TRACE11 0x1b0b0 + MX6QDL_PAD_CSI0_DAT15__ARM_TRACE12 0x1b0b0 + MX6QDL_PAD_CSI0_DAT16__ARM_TRACE13 0x1b0b0 + MX6QDL_PAD_CSI0_DAT17__ARM_TRACE14 0x1b0b0 + MX6QDL_PAD_CSI0_DAT18__ARM_TRACE15 0x1b0b0 + MX6QDL_PAD_CSI0_DAT19__GPIO6_IO05 0x1b0b0 + + MX6QDL_PAD_EIM_LBA__GPIO2_IO27 0x80000000 + MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000 + MX6QDL_PAD_EIM_RW__GPIO2_IO26 0x80000000 + MX6QDL_PAD_EIM_CS0__GPIO2_IO23 0x80000000 + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x80000000 + MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000 + MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000 + MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000 + MX6QDL_PAD_EIM_A19__GPIO2_IO19 0x80000000 + MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000 + MX6QDL_PAD_EIM_A21__GPIO2_IO17 0x80000000 + MX6QDL_PAD_EIM_A22__GPIO2_IO16 0x80000000 + MX6QDL_PAD_EIM_A23__GPIO6_IO06 0x80000000 + MX6QDL_PAD_EIM_A24__GPIO5_IO04 0x80000000 + MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000 + MX6QDL_PAD_EIM_DA0__GPIO3_IO00 0x80000000 + MX6QDL_PAD_EIM_DA1__GPIO3_IO01 0x80000000 + MX6QDL_PAD_EIM_DA2__GPIO3_IO02 0x80000000 + MX6QDL_PAD_EIM_DA3__GPIO3_IO03 0x80000000 + MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000 + MX6QDL_PAD_EIM_DA5__GPIO3_IO05 0x80000000 + MX6QDL_PAD_EIM_DA6__GPIO3_IO06 0x80000000 + MX6QDL_PAD_EIM_DA7__GPIO3_IO07 0x80000000 + MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000 + MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000 + MX6QDL_PAD_EIM_DA10__GPIO3_IO10 0x80000000 + MX6QDL_PAD_EIM_DA11__GPIO3_IO11 0x80000000 + MX6QDL_PAD_EIM_DA12__GPIO3_IO12 0x80000000arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 281
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ MX6QDL_PAD_EIM_DA13__GPIO3_IO13 0x80000000 + MX6QDL_PAD_EIM_DA14__GPIO3_IO14 0x80000000 + MX6QDL_PAD_EIM_DA15__GPIO3_IO15 0x80000000 + MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x80000000 + MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000 + MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x80000000 + MX6QDL_PAD_EIM_D21__GPIO3_IO21 0x80000000 + MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x80000000 + MX6QDL_PAD_EIM_D26__GPIO3_IO26 0x80000000 + MX6QDL_PAD_EIM_D27__GPIO3_IO27 0x80000000Do not rely on bootloader or reset value, and please use a proper config value instead.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 285
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +4
-0+ + + +Drop these newlines.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 292
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +7
-0+ MX6QDL_PAD_EIM_EB0__GPIO2_IO28 0x80000000 + MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x80000000 + MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x80000000 + MX6QDL_PAD_EIM_BCLK__GPIO6_IO31 0x80000000 + MX6QDL_PAD_EIM_WAIT__GPIO5_IO00 0x80000000 + +Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 295
Quoted 3 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +3
-0+ MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000 + MX6QDL_PAD_GPIO_4__GPIO1_IO04 0x80000000 +Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 302
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +7
-0+ MX6QDL_PAD_GPIO_7__GPIO1_IO07 0x80000000 + MX6QDL_PAD_GPIO_8__GPIO1_IO08 0x80000000 + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x80000000 + MX6QDL_PAD_GPIO_17__GPIO7_IO12 0x80000000 + MX6QDL_PAD_GPIO_18__GPIO7_IO13 0x80000000 + MX6QDL_PAD_GPIO_19__GPIO4_IO05 0x80000000 +Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 309
Quoted 7 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +7
-0+ MX6QDL_PAD_KEY_COL0__GPIO4_IO06 0x80000000 + MX6QDL_PAD_KEY_ROW0__GPIO4_IO07 0x80000000 + MX6QDL_PAD_KEY_COL1__GPIO4_IO08 0x80000000 + + + +Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 312
Quoted 3 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +3
-0+ MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000 + MX6QDL_PAD_NANDF_CS3__GPIO6_IO16 0x80000000 +Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 321
Quoted 9 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +9
-0+ MX6QDL_PAD_RGMII_TD0__GPIO6_IO20 0x80000000 + MX6QDL_PAD_RGMII_TD1__GPIO6_IO21 0x80000000 + MX6QDL_PAD_RGMII_TD2__GPIO6_IO22 0x80000000 + MX6QDL_PAD_RGMII_TD3__GPIO6_IO23 0x80000000 + MX6QDL_PAD_RGMII_RD0__GPIO6_IO25 0x80000000 + MX6QDL_PAD_RGMII_RD1__GPIO6_IO27 0x80000000 + MX6QDL_PAD_RGMII_RD2__GPIO6_IO28 0x80000000 + MX6QDL_PAD_RGMII_RD3__GPIO6_IO29 0x80000000 +Ditto
Quoted 44 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +44
-0+ MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0 /* WL_IRQ */ + MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1f0b0 /* WLAN_EN */ + MX6QDL_PAD_SD3_RST__GPIO7_IO08 0x1f0b0 /* BT_EN */ + MX6QDL_PAD_SD4_DAT0__GPIO2_IO08 0x80000000 + MX6QDL_PAD_SD4_DAT3__GPIO2_IO11 0x80000000 + >; + }; + + pinctrl_gpmi_nand: gpminandgrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CLE__NAND_CLE 0x0b0b1 + MX6QDL_PAD_NANDF_ALE__NAND_ALE 0x0b0b1 + MX6QDL_PAD_NANDF_WP_B__NAND_WP_B 0x0b0b1 + MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0x0b000 + MX6QDL_PAD_NANDF_CS0__NAND_CE0_B 0x0b0b1 + MX6QDL_PAD_SD4_CMD__NAND_RE_B 0x0b0b1 + MX6QDL_PAD_SD4_CLK__NAND_WE_B 0x0b0b1 + MX6QDL_PAD_NANDF_D0__NAND_DATA00 0x0b0b1 + MX6QDL_PAD_NANDF_D1__NAND_DATA01 0x0b0b1 + MX6QDL_PAD_NANDF_D2__NAND_DATA02 0x0b0b1 + MX6QDL_PAD_NANDF_D3__NAND_DATA03 0x0b0b1 + MX6QDL_PAD_NANDF_D4__NAND_DATA04 0x0b0b1 + MX6QDL_PAD_NANDF_D5__NAND_DATA05 0x0b0b1 + MX6QDL_PAD_NANDF_D6__NAND_DATA06 0x0b0b1 + MX6QDL_PAD_NANDF_D7__NAND_DATA07 0x0b0b1 + >; + }; + + + pinctrl_i2c3: i2c3grp { + fsl,pins = < + MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1 + >; + }; + + pinctrl_uart1: uart1grp { + fsl,pins = < + MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1 + MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1 + >; + }; + + pinctrl_uart2: uart2grp {arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 375
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ fsl,pins = < + MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1 + MX6QDL_PAD_SD4_DAT5__UART2_RTS_B 0x1b0b1 + MX6QDL_PAD_SD4_DAT6__UART2_CTS_B 0x1b0b1 + MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1 + >; + }; + + +One newline is good enough.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 388
Quoted 13 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +13
-0+ pinctrl_usdhc1: usdhc1grp { + fsl,pins = < + MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17071 + MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10071 + MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17071 + MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17071 + MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17071 + MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17071 + >; + }; + + +Ditto
Quoted 14 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +14
-0+ 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_tempsense: tempsensegrp { + fsl,pins = < + MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x1b0b0 /* Temp Sense Alert */arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 412
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ >; + }; + }; +}; + +&snvs_poweroff { + status = "okay"; +}; + +Ditto
Quoted 8 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +8
-0+&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; + status = "okay"; +}; + +&uart2 { + pinctrl-names = "default";arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 430
Quoted 10 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +10
-0+ pinctrl-0 = <&pinctrl_uart2>; + status = "okay"; +}; + +&usdhc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc1>; + cd-gpios = <&gpio6 16 GPIO_ACTIVE_HIGH>; + keep-power-in-suspend; + enable-sdio-wakeup;Property enable-sdio-wakeup is deprecated. Use wakeup-source instead.
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 439
Quoted 9 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +9
-0+ status = "okay"; +}; + +&usdhc3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc3>; + non-removable; + keep-power-in-suspend; + enable-sdio-wakeup;Ditto
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 443
Quoted 4 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +4
-0+ vmmc-supply = <&sw2_reg>; + status = "okay"; + #address-cells = <1>; + #size-cells = <0>;Have a new line between property list and child node. Also, we generally end the property list with property 'status'.
Quoted 8 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi line 446
Quoted 3 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +3
-0+ wlcore: wlcore at 0 { + compatible = "ti,wl1837"; + reg = <2>;'reg' doesn't match the unit-address in node name.
Shawn
Thank you for all your feedback. I'll post an update in the next few days once I hear your feedback to my questions.
adam
Quoted 14 lines
Quoted 14 lines
arch/arm/boot/dts/imx6qdl-logicpd.dtsi new file +6
-1+ interrupt-parent = <&gpio7>; + interrupts = <1 GPIO_ACTIVE_HIGH>; + }; +}; + + --2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Quoted 4 lines · Adam Ford
Quoted 4 lines
Quoted 3 lines
+&iomuxc {
arch/arm/boot/dts/imx6q-logicpd.dts new file +2
-0+ imx6qdl-logicpd-baseboard { +
Quoted 8 lines
Quoted 3 lines
Drop this container node and put the following pinctrl nodes directly under &iomuxc.
Like the regulators above, if I remove this connector, the system won't boot. I compared both the regulator and the iomuxc containers in this device tree with other imx6q boards, and I seem to be consistent with what other boards are doing.
You might want to rebase the patch to latest mainline like v4.9-rc3 and test first.
Shawn
PATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Quoted 9 lines · Shawn Guo
Quoted 8 lines · Adam Ford
Quoted 7 lines
arch/arm/boot/dts/imx6q-logicpd.dts line 268
Quoted 3 lines
+&iomuxc {
arch/arm/boot/dts/imx6q-logicpd.dts new file +2
-0+ imx6qdl-logicpd-baseboard { +Drop this container node and put the following pinctrl nodes directly under &iomuxc.
Quoted 7 lines
Quoted 4 lines
Like the regulators above, if I remove this connector, the system won't boot. I compared both the regulator and the iomuxc containers in this device tree with other imx6q boards, and I seem to be consistent with what other boards are doing.
You might want to rebase the patch to latest mainline like v4.9-rc3 and test first.
I rebased on the 4.9-rc4, and the pinmux errors go away, but the regulators appear to need their own container or I get the following error:
Warning (reg_format): "reg" property in /regulator-otg-vbus has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1) Warning (reg_format): "reg" property in /regulator-h1-vbus has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1) Warning (reg_format): "reg" property in /regulator-3v3 has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1) Warning (reg_format): "reg" property in /regulator-pcie has invalid length (4 bytes) (#address-cells == 1, #size-cells == 1)
Can I leave the the regulator container? This seems consistent with the other imx6 boards.
adam
Quoted 2 lines
Shawn
Fabio Estevam
reviewerPATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Hi Adam,
Quoted 3 lines · Adam Ford
I rebased on the 4.9-rc4, and the pinmux errors go away, but the regulators appear to need their own container or I get the following error:
You can write the regulators without the container as follows:
reg_3p3v: regulator-3p3v {
reg_usb_otg_vbus: regulator-usbotgvbus {
compatible = "regulator-fixed";
regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio4 15 GPIO_ACTIVE_HIGH>;
enable-active-high;
};Fabio Estevam
reviewerPATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Quoted 1 line · Fabio Estevam
You can write the regulators without the container as follows:
Or just look at arch/arm/boot/dts/imx6qdl-ts4900.dtsi for an example.
PATCH 1/1 ARM: dts: imx6: Add support for Logic PD SOM and Baseboard
Quoted 5 lines · Fabio Estevam
Quoted 1 line · Fabio Estevam
You can write the regulators without the container as follows:
Or just look at
arch/arm/boot/dts/imx6qdl-ts4900.dtsifor an example.
Thank you for the hint. It was the reg = <0> causing the issue. Once I removed these, It all went away.
I appreciate the patience. This is my first IMX6 board. I'll push a V2 Patch shortly.
adam