Squash with "dt: Implement an I2C pinctrl mux for BSC0."

raspberrypi · Apr 22, 2020 · 53ceea0 · 53ceea0
1 parent fc39dce
commit 53ceea0
Show file tree

Hide file tree

Showing 11 changed files with 88 additions and 9 deletions.
diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -22,6 +22,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -68,6 +73,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -22,6 +22,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -38,11 +43,6 @@
 	};
 };
 
-&i2c0mux {
-	pinctrl-0;
-	pinctrl-1 = <&i2c0_gpio28>;
-};
-
 &uart0 {
 	status = "okay";
 };
@@ -73,6 +73,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts
@@ -25,6 +25,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -67,6 +72,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
@@ -31,6 +31,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -116,6 +121,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
@@ -3,6 +3,7 @@
 #include "bcm2708.dtsi"
 #include "bcm2708-rpi.dtsi"
 #include "bcm283x-rpi-csi1-2lane.dtsi"
+#include "bcm283x-rpi-i2c0mux_0_28.dtsi"
 
 / {
 	compatible = "raspberrypi,model-zero", "brcm,bcm2835";
@@ -71,12 +72,14 @@
 	};
 };
 
-&i2c0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&i2c0_pins>;
+&i2c0if {
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts
@@ -22,6 +22,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -68,6 +73,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi
@@ -21,7 +21,7 @@
 		i2s = &i2s;
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
-		i2c9 = &i2c_csi_dsi;
+		i2c10 = &i2c_csi_dsi;
 		spi0 = &spi0;
 		spi1 = &spi1;
 		spi2 = &spi2;

diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts
@@ -22,6 +22,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -68,6 +73,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts
@@ -32,6 +32,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -126,6 +131,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts
@@ -32,6 +32,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -137,6 +142,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;

diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts
@@ -25,6 +25,11 @@
 		brcm,function = <1>; /* output */
 	};
 
+	i2c0_pins: i2c0 {
+		brcm,pins = <0 1>;
+		brcm,function = <4>;
+	};
+
 	i2c1_pins: i2c1 {
 		brcm,pins = <2 3>;
 		brcm,function = <4>;
@@ -87,6 +92,10 @@
 	clock-frequency = <100000>;
 };
 
+&i2c0mux {
+	pinctrl-0 = <&i2c0_pins>;
+};
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;