1 From 32282fb05466e5d5767b598e60136ef584847dc4 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Wed, 31 Oct 2018 15:00:20 +0000
4 Subject: [PATCH] BCM283x DT: Add CSI nodes to the device tree.
6 Adds CSI nodes to all the upstream device tree configs
8 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
10 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 +
11 arch/arm/boot/dts/bcm2835-rpi-a.dts | 1 +
12 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 +
13 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 +
14 arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 +
15 arch/arm/boot/dts/bcm2835-rpi-zero.dts | 1 +
16 arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 ++++++
17 arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 +
18 arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 +
19 arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi | 8 ++++++
20 arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi | 8 ++++++
21 arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi | 8 ++++++
22 arch/arm/boot/dts/bcm283x.dtsi | 26 +++++++++++++++++++
23 .../dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi | 1 +
24 14 files changed, 67 insertions(+)
25 create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
26 create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
27 create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
28 create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
30 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
31 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
33 #include "bcm2835.dtsi"
34 #include "bcm2835-rpi.dtsi"
35 #include "bcm283x-rpi-usb-host.dtsi"
36 +#include "bcm283x-rpi-csi1-2lane.dtsi"
39 compatible = "raspberrypi,model-a-plus", "brcm,bcm2835";
40 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts
41 +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts
43 #include "bcm2835.dtsi"
44 #include "bcm2835-rpi.dtsi"
45 #include "bcm283x-rpi-usb-host.dtsi"
46 +#include "bcm283x-rpi-csi1-2lane.dtsi"
49 compatible = "raspberrypi,model-a", "brcm,bcm2835";
50 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
51 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
53 #include "bcm2835-rpi.dtsi"
54 #include "bcm283x-rpi-smsc9514.dtsi"
55 #include "bcm283x-rpi-usb-host.dtsi"
56 +#include "bcm283x-rpi-csi1-2lane.dtsi"
59 compatible = "raspberrypi,model-b-plus", "brcm,bcm2835";
60 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
61 +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
63 #include "bcm2835-rpi.dtsi"
64 #include "bcm283x-rpi-smsc9512.dtsi"
65 #include "bcm283x-rpi-usb-host.dtsi"
66 +#include "bcm283x-rpi-csi1-2lane.dtsi"
69 compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835";
70 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts
71 +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts
73 #include "bcm2835-rpi.dtsi"
74 #include "bcm283x-rpi-smsc9512.dtsi"
75 #include "bcm283x-rpi-usb-host.dtsi"
76 +#include "bcm283x-rpi-csi1-2lane.dtsi"
79 compatible = "raspberrypi,model-b", "brcm,bcm2835";
80 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts
81 +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts
83 #include "bcm2835.dtsi"
84 #include "bcm2835-rpi.dtsi"
85 #include "bcm283x-rpi-usb-otg.dtsi"
86 +#include "bcm283x-rpi-csi1-2lane.dtsi"
89 compatible = "raspberrypi,model-zero", "brcm,bcm2835";
90 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
91 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
94 power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
98 + power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>;
102 + power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
104 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
105 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
107 #include "bcm2835-rpi.dtsi"
108 #include "bcm283x-rpi-smsc9514.dtsi"
109 #include "bcm283x-rpi-usb-host.dtsi"
110 +#include "bcm283x-rpi-csi1-2lane.dtsi"
113 compatible = "raspberrypi,2-model-b", "brcm,bcm2836";
114 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
115 +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
117 #include "bcm2835-rpi.dtsi"
118 #include "bcm283x-rpi-smsc9514.dtsi"
119 #include "bcm283x-rpi-usb-host.dtsi"
120 +#include "bcm283x-rpi-csi1-2lane.dtsi"
123 compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
125 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
127 +// SPDX-License-Identifier: GPL-2.0-only
131 + data-lanes = <1 2>;
136 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
138 +// SPDX-License-Identifier: GPL-2.0-only
142 + data-lanes = <1 2>;
147 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
149 +// SPDX-License-Identifier: GPL-2.0-only
153 + data-lanes = <1 2 3 4>;
157 --- a/arch/arm/boot/dts/bcm283x.dtsi
158 +++ b/arch/arm/boot/dts/bcm283x.dtsi
163 + csi0: csi@7e800000 {
164 + compatible = "brcm,bcm2835-unicam";
165 + reg = <0x7e800000 0x800>,
167 + interrupts = <2 6>;
168 + clocks = <&clocks BCM2835_CLOCK_CAM0>;
169 + clock-names = "lp";
170 + #address-cells = <1>;
172 + #clock-cells = <1>;
173 + status = "disabled";
176 + csi1: csi@7e801000 {
177 + compatible = "brcm,bcm2835-unicam";
178 + reg = <0x7e801000 0x800>,
180 + interrupts = <2 7>;
181 + clocks = <&clocks BCM2835_CLOCK_CAM1>;
182 + clock-names = "lp";
183 + #address-cells = <1>;
185 + #clock-cells = <1>;
186 + status = "disabled";
190 compatible = "brcm,bcm2835-i2c";
191 reg = <0x7e804000 0x1000>;
193 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
195 +// SPDX-License-Identifier: GPL-2.0-only
199 + data-lanes = <1 2>;