From 82cb82a0fd4b9faa37fd617f81150204310cc031 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Fri, 11 Sep 2020 18:22:05 +0300 Subject: overlay: apalis-imx8: rename overlays using official name The official name of SoM is Apalis-iMX8. Rename overlay files accordingly. Fix Makefile accordingly. Signed-off-by: Oleksandr Suvorov --- overlays/Makefile | 6 ++-- overlays/apalis-imx8_atmel-mxt_overlay.dts | 42 ++++++++++++++++++++++ overlays/apalis-imx8_display-lt170410_overlay.dts | 41 +++++++++++++++++++++ overlays/apalis-imx8_st-m41t0_overlay.dts | 29 +++++++++++++++ overlays/apalis-imx8qm_atmel-mxt_overlay.dts | 42 ---------------------- .../apalis-imx8qm_display-lt170410_overlay.dts | 41 --------------------- overlays/apalis-imx8qm_st-m41t0_overlay.dts | 29 --------------- 7 files changed, 115 insertions(+), 115 deletions(-) create mode 100644 overlays/apalis-imx8_atmel-mxt_overlay.dts create mode 100644 overlays/apalis-imx8_display-lt170410_overlay.dts create mode 100644 overlays/apalis-imx8_st-m41t0_overlay.dts delete mode 100644 overlays/apalis-imx8qm_atmel-mxt_overlay.dts delete mode 100644 overlays/apalis-imx8qm_display-lt170410_overlay.dts delete mode 100644 overlays/apalis-imx8qm_st-m41t0_overlay.dts diff --git a/overlays/Makefile b/overlays/Makefile index 5c6d4f5..13243a9 100644 --- a/overlays/Makefile +++ b/overlays/Makefile @@ -22,9 +22,9 @@ PWD := $(shell pwd) dtb-y += apalis-imx6_atmel-mxt_overlay.dtbo dtb-y += apalis-imx6_disable-parallel-rgb_overlay.dtbo dtb-y += apalis-imx6_lvds_overlay.dtbo -dtb-y += apalis-imx8qm_atmel-mxt_overlay.dtbo -dtb-y += apalis-imx8qm_display-lt170410_overlay.dtbo -dtb-y += apalis-imx8qm_st-m41t0_overlay.dtbo +dtb-y += apalis-imx8_atmel-mxt_overlay.dtbo +dtb-y += apalis-imx8_display-lt170410_overlay.dtbo +dtb-y += apalis-imx8_st-m41t0_overlay.dtbo dtb-y += apalis-imx8x_ad7879_overlay.dtbo dtb-y += apalis-imx8x_atmel-mxt_overlay.dtbo dtb-y += apalis-imx8x_display-lt161010_overlay.dtbo diff --git a/overlays/apalis-imx8_atmel-mxt_overlay.dts b/overlays/apalis-imx8_atmel-mxt_overlay.dts new file mode 100644 index 0000000..5f665bf --- /dev/null +++ b/overlays/apalis-imx8_atmel-mxt_overlay.dts @@ -0,0 +1,42 @@ +// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex. + +/dts-v1/; +/plugin/; + +#include "dt-bindings/interrupt-controller/irq.h" +#include "dt-bindings/gpio/gpio.h" +#include "dt-bindings/pinctrl/pads-imx8qm.h" + +/ { + compatible = "toradex,apalis-imx8qm"; +}; + +&i2c2 { + #address-cells = <1>; + #size-cells = <0>; + + /* Atmel maxtouch controller */ + atmel_mxt_ts: atmel_mxt_ts@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_touch>; + 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 = "okay"; + }; +}; + +&iomuxc { + apalis-imx8qm { + /* Apalis GPIO5+6 */ + pinctrl_touch: touchgrp { + fsl,pins = < + IMX8QM_FLEXCAN2_RX_LSIO_GPIO4_IO01 0x06000021 + IMX8QM_FLEXCAN2_TX_LSIO_GPIO4_IO02 0x06000021 + >; + }; + }; +}; + diff --git a/overlays/apalis-imx8_display-lt170410_overlay.dts b/overlays/apalis-imx8_display-lt170410_overlay.dts new file mode 100644 index 0000000..5f65f05 --- /dev/null +++ b/overlays/apalis-imx8_display-lt170410_overlay.dts @@ -0,0 +1,41 @@ +// LT170410 display (10inch) with a resolution of 1280x800 pixel. This display can be ordered at Toradex. + +/dts-v1/; +/plugin/; +/ { + compatible = "toradex,apalis-imx8qm"; +}; + +&ldb2 { + status = "okay"; +}; + +&ldb2_phy { + status = "okay"; +}; + +&{/lvds1_panel} { + status = "okay"; + compatible = "panel-lvds"; + + data-mapping = "vesa-24"; + width-mm = <1280>; + height-mm = <800>; + + panel-timing { + clock-frequency = <68930000>; + hactive = <1280>; + vactive = <800>; + hback-porch = <64>; + hfront-porch = <64>; + vback-porch = <5>; + vfront-porch = <5>; + hsync-len = <40>; + vsync-len = <6>; + + hsync-active = <0>; + vsync-active = <0>; + pixelclk-active = <0>; + }; +}; + diff --git a/overlays/apalis-imx8_st-m41t0_overlay.dts b/overlays/apalis-imx8_st-m41t0_overlay.dts new file mode 100644 index 0000000..76374e0 --- /dev/null +++ b/overlays/apalis-imx8_st-m41t0_overlay.dts @@ -0,0 +1,29 @@ +// Enable the external RTC ST m41t0 + +/dts-v1/; +/plugin/; + +#include "dt-bindings/interrupt-controller/irq.h" +#include "dt-bindings/gpio/gpio.h" + +/ { + compatible = "toradex,apalis-imx8qm"; +}; + +&i2c2 { + #address-cells = <1>; + #size-cells = <0>; + + /* M41T0M6 real time clock on carrier board */ + rtc_i2c: rtc@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; +}; + +&{/aliases} { + aliases { + rtc0 = &rtc_i2c; + }; +}; + diff --git a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts b/overlays/apalis-imx8qm_atmel-mxt_overlay.dts deleted file mode 100644 index 5f665bf..0000000 --- a/overlays/apalis-imx8qm_atmel-mxt_overlay.dts +++ /dev/null @@ -1,42 +0,0 @@ -// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex. - -/dts-v1/; -/plugin/; - -#include "dt-bindings/interrupt-controller/irq.h" -#include "dt-bindings/gpio/gpio.h" -#include "dt-bindings/pinctrl/pads-imx8qm.h" - -/ { - compatible = "toradex,apalis-imx8qm"; -}; - -&i2c2 { - #address-cells = <1>; - #size-cells = <0>; - - /* Atmel maxtouch controller */ - atmel_mxt_ts: atmel_mxt_ts@4a { - compatible = "atmel,maxtouch"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_touch>; - 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 = "okay"; - }; -}; - -&iomuxc { - apalis-imx8qm { - /* Apalis GPIO5+6 */ - pinctrl_touch: touchgrp { - fsl,pins = < - IMX8QM_FLEXCAN2_RX_LSIO_GPIO4_IO01 0x06000021 - IMX8QM_FLEXCAN2_TX_LSIO_GPIO4_IO02 0x06000021 - >; - }; - }; -}; - diff --git a/overlays/apalis-imx8qm_display-lt170410_overlay.dts b/overlays/apalis-imx8qm_display-lt170410_overlay.dts deleted file mode 100644 index 5f65f05..0000000 --- a/overlays/apalis-imx8qm_display-lt170410_overlay.dts +++ /dev/null @@ -1,41 +0,0 @@ -// LT170410 display (10inch) with a resolution of 1280x800 pixel. This display can be ordered at Toradex. - -/dts-v1/; -/plugin/; -/ { - compatible = "toradex,apalis-imx8qm"; -}; - -&ldb2 { - status = "okay"; -}; - -&ldb2_phy { - status = "okay"; -}; - -&{/lvds1_panel} { - status = "okay"; - compatible = "panel-lvds"; - - data-mapping = "vesa-24"; - width-mm = <1280>; - height-mm = <800>; - - panel-timing { - clock-frequency = <68930000>; - hactive = <1280>; - vactive = <800>; - hback-porch = <64>; - hfront-porch = <64>; - vback-porch = <5>; - vfront-porch = <5>; - hsync-len = <40>; - vsync-len = <6>; - - hsync-active = <0>; - vsync-active = <0>; - pixelclk-active = <0>; - }; -}; - diff --git a/overlays/apalis-imx8qm_st-m41t0_overlay.dts b/overlays/apalis-imx8qm_st-m41t0_overlay.dts deleted file mode 100644 index 76374e0..0000000 --- a/overlays/apalis-imx8qm_st-m41t0_overlay.dts +++ /dev/null @@ -1,29 +0,0 @@ -// Enable the external RTC ST m41t0 - -/dts-v1/; -/plugin/; - -#include "dt-bindings/interrupt-controller/irq.h" -#include "dt-bindings/gpio/gpio.h" - -/ { - compatible = "toradex,apalis-imx8qm"; -}; - -&i2c2 { - #address-cells = <1>; - #size-cells = <0>; - - /* M41T0M6 real time clock on carrier board */ - rtc_i2c: rtc@68 { - compatible = "st,m41t0"; - reg = <0x68>; - }; -}; - -&{/aliases} { - aliases { - rtc0 = &rtc_i2c; - }; -}; - -- cgit v1.2.3