mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +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>
105 lines
3.7 KiB
Diff
105 lines
3.7 KiB
Diff
From 1b02fe3ab446613cadcfac08d611b90becb02189 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 18 Apr 2018 17:04:23 +0100
|
|
Subject: [PATCH 277/454] overlays: Add 'combine' option to i2c overlays
|
|
|
|
The i2c0-bcm2708 and i2c1-bcm2708 overlays allow the I2C pin usage to
|
|
be changed. The names also suggest they revert to the old i2c_bcm2708
|
|
driver, but they don't. The newer i2c_bcm2835 driver forces
|
|
transactions to be combined where possible, but this breaks some
|
|
devices.
|
|
|
|
Add an option to disable transaction combining, which is currently
|
|
implemented by reverting to the old driver.
|
|
|
|
See: https://github.com/raspberrypi/firmware/issues/828
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
arch/arm/boot/dts/overlays/README | 12 ++++++++++--
|
|
arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts | 8 ++++++++
|
|
arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts | 9 +++++++++
|
|
3 files changed, 27 insertions(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/overlays/README
|
|
+++ b/arch/arm/boot/dts/overlays/README
|
|
@@ -865,8 +865,9 @@ Params: addr Set the
|
|
|
|
|
|
Name: i2c0-bcm2708
|
|
-Info: Enable the i2c_bcm2708 driver for the i2c0 bus. Not all pin combinations
|
|
- are usable on all platforms.
|
|
+Info: Change i2c0 pin usage. Not all pin combinations are usable on all
|
|
+ platforms - platforms other then Compute Modules can only use this
|
|
+ to disable transaction combining.
|
|
Load: dtoverlay=i2c0-bcm2708,<param>=<val>
|
|
Params: sda0_pin GPIO pin for SDA0 (deprecated - use pins_*)
|
|
scl0_pin GPIO pin for SCL0 (deprecated - use pins_*)
|
|
@@ -874,15 +875,22 @@ Params: sda0_pin GPIO pin
|
|
pins_28_29 Use pins 28 and 29
|
|
pins_44_45 Use pins 44 and 45
|
|
pins_46_47 Use pins 46 and 47
|
|
+ combine Allow transactions to be combined (default
|
|
+ "yes")
|
|
|
|
|
|
Name: i2c1-bcm2708
|
|
+Info: Change i2c1 pin usage. Not all pin combinations are usable on all
|
|
+ platforms - platforms other then Compute Modules can only use this
|
|
+ to disable transaction combining.
|
|
Info: Enable the i2c_bcm2708 driver for the i2c1 bus
|
|
Load: dtoverlay=i2c1-bcm2708,<param>=<val>
|
|
Params: sda1_pin GPIO pin for SDA1 (2 or 44 - default 2)
|
|
scl1_pin GPIO pin for SCL1 (3 or 45 - default 3)
|
|
pin_func Alternative pin function (4 (alt0), 6 (alt2) -
|
|
default 4)
|
|
+ combine Allow transactions to be combined (default
|
|
+ "yes")
|
|
|
|
|
|
Name: i2s-gpio28-31
|
|
--- a/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
|
|
+++ b/arch/arm/boot/dts/overlays/i2c0-bcm2708-overlay.dts
|
|
@@ -50,6 +50,13 @@
|
|
};
|
|
};
|
|
|
|
+ fragment@5 {
|
|
+ target = <&i2c0>;
|
|
+ __dormant__ {
|
|
+ compatible = "brcm,bcm2708-i2c";
|
|
+ };
|
|
+ };
|
|
+
|
|
__overrides__ {
|
|
sda0_pin = <&frag1>,"brcm,pins:0";
|
|
scl0_pin = <&frag1>,"brcm,pins:4";
|
|
@@ -57,5 +64,6 @@
|
|
pins_28_29 = <0>,"-1+2-3-4";
|
|
pins_44_45 = <0>,"-1-2+3-4";
|
|
pins_46_47 = <0>,"-1-2-3+4";
|
|
+ combine = <0>, "!5";
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
|
|
+++ b/arch/arm/boot/dts/overlays/i2c1-bcm2708-overlay.dts
|
|
@@ -26,9 +26,18 @@
|
|
brcm,function = <4>; /* alt 0 */
|
|
};
|
|
};
|
|
+
|
|
+ fragment@2 {
|
|
+ target = <&i2c1>;
|
|
+ __dormant__ {
|
|
+ compatible = "brcm,bcm2708-i2c";
|
|
+ };
|
|
+ };
|
|
+
|
|
__overrides__ {
|
|
sda1_pin = <&pins>,"brcm,pins:0";
|
|
scl1_pin = <&pins>,"brcm,pins:4";
|
|
pin_func = <&pins>,"brcm,function:0";
|
|
+ combine = <0>, "!2";
|
|
};
|
|
};
|