Skip to content

Commit 370ce5a

Browse files
committed
Merge tag 'omap-for-v6.15/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt
ARM: dts: misc. OMAP updates for v6.15 * tag 'omap-for-v6.15/dt-signed' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: ARM: dts: omap4-panda-a4: Add missing model and compatible properties dt-bindings: omap: Add TI Pandaboard A4 variant ARM: dts: ti/omap: omap4-serial: fix interrupts syntax ARM: dts: ti: omap: Align GPIO hog name with bindings Link: https://lore.kernel.org/r/7hiko7qzud.fsf@baylibre.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 43adf49 + ea07a47 commit 370ce5a

4 files changed

Lines changed: 17 additions & 5 deletions

File tree

Documentation/devicetree/bindings/arm/ti/omap.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,13 @@ properties:
141141
- const: ti,omap4430
142142
- const: ti,omap4
143143

144+
- description: OMAP4 PandaBoard Revision A4 and later
145+
items:
146+
- const: ti,omap4-panda-a4
147+
- const: ti,omap4-panda
148+
- const: ti,omap4430
149+
- const: ti,omap4
150+
144151
- description: OMAP4 DuoVero with Parlor expansion board/daughter board
145152
items:
146153
- const: gumstix,omap4-duovero-parlor

arch/arm/boot/dts/ti/omap/omap3-evm-processor-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@
205205

206206
/* T2_GPIO_2 low to route GPIO_61 to on-board devices */
207207
&twl_gpio {
208-
en_on_board_gpio_61 {
208+
en-on-board-gpio-61-hog {
209209
gpio-hog;
210210
gpios = <2 GPIO_ACTIVE_HIGH>;
211211
output-low;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,7 +1414,7 @@
14141414
uart3: serial@0 {
14151415
compatible = "ti,omap4-uart";
14161416
reg = <0x0 0x100>;
1417-
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
1417+
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
14181418
clock-frequency = <48000000>;
14191419
};
14201420
};
@@ -1765,7 +1765,7 @@
17651765
uart1: serial@0 {
17661766
compatible = "ti,omap4-uart";
17671767
reg = <0x0 0x100>;
1768-
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
1768+
interrupts-extended = <&wakeupgen GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
17691769
clock-frequency = <48000000>;
17701770
};
17711771
};
@@ -1794,7 +1794,7 @@
17941794
uart2: serial@0 {
17951795
compatible = "ti,omap4-uart";
17961796
reg = <0x0 0x100>;
1797-
interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
1797+
interrupts-extended = <&wakeupgen GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
17981798
clock-frequency = <48000000>;
17991799
};
18001800
};
@@ -1823,7 +1823,7 @@
18231823
uart4: serial@0 {
18241824
compatible = "ti,omap4-uart";
18251825
reg = <0x0 0x100>;
1826-
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
1826+
interrupts-extended = <&wakeupgen GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
18271827
clock-frequency = <48000000>;
18281828
};
18291829
};

arch/arm/boot/dts/ti/omap/omap4-panda-a4.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
#include "omap443x.dtsi"
88
#include "omap4-panda-common.dtsi"
99

10+
/ {
11+
model = "TI OMAP4 PandaBoard (A4)";
12+
compatible = "ti,omap4-panda-a4", "ti,omap4-panda", "ti,omap4430", "ti,omap4";
13+
};
14+
1015
/* Pandaboard Rev A4+ have external pullups on SCL & SDA */
1116
&dss_hdmi_pins {
1217
pinctrl-single,pins = <

0 commit comments

Comments
 (0)