diff --git a/arch/arm64/boot/dts/seconorth/pconxs.dtsi b/arch/arm64/boot/dts/seconorth/pconxs.dtsi index 7be1f08e4db4935efe3d21e8909540156d51ab9a..6b9567aa0cf7453447f130c418e11fdf31f16522 100644 --- a/arch/arm64/boot/dts/seconorth/pconxs.dtsi +++ b/arch/arm64/boot/dts/seconorth/pconxs.dtsi @@ -185,23 +185,19 @@ &pwm1 { status = "okay"; }; -&backlight1{ - status = "okay"; - pinctrl-0 = <&pinctrl_backlight_enable>; - enable-gpios = <spin73_gpio GPIO_ACTIVE_HIGH>; - brightness-levels = < 100 - 99 98 97 96 95 94 93 92 91 90 - 89 88 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 71 70 - 69 68 67 66 65 64 63 62 61 60 - 59 58 57 56 55 54 53 52 51 50 - 49 48 47 46 45 44 43 42 41 40 - 39 38 37 36 35 34 33 32 31 30 - 29 28 27 26 25 24 23 22 21 20 - 19 18 17 16 15 14 13 12 11 10 - 9 8 7 6 5 4 3 2 1 0>; -}; +/* + The backlight is provided by the SOM, so it should be defined in the SOM's + DTSI file. If a display needs reversed brightness levels, this should be + overridden by the display's DTSI file. +*/ +/* + The touch is part of the display, not the baseboard. + But if a touch is present, some configurations are almost the same, + at least when the pins to be used are defined somewhere else. + Furthermore to move the touch definition to the display will break + lots of existing device trees (believe me, I tried to do so). +*/ #ifdef TOUCH_INT i2c_touch: &i2c1 { /* Touch */ clock-frequency = <400000>; @@ -213,9 +209,7 @@ cap_touch: cap_touch_controller@0{ interrupt-parent = <touch_int_parent>; interrupts = <touch_int_pin IRQ_TYPE_LEVEL_LOW>; irq-gpio = <touch_int GPIO_ACTIVE_LOW>; - #ifdef TRIZEPS8MINI // on plus the reset is not connected reset-gpio = <touch_enable GPIO_ACTIVE_LOW>; - #endif status = "disabled"; }; @@ -300,6 +294,8 @@ &gpio1 10 (KK_RSRVD_IN |KK_RSRVD_EXPORT|KK_RSRVD_REQUEST(2)) /* CAN1_TX */ }; #endif +// the touch is part of the display, not the baseboard +#if 0 &iomuxc { #ifdef DISPLAY_ENABLE @@ -308,6 +304,31 @@ pinctrl_display_enable: display-enable { }; #endif +#ifdef TOUCH_INT + pinctrl_captouch: captouchgrp { + fsl,pins = < + #ifdef TRIZEPS8MINI // on plus the reset is not connected + // yes it is, but is is a mcu-gpio + TOUCH_RESET PAD_GPIO /* WAKE */ + #endif +#if defined(TOUCH_USE_INT2) && (TOUCH_USE_INT2==1) + TOUCH_INT2 PAD_GPIO /* IRQ */ +#else + TOUCH_INT PAD_GPIO /* IRQ */ +#endif + TOUCH_INT PAD_GPIO + >; + }; +#endif + +}; +#else +&iomuxc { +#ifdef DISPLAY_ENABLE + pinctrl_display_enable: display-enable { + fsl,pins = < DISPLAY_ENABLE PAD_GPIO_PU >; /* DISPLAY_ENABLE */ + }; +#endif #ifdef TOUCH_INT pinctrl_captouch: captouchgrp { fsl,pins = < @@ -320,6 +341,8 @@ TOUCH_INT PAD_GPIO >; }; #endif - }; + +#endif + #endif