Commit 282c4ad3 authored by Andrew Davis's avatar Andrew Davis Committed by Nishanth Menon

arm64: dts: ti: k3-j721e: Enable I2C nodes at the board level

I2C nodes defined in the top-level J721e 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: default avatarAndrew Davis <afd@ti.com>
Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Reviewed-by: default avatarBryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221020160305.18711-3-afd@ti.com
parent fe17e20f
...@@ -529,6 +529,7 @@ adc { ...@@ -529,6 +529,7 @@ adc {
}; };
&main_i2c0 { &main_i2c0 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>; pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>; clock-frequency = <400000>;
...@@ -565,6 +566,7 @@ p10-hog { ...@@ -565,6 +566,7 @@ p10-hog {
}; };
&main_i2c1 { &main_i2c1 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c1_pins_default>; pinctrl-0 = <&main_i2c1_pins_default>;
clock-frequency = <400000>; clock-frequency = <400000>;
...@@ -590,6 +592,7 @@ &k3_clks { ...@@ -590,6 +592,7 @@ &k3_clks {
}; };
&main_i2c3 { &main_i2c3 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c3_pins_default>; pinctrl-0 = <&main_i2c3_pins_default>;
clock-frequency = <400000>; clock-frequency = <400000>;
...@@ -628,6 +631,7 @@ pcm3168a_1: audio-codec@44 { ...@@ -628,6 +631,7 @@ pcm3168a_1: audio-codec@44 {
}; };
&main_i2c6 { &main_i2c6 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c6_pins_default>; pinctrl-0 = <&main_i2c6_pins_default>;
clock-frequency = <400000>; clock-frequency = <400000>;
......
...@@ -1229,6 +1229,7 @@ main_i2c0: i2c@2000000 { ...@@ -1229,6 +1229,7 @@ main_i2c0: i2c@2000000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 187 0>; clocks = <&k3_clks 187 0>;
power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>; power-domains = <&k3_pds 187 TI_SCI_PD_SHARED>;
status = "disabled";
}; };
main_i2c1: i2c@2010000 { main_i2c1: i2c@2010000 {
...@@ -1240,6 +1241,7 @@ main_i2c1: i2c@2010000 { ...@@ -1240,6 +1241,7 @@ main_i2c1: i2c@2010000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 188 0>; clocks = <&k3_clks 188 0>;
power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 188 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
main_i2c2: i2c@2020000 { main_i2c2: i2c@2020000 {
...@@ -1251,6 +1253,7 @@ main_i2c2: i2c@2020000 { ...@@ -1251,6 +1253,7 @@ main_i2c2: i2c@2020000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 189 0>; clocks = <&k3_clks 189 0>;
power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 189 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
main_i2c3: i2c@2030000 { main_i2c3: i2c@2030000 {
...@@ -1262,6 +1265,7 @@ main_i2c3: i2c@2030000 { ...@@ -1262,6 +1265,7 @@ main_i2c3: i2c@2030000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 190 0>; clocks = <&k3_clks 190 0>;
power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 190 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
main_i2c4: i2c@2040000 { main_i2c4: i2c@2040000 {
...@@ -1273,6 +1277,7 @@ main_i2c4: i2c@2040000 { ...@@ -1273,6 +1277,7 @@ main_i2c4: i2c@2040000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 191 0>; clocks = <&k3_clks 191 0>;
power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 191 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
main_i2c5: i2c@2050000 { main_i2c5: i2c@2050000 {
...@@ -1284,6 +1289,7 @@ main_i2c5: i2c@2050000 { ...@@ -1284,6 +1289,7 @@ main_i2c5: i2c@2050000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 192 0>; clocks = <&k3_clks 192 0>;
power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 192 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
main_i2c6: i2c@2060000 { main_i2c6: i2c@2060000 {
...@@ -1295,6 +1301,7 @@ main_i2c6: i2c@2060000 { ...@@ -1295,6 +1301,7 @@ main_i2c6: i2c@2060000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 193 0>; clocks = <&k3_clks 193 0>;
power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 193 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
ufs_wrapper: ufs-wrapper@4e80000 { ufs_wrapper: ufs-wrapper@4e80000 {
......
...@@ -147,6 +147,7 @@ mcu_i2c0: i2c@40b00000 { ...@@ -147,6 +147,7 @@ mcu_i2c0: i2c@40b00000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 194 0>; clocks = <&k3_clks 194 0>;
power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 194 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
mcu_i2c1: i2c@40b10000 { mcu_i2c1: i2c@40b10000 {
...@@ -158,6 +159,7 @@ mcu_i2c1: i2c@40b10000 { ...@@ -158,6 +159,7 @@ mcu_i2c1: i2c@40b10000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 195 0>; clocks = <&k3_clks 195 0>;
power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>; power-domains = <&k3_pds 195 TI_SCI_PD_EXCLUSIVE>;
status = "disabled";
}; };
wkup_i2c0: i2c@42120000 { wkup_i2c0: i2c@42120000 {
...@@ -169,6 +171,7 @@ wkup_i2c0: i2c@42120000 { ...@@ -169,6 +171,7 @@ wkup_i2c0: i2c@42120000 {
clock-names = "fck"; clock-names = "fck";
clocks = <&k3_clks 197 0>; clocks = <&k3_clks 197 0>;
power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>; power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>;
status = "disabled";
}; };
fss: fss@47000000 { fss: fss@47000000 {
......
...@@ -537,6 +537,7 @@ &ospi1 { ...@@ -537,6 +537,7 @@ &ospi1 {
}; };
&main_i2c0 { &main_i2c0 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>; pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>; clock-frequency = <400000>;
...@@ -564,18 +565,15 @@ i2c@1 { ...@@ -564,18 +565,15 @@ i2c@1 {
}; };
&main_i2c1 { &main_i2c1 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c1_pins_default>; pinctrl-0 = <&main_i2c1_pins_default>;
/* i2c1 is used for DVI DDC, so we need to use 100kHz */ /* i2c1 is used for DVI DDC, so we need to use 100kHz */
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
&main_i2c2 {
/* Unused */
status = "disabled";
};
&main_i2c3 { &main_i2c3 {
status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&main_i2c3_pins_default>; pinctrl-0 = <&main_i2c3_pins_default>;
clock-frequency = <400000>; clock-frequency = <400000>;
...@@ -602,21 +600,6 @@ i2c@1 { ...@@ -602,21 +600,6 @@ i2c@1 {
}; };
}; };
&main_i2c4 {
/* Unused */
status = "disabled";
};
&main_i2c5 {
/* Brought out on RPi Header */
status = "disabled";
};
&main_i2c6 {
/* Unused */
status = "disabled";
};
&main_gpio2 { &main_gpio2 {
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment