From nobody Mon Nov 25 14:59:25 2024 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 8F7BE482CD for ; Sun, 27 Oct 2024 14:45:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730040361; cv=none; b=uvu7tIt5QoUNmzgKLa/rkKGYXzR3hns5iH9BP6L1/wVTiN98BzzKr9h/0xNl/JBBvOHL6zZoUOYbOIyz3B3xqveD11y5AJtiEPdznlcbRkwUG++QPeJUyfm2IIEoPR3IA3OfizPe6niBnqoSIMxsjk9qKMHFaZ5CSz2UD1Wg1jM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730040361; c=relaxed/simple; bh=tUanrKhwXFYt9MSIAQPw+2GxwKgx0rYaAo6GfuhRWKU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EsOy7Rgp+ivE4FiunH4a3YNZxiJlQtJtESCdsJ6j5jtI87Otl0Of+c2IWx2H9dMtPq6odNkqTY6RTtjmKiPIO9oALwEPczT2eOXFeZYxOtUpVL4g/zAsfqC92xvKPICEShMS0Af+EAEu6lN6xsqvR89Cb8OTzDATVlhbc4XFaWM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=0qC7t+3Z; arc=none smtp.client-ip=209.85.215.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="0qC7t+3Z" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea7e2ff5ceso2369216a12.2 for ; Sun, 27 Oct 2024 07:45:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1730040359; x=1730645159; 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=xWEEDIuoc+ubQpnTY3Wis5Eq7A0dylpkEwbr0VsXG/k=; b=0qC7t+3ZD4hZpvhAIq4zNxSFBYSukRlvxDsY1J6uScPr6Td9HRQzKCJmsqy132vxKG OFtRKQqK3kJMoFwzaqUkkv6NEINJaVF+s8uFkmNtDqcS6EaF6ksFv8acl2dRtI6k7FjP jOf3jzCOErh6RyM+G8U8VshOEzSurLl8czMnBIvegslOUIcD8soYHyq8/jfSd3SgIFCq CtPnGI2d9/TmZ055vwd5rfcxczWeXFesvO62EGKqA0eE7hFsqcjdf/jVNJdSpPcVmDds 4bYGLXd8aM8tBwDKHsR/ZHSf9dLzHe8jZnsyWJpVfWkQEcgymC7uQKpANK9JI09qZzdG nztw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730040359; x=1730645159; 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=xWEEDIuoc+ubQpnTY3Wis5Eq7A0dylpkEwbr0VsXG/k=; b=bBu8dsxq5rVeBhPi3TXOSpQo4d5rRew3FRcArjepDZ1taxtTZc5xNo3xRBvDRIabZB 2xAPV/d7yekUtnSDZYY64H3lLSKjqJdEK/fD5Q8jSt0c5ml4GVwLkP96/xEEvQuAewfy t77Hz6cUpdcS0h+Bl76jfQqdwGiOw6W9rnQSni4C+uoTKwo6nXCzJkVeCa7yHBl4mfon SFJdKApYtHT/WivF1lSahuOkKkKEkqcJkDjqZDiT7mePed5xN36GzhBgyb5K8uvRH8im Co4J0XJ9ANv9o3MRdLwLGZ59R2t5Umohh5LZ4JwWMLglgFpv0sXc91KIqEKCaIPte2oT hzkQ== X-Forwarded-Encrypted: i=1; AJvYcCV5ZKIBaF0rPevbE0r0dFw/fSw+S+JH+D7fYzISANg7DeKiBqE/aGtFBaadW5kqHwk+WW4r+JwKEoYUKMw=@vger.kernel.org X-Gm-Message-State: AOJu0YxwMXPAlZh7CgwJLeYsBEjD/fKVDcKsbLg+SxeOmK/qBS241pd1 wUsq9ArVND3FBeGt6uDJQl+Ukm1mJkOhzycFoRkI59xOv2stCedvH7ZHVEJpChI= X-Google-Smtp-Source: AGHT+IH9/LAPD9XkxqAgDEzE/OAVQvWb8BYcvTb5Lysws0ZyjzOdHM8FJiGWnGHE78Q99U2WeQiUiQ== X-Received: by 2002:a05:6a20:4499:b0:1d9:1f51:faeb with SMTP id adf61e73a8af0-1d9a85349ecmr7492678637.39.1730040358888; Sun, 27 Oct 2024 07:45:58 -0700 (PDT) Received: from localhost.localdomain ([2a11:3:200::401b]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72057a0cb06sm4065110b3a.115.2024.10.27.07.45.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 07:45:58 -0700 (PDT) From: Guodong Xu To: Conor Dooley , Rob Herring , Krzysztof Kozlowski , Emil Renner Berthing , rafal@milecki.pl, Greg Kroah-Hartman Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Neil Armstrong , Heiko Stuebner , Michael Zhu , Drew Fustini , Alexandru Stan , Daniel Schaefer , Sandie Cao , Yuning Liang , Huiming Qiu , Alex Elder , linux@frame.work, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Guodong Xu Subject: [PATCH v6 1/5] riscv: dts: starfive: jh7110-common: revised device node Date: Sun, 27 Oct 2024 22:44:44 +0800 Message-Id: <20241027144448.1813611-2-guodong@riscstar.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241027144448.1813611-1-guodong@riscstar.com> References: <20241027144448.1813611-1-guodong@riscstar.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Earlier this year a new DTSI file was created to define common properties for the StarFive VisionFive 2 and Milk-V Mars boards, both of which use the StarFive JH7110 SoC. The Pine64 Star64 board has also been added since that time. Some of the nodes defined in "jh7110-common.dtsi" are enabled in that file because all of the boards including it "want" them enabled. An upcoming patch enables another JH7110 board, but for that board not all of these common nodes should be enabled. Prepare for supporting the new board by avoiding enabling these nodes in "jh711-common.dtsi", and enable them instead in these files: jh7110-milkv-mars.dts jh7110-pine64-star64.dts jh7110-starfive-visionfive-2.dtsi Signed-off-by: Alex Elder Signed-off-by: Guodong Xu Reviewed-by: Emil Renner Berthing --- v6: New patch .../boot/dts/starfive/jh7110-common.dtsi | 5 ----- .../boot/dts/starfive/jh7110-milkv-mars.dts | 17 ++++++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 17 ++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 20 +++++++++++++++++++ 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/b= oot/dts/starfive/jh7110-common.dtsi index c7771b3b6475..9e77f79ec162 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi .../boot/dts/starfive/jh7110-common.dtsi | 5 ----- .../boot/dts/starfive/jh7110-milkv-mars.dts | 17 ++++++++++++++++ .../dts/starfive/jh7110-pine64-star64.dts | 17 ++++++++++++++++ .../jh7110-starfive-visionfive-2.dtsi | 20 +++++++++++++++++++ 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/b= oot/dts/starfive/jh7110-common.dtsi index c7771b3b6475..9e77f79ec162 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -176,7 +176,6 @@ csi2rx_to_camss: endpoint { &gmac0 { phy-handle =3D <&phy0>; phy-mode =3D "rgmii-id"; - status =3D "okay"; =20 mdio { #address-cells =3D <1>; @@ -196,7 +195,6 @@ &i2c0 { i2c-scl-falling-time-ns =3D <510>; pinctrl-names =3D "default"; pinctrl-0 =3D <&i2c0_pins>; - status =3D "okay"; }; =20 &i2c2 { @@ -311,7 +309,6 @@ &pcie1 { &pwmdac { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwmdac_pins>; - status =3D "okay"; }; =20 &qspi { @@ -350,13 +347,11 @@ uboot@100000 { &pwm { pinctrl-names =3D "default"; pinctrl-0 =3D <&pwm_pins>; - status =3D "okay"; }; =20 &spi0 { pinctrl-names =3D "default"; pinctrl-0 =3D <&spi0_pins>; - status =3D "okay"; =20 spi_dev0: spi@0 { compatible =3D "rohm,dh2228fv"; diff --git a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts b/arch/risc= v/boot/dts/starfive/jh7110-milkv-mars.dts index 5cb9e99e1dac..66ad3eb2fd66 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts @@ -15,6 +15,11 @@ &gmac0 { starfive,tx-use-rgmii-clk; assigned-clocks =3D <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents =3D <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>; + status =3D "okay"; +}; + +&i2c0 { + status =3D "okay"; }; =20 &pcie0 { @@ -35,3 +40,15 @@ &phy0 { rx-internal-delay-ps =3D <1500>; tx-internal-delay-ps =3D <1500>; }; + +&pwm { + status =3D "okay"; +}; + +&pwmdac { + status =3D "okay"; +}; + +&spi0 { + status =3D "okay"; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts b/arch/r= iscv/boot/dts/starfive/jh7110-pine64-star64.dts index b720cdd15ed6..dbc8612b8464 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +++ b/arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts @@ -18,6 +18,7 @@ &gmac0 { starfive,tx-use-rgmii-clk; assigned-clocks =3D <&aoncrg JH7110_AONCLK_GMAC0_TX>; assigned-clock-parents =3D <&aoncrg JH7110_AONCLK_GMAC0_RMII_RTX>; + status =3D "okay"; }; =20 &gmac1 { @@ -39,6 +40,10 @@ phy1: ethernet-phy@1 { }; }; =20 +&i2c0 { + status =3D "okay"; +}; + &pcie1 { status =3D "okay"; }; @@ -63,3 +68,15 @@ &phy1 { motorcomm,tx-clk-10-inverted; motorcomm,tx-clk-100-inverted; }; + +&pwm { + status =3D "okay"; +}; + +&pwmdac { + status =3D "okay"; +}; + +&spi0 { + status =3D "okay"; +}; diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi= b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 18f38fc790a4..ef93a394bb2f 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -13,6 +13,10 @@ aliases { }; }; =20 +&gmac0 { + status =3D "okay"; +}; + &gmac1 { phy-handle =3D <&phy1>; phy-mode =3D "rgmii-id"; @@ -29,6 +33,10 @@ phy1: ethernet-phy@1 { }; }; =20 +&i2c0 { + status =3D "okay"; +}; + &mmc0 { non-removable; }; @@ -40,3 +48,15 @@ &pcie0 { &pcie1 { status =3D "okay"; }; + +&pwm { + status =3D "okay"; +}; + +&pwmdac { + status =3D "okay"; +}; + +&spi0 { + status =3D "okay"; +}; --=20 2.34.1