The MT8183 devicetree still uses the legacy U-Boot-only mediatek,ssusb child even though MT8183 is described by the upstream MTU3 binding.
Move the MAC resource from the whole-controller base to the device-block base expected by the upstream binding, remove the synthetic child, and place the Pumpkin peripheral properties on the controller node. Signed-off-by: Carlo Caione <[email protected]> --- arch/arm/dts/mt8183-pumpkin.dts | 4 ---- arch/arm/dts/mt8183.dtsi | 12 ++---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/arch/arm/dts/mt8183-pumpkin.dts b/arch/arm/dts/mt8183-pumpkin.dts index 470a7693997..623561b6a63 100644 --- a/arch/arm/dts/mt8183-pumpkin.dts +++ b/arch/arm/dts/mt8183-pumpkin.dts @@ -88,10 +88,6 @@ }; &usb { - status = "okay"; -}; - -&ssusb { mediatek,force-vbus; maximum-speed = "high-speed"; dr_mode = "peripheral"; diff --git a/arch/arm/dts/mt8183.dtsi b/arch/arm/dts/mt8183.dtsi index 294aa2b8979..b118a106f01 100644 --- a/arch/arm/dts/mt8183.dtsi +++ b/arch/arm/dts/mt8183.dtsi @@ -236,9 +236,9 @@ }; }; - usb: usb@11200000 { + usb: usb@11201000 { compatible ="mediatek,mt8183-mtu3", "mediatek,mtu3"; - reg = <0 0x11200000 0 0x3e00>, + reg = <0 0x11201000 0 0x2e00>, <0 0x11203e00 0 0x0100>; reg-names = "mac", "ippc"; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; @@ -251,14 +251,6 @@ ranges; status = "disabled"; - ssusb: ssusb@11200000 { - compatible = "mediatek,ssusb"; - reg = <0 0x11200000 0 0x3e00>; - reg-names = "mac"; - interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; - status = "disabled"; - }; - usb_host: xhci@11200000 { compatible = "mediatek,mtk-xhci"; reg = <0 0x11200000 0 0x1000>; -- 2.55.0
