Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6ull-colibri: update device trees to support overlays

Prepare in-tree device trees for out-of-tree device tree overlay support
(eMMC SKU only).

Relocate panel-dpi default to edt,et057090dhu (RGB 18bit VGA 640x480)
to the module-level dtsi and remove it from the carrier board dtsi.

Keep backlight, resistive touch and Atmel maxtouch nodes enabled
for both eMMC and NAND modules.

Signed-off-by: Denys Drozdov <denys.drozdov@toradex.com>
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Denys Drozdov and committed by
Shawn Guo
233edcae 8d386fa0

+27 -33
-29
arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
··· 29 29 clock-frequency = <16000000>; 30 30 }; 31 31 32 - panel: panel { 33 - compatible = "edt,et057090dhu"; 34 - backlight = <&bl>; 35 - power-supply = <&reg_3v3>; 36 - 37 - port { 38 - panel_in: endpoint { 39 - remote-endpoint = <&lcdif_out>; 40 - }; 41 - }; 42 - }; 43 32 44 33 reg_3v3: regulator-3v3 { 45 34 compatible = "regulator-fixed"; ··· 60 71 status = "okay"; 61 72 }; 62 73 63 - &bl { 64 - brightness-levels = <0 4 8 16 32 64 128 255>; 65 - default-brightness-level = <6>; 66 - power-supply = <&reg_3v3>; 67 - pwms = <&pwm4 0 5000000 1>; 68 - status = "okay"; 69 - }; 70 - 71 74 &ecspi1 { 72 75 status = "okay"; 73 76 ··· 85 104 m41t0m6: rtc@68 { 86 105 compatible = "st,m41t0"; 87 106 reg = <0x68>; 88 - }; 89 - }; 90 - 91 - &lcdif { 92 - status = "okay"; 93 - 94 - port { 95 - lcdif_out: endpoint { 96 - remote-endpoint = <&panel_in>; 97 - }; 98 107 }; 99 108 }; 100 109
+27 -4
arch/arm/boot/dts/imx6ull-colibri.dtsi
··· 11 11 ethernet1 = &fec1; 12 12 }; 13 13 14 - bl: backlight { 14 + backlight: backlight { 15 15 compatible = "pwm-backlight"; 16 + brightness-levels = <0 4 8 16 32 64 128 255>; 17 + default-brightness-level = <6>; 18 + enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; 16 19 pinctrl-names = "default"; 17 20 pinctrl-0 = <&pinctrl_gpio_bl_on>; 18 - enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>; 19 - status = "disabled"; 21 + power-supply = <&reg_3v3>; 22 + pwms = <&pwm4 0 5000000 1>; 23 + status = "okay"; 24 + }; 25 + 26 + panel_dpi: panel-dpi { 27 + compatible = "edt,et057090dhu"; 28 + backlight = <&backlight>; 29 + power-supply = <&reg_3v3>; 30 + status = "okay"; 31 + 32 + port { 33 + lcd_panel_in: endpoint { 34 + remote-endpoint = <&lcdif_out>; 35 + }; 36 + }; 20 37 }; 21 38 22 39 reg_module_3v3: regulator-module-3v3 { ··· 166 149 scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; 167 150 status = "okay"; 168 151 169 - ad7879@2c { 152 + ad7879_ts: touchscreen@2c { 170 153 compatible = "adi,ad7879-1"; 171 154 pinctrl-names = "default"; 172 155 pinctrl-0 = <&pinctrl_snvs_ad7879_int>; ··· 187 170 pinctrl-names = "default"; 188 171 pinctrl-0 = <&pinctrl_lcdif_dat 189 172 &pinctrl_lcdif_ctrl>; 173 + 174 + port { 175 + lcdif_out: endpoint { 176 + remote-endpoint = <&lcd_panel_in>; 177 + }; 178 + }; 190 179 }; 191 180 192 181 &pwm4 {