kernel: fix build on bcm27xx target platform
authorDaniel Golle <daniel@makrotopia.org>
Sat, 10 Sep 2022 00:24:08 +0000 (01:24 +0100)
committerDaniel Golle <daniel@makrotopia.org>
Sat, 10 Sep 2022 00:26:53 +0000 (01:26 +0100)
The bump to Linux 5.15.67 brought some changes in the VC4 display
driver which we had also patched downstream. Fix our local patches to
fix the build.

Fixes: fbe2f7db86 ("kernel: bump 5.15 to 5.15.67")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
target/linux/bcm27xx/patches-5.15/950-0005-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch
target/linux/bcm27xx/patches-5.15/950-0019-drm-vc4-select-PM.patch
target/linux/bcm27xx/patches-5.15/950-0163-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch
target/linux/bcm27xx/patches-5.15/950-0470-sound-usb-add-device-quirks-for-A4Tech-FHD-1080p-web.patch
target/linux/bcm27xx/patches-5.15/950-0580-drm-vc4-Ensure-vc4_hdmi-doesn-t-use-2711-HPD-registe.patch
target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch

index 21d3148af75706b43b543c7ccb56ac95e7027954..054cc1a583f06ef285873913def400f449f3f2bf 100644 (file)
@@ -20,7 +20,7 @@ Link: https://lore.kernel.org/r/20211025152903.1088803-9-maxime@cerno.tech
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2386,7 +2386,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2385,7 +2385,7 @@ static const struct vc4_hdmi_variant bcm
        .encoder_type           = VC4_ENCODER_TYPE_HDMI0,
        .debugfs_name           = "hdmi0_regs",
        .card_name              = "vc4-hdmi-0",
index e87ea31388c6726f94fcc71cf63f9ca8a7d78e28..d1183245c4a4ee729c0c2f7349edb1640c6688a7 100644 (file)
@@ -14,7 +14,12 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/Kconfig
 +++ b/drivers/gpu/drm/vc4/Kconfig
-@@ -9,6 +9,7 @@ config DRM_VC4
+@@ -5,11 +5,11 @@ config DRM_VC4
+       depends on DRM
+       depends on SND && SND_SOC
+       depends on COMMON_CLK
+-      depends on PM
+       select DRM_KMS_HELPER
        select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select DRM_PANEL_BRIDGE
index 725f7f69e2b7300714603c8a1fd16a39e241f821..1d43bf59e04483fddc577e2281d49640f43cc19f 100644 (file)
@@ -33,7 +33,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  #define USB_VENDOR_ID_BELKIN          0x050d
  #define USB_DEVICE_ID_FLIP_KVM                0x3201
  
-@@ -1307,6 +1310,9 @@
+@@ -1308,6 +1311,9 @@
  #define USB_VENDOR_ID_XAT     0x2505
  #define USB_DEVICE_ID_XAT_CSR 0x0220
  
index 7502adee5a12c18dad673ea4a58168894aa96378..9f0aa6fcd475d5421813719914e2ba3e361f076a 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
 
 --- a/sound/usb/quirks.c
 +++ b/sound/usb/quirks.c
-@@ -1923,6 +1923,8 @@ static const struct usb_audio_quirk_flag
+@@ -1925,6 +1925,8 @@ static const struct usb_audio_quirk_flag
                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
        DEVICE_FLG(0x2b53, 0x0031, /* Fiero SC-01 (firmware v1.1.0) */
                   QUIRK_FLAG_GENERIC_IMPLICIT_FB),
index 73f7ea871a0d04f897b5d6d6d16ab685baaef63e..0327929bd622a8bead6244d44eac4780d6452f4c 100644 (file)
@@ -55,7 +55,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  /* HDMI audio codec callbacks */
  static void vc4_hdmi_audio_set_mai_clock(struct vc4_hdmi *vc4_hdmi,
                                         unsigned int samplerate)
-@@ -2777,6 +2783,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2776,6 +2782,7 @@ static const struct vc4_hdmi_variant bcm
        .phy_rng_disable        = vc5_hdmi_phy_rng_disable,
        .channel_map            = vc5_hdmi_channel_map,
        .supports_hdr           = true,
@@ -63,7 +63,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  };
  
  static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = {
-@@ -2805,6 +2812,7 @@ static const struct vc4_hdmi_variant bcm
+@@ -2804,6 +2811,7 @@ static const struct vc4_hdmi_variant bcm
        .phy_rng_disable        = vc5_hdmi_phy_rng_disable,
        .channel_map            = vc5_hdmi_channel_map,
        .supports_hdr           = true,
index f5d1c7cc0d5ac23f5a0ee5a2f48db5290312c718..bec81e3f1673c0bb29e62a24dff8eca2c8ed7310 100644 (file)
@@ -103,30 +103,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
        return 0;
  }
  
-@@ -2615,20 +2641,11 @@ static int vc4_hdmi_bind(struct device *
-       if (ret)
-               goto err_put_ddc;
--      /*
--       * We need to have the device powered up at this point to call
--       * our reset hook and for the CEC init.
--       */
--      ret = vc4_hdmi_runtime_resume(dev);
--      if (ret)
--              goto err_put_ddc;
--
--      pm_runtime_get_noresume(dev);
--      pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
--      if (vc4_hdmi->variant->reset)
--              vc4_hdmi->variant->reset(vc4_hdmi);
-+      ret = pm_runtime_resume_and_get(dev);
-+      if (ret)
-+              goto err_put_ddc;
-       if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") ||
-            of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) &&
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 @@ -417,7 +417,7 @@ static inline u32 vc4_hdmi_read(struct v