1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
|
From 393b01ee7330723b5f27b86d1b03bed88f8a8ffa Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Thu, 9 Apr 2020 17:26:13 +0100
Subject: [PATCH] dt: Update all mainline bcm283x dt files for i2c0
pinctrl mux
BSC0 (aka i2c0) can me muxed via pinctrl to GPIOs 0&1, 28&29, or
44&45. These have different uses based on the platform (40pin header,
and CSI/DSI connectors), so add a pinctrl I2C mux between the
different options.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 5 +++++
arch/arm/boot/dts/bcm2835-rpi-a.dts | 7 +++++++
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 5 +++++
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 7 +++++++
arch/arm/boot/dts/bcm2835-rpi-b.dts | 7 +++++++
arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts | 5 +++++
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 5 +++++
arch/arm/boot/dts/bcm2835-rpi-zero.dts | 5 +++++
arch/arm/boot/dts/bcm2835-rpi.dtsi | 10 +++++++---
arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 5 +++++
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 5 +++++
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 5 +++++
arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 5 +++++
arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts | 5 +++++
14 files changed, 78 insertions(+), 3 deletions(-)
--- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
@@ -126,3 +126,8 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 28&29 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
@@ -121,3 +121,10 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* i2c0 on camera/display connector is gpio 0&1. Not exposed on header.
+ * To avoid having to remap everything, map both ports to gpios 0&1
+ */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio0>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
@@ -128,3 +128,8 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 28&29 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
@@ -121,3 +121,10 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* i2c0 on camera/display connector is gpio 0&1. Not exposed on header.
+ * To avoid having to remap everything, map both ports to gpios 0&1
+ */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio0>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
@@ -116,3 +116,10 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* camera/display connector use BSC1 on GPIOS 2&3.
+ * To avoid having to remap everything, map both ports to gpios 0&1
+ */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio0>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts
@@ -95,3 +95,8 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* WHAT TO DO HERE? */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts
@@ -149,3 +149,8 @@
pinctrl-0 = <&uart1_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 28&29 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
@@ -117,3 +117,8 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 28&29 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
@@ -46,13 +46,17 @@
};
};
-&i2c0 {
- pinctrl-names = "default";
- pinctrl-0 = <&i2c0_gpio0>;
+&i2c0if {
status = "okay";
clock-frequency = <100000>;
};
+&i2c0mux {
+ pinctrl-0 = <&i2c0_gpio0>;
+ /* pinctrl-1 varies based on platform */
+ status = "okay";
+};
+
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_gpio2>;
--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
@@ -128,3 +128,8 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 28&29 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
--- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
@@ -176,3 +176,8 @@
pinctrl-0 = <&uart1_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 44&45 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio44>;
+};
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -179,3 +179,8 @@
pinctrl-0 = <&uart1_gpio14>;
status = "okay";
};
+
+/* i2c on camera/display connector is gpio 44&45 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio44>;
+};
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -174,3 +174,8 @@
status = "okay";
bus-width = <4>;
};
+
+/* i2c on camera/display connector is gpio 44&45 */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio44>;
+};
--- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts
@@ -94,3 +94,8 @@
pinctrl-0 = <&uart0_gpio14>;
status = "okay";
};
+
+/* WHAT TO DO HERE? */
+&i2c0mux {
+ pinctrl-1 = <&i2c0_gpio28>;
+};
|
