meson-6.7: Refresh patches

patch/kernel/archive/meson-6.7/generic-0001-m8-m8b-m8m2-Support-HDMI.patch

@@ -1,4 +1,4 @@
-From 7c9bee96b281696f69ac1b45c423156919a1c3a6 Mon Sep 17 00:00:00 2001
+From 4367c45014e0ada25b438017df26140eeb795260 Mon Sep 17 00:00:00 2001
 From: Martin Blumenstingl <[email protected]>
 Date: Sat, 18 Nov 2023 01:22:02 +0800
 Subject: [PATCH 1/3] meson8/meson8b/meson8m2: Support HDMI
@@ -1258,7 +1258,7 @@ index 3f9345c1..59f80fcc 100644
  	struct {
  		bool osd1_enabled;
 diff --git a/drivers/gpu/drm/meson/meson_encoder_cvbs.c b/drivers/gpu/drm/meson/meson_encoder_cvbs.c
-index 3f73b211..833f701f 100644
+index 34074504..44c09f8b 100644
 --- a/drivers/gpu/drm/meson/meson_encoder_cvbs.c
 +++ b/drivers/gpu/drm/meson/meson_encoder_cvbs.c
 @@ -11,6 +11,7 @@
@@ -1375,7 +1375,7 @@ index 3f73b211..833f701f 100644
  	.get_modes = meson_encoder_cvbs_get_modes,
  	.atomic_enable = meson_encoder_cvbs_atomic_enable,
 diff --git a/drivers/gpu/drm/meson/meson_encoder_hdmi.c b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
-index 25ea7655..a3e6f86e 100644
+index c4686568..583f2924 100644
 --- a/drivers/gpu/drm/meson/meson_encoder_hdmi.c
 +++ b/drivers/gpu/drm/meson/meson_encoder_hdmi.c
 @@ -190,13 +190,13 @@ static void meson_encoder_hdmi_atomic_enable(struct drm_bridge *bridge,

patch/kernel/archive/meson-6.7/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch

@@ -1,7 +1,8 @@
-From bea6640cf697b0ed3aa501cbf433366025f3522a Mon Sep 17 00:00:00 2001
+From d11b44bf44111b9f1d5497e92826df46ff065dbd Mon Sep 17 00:00:00 2001
 From: hzy <[email protected]>
 Date: Sat, 18 Nov 2023 01:22:03 +0800
-Subject: [PATCH 2/3] meson8/meson8b/meson8m2: drm: Forcefully enable XRGB format
+Subject: [PATCH 2/3] meson8/meson8b/meson8m2: drm: Forcefully enable XRGB
+ format
 
 Signed-off-by: hzy <[email protected]>
 ---

patch/kernel/archive/meson-6.7/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch

@@ -1,4 +1,4 @@
-From cb981ffba971bc50770dd4d816f42b3d2467211c Mon Sep 17 00:00:00 2001
+From 99a889c050d71d663aba1ba2a706348be72ca787 Mon Sep 17 00:00:00 2001
 From: hzy <[email protected]>
 Date: Fri, 17 Nov 2023 22:54:18 +0800
 Subject: [PATCH 3/3] drm/meson: Support meson{8,8b}-hdmi-tx components

patch/kernel/archive/meson-6.7/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch

@@ -1,18 +1,19 @@
-From bde767e5a71e397dd4488de48d6b323d2916f477 Mon Sep 17 00:00:00 2001
+From b2a6218e25682158d6c7d6029505e60577fd4562 Mon Sep 17 00:00:00 2001
 From: hzy <[email protected]>
 Date: Sat, 18 Nov 2023 01:22:04 +0800
-Subject: [PATCH] Revert "mmc: core: Set HS clock speed before sending HS CMD13"
+Subject: [PATCH] Revert "mmc: core: Set HS clock speed before sending HS
+ CMD13"
 
 This reverts commit 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0.
 ---
  drivers/mmc/core/mmc.c | 23 ++++-------------------
  1 file changed, 4 insertions(+), 19 deletions(-)
 
 diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
-index 4a4bab9a..2af8f1e5 100644
+index 705942ed..8652fa28 100644
 --- a/drivers/mmc/core/mmc.c
 +++ b/drivers/mmc/core/mmc.c
-@@ -1391,17 +1391,13 @@ static int mmc_select_hs400es(struct mmc_card *card)
+@@ -1390,17 +1390,13 @@ static int mmc_select_hs400es(struct mmc_card *card)
  		goto out_err;
  	}
 
@@ -32,7 +33,7 @@ index 4a4bab9a..2af8f1e5 100644
  	/* Switch card to DDR with strobe bit */
  	val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE;
  	err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-@@ -1459,7 +1455,7 @@ static int mmc_select_hs400es(struct mmc_card *card)
+@@ -1458,7 +1454,7 @@ static int mmc_select_hs400es(struct mmc_card *card)
  static int mmc_select_hs200(struct mmc_card *card)
  {
  	struct mmc_host *host = card->host;
@@ -41,7 +42,7 @@ index 4a4bab9a..2af8f1e5 100644
  	int err = -EINVAL;
  	u8 val;
 
-@@ -1490,17 +1486,8 @@ static int mmc_select_hs200(struct mmc_card *card)
+@@ -1489,17 +1485,8 @@ static int mmc_select_hs200(struct mmc_card *card)
  				   false, true, MMC_CMD_RETRIES);
  		if (err)
  			goto err;
@@ -59,7 +60,7 @@ index 4a4bab9a..2af8f1e5 100644
 
  		/*
  		 * For HS200, CRC errors are not a reliable way to know the
-@@ -1513,10 +1500,8 @@ static int mmc_select_hs200(struct mmc_card *card)
+@@ -1512,10 +1499,8 @@ static int mmc_select_hs200(struct mmc_card *card)
  		 * mmc_select_timing() assumes timing has not changed if
  		 * it is a switch error.
  		 */

patch/kernel/archive/meson-6.7/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch

@@ -1,15 +1,16 @@
-From 764701e2399b2fa66991e4339e3735a836203c87 Mon Sep 17 00:00:00 2001
+From 6b1a414f7bb456817cd3cb385e9f5eb9e0d9cbe7 Mon Sep 17 00:00:00 2001
 From: hzy <[email protected]>
 Date: Sat, 18 Nov 2023 01:22:04 +0800
-Subject: [PATCH] Revert "pwm: meson: modify and simplify calculation in meson_pwm_get_state"
+Subject: [PATCH] Revert "pwm: meson: modify and simplify calculation in
+ meson_pwm_get_state"
 
 This reverts commit 6b9352f3f8a1a35faf0efc1ad1807ee303467796.
 ---
  drivers/pwm/pwm-meson.c | 14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
-index 25519cdd..63cf9719 100644
+index 5bea5324..a7c9b555 100644
 --- a/drivers/pwm/pwm-meson.c
 +++ b/drivers/pwm/pwm-meson.c
 @@ -322,8 +322,18 @@ static int meson_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,

patch/kernel/archive/meson-6.7/onecloud-0001-add-dts.patch

@@ -1,4 +1,4 @@
-From f7a9f2d3a662144708437726ec8b1a9f19ffff2b Mon Sep 17 00:00:00 2001
+From 5271ca000048ca86ac8f2e81ebcb1e2a0993cd73 Mon Sep 17 00:00:00 2001
 From: hzy <[email protected]>
 Date: Sat, 1 Apr 2023 13:24:42 +0800
 Subject: [PATCH 1/2] ARM: dts: meson8b: Add DTS for Xunlei Onecloud

patch/kernel/archive/meson-6.7/onecloud-0002-dts-Support-HDMI.patch

@@ -1,4 +1,4 @@
-From 5c20db97babb4c37d18a61d4a226f1ea5aa5924a Mon Sep 17 00:00:00 2001
+From 40100240a3702be8f8ceb88ec6643af669bd6de8 Mon Sep 17 00:00:00 2001
 From: hzy <[email protected]>
 Date: Sat, 1 Apr 2023 10:26:14 +0800
 Subject: [PATCH 2/2] ARM: dts: meson8b: onecloud: Support HDMI