From: Andrew Davis <afd@ti.com>
To: Nishanth Menon <nm@ti.com>, Vignesh Raghavendra <vigneshr@ti.com>,
Tero Kristo <kristo@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Bryan Brattlof <bb@ti.com>,
<linux-arm-kernel@lists.infradead.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: Andrew Davis <afd@ti.com>
Subject: [PATCH 12/12] arm64: dts: ti: k3-j721s2: Enable I2C nodes at the board level
Date: Thu, 20 Oct 2022 11:03:05 -0500 [thread overview]
Message-ID: <20221020160305.18711-13-afd@ti.com> (raw)
In-Reply-To: <20221020160305.18711-1-afd@ti.com>
I2C nodes defined in the top-level J721s2 SoC dtsi files are incomplete
and will not be functional unless they are extended with pinmux
information.
As the pinmux is only known at the board integration level, these
nodes should only be enabled when provided with this information.
Disable the I2C nodes in the dtsi files and only enable the ones that
are actually pinned out on a given board.
Signed-off-by: Andrew Davis <afd@ti.com>
---
.../dts/ti/k3-j721s2-common-proc-board.dts | 24 -------------------
arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 6 +++++
.../boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 3 +++
arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 1 +
4 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
index 3f4106f76893b..a7aa6cf08acd4 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-common-proc-board.dts
@@ -261,30 +261,6 @@ exp2: gpio@22 {
};
};
-&main_i2c1 {
- status = "disabled";
-};
-
-&main_i2c2 {
- status = "disabled";
-};
-
-&main_i2c3 {
- status = "disabled";
-};
-
-&main_i2c4 {
- status = "disabled";
-};
-
-&main_i2c5 {
- status = "disabled";
-};
-
-&main_i2c6 {
- status = "disabled";
-};
-
&main_sdhci0 {
/* eMMC */
non-removable;
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
index 1c18d6df6361a..d1ec261103761 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
@@ -266,6 +266,7 @@ main_i2c1: i2c@2010000 {
clocks = <&k3_clks 215 1>;
clock-names = "fck";
power-domains = <&k3_pds 215 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c2: i2c@2020000 {
@@ -277,6 +278,7 @@ main_i2c2: i2c@2020000 {
clocks = <&k3_clks 216 1>;
clock-names = "fck";
power-domains = <&k3_pds 216 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c3: i2c@2030000 {
@@ -288,6 +290,7 @@ main_i2c3: i2c@2030000 {
clocks = <&k3_clks 217 1>;
clock-names = "fck";
power-domains = <&k3_pds 217 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c4: i2c@2040000 {
@@ -299,6 +302,7 @@ main_i2c4: i2c@2040000 {
clocks = <&k3_clks 218 1>;
clock-names = "fck";
power-domains = <&k3_pds 218 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c5: i2c@2050000 {
@@ -310,6 +314,7 @@ main_i2c5: i2c@2050000 {
clocks = <&k3_clks 219 1>;
clock-names = "fck";
power-domains = <&k3_pds 219 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c6: i2c@2060000 {
@@ -321,6 +326,7 @@ main_i2c6: i2c@2060000 {
clocks = <&k3_clks 220 1>;
clock-names = "fck";
power-domains = <&k3_pds 220 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_sdhci0: mmc@4f80000 {
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
index d1dd40a6e42a4..3264b8e8faea5 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
@@ -146,6 +146,7 @@ wkup_i2c0: i2c@42120000 {
clocks = <&k3_clks 223 1>;
clock-names = "fck";
power-domains = <&k3_pds 223 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_i2c0: i2c@40b00000 {
@@ -157,6 +158,7 @@ mcu_i2c0: i2c@40b00000 {
clocks = <&k3_clks 221 1>;
clock-names = "fck";
power-domains = <&k3_pds 221 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_i2c1: i2c@40b10000 {
@@ -168,6 +170,7 @@ mcu_i2c1: i2c@40b10000 {
clocks = <&k3_clks 222 1>;
clock-names = "fck";
power-domains = <&k3_pds 222 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_mcan0: can@40528000 {
diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
index a2cb0916e4a2f..6930efff8a5a3 100644
--- a/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi
@@ -56,6 +56,7 @@ J721S2_IOPAD(0x024, PIN_OUTPUT, 0) /* (Y28) MCAN16_TX */
};
&main_i2c0 {
+ status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
--
2.37.3
next prev parent reply other threads:[~2022-10-20 16:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-20 16:02 [PATCH 00/12] TI J7x Disable Incomplete DT Nodes Andrew Davis
2022-10-20 16:02 ` [PATCH 01/12] arm64: dts: ti: k3-j721e: Enable UART nodes at the board level Andrew Davis
2022-10-20 16:02 ` [PATCH 02/12] arm64: dts: ti: k3-j721e: Enable I2C " Andrew Davis
2022-10-20 16:02 ` [PATCH 03/12] arm64: dts: ti: k3-j721e: Enable MCASP " Andrew Davis
2022-10-20 16:02 ` [PATCH 04/12] arm64: dts: ti: k3-j721e: Enable MCAN " Andrew Davis
2022-10-20 16:02 ` [PATCH 05/12] arm64: dts: ti: k3-j7200: Enable UART " Andrew Davis
2022-10-20 16:02 ` [PATCH 06/12] arm64: dts: ti: k3-j7200: Enable I2C " Andrew Davis
2022-10-20 16:03 ` [PATCH 07/12] arm64: dts: ti: k3-j721s2: Enable UART " Andrew Davis
2022-10-20 16:03 ` [PATCH 08/12] arm64: dts: ti: k3-j721e: Enable Mailbox " Andrew Davis
2022-10-20 16:03 ` [PATCH 09/12] arm64: dts: ti: k3-j7200: " Andrew Davis
2022-10-20 16:03 ` [PATCH 10/12] arm64: dts: ti: k3-j721s2: " Andrew Davis
2022-10-20 16:03 ` [PATCH 11/12] arm64: dts: ti: k3-j721s2: Enable MCAN " Andrew Davis
2022-10-20 16:03 ` Andrew Davis [this message]
2022-10-20 22:16 ` [PATCH 00/12] TI J7x Disable Incomplete DT Nodes Bryan Brattlof
2022-10-28 13:20 ` Vignesh Raghavendra
2022-10-28 13:31 ` Nishanth Menon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221020160305.18711-13-afd@ti.com \
--to=afd@ti.com \
--cc=bb@ti.com \
--cc=devicetree@vger.kernel.org \
--cc=kristo@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nm@ti.com \
--cc=robh+dt@kernel.org \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).