From patchwork Wed Apr 21 09:18:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1468652 X-Patchwork-Delegate: narmstrong@baylibre.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=Ac1GmWLd; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FQFNL0cSvz9sRR for ; Wed, 21 Apr 2021 19:18:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7C4A82B4E; Wed, 21 Apr 2021 11:18:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="Ac1GmWLd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6763982B73; Wed, 21 Apr 2021 11:18:27 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E9A6482B50 for ; Wed, 21 Apr 2021 11:18:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x434.google.com with SMTP id e7so31597969wrs.11 for ; Wed, 21 Apr 2021 02:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cv78mGMxMUBD27IM7NbYZIue72EV5rMvm2Gz4zNovNc=; b=Ac1GmWLdJmoTRv6b8nvTIIrS5DCqQ/vVaJbZooOrkIBUp9yYeeVNFy7bDwWROV92L7 uULi6zag36GebmaJ5nqLbtV7sNcqeeWRgYK98CGrSv+Bf94+y0SbdG9a57BDQE1vGRUf Z4/INzOFCbafT53DVWphp6/jG7bnkjGgjKxmG76ogoqMNfFIPdTOgasHuA87D3gBBCmP I1Vefz4wLRW3g6kMFwFAB3flsH7cGIfhvpJMW0y9sam3idDAyjuybK+P0Pi8RmhP+qHH YSieU18zj4ZmRTl/LyBCbBRZcuTkH0NgYswyWtH9EKd26EkBY5/h0c9A8ka87aU4tgJL 6Vgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cv78mGMxMUBD27IM7NbYZIue72EV5rMvm2Gz4zNovNc=; b=HaHhISC/Z6BceqjZle8JIhlBp8yNXLfHC5CqI/0T+ABDCFI+e7ybQFcu1jmZmbDizU YR3XNyb7kzXQ21ZX2ocNXwjo+BVb4hp3Zx/JPDqk1WVBYJpht7OF9hEYiCsI2NLrFP7S KiFu2p6sQWhDoodTILRrPNx3aHe5jk7AJIofcQLG1ZntYjvCiQeC3SLL1eL5zL4daXlg 6kAAZkbzyWC+QQ084JaJQbdsRHrhx8x0DCkRx1n9u4VmEfNDS5HG8LGdc6Y5fXXVmHxr IgQawphELns/iJZXNgrGrc8PZQ9+6YZeoHgJ0t44UqQisNuMDex2LjvfQooL9AT2L3rZ 61JA== X-Gm-Message-State: AOAM530awDLm8/ZAPaYIWdqsaaA0qWJEYG9vjoxQidAOC91GVfhbmTGX 1g0WOUhWoVgYQNiNyEB4k6grba0+kg0rHxNW X-Google-Smtp-Source: ABdhPJzOU3Pv2nN9lYRFO6dz6Jz77Azdqiaz7QW3kuqB+10Fm31mmMC7blPSu1JaQVrETBhQPNL5sw== X-Received: by 2002:adf:a119:: with SMTP id o25mr25472968wro.36.1618996696057; Wed, 21 Apr 2021 02:18:16 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:90c:e290:f781:73d5:3127:752d]) by smtp.gmail.com with ESMTPSA id n18sm2280714wrw.11.2021.04.21.02.18.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 02:18:15 -0700 (PDT) From: Neil Armstrong To: u-boot@lists.denx.de Cc: u-boot-amlogic@groups.io, Neil Armstrong Subject: [PATCH 3/8] ARM: meson-axg: remove local USB nodes Date: Wed, 21 Apr 2021 11:18:04 +0200 Message-Id: <20210421091809.3103002-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210421091809.3103002-1-narmstrong@baylibre.com> References: <20210421091809.3103002-1-narmstrong@baylibre.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean Drop the local USB nodes after Linux 5.12 sync. Signed-off-by: Neil Armstrong --- arch/arm/dts/meson-axg-s400-u-boot.dtsi | 8 ---- arch/arm/dts/meson-axg-u-boot.dtsi | 62 ------------------------- 2 files changed, 70 deletions(-) delete mode 100644 arch/arm/dts/meson-axg-u-boot.dtsi diff --git a/arch/arm/dts/meson-axg-s400-u-boot.dtsi b/arch/arm/dts/meson-axg-s400-u-boot.dtsi index 2c4b06f140..334650d610 100644 --- a/arch/arm/dts/meson-axg-s400-u-boot.dtsi +++ b/arch/arm/dts/meson-axg-s400-u-boot.dtsi @@ -3,8 +3,6 @@ * Copyright (c) 2017 Amlogic, Inc. All rights reserved. */ -#include "meson-axg-u-boot.dtsi" - /* wifi module */ &sd_emmc_b { status = "disabled"; @@ -15,12 +13,6 @@ status = "okay"; }; -&usb { - status = "okay"; - dr_mode = "otg"; - vbus-supply = <&usb_pwr>; -}; - &usb2_phy1 { phy-supply = <&vcc_5v>; }; diff --git a/arch/arm/dts/meson-axg-u-boot.dtsi b/arch/arm/dts/meson-axg-u-boot.dtsi deleted file mode 100644 index cb1c71e78c..0000000000 --- a/arch/arm/dts/meson-axg-u-boot.dtsi +++ /dev/null @@ -1,62 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2020 BayLibre, SAS. - * Author: Neil Armstrong - */ - -/ { - soc { - usb: usb@ffe09080 { - compatible = "amlogic,meson-gxl-usb-ctrl"; - reg = <0x0 0xffe09080 0x0 0x20>; - interrupts = ; - #address-cells = <2>; - #size-cells = <2>; - ranges; - - clocks = <&clkc CLKID_USB>, <&clkc CLKID_USB1_DDR_BRIDGE>; - clock-names = "usb_ctrl", "ddr"; - resets = <&reset RESET_USB_OTG>; - - dr_mode = "otg"; - - phys = <&usb2_phy1>; - phy-names = "usb2-phy1"; - - dwc2: usb@ff400000 { - compatible = "amlogic,meson-g12a-usb", "snps,dwc2"; - reg = <0x0 0xff400000 0x0 0x40000>; - interrupts = ; - clocks = <&clkc CLKID_USB1>; - clock-names = "otg"; - phys = <&usb2_phy1>; - dr_mode = "peripheral"; - g-rx-fifo-size = <192>; - g-np-tx-fifo-size = <128>; - g-tx-fifo-size = <128 128 16 16 16>; - }; - - dwc3: usb@ff500000 { - compatible = "snps,dwc3"; - reg = <0x0 0xff500000 0x0 0x100000>; - interrupts = ; - dr_mode = "host"; - maximum-speed = "high-speed"; - snps,dis_u2_susphy_quirk; - }; - }; - }; -}; - -&apb { - usb2_phy1: phy@9020 { - compatible = "amlogic,meson-gxl-usb2-phy"; - #phy-cells = <0>; - reg = <0x0 0x9020 0x0 0x20>; - clocks = <&clkc CLKID_USB>; - clock-names = "phy"; - resets = <&reset RESET_USB_OTG>; - reset-names = "phy"; - status = "okay"; - }; -};