diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-15 14:21:23 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-11-15 14:21:23 +0100 |
commit | 0f89a1c654e728aa92a14147abe684bede50e4e0 (patch) | |
tree | 456298a0f28bd436fd87559448eb82bf5d368941 /arch/arm/dts | |
parent | 64f85586d1dcb30eddd3d5d9ed39117bafb7da89 (diff) | |
parent | d92e7bb4d43d1b366655a9ec97c91c031f92ab64 (diff) | |
download | barebox-0f89a1c654e728aa92a14147abe684bede50e4e0.tar.gz barebox-0f89a1c654e728aa92a14147abe684bede50e4e0.tar.xz |
Merge branch 'for-next/skov-imx6'
Diffstat (limited to 'arch/arm/dts')
-rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/dts/imx6qdl-skov-imx6.dtsi | 20 | ||||
-rw-r--r-- | arch/arm/dts/imx6s-skov-imx6.dts | 22 |
3 files changed, 43 insertions, 1 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 80caa738a9..88a079497a 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -115,7 +115,7 @@ lwl-$(CONFIG_MACH_SOLIDRUN_CUBOX) += dove-cubox-bb.dtb.o lwl-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += imx6dl-hummingboard.dtb.o imx6q-hummingboard.dtb.o \ imx6dl-hummingboard2.dtb.o imx6q-hummingboard2.dtb.o \ imx6q-h100.dtb.o -lwl-$(CONFIG_MACH_SKOV_IMX6) += imx6dl-skov-imx6.dtb.o imx6q-skov-imx6.dtb.o +lwl-$(CONFIG_MACH_SKOV_IMX6) += imx6s-skov-imx6.dtb.o imx6dl-skov-imx6.dtb.o imx6q-skov-imx6.dtb.o lwl-$(CONFIG_MACH_SKOV_ARM9CPU) += at91-skov-arm9cpu.dtb.o lwl-$(CONFIG_MACH_SEEED_ODYSSEY) += stm32mp157c-odyssey.dtb.o lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb.o diff --git a/arch/arm/dts/imx6qdl-skov-imx6.dtsi b/arch/arm/dts/imx6qdl-skov-imx6.dtsi index 03f3cb02fc..371a931e53 100644 --- a/arch/arm/dts/imx6qdl-skov-imx6.dtsi +++ b/arch/arm/dts/imx6qdl-skov-imx6.dtsi @@ -273,6 +273,26 @@ remote-endpoint = <&display0_in>; }; +&usbh1 { + disable-over-current; + status = "okay"; +}; + +/* no usbh2 */ +&usbphynop1 { + status = "disabled"; +}; + +/* no usbh3 */ +&usbphynop2 { + status = "disabled"; +}; + +&usbotg { + disable-over-current; + status = "okay"; +}; + &iomuxc { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_hog>; diff --git a/arch/arm/dts/imx6s-skov-imx6.dts b/arch/arm/dts/imx6s-skov-imx6.dts new file mode 100644 index 0000000000..9061563e45 --- /dev/null +++ b/arch/arm/dts/imx6s-skov-imx6.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2015 Juergen Borleis, Pengutronix <kernel@pengutronix.de> + */ + +/dts-v1/; +#include <arm/imx6dl.dtsi> +#include "imx6dl.dtsi" +#include "imx6qdl-skov-imx6.dtsi" + +/ { + model = "Skov IMX6"; + compatible = "skov,imx6", "fsl,imx6dl"; + + chosen { + stdout-path = &uart2; + }; +}; + +&hdmi { + status = "disabled"; +}; |