From patchwork Tue Jul 20 15:24:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Salvaterra X-Patchwork-Id: 1507624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=UJ5GxQ9z; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=UW9k90I4; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GTjHd5MfYz9s24 for ; Wed, 21 Jul 2021 01:26:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=yeW0+WMFUmEcn3KIepb9rEW3uS0qID+jjc1NdoxpEEE=; b=UJ5GxQ9zwm6ve8 Mo66kedwqYOtuzpQ152ui7XwPLgu51O5RuU0gOXBCXhHBjLjEtKl+y2GSDRE0TBtYR8FtKCe1nEhs GQ1cAXTtA9qYh8XH/JoCsvz54PptuckOKJqDiaN7yetzbCFng91hdpIpUQHji4aawnDJKI7RfVws7 VBPFfOdCFCE66L36bnGlePRJQ498bC+Jdkm4t/ewhx8LqWVcnSddvg1tOfzD1JHFwptAsIUBIEQ4k 8Zxw7IfUMLiGVDkxsrGPfNXhg5rSq0mXFWk4pikoW8Iv9pjm1CZOWlxOz/qJZ3y/6M0xASoNPAgcj YKAA9tK8zgH1Cwh6wDHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5rcB-00DQYV-CF; Tue, 20 Jul 2021 15:24:59 +0000 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m5rc7-00DQXe-TG for openwrt-devel@lists.openwrt.org; Tue, 20 Jul 2021 15:24:57 +0000 Received: by mail-ej1-x62a.google.com with SMTP id hd33so34875118ejc.9 for ; Tue, 20 Jul 2021 08:24:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mOf+sVdepwCSs82hTEaIW4QY1Ic/wNvHSrN4D82mjvI=; b=UW9k90I4VkCebmDZoE+QsHx3VTH7DhGotnEVD+t8VB7ovSPeo1j2Pm0MZwnANEykCm NN586svuDd8AIsm3mkkXdHUi+t9zeVIQOy0Z9Hi2J7uEYtWn/Ig0A9pHiWpfNrzyxotZ DLThZuOvVhrjTDatud6SR4qSD5Qceu81l4i9FKQ2aetIz13ZX+6t339C5XC8Oz4B5nbD K8kMGuQU4CPjqaJI+tXX9HuqkzfWjbxv9kQ5s6aIbIwcYSt5T7MzoVBW6LN+G23Yk9QR kKgXuEWeza7htkXoHTJjSpcU6rbQTOEyGAz6ob4LAKKUfgWevsc8Fg2yoz4VdJNNvDJH z+4w== 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:mime-version :content-transfer-encoding; bh=mOf+sVdepwCSs82hTEaIW4QY1Ic/wNvHSrN4D82mjvI=; b=p3U6AIOzv/e5eUYMxJ9jQOF0PXnlzi30unwkmiISsDML6To+zW6aIP5q0PApt6beQV M8G7yC34CrnJ3gzhTnkVFIQZ3IU1jR0/HWf0VsaHeebqCs/g4zf+EW76z+uw1rKdRqok mTwzzWnD59YyIxPX+Yl1ivAf3Rn9liQTpTu07acIxmnAqTNHtguT3pZf3OSrZWvwetlT zk4FOiGchloHKXuFqyVMHEraghCeBuJWRxxaEE9PnW73mnsHma3dX0ZgpM5Fh6u+E3Z+ 592PVfdDOH7QhJeIV7bJMxxzGNoHzJYphPgC6hnde7LaLlVyQf1vBzxyF7R7itMGgdxZ 1S4g== X-Gm-Message-State: AOAM53044otowHbzclIdzOqgLbaegippBaDeIfmW9qqHy78+ryeURP9o FuAD8CVHfOu7Cyk9l5hhvdJYDB/zr1ectmM= X-Google-Smtp-Source: ABdhPJzwA4knvAwetLqUdvFRLHKDG0GzG54B1ZWGMpALHoBMVNrjK0bPUEnPv4rZCQkmpugYzknnZg== X-Received: by 2002:a17:907:7296:: with SMTP id dt22mr33668293ejc.86.1626794694019; Tue, 20 Jul 2021 08:24:54 -0700 (PDT) Received: from mallard.adg.lan (a95-94-77-238.cpe.netcabo.pt. [95.94.77.238]) by smtp.gmail.com with ESMTPSA id bm1sm7323173ejb.38.2021.07.20.08.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jul 2021 08:24:53 -0700 (PDT) From: Rui Salvaterra To: openwrt-devel@lists.openwrt.org Cc: daniel@makrotopia.org, mail@david-bauer.net, Rui Salvaterra Subject: [PATCH] linux/rockchip: update the USB 3.0 controller node patch Date: Tue, 20 Jul 2021 16:24:50 +0100 Message-Id: <20210720152450.493544-1-rsalvaterra@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210720_082456_000058_384D12BB X-CRM114-Status: GOOD ( 14.79 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This has been added in Linux 5.10.51 [1], but it's broken/incomplete. Update our patch and refresh the remaining patches. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.51&id=421aff50af5e4cdc56b3ac8d6b670e09697bc8ac Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [rsalvaterra[at]gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:62a listed in] [list.dnswl.org] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This has been added in Linux 5.10.51 [1], but it's broken/incomplete. Update our patch and refresh the remaining patches. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.51&id=421aff50af5e4cdc56b3ac8d6b670e09697bc8ac Signed-off-by: Rui Salvaterra --- ...address-support-to-of_get_mac_addres.patch | 13 +++----- ...et-add-mac-address-increment-support.patch | 9 ++---- ...usb3-controller-node-for-RK3328-SoCs.patch | 32 ++++++++++++------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch index 44a6b6a047..9e16564953 100644 --- a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch +++ b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch @@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith drivers/of/of_net.c | 75 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index 6e411821583e..f072e2509cc9 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c @@ -11,6 +11,7 @@ @@ -27,7 +25,7 @@ index 6e411821583e..f072e2509cc9 100644 /** * of_get_phy_mode - Get phy mode for given device_node -@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node *np, phy_interface_t *interface) +@@ -45,7 +46,7 @@ int of_get_phy_mode(struct device_node * } EXPORT_SYMBOL_GPL(of_get_phy_mode); @@ -36,7 +34,7 @@ index 6e411821583e..f072e2509cc9 100644 { struct property *pp = of_find_property(np, name, NULL); -@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np) +@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem return mac; } @@ -107,7 +105,7 @@ index 6e411821583e..f072e2509cc9 100644 /** * Search the device tree for the best MAC address to use. 'mac-address' is * checked first, because that is supposed to contain to "most recent" MAC -@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem(struct device_node *np) +@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists * but is all zeros. * @@ -118,7 +116,7 @@ index 6e411821583e..f072e2509cc9 100644 * Return: Will be a valid pointer on success and ERR_PTR in case of error. */ const void *of_get_mac_address(struct device_node *np) -@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct device_node *np) +@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct de if (addr) return addr; @@ -129,6 +127,3 @@ index 6e411821583e..f072e2509cc9 100644 return of_get_mac_addr_nvmem(np); } EXPORT_SYMBOL(of_get_mac_address); --- -2.30.2 - diff --git a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch index 1c08e23699..0776d7bccc 100644 --- a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch +++ b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch @@ -18,11 +18,9 @@ Signed-off-by: Ansuel Smith drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 14 deletions(-) -diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c -index f072e2509cc9..0dbd1f7ef396 100644 --- a/drivers/of/of_net.c +++ b/drivers/of/of_net.c -@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name) +@@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct devi return NULL; } @@ -67,7 +65,7 @@ index f072e2509cc9..0dbd1f7ef396 100644 { #ifdef CONFIG_MTD struct device_node *mtd_np = NULL; -@@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np) +@@ -167,28 +172,54 @@ free: * If a mtd-mac-address property exists, try to fetch the MAC address from the * specified mtd device, and store it as a 'mac-address' property * @@ -128,6 +126,3 @@ index f072e2509cc9..0dbd1f7ef396 100644 + return addr; } EXPORT_SYMBOL(of_get_mac_address); --- -2.30.2 - diff --git a/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch b/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch index 54036c0f6b..2dd6e40ebf 100644 --- a/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch +++ b/target/linux/rockchip/patches-5.10/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch @@ -26,20 +26,30 @@ use-case. You've been warned. --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -1003,6 +1003,33 @@ - status = "disabled"; +@@ -985,22 +985,30 @@ }; -+ usbdrd3: usb@ff600000 { + usbdrd3: usb@ff600000 { +- compatible = "rockchip,rk3328-dwc3", "snps,dwc3"; +- reg = <0x0 0xff600000 0x0 0x100000>; +- interrupts = ; + compatible = "rockchip,rk3328-dwc3", "rockchip,rk3399-dwc3"; -+ clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>, -+ <&cru ACLK_USB3OTG>; -+ clock-names = "ref_clk", "suspend_clk", -+ "bus_clk"; + clocks = <&cru SCLK_USB3OTG_REF>, <&cru SCLK_USB3OTG_SUSPEND>, + <&cru ACLK_USB3OTG>; + clock-names = "ref_clk", "suspend_clk", + "bus_clk"; +- dr_mode = "otg"; +- phy_type = "utmi_wide"; +- snps,dis-del-phy-power-chg-quirk; +- snps,dis_enblslpm_quirk; +- snps,dis-tx-ipgap-linecheck-quirk; +- snps,dis-u2-freeclk-exists-quirk; +- snps,dis_u2_susphy_quirk; +- snps,dis_u3_susphy_quirk; + #address-cells = <2>; + #size-cells = <2>; + ranges; -+ status = "disabled"; + status = "disabled"; + + usbdrd_dwc3: dwc3@ff600000 { + compatible = "snps,dwc3"; @@ -55,8 +65,6 @@ use-case. You've been warned. + snps,dis-tx-ipgap-linecheck-quirk; + status = "disabled"; + }; -+ }; -+ + }; + gic: interrupt-controller@ff811000 { - compatible = "arm,gic-400"; - #interrupt-cells = <3>;