From 32282fb05466e5d5767b598e60136ef584847dc4 Mon Sep 17 00:00:00 2001 From: Dave Stevenson Date: Wed, 31 Oct 2018 15:00:20 +0000 Subject: [PATCH] BCM283x DT: Add CSI nodes to the device tree. Adds CSI nodes to all the upstream device tree configs Signed-off-by: Dave Stevenson --- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-a.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 1 + arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 ++++++ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 1 + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 + arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi | 8 ++++++ arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi | 8 ++++++ arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi | 8 ++++++ arch/arm/boot/dts/bcm283x.dtsi | 26 +++++++++++++++++++ .../dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi | 1 + 14 files changed, 67 insertions(+) create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -3,6 +3,7 @@ #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,model-a-plus", "brcm,bcm2835"; --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -3,6 +3,7 @@ #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,model-a", "brcm,bcm2835"; --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -4,6 +4,7 @@ #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,model-b-plus", "brcm,bcm2835"; --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -4,6 +4,7 @@ #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-smsc9512.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,model-b-rev2", "brcm,bcm2835"; --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -4,6 +4,7 @@ #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-smsc9512.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,model-b", "brcm,bcm2835"; --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -13,6 +13,7 @@ #include "bcm2835.dtsi" #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-usb-otg.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,model-zero", "brcm,bcm2835"; --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -108,3 +108,11 @@ &dsi1 { power-domains = <&power RPI_POWER_DOMAIN_DSI1>; }; + +&csi0 { + power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>; +}; + +&csi1 { + power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>; +}; --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -4,6 +4,7 @@ #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,2-model-b", "brcm,bcm2836"; --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -4,6 +4,7 @@ #include "bcm2835-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" +#include "bcm283x-rpi-csi1-2lane.dtsi" / { compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only +&csi0 { + port { + endpoint { + data-lanes = <1 2>; + }; + }; +}; --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only +&csi1 { + port { + endpoint { + data-lanes = <1 2>; + }; + }; +}; --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only +&csi1 { + port { + endpoint { + data-lanes = <1 2 3 4>; + }; + }; +}; --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -565,6 +565,32 @@ status = "disabled"; }; + csi0: csi@7e800000 { + compatible = "brcm,bcm2835-unicam"; + reg = <0x7e800000 0x800>, + <0x7e802000 0x4>; + interrupts = <2 6>; + clocks = <&clocks BCM2835_CLOCK_CAM0>; + clock-names = "lp"; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + status = "disabled"; + }; + + csi1: csi@7e801000 { + compatible = "brcm,bcm2835-unicam"; + reg = <0x7e801000 0x800>, + <0x7e802004 0x4>; + interrupts = <2 7>; + clocks = <&clocks BCM2835_CLOCK_CAM1>; + clock-names = "lp"; + #address-cells = <1>; + #size-cells = <0>; + #clock-cells = <1>; + status = "disabled"; + }; + i2c1: i2c@7e804000 { compatible = "brcm,bcm2835-i2c"; reg = <0x7e804000 0x1000>; --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only +&csi1 { + port { + endpoint { + data-lanes = <1 2>; + }; + }; +}; >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 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273