Convention followed in all other DTSI files is to define I2C controller
address/size-cells in the DTSI thus reducing code needed in each DTS.
It's also logical, since I2C is a bus and needs definition of addressing
children, even if the bus is enabled without the nodes.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
.../arm64/boot/dts/exynos/exynos7870-a2corelte.dts | 9 ----
arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts | 5 ---
arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts | 6 ---
arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts | 3 --
arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts | 9 ----
arch/arm64/boot/dts/exynos/exynos7870.dtsi | 48 ++++++++++++++++++++++
6 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts b/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
index 6f40ca4350ed..0888cd2faca4 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-a2corelte.dts
@@ -158,9 +158,6 @@ &gpu {
};
&hsi2c0 {
- #address-cells = <1>;
- #size-cells = <0>;
-
status = "okay";
pmic@66 {
@@ -394,9 +391,6 @@ vdd_ldo35: ldo35 {
};
&i2c5 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
@@ -428,9 +422,6 @@ proximity@48 {
};
&i2c6 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts b/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts
index d685bc0703cf..36c327668db5 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts
@@ -129,8 +129,6 @@ &gpu {
&hsi2c0 {
status = "okay";
- #address-cells = <1>;
- #size-cells = <0>;
pmic@66 {
compatible = "samsung,s2mpu05-pmic";
@@ -358,9 +356,6 @@ vdd_ldo35: ldo35 {
};
&i2c2 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts b/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
index 09f2367cfec9..de30d0970336 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts
@@ -383,9 +383,6 @@ vdd_ldo35: ldo35 {
};
&i2c5 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
@@ -409,9 +406,6 @@ accelerometer@1d {
};
&i2c6 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts b/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts
index 1da826ca1087..079b2b581307 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts
@@ -334,9 +334,6 @@ vdd_ldo35: ldo35 {
};
&i2c1 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts b/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
index 29e124c72e9d..29be4764f84d 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
+++ b/arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts
@@ -398,9 +398,6 @@ vdd_ldo35: ldo35 {
};
&i2c1 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
@@ -438,9 +435,6 @@ rmi4-f12@12 {
};
&i2c7 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
@@ -464,9 +458,6 @@ accelerometer@1d {
};
&i2c8 {
- #address-cells = <1>;
- #size-cells = <0>;
-
samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>;
diff --git a/arch/arm64/boot/dts/exynos/exynos7870.dtsi b/arch/arm64/boot/dts/exynos/exynos7870.dtsi
index 2827e10d6962..19f9ae783587 100644
--- a/arch/arm64/boot/dts/exynos/exynos7870.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7870.dtsi
@@ -220,6 +220,9 @@ hsi2c0: i2c@10510000 {
clock-names = "hsi2c";
clocks = <&cmu_mif CLK_GOUT_MIF_HSI2C_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -422,6 +425,9 @@ i2c0: i2c@13830000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C0_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -437,6 +443,9 @@ i2c1: i2c@13840000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C1_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -452,6 +461,9 @@ i2c2: i2c@13850000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C2_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -467,6 +479,9 @@ i2c3: i2c@13860000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C3_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -482,6 +497,9 @@ i2c4: i2c@13870000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C4_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -497,6 +515,9 @@ i2c5: i2c@13880000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C5_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -512,6 +533,9 @@ i2c6: i2c@13890000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C6_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -527,6 +551,9 @@ hsi2c1: i2c@138a0000 {
clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C1_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -542,6 +569,9 @@ hsi2c2: i2c@138b0000 {
clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C2_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -557,6 +587,9 @@ hsi2c3: i2c@138c0000 {
clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C3_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -572,6 +605,9 @@ i2c7: i2c@138d0000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C7_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -587,6 +623,9 @@ i2c8: i2c@138e0000 {
clock-names = "i2c";
clocks = <&cmu_peri CLK_GOUT_PERI_I2C8_PCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -602,6 +641,9 @@ hsi2c4: i2c@138f0000 {
clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C4_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -617,6 +659,9 @@ hsi2c5: i2c@13950000 {
clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C5_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
@@ -632,6 +677,9 @@ hsi2c6: i2c@13960000 {
clock-names = "hsi2c";
clocks = <&cmu_peri CLK_GOUT_PERI_HSI2C6_IPCLK>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
status = "disabled";
};
--
2.51.0© 2016 - 2026 Red Hat, Inc.