target/linux/brcm2708/patches-4.19/950-0179-BCM283x-DT-Add-CSI-nodes-to-the-device-tree.patch

   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.
   5
   6 Adds CSI nodes to all the upstream device tree configs
   7
   8 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
   9 ---
  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
  29
  30 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  31 +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
  32 @@ -3,6 +3,7 @@
  33  #include "bcm2835.dtsi"
  34  #include "bcm2835-rpi.dtsi"
  35  #include "bcm283x-rpi-usb-host.dtsi"
  36 +#include "bcm283x-rpi-csi1-2lane.dtsi"
  37
  38  / {
  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
  42 @@ -3,6 +3,7 @@
  43  #include "bcm2835.dtsi"
  44  #include "bcm2835-rpi.dtsi"
  45  #include "bcm283x-rpi-usb-host.dtsi"
  46 +#include "bcm283x-rpi-csi1-2lane.dtsi"
  47
  48  / {
  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
  52 @@ -4,6 +4,7 @@
  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"
  57
  58  / {
  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
  62 @@ -4,6 +4,7 @@
  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"
  67
  68  / {
  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
  72 @@ -4,6 +4,7 @@
  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"
  77
  78  / {
  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
  82 @@ -13,6 +13,7 @@
  83  #include "bcm2835.dtsi"
  84  #include "bcm2835-rpi.dtsi"
  85  #include "bcm283x-rpi-usb-otg.dtsi"
  86 +#include "bcm283x-rpi-csi1-2lane.dtsi"
  87
  88  / {
  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
  92 @@ -108,3 +108,11 @@
  93  &dsi1 {
  94         power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
  95  };
  96 +
  97 +&csi0 {
  98 +       power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>;
  99 +};
 100 +
 101 +&csi1 {
 102 +       power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
 103 +};
 104 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 105 +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
 106 @@ -4,6 +4,7 @@
 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"
 111
 112  / {
 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
 116 @@ -4,6 +4,7 @@
 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"
 121
 122  / {
 123         compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
 124 --- /dev/null
 125 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi
 126 @@ -0,0 +1,8 @@
 127 +// SPDX-License-Identifier: GPL-2.0-only
 128 +&csi0 {
 129 +       port {
 130 +               endpoint {
 131 +                       data-lanes = <1 2>;
 132 +               };
 133 +       };
 134 +};
 135 --- /dev/null
 136 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
 137 @@ -0,0 +1,8 @@
 138 +// SPDX-License-Identifier: GPL-2.0-only
 139 +&csi1 {
 140 +       port {
 141 +               endpoint {
 142 +                       data-lanes = <1 2>;
 143 +               };
 144 +       };
 145 +};
 146 --- /dev/null
 147 +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi
 148 @@ -0,0 +1,8 @@
 149 +// SPDX-License-Identifier: GPL-2.0-only
 150 +&csi1 {
 151 +       port {
 152 +               endpoint {
 153 +                       data-lanes = <1 2 3 4>;
 154 +               };
 155 +       };
 156 +};
 157 --- a/arch/arm/boot/dts/bcm283x.dtsi
 158 +++ b/arch/arm/boot/dts/bcm283x.dtsi
 159 @@ -565,6 +565,32 @@
 160                         status = "disabled";
 161                 };
 162
 163 +               csi0: csi@7e800000 {
 164 +                       compatible = "brcm,bcm2835-unicam";
 165 +                       reg = <0x7e800000 0x800>,
 166 +                             <0x7e802000 0x4>;
 167 +                       interrupts = <2 6>;
 168 +                       clocks = <&clocks BCM2835_CLOCK_CAM0>;
 169 +                       clock-names = "lp";
 170 +                       #address-cells = <1>;
 171 +                       #size-cells = <0>;
 172 +                       #clock-cells = <1>;
 173 +                       status = "disabled";
 174 +               };
 175 +
 176 +               csi1: csi@7e801000 {
 177 +                       compatible = "brcm,bcm2835-unicam";
 178 +                       reg = <0x7e801000 0x800>,
 179 +                             <0x7e802004 0x4>;
 180 +                       interrupts = <2 7>;
 181 +                       clocks = <&clocks BCM2835_CLOCK_CAM1>;
 182 +                       clock-names = "lp";
 183 +                       #address-cells = <1>;
 184 +                       #size-cells = <0>;
 185 +                       #clock-cells = <1>;
 186 +                       status = "disabled";
 187 +               };
 188 +
 189                 i2c1: i2c@7e804000 {
 190                         compatible = "brcm,bcm2835-i2c";
 191                         reg = <0x7e804000 0x1000>;
 192 --- /dev/null
 193 +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
 194 @@ -0,0 +1,8 @@
 195 +// SPDX-License-Identifier: GPL-2.0-only
 196 +&csi1 {
 197 +       port {
 198 +               endpoint {
 199 +                       data-lanes = <1 2>;
 200 +               };
 201 +       };
 202 +};