Skip to content

Commit 16ea3c9

Browse files
committed
Merge tag 'omap-for-v6.20/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt
ARM: dts: OMAP updates for v6.20 * tag 'omap-for-v6.20/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap: ARM: dts: omap: dra7: Remove bogus #syscon-cells property ARM: dts: ti/omap: omap*: fix watchdog node names ARM: dts: ti: Drop unused .dtsi ARM: dts: Drop am335x-base0033 devicetree ARM: dts: tps65910: Add gpio & interrupt properties ARM: dts: omap: enable panic-indicator option ARM: dts: ti/omap: omap4-epson-embt2ws: add powerbutton Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents d69af47 + 76f88d2 commit 16ea3c9

14 files changed

Lines changed: 15 additions & 360 deletions

arch/arm/boot/dts/ti/omap/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ dtb-$(CONFIG_SOC_AM33XX) += \
8686
am335x-baltos-ir2110.dtb \
8787
am335x-baltos-ir3220.dtb \
8888
am335x-baltos-ir5221.dtb \
89-
am335x-base0033.dtb \
9089
am335x-bone.dtb \
9190
am335x-boneblack.dtb \
9291
am335x-boneblack-wireless.dtb \

arch/arm/boot/dts/ti/omap/am335x-baltos-leds.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
linux,default-trigger = "default-on";
2323
gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
2424
default-state = "on";
25+
panic-indicator;
2526
};
2627
led_wlan: led-wlan {
2728
label = "onrisc:blue:wlan";

arch/arm/boot/dts/ti/omap/am335x-base0033.dts

Lines changed: 0 additions & 92 deletions
This file was deleted.

arch/arm/boot/dts/ti/omap/am3703.dtsi

Lines changed: 0 additions & 14 deletions
This file was deleted.

arch/arm/boot/dts/ti/omap/am3715.dtsi

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@
109109
scm_conf1: scm_conf@1c04 {
110110
compatible = "syscon";
111111
reg = <0x1c04 0x0020>;
112-
#syscon-cells = <2>;
113112
};
114113

115114
scm_conf_pcie: scm_conf@1c24 {

arch/arm/boot/dts/ti/omap/omap2430.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
interrupts = <93>;
333333
};
334334

335-
wd_timer2: wdt@49016000 {
335+
wd_timer2: watchdog@49016000 {
336336
compatible = "ti,omap2-wdt";
337337
ti,hwmods = "wd_timer2";
338338
reg = <0x49016000 0x80>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@
553553
status = "disabled";
554554
};
555555

556-
wdt2: wdt@48314000 {
556+
wdt2: watchdog@48314000 {
557557
compatible = "ti,omap3-wdt";
558558
reg = <0x48314000 0x80>;
559559
ti,hwmods = "wd_timer2";

arch/arm/boot/dts/ti/omap/omap3430es1-clocks.dtsi

Lines changed: 0 additions & 237 deletions
This file was deleted.

0 commit comments

Comments
 (0)