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
|
From 56a619cbaa22d536455de8e339747faa196615de Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.com>
Date: Wed, 12 Apr 2023 16:11:40 +0100
Subject: [PATCH] ARM: dts: bcm27xx: Add i2c_arm/vc and friends
Since there is now a dedicated dts file for the rev1 Model B (the only
Pi to drive the primary camera with i2c1), move the creation of the
i2c_arm, i2c_vc and i2c labels, aliases and overrides into the base dts
files.
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
---
arch/arm/boot/dts/bcm2708-rpi-b-plus.dts | 6 ++++++
arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts | 13 +++++++++++++
arch/arm/boot/dts/bcm2708-rpi-b.dts | 6 ++++++
arch/arm/boot/dts/bcm2708-rpi-cm.dtsi | 6 ++++++
arch/arm/boot/dts/bcm2708-rpi-zero-w.dts | 3 +++
arch/arm/boot/dts/bcm2708-rpi-zero.dts | 3 +++
arch/arm/boot/dts/bcm2709-rpi.dtsi | 3 +++
arch/arm/boot/dts/bcm270x-rpi.dtsi | 7 +++++++
arch/arm/boot/dts/bcm2711-rpi-ds.dtsi | 3 +++
9 files changed, 50 insertions(+)
--- a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts
@@ -186,6 +186,12 @@
cam0_reg: &cam_dummy_reg {
};
+i2c_arm: &i2c1 {
+};
+
+i2c_vc: &i2c0 {
+};
+
/ {
__overrides__ {
audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
--- a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts
@@ -197,6 +197,12 @@ i2c_csi_dsi: &i2c1 {
cam0_reg: &cam_dummy_reg {
};
+i2c_arm: &i2c0 {
+};
+
+i2c_vc: &i2c1 {
+};
+
/ {
__overrides__ {
audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
@@ -204,5 +210,12 @@ cam0_reg: &cam_dummy_reg {
act_led_gpio = <&act_led>,"gpios:4";
act_led_activelow = <&act_led>,"gpios:8";
act_led_trigger = <&act_led>,"linux,default-trigger";
+
+ i2c = <&i2c0>,"status";
+ i2c_arm = <&i2c0>,"status";
+ i2c_vc = <&i2c1>,"status";
+ i2c_baudrate = <&i2c0>,"clock-frequency:0";
+ i2c_arm_baudrate = <&i2c0>,"clock-frequency:0";
+ i2c_vc_baudrate = <&i2c1>,"clock-frequency:0";
};
};
--- a/arch/arm/boot/dts/bcm2708-rpi-b.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts
@@ -179,6 +179,12 @@
cam0_reg: &cam_dummy_reg {
};
+i2c_arm: &i2c1 {
+};
+
+i2c_vc: &i2c0 {
+};
+
/ {
__overrides__ {
audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_headphones=0 snd_bcm2835.enable_hdmi=0'}";
--- a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
+++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi
@@ -9,6 +9,12 @@
};
};
+i2c_arm: &i2c1 {
+};
+
+i2c_vc: &i2c0 {
+};
+
/ {
__overrides__ {
act_led_gpio = <&act_led>,"gpios:4";
--- a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts
@@ -235,6 +235,9 @@
cam0_reg: &cam_dummy_reg {
};
+i2c_arm: &i2c1 {};
+i2c_vc: &i2c0 {};
+
/ {
__overrides__ {
audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
--- a/arch/arm/boot/dts/bcm2708-rpi-zero.dts
+++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts
@@ -176,6 +176,9 @@
cam0_reg: &cam_dummy_reg {
};
+i2c_arm: &i2c1 {};
+i2c_vc: &i2c0 {};
+
/ {
__overrides__ {
audio = <&chosen>,"bootargs{on='snd_bcm2835.enable_hdmi=1',off='snd_bcm2835.enable_hdmi=0'}";
--- a/arch/arm/boot/dts/bcm2709-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi
@@ -3,3 +3,6 @@
&vchiq {
compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
};
+
+i2c_arm: &i2c1 {};
+i2c_vc: &i2c0 {};
--- a/arch/arm/boot/dts/bcm270x-rpi.dtsi
+++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi
@@ -21,6 +21,7 @@
i2c0 = &i2c0;
i2c1 = &i2c1;
i2c10 = &i2c_csi_dsi;
+ i2c = &i2c_arm;
spi0 = &spi0;
spi1 = &spi1;
spi2 = &spi2;
@@ -79,8 +80,14 @@
spi = <&spi0>,"status";
i2c0 = <&i2c0if>,"status",<&i2c0mux>,"status";
i2c1 = <&i2c1>,"status";
+ i2c = <&i2c1>,"status";
+ i2c_arm = <&i2c1>,"status";
+ i2c_vc = <&i2c0if>,"status",<&i2c0mux>,"status";
i2c0_baudrate = <&i2c0if>,"clock-frequency:0";
i2c1_baudrate = <&i2c1>,"clock-frequency:0";
+ i2c_baudrate = <&i2c1>,"clock-frequency:0";
+ i2c_arm_baudrate = <&i2c1>,"clock-frequency:0";
+ i2c_vc_baudrate = <&i2c0if>,"clock-frequency:0";
watchdog = <&watchdog>,"status";
random = <&random>,"status";
--- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
+++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
@@ -267,6 +267,9 @@
interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;
};
+i2c_arm: &i2c1 {};
+i2c_vc: &i2c0 {};
+
/delete-node/ &v3d;
/ {
|