[PATCH 3/7] ARM: dts: ti: am335x: Fix redundant interrupts property in USB nodes
Bhargav Joshi <[email protected]>
| Newsgroups | org.kernel.vger.linux-omap,org.infradead.lists.linux-phy,org.kernel.vger.dmaengine,org.kernel.vger.linux-devicetree,org.kernel.vger.linux-kernel,org.kernel.vger.linux-usb |
|---|---|
| Message-ID | <[email protected]> |
The am33xx.dtsi defines a single interrupts property for the MUSB nodes. Several board-level files override the usb0 node to use interrupts-extended instead to include vbus interrupt. Since both interrupts and interrupts-extended cannot be used simultaneously, Add /delete-property/ interrupts to the overriding nodes to resolve the schema warnings. Signed-off-by: Bhargav Joshi <[email protected]> --- arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | 1 + arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 1 + arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts | 1 + arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi index 1d83fc116b66..c436edd98e10 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi @@ -197,6 +197,7 @@ &uart0 { &usb0 { dr_mode = "peripheral"; + /delete-property/ interrupts; interrupts-extended = <&intc 18 &tps 0>; interrupt-names = "mc", "vbus"; }; diff --git a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts index d430f0bef165..7da2fb782ab2 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-boneblue.dts @@ -304,6 +304,7 @@ &uart5 { &usb0 { dr_mode = "peripheral"; + /delete-property/ interrupts; interrupts-extended = <&intc 18 &tps 0>; interrupt-names = "mc", "vbus"; }; diff --git a/arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts b/arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts index d21118cdb6c2..6bf388c4abbf 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts @@ -35,6 +35,7 @@ v3v3: regulator-v3v3 { }; &usb0 { + /delete-property/ interrupts; interrupts-extended = <&intc 18>; interrupt-names = "mc"; }; diff --git a/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts b/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts index 23caaaabf351..068ea23bbc0c 100644 --- a/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts +++ b/arch/arm/boot/dts/ti/omap/am335x-osd3358-sm-red.dts @@ -376,6 +376,7 @@ &uart0 { &usb0 { dr_mode = "peripheral"; + /delete-property/ interrupts; interrupts-extended = <&intc 18 &tps 0>; interrupt-names = "mc", "vbus"; }; -- 2.55.0