Skip to content

Commit 865f5be

Browse files
committed
Merge tag 'omap-for-v6.14/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt
ARM: dts: ti/omap/dra7: minor updates for v6.14 * tag 'omap-for-v6.14/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: ARM: dts: ti/omap: omap3-gta04: use proper touchscreen properties ARM: dts: ti: am437x-l4: remove autoidle for UART ARM: dts: ti/omap: gta04: fix pm issues caused by spi module ARM: dts: dra7: Add bus_dma_limit for l4 cfg bus Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6253c63 + dd504db commit 865f5be

File tree

3 files changed

+22
-14
lines changed

3 files changed

+22
-14
lines changed

arch/arm/boot/dts/ti/omap/am437x-l4.dtsi

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,7 @@
180180
<0x9058 0x4>;
181181
reg-names = "rev", "sysc", "syss";
182182
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
183-
SYSC_OMAP2_SOFTRESET |
184-
SYSC_OMAP2_AUTOIDLE)>;
183+
SYSC_OMAP2_SOFTRESET)>;
185184
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
186185
<SYSC_IDLE_NO>,
187186
<SYSC_IDLE_SMART>,
@@ -698,8 +697,7 @@
698697
<0x22058 0x4>;
699698
reg-names = "rev", "sysc", "syss";
700699
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
701-
SYSC_OMAP2_SOFTRESET |
702-
SYSC_OMAP2_AUTOIDLE)>;
700+
SYSC_OMAP2_SOFTRESET)>;
703701
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
704702
<SYSC_IDLE_NO>,
705703
<SYSC_IDLE_SMART>,
@@ -726,8 +724,7 @@
726724
<0x24058 0x4>;
727725
reg-names = "rev", "sysc", "syss";
728726
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
729-
SYSC_OMAP2_SOFTRESET |
730-
SYSC_OMAP2_AUTOIDLE)>;
727+
SYSC_OMAP2_SOFTRESET)>;
731728
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
732729
<SYSC_IDLE_NO>,
733730
<SYSC_IDLE_SMART>,
@@ -1385,8 +1382,7 @@
13851382
<0xa6058 0x4>;
13861383
reg-names = "rev", "sysc", "syss";
13871384
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
1388-
SYSC_OMAP2_SOFTRESET |
1389-
SYSC_OMAP2_AUTOIDLE)>;
1385+
SYSC_OMAP2_SOFTRESET)>;
13901386
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
13911387
<SYSC_IDLE_NO>,
13921388
<SYSC_IDLE_SMART>,
@@ -1413,8 +1409,7 @@
14131409
<0xa8058 0x4>;
14141410
reg-names = "rev", "sysc", "syss";
14151411
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
1416-
SYSC_OMAP2_SOFTRESET |
1417-
SYSC_OMAP2_AUTOIDLE)>;
1412+
SYSC_OMAP2_SOFTRESET)>;
14181413
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
14191414
<SYSC_IDLE_NO>,
14201415
<SYSC_IDLE_SMART>,
@@ -1441,8 +1436,7 @@
14411436
<0xaa058 0x4>;
14421437
reg-names = "rev", "sysc", "syss";
14431438
ti,sysc-mask = <(SYSC_OMAP2_ENAWAKEUP |
1444-
SYSC_OMAP2_SOFTRESET |
1445-
SYSC_OMAP2_AUTOIDLE)>;
1439+
SYSC_OMAP2_SOFTRESET)>;
14461440
ti,sysc-sidle = <SYSC_IDLE_FORCE>,
14471441
<SYSC_IDLE_NO>,
14481442
<SYSC_IDLE_SMART>,

arch/arm/boot/dts/ti/omap/dra7-l4.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
ranges = <0x00000000 0x4a000000 0x100000>, /* segment 0 */
1313
<0x00100000 0x4a100000 0x100000>, /* segment 1 */
1414
<0x00200000 0x4a200000 0x100000>; /* segment 2 */
15+
dma-ranges;
1516

1617
segment@0 { /* 0x4a000000 */
1718
compatible = "simple-pm-bus";
@@ -557,6 +558,7 @@
557558
<0x0007e000 0x0017e000 0x001000>, /* ap 124 */
558559
<0x00059000 0x00159000 0x001000>, /* ap 125 */
559560
<0x0005a000 0x0015a000 0x001000>; /* ap 126 */
561+
dma-ranges;
560562

561563
target-module@2000 { /* 0x4a102000, ap 27 3c.0 */
562564
compatible = "ti,sysc";

arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@
446446
pinctrl-names = "default";
447447
pinctrl-0 = <
448448
&hsusb2_2_pins
449+
&mcspi3hog_pins
449450
>;
450451

451452
hsusb2_2_pins: hsusb2-2-pins {
@@ -459,6 +460,15 @@
459460
>;
460461
};
461462

463+
mcspi3hog_pins: mcspi3hog-pins {
464+
pinctrl-single,pins = <
465+
OMAP3630_CORE2_IOPAD(0x25dc, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d0 */
466+
OMAP3630_CORE2_IOPAD(0x25de, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d1 */
467+
OMAP3630_CORE2_IOPAD(0x25e0, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d2 */
468+
OMAP3630_CORE2_IOPAD(0x25e2, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* etk_d3 */
469+
>;
470+
};
471+
462472
spi_gpio_pins: spi-gpio-pinmux-pins {
463473
pinctrl-single,pins = <
464474
OMAP3630_CORE2_IOPAD(0x25d8, PIN_OUTPUT | MUX_MODE4) /* clk */
@@ -591,8 +601,10 @@
591601
interrupts = <0 IRQ_TYPE_EDGE_FALLING>; /* GPIO_160 */
592602
gpios = <&gpio6 0 GPIO_ACTIVE_LOW>; /* GPIO_160 */
593603
ti,x-plate-ohms = <600>;
594-
touchscreen-size-x = <480>;
595-
touchscreen-size-y = <640>;
604+
touchscreen-size-x = <0xf00>;
605+
touchscreen-size-y = <0xf00>;
606+
touchscreen-min-x = <0x100>;
607+
touchscreen-min-y = <0x100>;
596608
touchscreen-max-pressure = <1000>;
597609
touchscreen-fuzz-x = <3>;
598610
touchscreen-fuzz-y = <8>;

0 commit comments

Comments
 (0)