summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-colibri.dtsi
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-09-23 17:26:21 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2021-09-23 17:34:16 +0200
commitce72bea42c97c5bdb035fb15f43108a3ea68a38b (patch)
tree69c71b242c6042add10b15222356fa3404f8e9b0 /arch/arm/boot/dts/imx6ull-colibri.dtsi
parentfdb5fc1598df28dc6778a9cfcbaeb2e926122075 (diff)
dts: colibri-imx6ull: reenable pwm4 and i2c2
If PWM_A is not used for the backlight it might be used as regular PWM through the sysfs, so keep enabled. If i2c2 is disabled this might change the bus numbering of the I2C busses. Keep the bus enabled, even if we do not enable the touch controller attached to it. Extends commit 1c530823b1e9 ("dts: colibri-imx6ull: added overlays split"). Related-to: ELB-4065 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-colibri.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6ull-colibri.dtsi3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 9013a5f33e28..dd5c2fc36b0e 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -166,7 +166,7 @@
pinctrl-1 = <&pinctrl_i2c2_gpio>;
sda-gpios = <&gpio1 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
- status = "disabled";
+ status = "okay";
ad7879_ts: touchscreen@2c {
compatible = "adi,ad7879-1";
@@ -203,7 +203,6 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm4>;
#pwm-cells = <3>;
- status = "disabled";
};
&pwm5 {