diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-07-21 15:27:26 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2022-07-25 16:12:00 +0200 |
| commit | d0399a46e7cda63c07e3eb8558bef84cfb068028 (patch) | |
| tree | 109f7d723e2c5fecc52355e6fcb39b7107c12b16 /arch/arm/dts/imx6qdl-gw5904.dtsi | |
| parent | 50b229523bbc5511e1bace34df779f84950bf872 (diff) | |
imx6dl/imx6qdl: synchronise device trees with linux
Synchronise device trees with linux-next next-20220708.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/dts/imx6qdl-gw5904.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6qdl-gw5904.dtsi | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/arch/arm/dts/imx6qdl-gw5904.dtsi b/arch/arm/dts/imx6qdl-gw5904.dtsi index 381f605cc0..612b6e068e 100644 --- a/arch/arm/dts/imx6qdl-gw5904.dtsi +++ b/arch/arm/dts/imx6qdl-gw5904.dtsi @@ -55,9 +55,8 @@ led0 = &led0; led1 = &led1; led2 = &led2; - mmc0 = &usdhc3; - usb0 = &usbotg; - usb1 = &usbh1; + usb0 = &usbh1; + usb1 = &usbotg; }; chosen { @@ -73,8 +72,6 @@ gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; user-pb { label = "user_pb"; @@ -176,8 +173,7 @@ regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>; - enable-active-high; + regulator-always-on; }; reg_usb_otg_vbus: regulator-usb-otg-vbus { @@ -201,9 +197,6 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet>; phy-mode = "rgmii-id"; - phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>; - phy-reset-duration = <10>; - phy-reset-post-delay = <300>; status = "okay"; fixed-link { @@ -474,6 +467,11 @@ }; }; + crypto@60 { + compatible = "atmel,atecc508a"; + reg = <0x60>; + }; + imu@6a { compatible = "st,lsm9ds1-imu"; reg = <0x6a>; @@ -588,14 +586,11 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbotg>; disable-over-current; - dr_mode = "otg"; status = "okay"; }; &usbh1 { vbus-supply = <®_usb_h1_vbus>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usbotg>; status = "okay"; }; @@ -756,12 +751,6 @@ >; }; - pinctrl_usbh1: usbh1grp { - fsl,pins = < - MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 - >; - }; - pinctrl_usbotg: usbotggrp { fsl,pins = < MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 |