arm: dts: colibri-imx6ull: keep peripherals disabled
Subsystems (2)
PATCH 1/4 arm: dts: colibri-imx6ull: keep peripherals disabled
From: Philippe Schenker <[email protected]>
Toradex does provide device-tree overlays to enable certain evaluation hardware. Keep the buses disabled by default to be enabled again with overlays.
For customers including this device-tree this has also the advantage that the hardware we want by default running does not automatically enable signals on their end.
---
arch/arm/boot/dts/imx6ull-colibri.dtsi | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx6ull-colibri.dtsi +5 -3
@@ -21,7 +21,7 @@ backlight: backlight { pinctrl-0 = <&pinctrl_gpio_bl_on>; power-supply = <®_3v3>; pwms = <&pwm4 0 5000000 1>; - status = "okay"; + status = "disabled"; }; gpio-keys {
@@ -42,7 +42,7 @@ panel_dpi: panel-dpi { compatible = "edt,et057090dhu"; backlight = <&backlight>; power-supply = <®_3v3>; - status = "okay"; + status = "disabled"; port { lcd_panel_in: endpoint {
@@ -159,7 +159,7 @@ &i2c1 { pinctrl-1 = <&pinctrl_i2c1_gpio>; sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - status = "okay"; + status = "disabled"; /* Atmel maxtouch controller */ atmel_mxt_ts: touchscreen@4a {
@@ -202,6 +202,7 @@ ad7879_ts: touchscreen@2c { adi,median-filter-size = /bits/ 8 <2>; adi,averaging = /bits/ 8 <1>; adi,conversion-interval = /bits/ 8 <255>; + status = "disabled"; }; };
@@ -209,6 +210,7 @@ &lcdif { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcdif_dat &pinctrl_lcdif_ctrl>; + status = "disabled"; port { lcdif_out: endpoint {
Signature · 1 line
2.37.3
PATCH 2/4 arm: dts: colibri-imx6ull: enable default peripherals
From: Philippe Schenker <[email protected]>
For NAND modules Toradex does not provide any device-tree overlays. But we always had a default display output enabled on NAND modules as well as touchscreens that are placed on displays which can easily be plugged into those carrier boards. Do reenable these displays and touchscreen output on all device-trees that are used on NAND modules.
---
arch/arm/boot/dts/imx6ull-colibri-aster.dts | 40 +++++++++++++++++++ arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts | 24 +++++++++++ arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts | 40 +++++++++++++++++++ arch/arm/boot/dts/imx6ull-colibri-iris.dts | 22 +++++++++- .../boot/dts/imx6ull-colibri-wifi-aster.dts | 40 +++++++++++++++++++ .../boot/dts/imx6ull-colibri-wifi-eval-v3.dts | 24 +++++++++++ .../boot/dts/imx6ull-colibri-wifi-iris-v2.dts | 24 +++++++++++ .../boot/dts/imx6ull-colibri-wifi-iris.dts | 20 ++++++++++ 8 files changed, 233 insertions(+), 1 deletion(-)
arch/arm/boot/dts/imx6ull-colibri-aster.dts +40 -0
@@ -15,6 +15,46 @@ / { "fsl,imx6ull"; }; +&ad7879_ts { + status = "okay"; +}; + &atmel_mxt_ts { status = "okay"; }; + +&backlight { + status = "okay"; +}; + +&i2c1 { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +}; + +/* PWM <B> */ +&pwm5 { + /* Pin already used by atmel_mxt_ts touchscreen */ + status = "disabled"; +}; + +/* PWM <C> */ +&pwm6 { + /* Pin already used by atmel_mxt_ts touchscreen */ + status = "disabled"; +};
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dts +24 -0
@@ -12,3 +12,27 @@ / { model = "Toradex Colibri iMX6ULL 256/512MB on Colibri Evaluation Board V3"; compatible = "toradex,colibri-imx6ull-eval", "fsl,imx6ull"; }; + +&ad7879_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +};
arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts +40 -0
@@ -15,10 +15,18 @@ / { "fsl,imx6ull"; }; +&ad7879_ts { + status = "okay"; +}; + &atmel_mxt_ts { status = "okay"; }; +&backlight { + status = "okay"; +}; + &gpio1 { /* This turns the LVDS transceiver on */ lvds-power-on {
@@ -63,3 +71,35 @@ lvds-color-map { output-low; }; }; + +&i2c1 { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +}; + +/* PWM <B> */ +&pwm5 { + /* Pin already used by atmel_mxt_ts touchscreen */ + status = "disabled"; +}; + +/* PWM <C> */ +&pwm6 { + /* Pin already used by atmel_mxt_ts touchscreen */ + status = "disabled"; +};
arch/arm/boot/dts/imx6ull-colibri-iris.dts +21 -1
@@ -15,6 +15,26 @@ / { "fsl,imx6ull"; }; -&atmel_mxt_ts { +&ad7879_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { status = "okay"; };
arch/arm/boot/dts/imx6ull-colibri-wifi-aster.dts +40 -0
@@ -15,6 +15,46 @@ / { "fsl,imx6ull"; }; +&ad7879_ts { + status = "okay"; +}; + &atmel_mxt_ts { status = "okay"; }; + +&backlight { + status = "okay"; +}; + +&i2c1 { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +}; + +/* PWM <B> */ +&pwm5 { + /* Pin already used by atmel_mxt_ts touchscreen */ + status = "disabled"; +}; + +/* PWM <C> */ +&pwm6 { + /* Pin already used by atmel_mxt_ts touchscreen */ + status = "disabled"; +};
arch/arm/boot/dts/imx6ull-colibri-wifi-eval-v3.dts +24 -0
@@ -12,3 +12,27 @@ / { model = "Toradex Colibri iMX6ULL 512MB on Colibri Evaluation Board V3"; compatible = "toradex,colibri-imx6ull-wifi-eval", "fsl,imx6ull"; }; + +&ad7879_ts { + status = "okay"; +}; + +&backlight { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +};
arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts +24 -0
@@ -15,10 +15,18 @@ / { "fsl,imx6ull"; }; +&ad7879_ts { + status = "okay"; +}; + &atmel_mxt_ts { status = "okay"; }; +&backlight { + status = "okay"; +}; + &gpio1 { /* This turns the LVDS transceiver on */ lvds-power-on {
@@ -63,3 +71,19 @@ lvds-color-map { output-low; }; }; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +}; + +&pwm4 { + status = "okay"; +};
arch/arm/boot/dts/imx6ull-colibri-wifi-iris.dts +20 -0
@@ -15,6 +15,26 @@ / { "fsl,imx6ull"; }; +&ad7879_ts { + status = "okay"; +}; + &atmel_mxt_ts { status = "okay"; }; + +&backlight { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&lcdif { + status = "okay"; +}; + +&panel_dpi { + status = "okay"; +};
Signature · 1 line
2.37.3
PATCH 3/4 arm: dts: colibri-imx6ull: add -hog to gpio hogs
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
Since it seems to be a naming-convention to add -hog for gpio hogs do this.
---
arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts | 8 ++++---- arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 4 ++-- arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/imx6ull-colibri-iris-v2.dts +4 -4
@@ -29,7 +29,7 @@ &backlight { &gpio1 { /* This turns the LVDS transceiver on */ - lvds-power-on { + lvds-power-on-hog { gpio-hog; gpios = <14 GPIO_ACTIVE_HIGH>; /* SODIMM 99 */ line-name = "LVDS_POWER_ON";
@@ -42,7 +42,7 @@ &gpio2 { * This switches the LVDS transceiver to the single-channel * output mode. */ - lvds-ch-mode { + lvds-ch-mode-hog { gpio-hog; gpios = <0 GPIO_ACTIVE_HIGH>; /* SODIMM 55 */ line-name = "LVDS_CH_MODE";
@@ -52,7 +52,7 @@ lvds-ch-mode { /* * This switches the LVDS transceiver to the 24-bit RGB mode. */ - lvds-rgb-mode { + lvds-rgb-mode-hog { gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>; /* SODIMM 63 */ line-name = "LVDS_RGB_MODE";
@@ -64,7 +64,7 @@ &gpio5 { /* * This switches the LVDS transceiver to VESA color mapping mode. */ - lvds-color-map { + lvds-color-map-hog { gpio-hog; gpios = <3 GPIO_ACTIVE_HIGH>; /* SODIMM 95 */ line-name = "LVDS_COLOR_MAP";
arch/arm/boot/dts/imx6ull-colibri-iris.dtsi +2 -2
@@ -59,7 +59,7 @@ &gpio1 { * in userspace. * The same applies to uart1_tx_on. */ - uart25_tx_on { + uart25_tx_on-hog { gpio-hog; gpios = <15 0>; output-high;
@@ -67,7 +67,7 @@ uart25_tx_on { }; &gpio2 { - uart1_tx_on { + uart1_tx_on-hog { gpio-hog; gpios = <7 0>; output-high;
arch/arm/boot/dts/imx6ull-colibri-wifi-iris-v2.dts +4 -4
@@ -29,7 +29,7 @@ &backlight { &gpio1 { /* This turns the LVDS transceiver on */ - lvds-power-on { + lvds-power-on-hog { gpio-hog; gpios = <14 GPIO_ACTIVE_HIGH>; /* SODIMM 99 */ line-name = "LVDS_POWER_ON";
@@ -42,7 +42,7 @@ &gpio2 { * This switches the LVDS transceiver to the single-channel * output mode. */ - lvds-ch-mode { + lvds-ch-mode-hog { gpio-hog; gpios = <0 GPIO_ACTIVE_HIGH>; /* SODIMM 55 */ line-name = "LVDS_CH_MODE";
@@ -52,7 +52,7 @@ lvds-ch-mode { /* * This switches the LVDS transceiver to the 24-bit RGB mode. */ - lvds-rgb-mode { + lvds-rgb-mode-hog { gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>; /* SODIMM 63 */ line-name = "LVDS_RGB_MODE";
@@ -64,7 +64,7 @@ &gpio5 { /* * This switches the LVDS transceiver to VESA color mapping mode. */ - lvds-color-map { + lvds-color-map-hog { gpio-hog; gpios = <3 GPIO_ACTIVE_HIGH>; /* SODIMM 95 */ line-name = "LVDS_COLOR_MAP";
Signature · 1 line
2.37.3
PATCH 4/4 arm: dts: colibri-imx7: fix confusing naming
In reply to Philippe SchenkerFrom: Philippe Schenker <[email protected]>
fix the naming of node-name vs label-name to the correct one, that is the label was always correct.
---
arch/arm/boot/dts/imx7-colibri.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +2 -2
@@ -652,7 +652,7 @@ &iomuxc { * NOTE: This pin group conflicts with pin groups pinctrl_pwm2/pinctrl_pwm3. * Don't use them simultaneously. */ - pinctrl_atmel_adapter: atmelconnectorgrp { + pinctrl_atmel_adapter: atmeladaptergrp { fsl,pins = < MX7D_PAD_GPIO1_IO09__GPIO1_IO9 0x74 /* SODIMM 28 / INT */ MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x14 /* SODIMM 30 / RST */
@@ -660,7 +660,7 @@ MX7D_PAD_GPIO1_IO10__GPIO1_IO10 0x14 /* SODIMM 30 / RST */ }; /* Atmel MXT touchsceen + boards with built-in Capacitive Touch Connector */ - pinctrl_atmel_connector: atmeladaptergrp { + pinctrl_atmel_connector: atmelconnectorgrp { fsl,pins = < MX7D_PAD_EPDC_BDR0__GPIO2_IO28 0x14 /* SODIMM 106 / RST */ MX7D_PAD_EPDC_DATA15__GPIO2_IO15 0x74 /* SODIMM 107 / INT */
Signature · 1 line
2.37.3
Quoted 11 lines · Philippe Schenker
From: Philippe Schenker <[email protected]>
Toradex does provide device-tree overlays to enable certain evaluation hardware. Keep the buses disabled by default to be enabled again with overlays.
For customers including this device-tree this has also the advantage that the hardware we want by default running does not automatically enable signals on their end.
Signed-off-by Philippe Schenker <[email protected]>
We idiomatically prefix i.MX arm DTS like 'ARM: dts: ...' Please be noted for the future patches.
Fixed prefix and applied the series.
Shawn