diff options
| -rw-r--r-- | arch/arm/boot/dts/imx7-colibri.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri-aster.dts | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 16 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7s-colibri-aster.dts | 20 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 28 |
6 files changed, 85 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index f1222c042df0..3767f94470ec 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -52,7 +52,7 @@ enable-gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; power-supply = <®_module_3v3>; pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>; - status = "okay"; + status = "disabled"; }; @@ -60,6 +60,7 @@ compatible = "panel-dpi"; backlight = <&backlight>; power-supply = <®_3v3>; + status = "disabled"; width-mm = <115>; height-mm = <86>; @@ -400,7 +401,7 @@ adi,median-filter-size = /bits/ 8 <2>; adi,averaging = /bits/ 8 <1>; adi,conversion-interval = /bits/ 8 <255>; - status = "okay"; + status = "disabled"; }; pmic@33 { @@ -492,7 +493,7 @@ interrupt-parent = <&gpio2>; interrupts = <15 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 107, INT */ reset-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; /* SODIMM 106, RST */ - status = "okay"; + status = "disabled"; }; }; @@ -503,7 +504,7 @@ pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; - status = "okay"; + status = "disabled"; port { lcdif_out: endpoint { diff --git a/arch/arm/boot/dts/imx7d-colibri-aster.dts b/arch/arm/boot/dts/imx7d-colibri-aster.dts index ee5c66713eb2..a1601afaa85f 100644 --- a/arch/arm/boot/dts/imx7d-colibri-aster.dts +++ b/arch/arm/boot/dts/imx7d-colibri-aster.dts @@ -18,6 +18,26 @@ "fsl,imx7d"; }; +&ad7879_ts { + status = "okay"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + &usbotg2 { vbus-supply = <®_usbh_vbus>; status = "okay"; diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi index 485a03943b47..af39e5370fa1 100644 --- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi @@ -46,23 +46,3 @@ &usdhc3 { status = "okay"; }; - -&ad7879_ts { - status = "disabled"; -}; - -&backlight { - status = "disabled"; -}; - -&lcdif { - status = "disabled"; -}; - -&pwm1 { - status = "disabled"; -}; - -&atmel_mxt_ts { - status = "disabled"; -}; diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts index d6e4e89ca042..0644b0275b92 100644 --- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts @@ -50,8 +50,7 @@ "fsl,imx7d"; }; -&usbotg2 { - vbus-supply = <®_usbh_vbus>; +&ad7879_ts { status = "okay"; }; @@ -67,10 +66,19 @@ status = "disabled"; }; -&pwm2 { +&backlight { + status = "okay"; +}; + +&lcdif { status = "okay"; }; -&pwm3 { +&panel_dpi { + status = "okay"; +}; + +&usbotg2 { + vbus-supply = <®_usbh_vbus>; status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7s-colibri-aster.dts b/arch/arm/boot/dts/imx7s-colibri-aster.dts index c591e5f29a9b..3ce1ffd8dfb2 100644 --- a/arch/arm/boot/dts/imx7s-colibri-aster.dts +++ b/arch/arm/boot/dts/imx7s-colibri-aster.dts @@ -17,3 +17,23 @@ "toradex,colibri-imx7s", "fsl,imx7s", "fsl,imx7d"; }; + +&ad7879_ts { + status = "okay"; +}; + +&atmel_mxt_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts index bd2a49c1ade6..c7e988536ea3 100644 --- a/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx7s-colibri-eval-v3.dts @@ -49,3 +49,31 @@ compatible = "toradex,colibri-imx7s-eval-v3", "toradex,colibri-imx7s", "fsl,imx7s"; }; + +&ad7879_ts { + status = "okay"; +}; + +/* + * The PCAP uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3. + * So if you enable following PCAP controller, disable pwm2/pwm3 first. + */ +&atmel_mxt_ts { + pinctrl-0 = <&pinctrl_atmel_adapter>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM_28, INT */ + reset-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; /* SODIMM_30, RST */ + status = "disabled"; +}; + +&backlight { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; |