From patchwork Tue Jan 16 20:41:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 763157 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0AD4938395; Tue, 16 Jan 2024 20:41:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705437683; cv=none; b=V+w8bwlwipFFH5pW4xm3KZeXkDJawG33CBNUnEN5uw2tJbWHJlvrmxKqcrV91m/mJ8IQ/RxYUKSgCkRtsLrjcb86TMP9qkGBPG/WhwwcSEu2zj+3mO4n7lkHtLJZscwQ35Y6XTQLLBusK/NY0473un4g8QrBaxrIyrmvKxIjrik= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705437683; c=relaxed/simple; bh=XCvYWP355Fhaawn/5OW3KCqVRZ0sq76+8/0cmtgC4+E=; h=Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Google-Smtp-Source:X-Received:Received:From: To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=rS0r9tUvDgGTgVotPadpUFQqGiUyXXlpzzoH2HJd+QEWu1m2KGReSPTo6NGsneXKtqOG/SgbUP+SDU66MMaQyNWorsAXve55N0C1sqTIv3Nsy26wT9o7Yr2nrELAX7mdYhaf+DxXzo5o0ntevRnRplCJDt3A3EU93mBsa3qpDvs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gqVUde53; arc=none smtp.client-ip=209.85.160.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gqVUde53" Received: by mail-qt1-f172.google.com with SMTP id d75a77b69052e-429be9fe952so39550531cf.0; Tue, 16 Jan 2024 12:41:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705437680; x=1706042480; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xKvjgEuWJbSxEFFzQ1IdsdgMBmwT8jOSBvK770lzRTk=; b=gqVUde53KYqc4NgXkb4CK3vTrbAdbfO89o/6v3jyHWpbZwklI6HD0jJO09jB8oIs8s OklonKEvIEWwotZqlcGi/JEWUTbKWGEcfRbwE/mPWAzXbLQvAaZli+J1EgPmgvDyR9md iKAcNCecj2UKkCJ9GUpvSoVEylgW6AyiU6S4ckpGtd3jZMSof5U4N3LqxbtRqqRcL44l 97QvLYeQj5hwjWuhk1mgeAHKiCFoRKP2nylphwlOre/bV2P66tlI5VK9w1FRpR8CR/GM joO4LX2M13MIZwj7hbWqo+Gvd3CXL9K2dwT3WvP8kw2ta7HVlJRTPBBcj5nWsu/f+7an dguA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705437680; x=1706042480; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xKvjgEuWJbSxEFFzQ1IdsdgMBmwT8jOSBvK770lzRTk=; b=p2vRzbQHaUSpdpQurqw4EW66+NHGHPXl1QTbP+FfUaoS2EmIPO8iFUKH7aSxUfbgfC RaZEsCBtnrTcIjQbZMBvwSFMULkWfNb7EIBwoZnl7/qll3kyFEdbOcVr1e6hkhnNrOph ySssQHjOMk/BOxQavYUX1xvmPiFoyPBFgGaaG7IS00OOAn4i5t+rko9ZI8zMujOCC3w2 Xl/e0wtebOyPBlW2LfA0VTF4ji1LK/wm/Pa81A32/VtjAL0CjNFA7/RBnIVr2EzAp+tP 7JHCzANP9j42OUZf/IntgCzYBRDSeSDVlsyJaEGF43pAnNy8hkNe2NIMAlUkI+cuMfG6 J7vg== X-Gm-Message-State: AOJu0Yzt6CiZ7a5RpaakmHfy1OaHfD2QFy1lgmnRYPO3/cnR5w0/XsG6 oitxRpRSynM5d7LJCzyrp1j64RSKA/A= X-Google-Smtp-Source: AGHT+IGKcQ/SAihBdD6ihNwYRSNgO2+0Zfozh06Nmkz6o8mmNBZYDS1QuN1HRT5DTCFw6RwZ6BJ8AQ== X-Received: by 2002:ad4:5bc3:0:b0:681:78b8:1058 with SMTP id t3-20020ad45bc3000000b0068178b81058mr844835qvt.49.1705437679920; Tue, 16 Jan 2024 12:41:19 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d10-20020a0cfe8a000000b0067f454b5307sm4419061qvs.108.2024.01.16.12.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 12:41:19 -0800 (PST) From: Trevor Woerner To: linux-kernel@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 1/2] arm64: dts: rockchip: rock-pi-e: adjust phy-handle name Date: Tue, 16 Jan 2024 15:41:01 -0500 Message-ID: <20240116204103.29318-1-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The rock-pi-e currently comes in 4 board spins, the latest one (v1.21) swaps out the Realtek 8211e PHY for an 8211f PHY. Therefore modify the phy-handle name to be more generic. Signed-off-by: Trevor Woerner --- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts index 018a3a5075c7..096cfa19036e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts @@ -146,7 +146,7 @@ &gmac2io { assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; clock_in_out = "input"; - phy-handle = <&rtl8211e>; + phy-handle = <&rtl8211>; phy-mode = "rgmii"; phy-supply = <&vcc_io>; pinctrl-names = "default"; @@ -163,7 +163,7 @@ mdio { #address-cells = <1>; #size-cells = <0>; - rtl8211e: ethernet-phy@1 { + rtl8211: ethernet-phy@1 { reg = <1>; pinctrl-0 = <ð_phy_int_pin>, <ð_phy_reset_pin>; pinctrl-names = "default"; From patchwork Tue Jan 16 20:41:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trevor Woerner X-Patchwork-Id: 763402 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B35673839E; Tue, 16 Jan 2024 20:41:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705437686; cv=none; b=UUMlfYpBlQ/ZjqLeciICypPDz5poujBstoE14rwpTXJT5Mn72E9N1LiYv2P8eDFkgjciJFBJRf12LQTNOeIs1jKThXYWZYBE8pE2vMbioavAmcPhpYVUgkCfcz2w047HJlQq9HJGQM1de6qmKDXd8mvI8sz4kphPKeB4zcypoMg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705437686; c=relaxed/simple; bh=8Epi2BmwuRR1jJjMxHuvQypLnY+hkT/Xyn+UQAsftfg=; h=Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Google-Smtp-Source:X-Received:Received:From: To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; b=kYvAlyZBuaCrVztyYs/G1YiZeIS/w4PntCZ5Ngkc9R0wg4fbjmyAaOx0o9VMo2VonzCkhpdHAFetEKGVBE7igWOKqy+RkjOrRsQ0PlBpn8fPqd3+oZh03BOqVE/bivthuXunMz8f6CQUELDS1I0rraSK59WIGggwdTEFmf1MxtA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QgXzkrqx; arc=none smtp.client-ip=209.85.222.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QgXzkrqx" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-7810827e54eso718561185a.2; Tue, 16 Jan 2024 12:41:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705437681; x=1706042481; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=StKRXgnZGREhQExaCuJaYVjX3Jya2+71hiETmJNExMg=; b=QgXzkrqx+cYFRj4SIJGsbZqqsk9qCN0CUBc/CGrsSqDx5x2viqLJ80uVLTFdDCl/CA SSNk1cpQUDz6BLch2Ainf/TSF2KsPXKrnCkHZm/ejsSgBEeFLc9ILdFHIBUl9ex5brx3 d36Mkm999yX4QodKxFGA1JknqpPCOIVfXM6C1dVpshjuPqAOHxS+cfTy5JoJYiyOudZ7 t9flIRE44pD2+85cDfgmSvNY0LMUrHosfywUfanD13gpQoLEFxwr2RDhwaVk+zK+e5eR M/TYj2vMjBM9khIJBMreCYKS1C9+n7hj5XNsVFI24Egn76WGH3AJH35JQUHLy/yaPCSg YHcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705437681; x=1706042481; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=StKRXgnZGREhQExaCuJaYVjX3Jya2+71hiETmJNExMg=; b=J9ZJA8hwVvsClquH/J+wdzwNQTqKAYbK7mlhjkfPW4VgynnLL770ysA5jemQZUDByp fNck/xjGdeWzWu5ves9oU+pOaaaqh/UlSion/iAkvAS29B96teNwJoS9RXb07SdbVFhN /q9R6Q+hdh06InXj0oTVKnl+aCkZUPFEO45QaXAWMhKqfc5fA1821a9clyyv8TKs69rF AxRbCXQ3JF0iLxc4w0S3VQC5ZugL2+7ToPHSucZXbUdi+nZlHpcBk/vbSPoIcm7aTKFN Q8jyJJi7ix+NLGtd5BtYV2J3wZ9cw6qdyvAU3Aic9mojIazTH56/5b+2YuU2HL2dRVja SUwQ== X-Gm-Message-State: AOJu0Yy+zXAbZXxwqMpDFJWtX3U91CsRpTVhLsTaFIyFUjF+VYhPSA1g FXxXpSxQSbgec8QpjA01zkH8LbTHAO0= X-Google-Smtp-Source: AGHT+IH3Ja1QEZGR+NYI54PmP6WRhDaXVNnXOfiQFtZpqhul+4levY2faChY02X4/rctxREEh2F8Ew== X-Received: by 2002:a05:6214:262c:b0:680:3ac:2415 with SMTP id gv12-20020a056214262c00b0068003ac2415mr10417737qvb.120.1705437681591; Tue, 16 Jan 2024 12:41:21 -0800 (PST) Received: from localhost.localdomain (pppoe-209-91-167-254.vianet.ca. [209.91.167.254]) by smtp.gmail.com with ESMTPSA id d10-20020a0cfe8a000000b0067f454b5307sm4419061qvs.108.2024.01.16.12.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 12:41:20 -0800 (PST) From: Trevor Woerner To: linux-kernel@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Chen-Yu Tsai Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH 2/2] arm64: dts: rockchip: rock-pi-e: fix location of snps properties Date: Tue, 16 Jan 2024 15:41:02 -0500 Message-ID: <20240116204103.29318-2-twoerner@gmail.com> X-Mailer: git-send-email 2.43.0.76.g1a87c842ece3 In-Reply-To: <20240116204103.29318-1-twoerner@gmail.com> References: <20240116204103.29318-1-twoerner@gmail.com> Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 A number of snps (Synopsys) properties are not in their correct location. Fixes: b918e81f2145 ("arm64: dts: rockchip: rk3328: Add Radxa ROCK Pi E") Signed-off-by: Trevor Woerner --- arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts index 096cfa19036e..0739b8fec86e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts @@ -150,8 +150,11 @@ &gmac2io { phy-mode = "rgmii"; phy-supply = <&vcc_io>; pinctrl-names = "default"; - pinctrl-0 = <&rgmiim1_pins>; + pinctrl-0 = <&rgmiim1_pins>, <ð_phy_reset_pin>; snps,aal; + snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; snps,rxpbl = <0x4>; snps,txpbl = <0x4>; tx_delay = <0x26>; @@ -165,13 +168,10 @@ mdio { rtl8211: ethernet-phy@1 { reg = <1>; - pinctrl-0 = <ð_phy_int_pin>, <ð_phy_reset_pin>; + pinctrl-0 = <ð_phy_int_pin>; pinctrl-names = "default"; interrupt-parent = <&gpio1>; interrupts = <24 IRQ_TYPE_LEVEL_LOW>; - reset-assert-us = <10000>; - reset-deassert-us = <50000>; - reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>; }; }; };