mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
190 lines
5.3 KiB
Diff
190 lines
5.3 KiB
Diff
From ca576b3fd93dff35bdf39f5fd44edf938e545ac9 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
Date: Thu, 5 Jul 2018 16:43:56 +0100
|
|
Subject: [PATCH 341/454] BCM283x DT: Add CSI nodes to the device tree.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
|
|
---
|
|
arch/arm/boot/dts/bcm2708-rpi.dtsi | 8 ++++++
|
|
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-csi1-2lane.dtsi | 7 +++++
|
|
arch/arm/boot/dts/bcm283x.dtsi | 28 +++++++++++++++++++
|
|
.../dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi | 1 +
|
|
13 files changed, 60 insertions(+)
|
|
create mode 100644 arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi
|
|
create mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi
|
|
|
|
--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi
|
|
@@ -160,3 +160,11 @@ sdhost_pins: &sdhost_gpio48 {
|
|
&vec {
|
|
status = "disabled";
|
|
};
|
|
+
|
|
+&csi0 {
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_UNICAM0>;
|
|
+};
|
|
+
|
|
+&csi1 {
|
|
+ power-domains = <&power RPI_POWER_DOMAIN_UNICAM1>;
|
|
+};
|
|
--- 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
|
|
@@ -106,3 +106,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-csi1-2lane.dtsi
|
|
@@ -0,0 +1,7 @@
|
|
+&csi1 {
|
|
+ port {
|
|
+ endpoint {
|
|
+ data-lanes = <1 2>;
|
|
+ };
|
|
+ };
|
|
+};
|
|
--- a/arch/arm/boot/dts/bcm283x.dtsi
|
|
+++ b/arch/arm/boot/dts/bcm283x.dtsi
|
|
@@ -544,6 +544,34 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
+ csi0: csi0@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: csi1@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,7 @@
|
|
+&csi1 {
|
|
+ port {
|
|
+ endpoint {
|
|
+ data-lanes = <1 2>;
|
|
+ };
|
|
+ };
|
|
+};
|