mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
203 lines
5.7 KiB
Diff
203 lines
5.7 KiB
Diff
From 32282fb05466e5d5767b598e60136ef584847dc4 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
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 <dave.stevenson@raspberrypi.org>
|
|
---
|
|
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>;
|
|
+ };
|
|
+ };
|
|
+};
|