target/linux/bcm27xx/patches-5.10/950-0706-ARM-dts-bcm2711-Tidy-the-HDMI-I2C-aliases.patch

   1 From fdde18c3416afd1e971ddee7a65f08bed9fd44a7 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Mon, 19 Jul 2021 10:47:02 +0100
   4 Subject: [PATCH] ARM: dts: bcm2711: Tidy the HDMI I2C aliases
   5
   6 The bcm2711 vc3-kms-v3d overlay enables the I2C instances used for
   7 EDID data. Give these distinct I2C interface numbers (20 & 21) to
   8 clearly separate them from other regular I2C blocks (1, 3-6) and the
   9 mux on I2C0 (10+).
  10
  11 The 2711 DTS tree no longer includes i2c2, so the explicit deletion can
  12 be removed.
  13
  14 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  15 ---
  16  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 10 ++--------
  17  arch/arm/boot/dts/bcm2711-rpi-400.dts | 10 ++--------
  18  arch/arm/boot/dts/bcm2711-rpi-cm4.dts | 10 ++--------
  19  3 files changed, 6 insertions(+), 24 deletions(-)
  20
  21 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  22 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  23 @@ -350,11 +350,12 @@
  24                 mmc0 = &emmc2;
  25                 mmc1 = &mmcnr;
  26                 mmc2 = &sdhost;
  27 -               /delete-property/ i2c2;
  28                 i2c3 = &i2c3;
  29                 i2c4 = &i2c4;
  30                 i2c5 = &i2c5;
  31                 i2c6 = &i2c6;
  32 +               i2c20 = &ddc0;
  33 +               i2c21 = &ddc1;
  34                 spi3 = &spi3;
  35                 spi4 = &spi4;
  36                 spi5 = &spi5;
  37 @@ -560,13 +561,6 @@
  38         pinctrl-0 = <&i2s_pins>;
  39  };
  40
  41 -/ {
  42 -       __overrides__ {
  43 -               /delete-property/ i2c2_baudrate;
  44 -               /delete-property/ i2c2_iknowwhatimdoing;
  45 -       };
  46 -};
  47 -
  48  // =============================================
  49  // Board specific stuff here
  50
  51 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
  52 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
  53 @@ -348,11 +348,12 @@
  54                 mmc0 = &emmc2;
  55                 mmc1 = &mmcnr;
  56                 mmc2 = &sdhost;
  57 -               /delete-property/ i2c2;
  58                 i2c3 = &i2c3;
  59                 i2c4 = &i2c4;
  60                 i2c5 = &i2c5;
  61                 i2c6 = &i2c6;
  62 +               i2c20 = &ddc0;
  63 +               i2c21 = &ddc1;
  64                 spi3 = &spi3;
  65                 spi4 = &spi4;
  66                 spi5 = &spi5;
  67 @@ -558,13 +559,6 @@
  68         pinctrl-0 = <&i2s_pins>;
  69  };
  70
  71 -/ {
  72 -       __overrides__ {
  73 -               /delete-property/ i2c2_baudrate;
  74 -               /delete-property/ i2c2_iknowwhatimdoing;
  75 -       };
  76 -};
  77 -
  78  // =============================================
  79  // Board specific stuff here
  80
  81 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
  82 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
  83 @@ -363,11 +363,12 @@
  84                 mmc0 = &emmc2;
  85                 mmc1 = &mmcnr;
  86                 mmc2 = &sdhost;
  87 -               /delete-property/ i2c2;
  88                 i2c3 = &i2c3;
  89                 i2c4 = &i2c4;
  90                 i2c5 = &i2c5;
  91                 i2c6 = &i2c6;
  92 +               i2c20 = &ddc0;
  93 +               i2c21 = &ddc1;
  94                 spi3 = &spi3;
  95                 spi4 = &spi4;
  96                 spi5 = &spi5;
  97 @@ -573,13 +574,6 @@
  98         pinctrl-0 = <&i2s_pins>;
  99  };
 100
 101 -/ {
 102 -       __overrides__ {
 103 -               /delete-property/ i2c2_baudrate;
 104 -               /delete-property/ i2c2_iknowwhatimdoing;
 105 -       };
 106 -};
 107 -
 108  // =============================================
 109  // Board specific stuff here
 110