]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ASoC: Merge up fixes for CI
authorMark Brown <broonie@kernel.org>
Fri, 12 May 2023 04:14:20 +0000 (13:14 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 15 May 2023 10:55:52 +0000 (19:55 +0900)
Avoid tripping over fixed issues in CI.

1  2 
Documentation/devicetree/bindings/sound/tas2562.yaml
Documentation/devicetree/bindings/sound/tas2770.yaml
Documentation/devicetree/bindings/sound/tas27xx.yaml
sound/soc/amd/yc/acp6x-mach.c
sound/soc/dwc/dwc-i2s.c
sound/soc/jz4740/jz4740-i2s.c

index a134eba4d59aa9c88153daeb6b62e944debbcdc7,4406a5def0768e2c7495daae8b595e3bd0bffff8..31e466917c3d4fbd496d8ef2e67f23dbfb562b8a
@@@ -311,13 -311,13 +311,20 @@@ static const struct dmi_system_id yc_ac
                        DMI_MATCH(DMI_BOARD_NAME, "8A22"),
                }
        },
 +      {
 +              .driver_data = &acp6x_card,
 +              .matches = {
 +                      DMI_MATCH(DMI_BOARD_VENDOR, "MECHREVO"),
 +                      DMI_MATCH(DMI_BOARD_NAME, "MRID6"),
 +              }
 +      },
+       {
+               .driver_data = &acp6x_card,
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "System76"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "pang12"),
+               }
+       },
        {}
  };
  
Simple merge
Simple merge