From 53ceea061a44e415abcff6b7e37e845905846d32 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Wed, 22 Apr 2020 14:46:58 +0100 Subject: [PATCH] Squash with "dt: Implement an I2C pinctrl mux for BSC0." --- arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 9 +++++++++ arch/arm/boot/dts/bcm2708-rpi-b.dts | 14 +++++++++----- arch/arm/boot/dts/bcm2708-rpi-cm.dts | 9 +++++++++ arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 9 +++++++++ arch/arm/boot/dts/bcm2708-rpi-zero.dts | 9 ++++++--- arch/arm/boot/dts/bcm2709-rpi-2-b.dts | 9 +++++++++ arch/arm/boot/dts/bcm270x-rpi.dtsi | 2 +- arch/arm/boot/dts/bcm2710-rpi-2-b.dts | 9 +++++++++ arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 9 +++++++++ arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 9 +++++++++ arch/arm/boot/dts/bcm2710-rpi-cm3.dts | 9 +++++++++ 11 files changed, 88 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts index febe77131858fa..0e137d85897b63 100644 --- 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 index b8baf21b6b18d3..47c093364683b1 100644 --- 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 index b1dc233784c21d..5dcdf8888ec127 100644 --- 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 index 7952b08a6ccf59..af883bf02ec5ad 100644 --- 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 index 2909ddeafc8336..0e61e8269efc8f 100644 --- 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 index 52a807dafaad8d..77678a3d7ef915 100644 --- 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 index cb2ccace8b1cee..e3d90b4262f1fb 100644 --- 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 index eb654d00cdbd88..dd7e1897ea4564 100644 --- 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 index 60973bd342a1a4..f4973868818704 100644 --- 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 index 653f09af5b5020..112eb73f2cc1f2 100644 --- 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 index 2d54f4c90da202..88f7fe53b97f25 100644 --- 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>;