From 4c0f57396d18270f06f3525fc1b27aa683c9a53f Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 9 Nov 2020 14:44:25 +0200 Subject: arm64: dts: apalis-imx8: rename Eval board device tree The device tree of Apalis Evaluation board is common for both Apalis iMX8QM and Apalis iMX8QP modules. Rename the device tree to further use it for both modules. Related-to: ELB-3036 Signed-off-by: Oleksandr Suvorov --- .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 425 +++++++++++++++++++++ .../boot/dts/freescale/imx8qm-apalis-eval.dts | 4 +- .../boot/dts/freescale/imx8qm-apalis-eval.dtsi | 425 --------------------- .../boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts | 2 +- 4 files changed, 428 insertions(+), 428 deletions(-) create mode 100644 arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi delete mode 100644 arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dtsi diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi new file mode 100644 index 000000000000..62af86afb69e --- /dev/null +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi @@ -0,0 +1,425 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 +/* + * Copyright 2019-2020 Toradex + */ + +#include + +/ { + aliases { + rtc0 = &rtc_i2c; + rtc1 = &rtc; + }; + + reg_usb_host_vbus: regulator-usb-host-vbus { + regulator-name = "VCC USBH2(ABCD) / USBH(3|4)"; + }; +}; + +&adc0 { + status = "okay"; +}; + +&adc1 { + status = "okay"; +}; + +&amix { + status = "okay"; +}; + +&asrc0 { + status = "okay"; +}; + +&backlight { + default-brightness-level = <4>; + brightness-levels = <0 45 63 88 119 158 203 255>; + pwms = <&pwm_lvds1 0 6666667 PWM_POLARITY_INVERTED>; + status = "okay"; +}; + +&dc0_dpr1_channel1 { + status = "okay"; +}; + +&dc0_dpr1_channel2 { + status = "okay"; +}; + +&dc0_dpr1_channel3 { + status = "okay"; +}; + +&dc0_dpr2_channel1 { + status = "okay"; +}; + +&dc0_dpr2_channel2 { + status = "okay"; +}; + +&dc0_dpr2_channel3 { + status = "okay"; +}; + +&dc0_pc { + status = "okay"; +}; + +&dc0_prg1 { + status = "okay"; +}; + +&dc0_prg2 { + status = "okay"; +}; + +&dc0_prg3 { + status = "okay"; +}; + +&dc0_prg4 { + status = "okay"; +}; + +&dc0_prg5 { + status = "okay"; +}; + +&dc0_prg6 { + status = "okay"; +}; + +&dc0_prg7 { + status = "okay"; +}; + +&dc0_prg8 { + status = "okay"; +}; + +&dc0_prg9 { + status = "okay"; +}; + +&dc1_dpr1_channel1 { + status = "okay"; +}; + +&dc1_dpr1_channel2 { + status = "okay"; +}; + +&dc1_dpr1_channel3 { + status = "okay"; +}; + +&dc1_dpr2_channel1 { + status = "okay"; +}; + +&dc1_dpr2_channel2 { + status = "okay"; +}; + +&dc1_dpr2_channel3 { + status = "okay"; +}; + +&dc1_pc { + status = "okay"; +}; + +&dc1_prg1 { + status = "okay"; +}; + +&dc1_prg2 { + status = "okay"; +}; + +&dc1_prg3 { + status = "okay"; +}; + +&dc1_prg4 { + status = "okay"; +}; + +&dc1_prg5 { + status = "okay"; +}; + +&dc1_prg6 { + status = "okay"; +}; + +&dc1_prg7 { + status = "okay"; +}; + +&dc1_prg8 { + status = "okay"; +}; + +&dc1_prg9 { + status = "okay"; +}; + +&dpu1 { + status = "okay"; +}; + +&dpu2 { + status = "okay"; +}; + +&fec1 { + status = "okay"; +}; + +&flexcan1 { + status = "okay"; +}; + +&flexcan2 { + status = "okay"; +}; + +&gpu_3d0{ + status = "okay"; +}; + +&gpu_3d1{ + status = "okay"; +}; + +/* Apalis HDMI1 */ +&hdmi { + status = "okay"; +}; + +&hdmi_lpcg_apb { + status = "okay"; +}; + +&hdmi_lpcg_apb_mux_csr { + status = "okay"; +}; + +&hdmi_lpcg_apb_mux_ctrl { + status = "okay"; +}; + +&hdmi_lpcg_gpio_ipg { + status = "okay"; +}; + +&hdmi_lpcg_i2c0 { + status = "okay"; +}; + +&hdmi_lpcg_i2s { + status = "okay"; +}; + +&hdmi_lpcg_lis_ipg { + status = "okay"; +}; + +&hdmi_lpcg_msi_hclk { + status = "okay"; +}; + +&hdmi_lpcg_phy { + status = "okay"; +}; + +&hdmi_lpcg_pwm_ipg { + status = "okay"; +}; + +&hdmi_lpcg_pxl { + status = "okay"; +}; + +/* Apalis I2C2 (DDC) */ +&i2c0 { + status = "okay"; +}; + +/* Apalis I2C1 */ +&i2c2 { + status = "okay"; + + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio5>, <&pinctrl_gpio6>; + reg = <0x4a>; + interrupt-parent = <&lsio_gpio4>; + interrupts = <1 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ + reset-gpios = <&lsio_gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ + status = "disabled"; + }; + + /* M41T0M6 real time clock on carrier board */ + rtc_i2c: rtc@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; +}; + +/* Apalis I2C3 (CAM) */ +&i2c3 { + status = "okay"; +}; + +&imx8_gpu_ss { + status = "okay"; +}; + +&irqsteer_csi0 { + status = "okay"; +}; + +&irqsteer_csi1 { + status = "okay"; +}; + +&irqsteer_hdmi { + status = "okay"; +}; + +/* Apalis SPI1 */ +&lpspi0 { + status = "okay"; +}; + +/* Apalis SPI2 */ +&lpspi2 { + status = "okay"; +}; + +/* Apalis UART3 */ +&lpuart0 { + status = "okay"; +}; + +/* Apalis UART1 */ +&lpuart1 { + status = "okay"; +}; + +/* Apalis UART4 */ +&lpuart2 { + status = "okay"; +}; + +/* Apalis UART2 */ +&lpuart3 { + status = "okay"; +}; + +/* Apalis PCIE1 */ +&pciea{ + status = "okay"; +}; + +/* Apalis PWM3, MXM3 pin 6 */ +&pwm0 { + status = "okay"; +}; + +/* Apalis PWM4, MXM3 pin 8 */ +&pwm1 { + status = "okay"; +}; + +/* Apalis PWM1, MXM3 pin 2 */ +&pwm2 { + status = "okay"; +}; + +/* Apalis PWM2, MXM3 pin 4 */ +&pwm3 { + status = "okay"; +}; + +&pwm_lvds1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm_bkl>; + status = "okay"; +}; + +&sai1 { + status = "okay"; +}; + +&sai5 { + status = "okay"; +}; + +&sai5_lpcg { + status = "okay"; +}; + +/* Apalis SATA1 */ +&sata { + status = "okay"; +}; + +/* Apalis SPDIF1 */ +&spdif0 { + status = "okay"; +}; + +&spdif1 { + status = "okay"; +}; + +&spdif1_lpcg { + status = "okay"; +}; + +/* Apalis USBH2, Apalis USBH3 and on-module Wi-Fi via on-module HSIC Hub */ +&usbh1 { + vbus-supply = <®_usb_host_vbus>; + status = "okay"; +}; + +/* Apalis USBO1 */ +&usbotg1 { + status = "okay"; +}; + +/* Apalis USBH4 SuperSpeed */ +&usbotg3 { + dr_mode = "host"; + vbus-supply = <®_usb_host_vbus>; + status = "okay"; +}; + +/* Apalis MMC1 */ +&usdhc2 { + status = "okay"; +}; + +/* Apalis SD1 */ +&usdhc3 { + status = "okay"; +}; + +&vpu_decoder { + status = "okay"; +}; + +&vpu_encoder { + status = "okay"; +}; + +&wakeup_key { + status = "okay"; +}; + diff --git a/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts b/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts index 418f419861f9..5b54eec65da5 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dts @@ -1,12 +1,12 @@ // SPDX-License-Identifier: GPL-2.0+ OR X11 /* - * Copyright 2019 Toradex + * Copyright 2019-2020 Toradex */ /dts-v1/; #include "imx8qm-apalis.dtsi" -#include "imx8qm-apalis-eval.dtsi" +#include "imx8-apalis-eval.dtsi" / { model = "Toradex Apalis iMX8QM/QP on Apalis Evaluation Board"; diff --git a/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dtsi deleted file mode 100644 index 72c88ad6bc10..000000000000 --- a/arch/arm64/boot/dts/freescale/imx8qm-apalis-eval.dtsi +++ /dev/null @@ -1,425 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * Copyright 2019 Toradex - */ - -#include - -/ { - aliases { - rtc0 = &rtc_i2c; - rtc1 = &rtc; - }; - - reg_usb_host_vbus: regulator-usb-host-vbus { - regulator-name = "VCC USBH2(ABCD) / USBH(3|4)"; - }; -}; - -&adc0 { - status = "okay"; -}; - -&adc1 { - status = "okay"; -}; - -&amix { - status = "okay"; -}; - -&asrc0 { - status = "okay"; -}; - -&backlight { - default-brightness-level = <4>; - brightness-levels = <0 45 63 88 119 158 203 255>; - pwms = <&pwm_lvds1 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; -}; - -&dc0_dpr1_channel1 { - status = "okay"; -}; - -&dc0_dpr1_channel2 { - status = "okay"; -}; - -&dc0_dpr1_channel3 { - status = "okay"; -}; - -&dc0_dpr2_channel1 { - status = "okay"; -}; - -&dc0_dpr2_channel2 { - status = "okay"; -}; - -&dc0_dpr2_channel3 { - status = "okay"; -}; - -&dc0_pc { - status = "okay"; -}; - -&dc0_prg1 { - status = "okay"; -}; - -&dc0_prg2 { - status = "okay"; -}; - -&dc0_prg3 { - status = "okay"; -}; - -&dc0_prg4 { - status = "okay"; -}; - -&dc0_prg5 { - status = "okay"; -}; - -&dc0_prg6 { - status = "okay"; -}; - -&dc0_prg7 { - status = "okay"; -}; - -&dc0_prg8 { - status = "okay"; -}; - -&dc0_prg9 { - status = "okay"; -}; - -&dc1_dpr1_channel1 { - status = "okay"; -}; - -&dc1_dpr1_channel2 { - status = "okay"; -}; - -&dc1_dpr1_channel3 { - status = "okay"; -}; - -&dc1_dpr2_channel1 { - status = "okay"; -}; - -&dc1_dpr2_channel2 { - status = "okay"; -}; - -&dc1_dpr2_channel3 { - status = "okay"; -}; - -&dc1_pc { - status = "okay"; -}; - -&dc1_prg1 { - status = "okay"; -}; - -&dc1_prg2 { - status = "okay"; -}; - -&dc1_prg3 { - status = "okay"; -}; - -&dc1_prg4 { - status = "okay"; -}; - -&dc1_prg5 { - status = "okay"; -}; - -&dc1_prg6 { - status = "okay"; -}; - -&dc1_prg7 { - status = "okay"; -}; - -&dc1_prg8 { - status = "okay"; -}; - -&dc1_prg9 { - status = "okay"; -}; - -&dpu1 { - status = "okay"; -}; - -&dpu2 { - status = "okay"; -}; - -&fec1 { - status = "okay"; -}; - -&flexcan1 { - status = "okay"; -}; - -&flexcan2 { - status = "okay"; -}; - -&gpu_3d0{ - status = "okay"; -}; - -&gpu_3d1{ - status = "okay"; -}; - -/* Apalis HDMI1 */ -&hdmi { - status = "okay"; -}; - -&hdmi_lpcg_apb { - status = "okay"; -}; - -&hdmi_lpcg_apb_mux_csr { - status = "okay"; -}; - -&hdmi_lpcg_apb_mux_ctrl { - status = "okay"; -}; - -&hdmi_lpcg_gpio_ipg { - status = "okay"; -}; - -&hdmi_lpcg_i2c0 { - status = "okay"; -}; - -&hdmi_lpcg_i2s { - status = "okay"; -}; - -&hdmi_lpcg_lis_ipg { - status = "okay"; -}; - -&hdmi_lpcg_msi_hclk { - status = "okay"; -}; - -&hdmi_lpcg_phy { - status = "okay"; -}; - -&hdmi_lpcg_pwm_ipg { - status = "okay"; -}; - -&hdmi_lpcg_pxl { - status = "okay"; -}; - -/* Apalis I2C2 (DDC) */ -&i2c0 { - status = "okay"; -}; - -/* Apalis I2C1 */ -&i2c2 { - status = "okay"; - - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio5>, <&pinctrl_gpio6>; - reg = <0x4a>; - interrupt-parent = <&lsio_gpio4>; - interrupts = <1 IRQ_TYPE_EDGE_FALLING>; /* Apalis GPIO5 */ - reset-gpios = <&lsio_gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */ - status = "disabled"; - }; - - /* M41T0M6 real time clock on carrier board */ - rtc_i2c: rtc@68 { - compatible = "st,m41t0"; - reg = <0x68>; - }; -}; - -/* Apalis I2C3 (CAM) */ -&i2c3 { - status = "okay"; -}; - -&imx8_gpu_ss { - status = "okay"; -}; - -&irqsteer_csi0 { - status = "okay"; -}; - -&irqsteer_csi1 { - status = "okay"; -}; - -&irqsteer_hdmi { - status = "okay"; -}; - -/* Apalis SPI1 */ -&lpspi0 { - status = "okay"; -}; - -/* Apalis SPI2 */ -&lpspi2 { - status = "okay"; -}; - -/* Apalis UART3 */ -&lpuart0 { - status = "okay"; -}; - -/* Apalis UART1 */ -&lpuart1 { - status = "okay"; -}; - -/* Apalis UART4 */ -&lpuart2 { - status = "okay"; -}; - -/* Apalis UART2 */ -&lpuart3 { - status = "okay"; -}; - -/* Apalis PCIE1 */ -&pciea{ - status = "okay"; -}; - -/* Apalis PWM3, MXM3 pin 6 */ -&pwm0 { - status = "okay"; -}; - -/* Apalis PWM4, MXM3 pin 8 */ -&pwm1 { - status = "okay"; -}; - -/* Apalis PWM1, MXM3 pin 2 */ -&pwm2 { - status = "okay"; -}; - -/* Apalis PWM2, MXM3 pin 4 */ -&pwm3 { - status = "okay"; -}; - -&pwm_lvds1 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm_bkl>; - status = "okay"; -}; - -&sai1 { - status = "okay"; -}; - -&sai5 { - status = "okay"; -}; - -&sai5_lpcg { - status = "okay"; -}; - -/* Apalis SATA1 */ -&sata { - status = "okay"; -}; - -/* Apalis SPDIF1 */ -&spdif0 { - status = "okay"; -}; - -&spdif1 { - status = "okay"; -}; - -&spdif1_lpcg { - status = "okay"; -}; - -/* Apalis USBH2, Apalis USBH3 and on-module Wi-Fi via on-module HSIC Hub */ -&usbh1 { - vbus-supply = <®_usb_host_vbus>; - status = "okay"; -}; - -/* Apalis USBO1 */ -&usbotg1 { - status = "okay"; -}; - -/* Apalis USBH4 SuperSpeed */ -&usbotg3 { - dr_mode = "host"; - vbus-supply = <®_usb_host_vbus>; - status = "okay"; -}; - -/* Apalis MMC1 */ -&usdhc2 { - status = "okay"; -}; - -/* Apalis SD1 */ -&usdhc3 { - status = "okay"; -}; - -&vpu_decoder { - status = "okay"; -}; - -&vpu_encoder { - status = "okay"; -}; - -&wakeup_key { - status = "okay"; -}; - diff --git a/arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts b/arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts index 98ed5e3da1a4..94adf866bb2f 100644 --- a/arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts +++ b/arch/arm64/boot/dts/freescale/imx8qm-apalis-v1.1-eval.dts @@ -6,7 +6,7 @@ /dts-v1/; #include "imx8qm-apalis-v1.1.dtsi" -#include "imx8qm-apalis-eval.dtsi" +#include "imx8-apalis-eval.dtsi" / { model = "Toradex Apalis iMX8QM/QP V1.1 on Apalis Evaluation Board"; -- cgit v1.2.3