ARM: dts: imx7d: cl-som-imx7 imx7d-sbc-imx7: move USB
Subsystems (3)
PATCH 1/12 ARM: dts: imx7d: cl-som-imx7 imx7d-sbc-imx7: move USB
Whether and which USB port is enabled and how they are powered is a function of the carrier board, not of the SoM. Different carrier boards can have different ports enabled / wired up, and power them differently; so this should really move into the respective DTS.
Do so and update the USB power supply to reflect the actual situation on the sbc-imx7 carrier board.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 24 ------------------------ arch/arm/boot/dts/imx7d-sbc-imx7.dts | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +0 -24
@@ -22,15 +22,6 @@ device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */ }; - - reg_usb_otg1_vbus: regulator-vbus { - compatible = "regulator-fixed"; - regulator-name = "usb_otg1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; &cpu0 {
@@ -193,13 +184,6 @@ status = "okay"; }; -&usbotg1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbotg1>; - vbus-supply = <®_usb_otg1_vbus>; - status = "okay"; -}; - &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>;
@@ -278,11 +262,3 @@ >; }; }; - -&iomuxc_lpsr { - pinctrl_usbotg1: usbotg1grp { - fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */ - >; - }; -};
arch/arm/boot/dts/imx7d-sbc-imx7.dts +13 -0
@@ -15,6 +15,14 @@ / { model = "CompuLab SBC-iMX7"; compatible = "compulab,sbc-imx7", "compulab,cl-som-imx7", "fsl,imx7d"; + + reg_usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; }; &usdhc1 {
@@ -26,6 +34,11 @@ status = "okay"; }; +&&usbotg1 { + vbus-supply = <®_usb_vbus>; + status = "okay"; +}; + &iomuxc { pinctrl_usdhc1: usdhc1grp { fsl,pins = <
Signature · 1 line
2.23.0.rc1
PATCH 2/12 ARM: dts: imx7d: cl-som-imx7: add phy-reset-gpios
According to the design team:
* reset input PHY0 is directly connected to the corresponding pin GPIO1_4 in the i.MX7
* reset for PHY1 is done using the gpio expander bit 4
While touching this area, also add a 'compatible' to the phy to make it more clear what this is and which driver handles this - an Ethernet phy attached to mdio, handled by of_mdio.c
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +13 -1
@@ -30,13 +30,14 @@ &fec1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enet1>; + pinctrl-0 = <&pinctrl_enet1 &pinctrl_enet1phy>; assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>, <&clks IMX7D_ENET1_TIME_ROOT_CLK>; assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>; assigned-clock-rates = <0>, <100000000>; phy-mode = "rgmii-id"; phy-handle = <ðphy0>; + phy-reset-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; fsl,magic-packet; status = "okay";
@@ -45,10 +46,12 @@ #size-cells = <0>; ethphy0: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; reg = <0>; }; ethphy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; reg = <1>; }; };
@@ -63,6 +66,7 @@ assigned-clock-rates = <0>, <100000000>; phy-mode = "rgmii-id"; phy-handle = <ðphy1>; + phy-reset-gpios = <&pca9555 4 GPIO_ACTIVE_LOW>; fsl,magic-packet; status = "okay"; };
@@ -262,3 +266,11 @@ >; }; }; + +&iomuxc_lpsr { + pinctrl_enet1phy: enet1phygrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x34 + >; + }; +};
Signature · 1 line
2.23.0.rc1
PATCH 3/12 ARM: dts: imx7d: cl-som-imx7: fix i2c2
In reply to André DraszikI2C2 is configured incorrectly at the moment:
* update i2c2 to actually work (fix incorrect pinctrl assignments)
* add the i2c2 bus recovery information [1]
[1] Note that scl is being marked as GPIO_OPEN_DRAIN even
though the i.MX pinctrl driver does not support enabling
open drain directly - it is enabled by the fixed pinmux
entry.
So while this flag has no effect in practice, it needs
to be there purely so as to fix the following warning
from gpiolib:
gpio-6 (scl): enforced open drain please flag it properly in DT/ACPI DSDT/board file
as that is the mode requested by i2c-imx.c
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 26 +++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +18 -8
@@ -72,8 +72,11 @@ }; &i2c2 { - pinctrl-names = "default"; + pinctrl-names = "default", "gpio"; pinctrl-0 = <&pinctrl_i2c2>; + pinctrl-1 = <&pinctrl_i2c2_recovery>; + sda-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + scl-gpios = <&gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; status = "okay"; pmic: pmic@8 {
@@ -236,13 +239,6 @@ >; }; - pinctrl_i2c2: i2c2grp { - fsl,pins = < - MX7D_PAD_I2C2_SDA__I2C2_SDA 0x4000007f - MX7D_PAD_I2C2_SCL__I2C2_SCL 0x4000007f - >; - }; - pinctrl_uart1: uart1grp { fsl,pins = < MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX 0x79
@@ -273,4 +269,18 @@ MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4 0x34 >; }; + + pinctrl_i2c2: i2c2grp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO07__I2C2_SDA 0x4000000f + MX7D_PAD_LPSR_GPIO1_IO06__I2C2_SCL 0x4000000f + >; + }; + + pinctrl_i2c2_recovery: i2c2recoverygrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7 0x4000007f + MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x4000007f + >; + }; };
Signature · 1 line
2.23.0.rc1
PATCH 4/12 ARM: dts: imx7d: cl-som-imx7: add emmicro,em3027 RTC
In reply to André Draszikadd/enable RTC support using the on-board EM3027 real time clock on i2c2.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +5 -0
@@ -181,6 +181,11 @@ reg = <0x50>; pagesize = <16>; }; + + rtc@56 { + compatible = "emmicro,em3027"; + reg = <0x56>; + }; }; &uart1 {
Signature · 1 line
2.23.0.rc1
PATCH 5/12 ARM: dts: imx7d: cl-som-imx7: update pfuze3000 max voltage
In reply to André DraszikThe max voltage of SW1A is 3.3V on PF3000 as per
http://cache.freescale.com/files/analog/doc/data_sheet/PF3000.pdf?fsrch=1&sr=1&pageNum=1
While at it, remove the unnecessary leading zero from the i2c address.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +2 -2
@@ -81,12 +81,12 @@ pmic: pmic@8 { compatible = "fsl,pfuze3000"; - reg = <0x08>; + reg = <0x8>; regulators { sw1a_reg: sw1a { regulator-min-microvolt = <700000>; - regulator-max-microvolt = <1475000>; + regulator-max-microvolt = <3300000>; regulator-boot-on; regulator-always-on; regulator-ramp-delay = <6250>;
Signature · 1 line
2.23.0.rc1
PATCH 6/12 ARM: dts: imx7d: cl-som-imx7: add / enable watchdog
In reply to André Draszikadd / enable watchdog which is connected via WDOG_B to the PMIC, due to i.MX7 Errata e10574
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +12 -0
@@ -207,6 +207,12 @@ status = "okay"; }; +&wdog1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_wdog>; + fsl,ext-reset-output; +}; + &iomuxc { pinctrl_enet1: enet1grp { fsl,pins = <
@@ -288,4 +294,10 @@ MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6 0x4000007f >; }; + + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74 + >; + }; };
Signature · 1 line
2.23.0.rc1
PATCH 7/12 ARM: dts: imx7d: cl-som-imx7: add/enable SPI flash on spi1
In reply to André Draszikadd/enable SPI flash on spi1 using the default vendor's partition layout as per downstream kernel
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +45 -0
@@ -28,6 +28,36 @@ cpu-supply = <&sw1a_reg>; }; +&ecspi1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>; + cs-gpios = <&gpio4 19 GPIO_ACTIVE_HIGH>; + status = "okay"; + + flash@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "jedec,spi-nor"; + spi-max-frequency = <20000000>; + reg = <0>; + + partition@0 { + label = "uboot"; + reg = <0x0 0xc0000>; + }; + + partition@c0000 { + label = "uboot environment"; + reg = <0xc0000 0x40000>; + }; + + partition@100000 { + label = "splash"; + reg = <0x100000 0x100000>; + }; + }; +}; + &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1 &pinctrl_enet1phy>;
@@ -214,6 +244,21 @@ }; &iomuxc { + pinctrl_ecspi1: ecspi1grp { + fsl,pins = < + MX7D_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0xf + MX7D_PAD_ECSPI1_MISO__ECSPI1_MISO 0xf + MX7D_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0xf + >; + }; + + pinctrl_ecspi1_cs: ecspi1_cs_grp { + fsl,pins = < + /* SPI flash chipselect */ + MX7D_PAD_ECSPI1_SS0__GPIO4_IO19 0x34 + >; + }; + pinctrl_enet1: enet1grp { fsl,pins = < MX7D_PAD_SD2_CD_B__ENET1_MDIO 0x30
Signature · 1 line
2.23.0.rc1
PATCH 8/12 ARM: dts: imx7d: cl-som-imx7: update UART1 (debug) clock
In reply to André Draszikassign OSC as uart1 (debug) clock to achieve low power, so that the PLL doesn't need to be kept on
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +1 -1
@@ -222,7 +222,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; assigned-clocks = <&clks IMX7D_UART1_ROOT_SRC>; - assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>; status = "okay"; };
Signature · 1 line
2.23.0.rc1
PATCH 9/12 ARM: dts: imx7d: cl-som-imx7: add SMSC USB3503 usb hub
In reply to André DraszikAs per the SoM design, add the SMSC USB3503 that is used as a PHY in hardware-only mode, connected to the imx7d's &usbh interface, providing additional USB ports for USB and mini-PCIe.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +6 -0
@@ -22,6 +22,12 @@ device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */ }; + + /* SMSC USB3503 connected to &usbh */ + usb_hub: usb-hub { + compatible = "smsc,usb3503"; + reset-gpios = <&pca9555 6 GPIO_ACTIVE_LOW>; + }; }; &cpu0 {
Signature · 1 line
2.23.0.rc1
PATCH 10/12 ARM: dts: imx7d: cl-som-imx7: add WiLink8 WLAN support
In reply to André Draszikadd / enable TI's WiLink8 WLAN module on SDIO2.
Notes:
* power is always enabled (because of bluetooth)
* the downstream delay of 70ms after power-on
doesn't seem to reliably work, hence it was
bumped to 700ms
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 60 +++++++++++++++++++++++++ 1 file changed, 60 insertions(+)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +60 -0
@@ -28,6 +28,24 @@ compatible = "smsc,usb3503"; reset-gpios = <&pca9555 6 GPIO_ACTIVE_LOW>; }; + + pwrseq_ti_wifi: ti-wifi-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&pca9555 0 GPIO_ACTIVE_LOW>; + post-power-on-delay-ms = <700>; + /* 10μs during shutdown, but 60μs between two enables */ + power-off-delay-us = "60"; + }; + + reg_ti_wifi: regulator-ti-wifi { + compatible = "regulator-fixed"; + regulator-name = "wilink-regulator"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&pca9555 9 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-always-on; + }; }; &cpu0 {
@@ -232,6 +250,31 @@ status = "okay"; }; +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + bus-width = <4>; + no-1-8-v; + keep-power-in-suspend; + wakeup-source; + vmmc-supply = <®_ti_wifi>; + mmc-pwrseq = <&pwrseq_ti_wifi>; + non-removable; + cap-power-off-card; + status = "okay"; + + #address-cells = <1>; + #size-cells = <0>; + wlcore: wlcore@2 { + compatible = "ti,wl1835"; + reg = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2_wlcore>; + interrupt-parent = <&gpio1>; + interrupts = <15 IRQ_TYPE_LEVEL_HIGH>; + }; +}; + &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>;
@@ -308,6 +351,23 @@ >; }; + pinctrl_usdhc2: usdhc2grp { + fsl,pins = < + MX7D_PAD_SD2_CMD__SD2_CMD 0x59 + MX7D_PAD_SD2_CLK__SD2_CLK 0x19 + MX7D_PAD_SD2_DATA0__SD2_DATA0 0x59 + MX7D_PAD_SD2_DATA1__SD2_DATA1 0x59 + MX7D_PAD_SD2_DATA2__SD2_DATA2 0x59 + MX7D_PAD_SD2_DATA3__SD2_DATA3 0x59 + >; + }; + + pinctrl_usdhc2_wlcore: usdhc2wlcoregrp { + fsl,pins = < + MX7D_PAD_GPIO1_IO15__GPIO1_IO15 0x34 + >; + }; + pinctrl_usdhc3: usdhc3grp { fsl,pins = < MX7D_PAD_SD3_CMD__SD3_CMD 0x59
Signature · 1 line
2.23.0.rc1
PATCH 11/12 ARM: dts: imx7d: cl-som-imx7: add WiLink Bluetooth support
In reply to André Draszikadd / enable TI's WiLink8 Bluetooth module on UART3.
--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
arch/arm/boot/dts/imx7d-cl-som-imx7.dts +24 -0
@@ -250,6 +250,21 @@ status = "okay"; }; +&uart3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; + assigned-clocks = <&clks IMX7D_UART3_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>; + uart-has-rtscts; + status = "okay"; + + bluetooth { + compatible = "ti,wl1835-st"; + enable-gpios = <&pca9555 1 GPIO_ACTIVE_HIGH>; + max-speed = <3000000>; + }; +}; + &usdhc2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>;
@@ -351,6 +366,15 @@ >; }; + pinctrl_uart3: uart3grp { + fsl,pins = < + MX7D_PAD_UART3_TX_DATA__UART3_DCE_TX 0x79 + MX7D_PAD_UART3_RX_DATA__UART3_DCE_RX 0x79 + MX7D_PAD_UART3_CTS_B__UART3_DCE_CTS 0x79 + MX7D_PAD_UART3_RTS_B__UART3_DCE_RTS 0x79 + >; + }; + pinctrl_usdhc2: usdhc2grp { fsl,pins = < MX7D_PAD_SD2_CMD__SD2_CMD 0x59
Signature · 1 line
2.23.0.rc1
PATCH 12/12 ARM: dts: imx7d: sbc-iot-imx7: add basic board support
In reply to André DraszikThis is a forward-port of Compulab's downstream commit against linux 4.9.11.
Original commit message:
The SB-IOT-iMX7 base board together with CL-SOM-iMX7 SoM forms SBC-IOT-iMX7 single board computer. SBC-IOT-iMX7 is a single board computer optimized for industrial control and monitoring, extensive wireless and wired connectivity, ideal solution for cost-sensitive systems. It is based on the Freescale i.MX7 system-on-chip. SBC-IOT-iMX7 is implemented with the CL-SOM-iMX7 System-on-Module providing most of the functions,and SB-IOT-iMX7 carrier board providing additional peripheral functions and connectors.
https://www.compulab.com/products/computer-on-modules/cl-som-imx7-freescale-i-mx-7-system-on-module/
https://www.compulab.com/products/sbcs/sbc-iot-imx7-nxp-i-mx-7-internet-of-things-single-board-computer/
This commit adds basic board support, including:
* SD-card (note that write-protect is not connected on this carrier board)
* SPI (available on expansion header)
* i2c3 & i2c4 (including bus recovery information)
* additional UARTs
* all USB ports
Compared to the downtream commit, this commit doesn't add / enable the PCIe and LCD interface, as PCIe support needs an additional patch to the PCI controller first, and I can't test the LCD.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx7d-sbc-iot-imx7.dts | 198 +++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 arch/arm/boot/dts/imx7d-sbc-iot-imx7.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -591,6 +591,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-pico-hobbit.dtb \ imx7d-pico-pi.dtb \ imx7d-sbc-imx7.dtb \ + imx7d-sbc-iot-imx7.dtb \ imx7d-sdb.dtb \ imx7d-sdb-reva.dtb \ imx7d-sdb-sht11.dtb \
arch/arm/boot/dts/imx7d-sbc-iot-imx7.dts new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
2.23.0.rc1
PATCH v2 1/1 ARM: dts: imx7d: sbc-iot-imx7: add basic board support
This is a forward-port of Compulab's downstream commit against linux 4.9.11.
Original commit message:
The SB-IOT-iMX7 base board together with CL-SOM-iMX7 SoM forms SBC-IOT-iMX7 single board computer. SBC-IOT-iMX7 is a single board computer optimized for industrial control and monitoring, extensive wireless and wired connectivity, ideal solution for cost-sensitive systems. It is based on the Freescale i.MX7 system-on-chip. SBC-IOT-iMX7 is implemented with the CL-SOM-iMX7 System-on-Module providing most of the functions,and SB-IOT-iMX7 carrier board providing additional peripheral functions and connectors.
https://www.compulab.com/products/computer-on-modules/cl-som-imx7-freescale-i-mx-7-system-on-module/
https://www.compulab.com/products/sbcs/sbc-iot-imx7-nxp-i-mx-7-internet-of-things-single-board-computer/
This commit adds basic board support, including:
* SD-card (note that write-protect is not connected on this carrier board)
* SPI (available on expansion header)
* i2c3 & i2c4 (including bus recovery information)
* additional UARTs
* all USB ports
Compared to the downtream commit, this commit doesn't add / enable the PCIe and LCD interface, as PCIe support needs an additional patch to the PCI controller first, and I can't test the LCD.
---
v2:
* use standard uart-has-rtscts instead of fsl,uart-has-rtscts
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx7d-sbc-iot-imx7.dts | 198 +++++++++++++++++++++++ 2 files changed, 199 insertions(+) create mode 100644 arch/arm/boot/dts/imx7d-sbc-iot-imx7.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -591,6 +591,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-pico-hobbit.dtb \ imx7d-pico-pi.dtb \ imx7d-sbc-imx7.dtb \ + imx7d-sbc-iot-imx7.dtb \ imx7d-sdb.dtb \ imx7d-sdb-reva.dtb \ imx7d-sdb-sht11.dtb \
arch/arm/boot/dts/imx7d-sbc-iot-imx7.dts new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
2.23.0.rc1
Quoted 6 lines · André Draszik
Whether and which USB port is enabled and how they are powered is a function of the carrier board, not of the SoM. Different carrier boards can have different ports enabled / wired up, and power them differently; so this should really move into the respective DTS.
Quoted 6 lines
Do so and update the USB power supply to reflect the actual situation on the sbc-imx7 carrier board.
Signed-off-by André Draszik <[email protected]>Cc Ilya Ledvich <[email protected]>Cc Igor Grinberg <[email protected]>
Ilya, Igor, can you have a look at the series?
Shawn
Quoted 94 lines
Cc Rob Herring <[email protected]>Cc Mark Rutland <[email protected]>Cc Shawn Guo <[email protected]>Cc Sascha Hauer <[email protected]>Cc Pengutronix Kernel Team <[email protected]>Cc Fabio Estevam <[email protected]>Cc NXP Linux Team <[email protected]>--- arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 24 ------------------------ arch/arm/boot/dts/imx7d-sbc-imx7.dts | 13 +++++++++++++ 2 files changed, 13 insertions(+), 24 deletions(-)arch/arm/boot/dts/imx7d-cl-som-imx7.dts +0
-24@@ -22,15 +22,6 @@ device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB - minimal configuration */ }; - - reg_usb_otg1_vbus: regulator-vbus { - compatible = "regulator-fixed"; - regulator-name = "usb_otg1_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; }; &cpu0 {@@ -193,13 +184,6 @@ status = "okay"; }; -&usbotg1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbotg1>; - vbus-supply = <®_usb_otg1_vbus>; - status = "okay"; -}; - &usdhc3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>;@@ -278,11 +262,3 @@ >; }; }; - -&iomuxc_lpsr { - pinctrl_usbotg1: usbotg1grp { - fsl,pins = < - MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x14 /* OTG PWREN */ - >; - }; -};arch/arm/boot/dts/imx7d-sbc-imx7.dts +13
-0@@ -15,6 +15,14 @@ / { model = "CompuLab SBC-iMX7"; compatible = "compulab,sbc-imx7", "compulab,cl-som-imx7", "fsl,imx7d"; + + reg_usb_vbus: regulator-usb-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb_vbus"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; }; &usdhc1 {@@ -26,6 +34,11 @@ status = "okay"; }; +&&usbotg1 { + vbus-supply = <®_usb_vbus>; + status = "okay"; +}; + &iomuxc { pinctrl_usdhc1: usdhc1grp { fsl,pins = <Signature · 1 line
2.23.0.rc1