diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-08-21 10:54:34 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2021-08-21 19:07:07 +0200 |
| commit | 8299d1f057439f94c6a4412e2e5c5082b82a30c9 (patch) | |
| tree | 1bf678d61f11f7394493be464c7876e496f7faed /target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch | |
| parent | 33b6885975ce376ff075362b7f0890326043111b (diff) | |
| download | upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.gz upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.tar.bz2 upstream-8299d1f057439f94c6a4412e2e5c5082b82a30c9.zip | |
bcm27xx: add kernel 5.10 support
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted
patches, wireless patches and defconfig patches.
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 4B v1.1 4G
bcm2711: boot tested on RPi 4B v1.1 4G
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch b/target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch new file mode 100644 index 0000000000..f6a60f54d1 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch @@ -0,0 +1,110 @@ +From fdde18c3416afd1e971ddee7a65f08bed9fd44a7 Mon Sep 17 00:00:00 2001 +From: Phil Elwell <phil@raspberrypi.com> +Date: Mon, 19 Jul 2021 10:47:02 +0100 +Subject: [PATCH] ARM: dts: bcm2711: Tidy the HDMI I2C aliases + +The bcm2711 vc3-kms-v3d overlay enables the I2C instances used for +EDID data. Give these distinct I2C interface numbers (20 & 21) to +clearly separate them from other regular I2C blocks (1, 3-6) and the +mux on I2C0 (10+). + +The 2711 DTS tree no longer includes i2c2, so the explicit deletion can +be removed. + +Signed-off-by: Phil Elwell <phil@raspberrypi.com> +--- + arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 10 ++-------- + arch/arm/boot/dts/bcm2711-rpi-400.dts | 10 ++-------- + arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 10 ++-------- + 3 files changed, 6 insertions(+), 24 deletions(-) + +--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +@@ -349,11 +349,12 @@ + mmc0 = &emmc2; + mmc1 = &mmcnr; + mmc2 = &sdhost; +- /delete-property/ i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + i2c6 = &i2c6; ++ i2c20 = &ddc0; ++ i2c21 = &ddc1; + spi3 = &spi3; + spi4 = &spi4; + spi5 = &spi5; +@@ -559,13 +560,6 @@ + pinctrl-0 = <&i2s_pins>; + }; + +-/ { +- __overrides__ { +- /delete-property/ i2c2_baudrate; +- /delete-property/ i2c2_iknowwhatimdoing; +- }; +-}; +- + // ============================================= + // Board specific stuff here + +--- a/arch/arm/boot/dts/bcm2711-rpi-400.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts +@@ -348,11 +348,12 @@ + mmc0 = &emmc2; + mmc1 = &mmcnr; + mmc2 = &sdhost; +- /delete-property/ i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + i2c6 = &i2c6; ++ i2c20 = &ddc0; ++ i2c21 = &ddc1; + spi3 = &spi3; + spi4 = &spi4; + spi5 = &spi5; +@@ -558,13 +559,6 @@ + pinctrl-0 = <&i2s_pins>; + }; + +-/ { +- __overrides__ { +- /delete-property/ i2c2_baudrate; +- /delete-property/ i2c2_iknowwhatimdoing; +- }; +-}; +- + // ============================================= + // Board specific stuff here + +--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts ++++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts +@@ -363,11 +363,12 @@ + mmc0 = &emmc2; + mmc1 = &mmcnr; + mmc2 = &sdhost; +- /delete-property/ i2c2; + i2c3 = &i2c3; + i2c4 = &i2c4; + i2c5 = &i2c5; + i2c6 = &i2c6; ++ i2c20 = &ddc0; ++ i2c21 = &ddc1; + spi3 = &spi3; + spi4 = &spi4; + spi5 = &spi5; +@@ -573,13 +574,6 @@ + pinctrl-0 = <&i2s_pins>; + }; + +-/ { +- __overrides__ { +- /delete-property/ i2c2_baudrate; +- /delete-property/ i2c2_iknowwhatimdoing; +- }; +-}; +- + // ============================================= + // Board specific stuff here + |