diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-09 09:27:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-09 09:27:26 -0400 |
| commit | 4da98ee1dd72aedaec10551ab52d647ece3a48f5 (patch) | |
| tree | 48cd0e240d5e37d0b8655005a960dde88fb75fc9 /arch/arm/dts/imx6qdl-gw553x.dtsi | |
| parent | 0dec2030ccc686eae4616d1ce57d41eaed15685e (diff) | |
| parent | a8f46306413e2b47d1c93e45436ed11f5bb2c4c3 (diff) | |
| download | u-boot-4da98ee1dd72aedaec10551ab52d647ece3a48f5.tar.gz | |
Merge tag 'u-boot-imx-20210809' of https://source.denx.de/u-boot/custodians/u-boot-imxWIP/09Aug2021
u-boot-imx-20210809
- new SOC: add support for imx8ulp
- Toradex fixes for colibri (vf / imx6 / imx7 / imx8x)
- convert to DM for mx28evk
- Fixes for Gateworks ventana boards
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/8639
Diffstat (limited to 'arch/arm/dts/imx6qdl-gw553x.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6qdl-gw553x.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/dts/imx6qdl-gw553x.dtsi b/arch/arm/dts/imx6qdl-gw553x.dtsi index b6965f25da9..b15c2818524 100644 --- a/arch/arm/dts/imx6qdl-gw553x.dtsi +++ b/arch/arm/dts/imx6qdl-gw553x.dtsi @@ -55,8 +55,8 @@ led0 = &led0; led1 = &led1; nand = &gpmi; - usb0 = &usbh1; - usb1 = &usbotg; + usb0 = &usbotg; + usb1 = &usbh1; }; chosen { @@ -688,6 +688,7 @@ fsl,pins = < MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059 MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0 /* OTG_PWR_EN */ + MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x17059 >; }; |