Skip to content

Commit 0a11330

Browse files
pelwellpelwell
authored
Merge branch 'rpi-6.18.y' into rp1clk
2 parents 560b8d7 + 03314cd commit 0a11330

File tree

16 files changed

+124
-32
lines changed

16 files changed

+124
-32
lines changed

‎arch/arm/boot/dts/overlays/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
131131
i2s-dac.dtbo \
132132
i2s-gpio28-31.dtbo \
133133
i2s-master-dac.dtbo \
134+
ilitek-ts-i2c.dtbo \
134135
ilitek251x.dtbo \
135136
imx219.dtbo \
136137
imx258.dtbo \

‎arch/arm/boot/dts/overlays/README‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2784,6 +2784,17 @@ Load: dtoverlay=i2s-master-dac
27842784
Params: <None>
27852785

27862786

2787+
Name: ilitek-ts-i2c
2788+
Info: Enables I2C connected Ilitek 23XX, 25XX, and 213X touch controllers
2789+
using GPIO 4 (pin 7 on GPIO header) for interrupt.
2790+
Load: dtoverlay=ilitek-ts-i2c,<param>=<val>
2791+
Params: interrupt GPIO used for interrupt (default 4)
2792+
invx Touchscreen inverted x axis
2793+
invy Touchscreen inverted y axis
2794+
swapxy Touchscreen swapped x y axis
2795+
i2c-path Override I2C path to allow for i2c-gpio buses
2796+
2797+
27872798
Name: ilitek251x
27882799
Info: Enables I2C connected Ilitek 251x multiple touch controller using
27892800
GPIO 4 (pin 7 on GPIO header) for interrupt.
@@ -5320,6 +5331,8 @@ Params: ctsrts Enable CTS/RTS on GPIOs 2-3 (default off)
53205331
drive the OE pin of an RS485 transceiver (i.e.
53215332
MAX3078E); also enables the UARTx ctsrts
53225333
parameter, as RTS is required (default off).
5334+
rs485_full_duplex When RS485 mode is enabled, enables receiving of
5335+
data while sending data (default off)
53235336
rs485_invert_rts When RS485 mode is enabled, inverts the RTS
53245337
line from active-high (default) to active-low.
53255338
rs485_rts_on_delay When RS485 mode is enabled, sets the delay (in
@@ -5344,6 +5357,8 @@ Params: ctsrts Enable CTS/RTS on GPIOs 6-7 (default off)
53445357
drive the OE pin of an RS485 transceiver (i.e.
53455358
MAX3078E); also enables the UARTx ctsrts
53465359
parameter, as RTS is required (default off).
5360+
rs485_full_duplex When RS485 mode is enabled, enables receiving of
5361+
data while sending data (default off)
53475362
rs485_invert_rts When RS485 mode is enabled, inverts the RTS
53485363
line from active-high (default) to active-low.
53495364
rs485_rts_on_delay When RS485 mode is enabled, sets the delay (in
@@ -5368,6 +5383,8 @@ Params: ctsrts Enable CTS/RTS on GPIOs 10-11 (default off)
53685383
drive the OE pin of an RS485 transceiver (i.e.
53695384
MAX3078E); also enables the UARTx ctsrts
53705385
parameter, as RTS is required (default off).
5386+
rs485_full_duplex When RS485 mode is enabled, enables receiving of
5387+
data while sending data (default off)
53715388
rs485_invert_rts When RS485 mode is enabled, inverts the RTS
53725389
line from active-high (default) to active-low.
53735390
rs485_rts_on_delay When RS485 mode is enabled, sets the delay (in
@@ -5392,6 +5409,8 @@ Params: ctsrts Enable CTS/RTS on GPIOs 14-15 (default off)
53925409
drive the OE pin of an RS485 transceiver (i.e.
53935410
MAX3078E); also enables the UARTx ctsrts
53945411
parameter, as RTS is required (default off).
5412+
rs485_full_duplex When RS485 mode is enabled, enables receiving of
5413+
data while sending data (default off)
53955414
rs485_invert_rts When RS485 mode is enabled, inverts the RTS
53965415
line from active-high (default) to active-low.
53975416
rs485_rts_on_delay When RS485 mode is enabled, sets the delay (in

‎arch/arm/boot/dts/overlays/ilitek-ts-i2c-overlay.dts‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
// Device tree overlay for I2C connected Ilitek multiple touch controller
2+
/dts-v1/;
3+
/plugin/;
4+
5+
#include <dt-bindings/interrupt-controller/irq.h>
6+
7+
/ {
8+
compatible = "brcm,bcm2835";
9+
10+
fragment@0 {
11+
target = <&gpio>;
12+
__overlay__ {
13+
ili2130_pins: ili2130_pins {
14+
brcm,pins = <4>; // interrupt
15+
brcm,function = <0>; // in
16+
brcm,pull = <2>; // pull-up
17+
};
18+
};
19+
};
20+
21+
frag1: fragment@1 {
22+
target = <&i2c1>;
23+
__overlay__ {
24+
#address-cells = <1>;
25+
#size-cells = <0>;
26+
status = "okay";
27+
28+
ili2130: ili2130@41 {
29+
compatible = "ilitek,ili2130";
30+
reg = <0x41>;
31+
pinctrl-names = "default";
32+
pinctrl-0 = <&ili2130_pins>;
33+
interrupt-parent = <&gpio>;
34+
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
35+
};
36+
};
37+
};
38+
39+
fragment@2 {
40+
target = <&ili2130>;
41+
__overlay__ {
42+
touchscreen-inverted-x;
43+
};
44+
};
45+
46+
fragment@3 {
47+
target = <&ili2130>;
48+
__overlay__ {
49+
touchscreen-inverted-y;
50+
};
51+
};
52+
53+
__overrides__ {
54+
interrupt = <&ili2130_pins>,"brcm,pins:0",
55+
<&ili2130>,"interrupts:0";
56+
i2c-path = <&frag1>, "target?=0",
57+
<&frag1>, "target-path";
58+
invx = <0>, "-2";
59+
invy = <0>, "-3";
60+
swapxy = <&ili2130>,"touchscreen-swapped-x-y?";
61+
};
62+
};

‎arch/arm/boot/dts/overlays/ilitek251x-overlay.dts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
/dts-v1/;
33
/plugin/;
44

5+
#include <dt-bindings/interrupt-controller/irq.h>
6+
57
/ {
68
compatible = "brcm,bcm2835";
79

@@ -29,7 +31,7 @@
2931
pinctrl-names = "default";
3032
pinctrl-0 = <&ili251x_pins>;
3133
interrupt-parent = <&gpio>;
32-
interrupts = <4 8>; // high-to-low edge triggered
34+
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
3335
touchscreen-size-x = <16384>;
3436
touchscreen-size-y = <9600>;
3537
};

‎arch/arm/boot/dts/overlays/uart2-overlay.dts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
};
2020
};
2121

22-
rs485: fragment@2 {
22+
fragment@2 {
2323
target = <&uart2>;
24-
__dormant__ {
24+
rs485: __dormant__ {
2525
linux,rs485-enabled-at-boot-time;
2626
rs485-rts-delay = <0 0>;
2727
};
@@ -30,7 +30,8 @@
3030
__overrides__ {
3131
ctsrts = <0>,"=1";
3232
rs485 = <0>,"=1=2";
33-
rs485_invert_rts = <&rs485>,"rs485-rts-active-low";
33+
rs485_full_duplex = <&rs485>,"rs485-rx-during-tx?";
34+
rs485_invert_rts = <&rs485>,"rs485-rts-active-low?";
3435
rs485_rts_on_delay = <&rs485>, "rs485-rts-delay:0";
3536
rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4";
3637
};

‎arch/arm/boot/dts/overlays/uart3-overlay.dts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
};
2020
};
2121

22-
rs485: fragment@2 {
22+
fragment@2 {
2323
target = <&uart3>;
24-
__dormant__ {
24+
rs485: __dormant__ {
2525
linux,rs485-enabled-at-boot-time;
2626
rs485-rts-delay = <0 0>;
2727
};
@@ -30,7 +30,8 @@
3030
__overrides__ {
3131
ctsrts = <0>,"=1";
3232
rs485 = <0>,"=1=2";
33-
rs485_invert_rts = <&rs485>,"rs485-rts-active-low";
33+
rs485_full_duplex = <&rs485>,"rs485-rx-during-tx?";
34+
rs485_invert_rts = <&rs485>,"rs485-rts-active-low?";
3435
rs485_rts_on_delay = <&rs485>, "rs485-rts-delay:0";
3536
rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4";
3637
};

‎arch/arm/boot/dts/overlays/uart4-overlay.dts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
};
2020
};
2121

22-
rs485: fragment@2 {
22+
fragment@2 {
2323
target = <&uart4>;
24-
__dormant__ {
24+
rs485: __dormant__ {
2525
linux,rs485-enabled-at-boot-time;
2626
rs485-rts-delay = <0 0>;
2727
};
@@ -30,7 +30,8 @@
3030
__overrides__ {
3131
ctsrts = <0>,"=1";
3232
rs485 = <0>,"=1=2";
33-
rs485_invert_rts = <&rs485>,"rs485-rts-active-low";
33+
rs485_full_duplex = <&rs485>,"rs485-rx-during-tx?";
34+
rs485_invert_rts = <&rs485>,"rs485-rts-active-low?";
3435
rs485_rts_on_delay = <&rs485>, "rs485-rts-delay:0";
3536
rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4";
3637
};

‎arch/arm/boot/dts/overlays/uart5-overlay.dts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
};
2020
};
2121

22-
rs485: fragment@2 {
22+
fragment@2 {
2323
target = <&uart5>;
24-
__dormant__ {
24+
rs485: __dormant__ {
2525
linux,rs485-enabled-at-boot-time;
2626
rs485-rts-delay = <0 0>;
2727
};
@@ -30,7 +30,8 @@
3030
__overrides__ {
3131
ctsrts = <0>,"=1";
3232
rs485 = <0>,"=1=2";
33-
rs485_invert_rts = <&rs485>,"rs485-rts-active-low";
33+
rs485_full_duplex = <&rs485>,"rs485-rx-during-tx?";
34+
rs485_invert_rts = <&rs485>,"rs485-rts-active-low?";
3435
rs485_rts_on_delay = <&rs485>, "rs485-rts-delay:0";
3536
rs485_rts_off_delay = <&rs485>, "rs485-rts-delay:4";
3637
};

‎arch/arm/configs/bcm2709_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,7 @@ CONFIG_TOUCHSCREEN_EGALAX=m
629629
CONFIG_TOUCHSCREEN_EXC3000=m
630630
CONFIG_TOUCHSCREEN_GOODIX=m
631631
CONFIG_TOUCHSCREEN_ILI210X=m
632+
CONFIG_TOUCHSCREEN_ILITEK=m
632633
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
633634
CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
634635
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m

‎arch/arm/configs/bcmrpi_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,7 @@ CONFIG_TOUCHSCREEN_EGALAX=m
623623
CONFIG_TOUCHSCREEN_EXC3000=m
624624
CONFIG_TOUCHSCREEN_GOODIX=m
625625
CONFIG_TOUCHSCREEN_ILI210X=m
626+
CONFIG_TOUCHSCREEN_ILITEK=m
626627
CONFIG_TOUCHSCREEN_EDT_FT5X06=m
627628
CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m
628629
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m

0 commit comments

Comments
 (0)