From 1d30d4c8def436db36b1d1800634c92f62bccfcb Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 4 Jan 2025 01:36:20 +0000 Subject: [PATCH] `meson`/`current`: rewrite-kernel-patches, no changes --- ...-size-if-no-ZONE_DMA-bouncing-needed.patch | 12 +-- ...eneric-0001-m8-m8b-m8m2-Support-HDMI.patch | 95 +++++++++---------- ...upport-meson-8-8b-hdmi-tx-components.patch | 8 +- ...-clock-speed-before-sending-HS-CMD13.patch | 18 ++-- ...-modify-and-simplify-calculation-in-.patch | 11 ++- .../meson-6.6/odroidc1-dts-Enable-HDMI.patch | 11 +-- .../meson-6.6/onecloud-0001-add-dts.patch | 15 ++- .../onecloud-0002-dts-Support-HDMI.patch | 10 +- 8 files changed, 87 insertions(+), 93 deletions(-) diff --git a/patch/kernel/archive/meson-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch b/patch/kernel/archive/meson-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch index c31c4414fb..3930553438 100644 --- a/patch/kernel/archive/meson-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch +++ b/patch/kernel/archive/meson-6.6/0010-arm64-swiotlb-Reduce-the-default-size-if-no-ZONE_DMA-bouncing-needed.patch @@ -1,8 +1,8 @@ -From 7648741002eeb851ceb394864253445b77ea3d25 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Wed, 10 Apr 2024 08:25:37 -0400 -Subject: [PATCH] arm64: swiotlb: Reduce the default size if no ZONE_DMA - bouncing needed +Subject: arm64: swiotlb: Reduce the default size if no ZONE_DMA bouncing + needed With CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC enabled, the arm64 kernel still allocates the default SWIOTLB buffer (64MB) even if ZONE_DMA is disabled @@ -18,11 +18,11 @@ Cc: Ross Burton Cc: Will Deacon Reviewed-by: Robin Murphy --- - arch/arm64/mm/init.c | 11 ++++++++++- + arch/arm64/mm/init.c | 11 +++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c -index 8a0f8604348b..8deec68028ac 100644 +index 111111111111..222222222222 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -16,6 +16,7 @@ @@ -52,5 +52,5 @@ index 8a0f8604348b..8deec68028ac 100644 swiotlb_init(swiotlb, SWIOTLB_VERBOSE); -- -2.39.2 +Armbian diff --git a/patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch index 31b9f3a321..6b78146c6c 100644 --- a/patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch @@ -1,42 +1,37 @@ -From 7c9bee96b281696f69ac1b45c423156919a1c3a6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sat, 18 Nov 2023 01:22:02 +0800 -Subject: [PATCH 1/3] meson8/meson8b/meson8m2: Support HDMI +Subject: meson8/meson8b/meson8m2: Support HDMI The following codes are come from https://github.com/xdarklight/linux/commits/meson-mx-integration-5.18-20220516. Special thank to Martin Blumenstingl. - --- - .../bindings/display/amlogic,meson-vpu.yaml | 16 + - .../phy/amlogic,meson-cvbs-dac-phy.yaml | 81 + - arch/arm/boot/dts/amlogic/meson.dtsi | 13 + - arch/arm/boot/dts/amlogic/meson8.dtsi | 168 +- - arch/arm/boot/dts/amlogic/meson8b.dtsi | 171 +- - arch/arm/boot/dts/amlogic/meson8m2.dtsi | 4 + - drivers/gpu/drm/meson/Kconfig | 9 + - drivers/gpu/drm/meson/Makefile | 1 + - drivers/gpu/drm/meson/meson_drv.c | 313 +++- - drivers/gpu/drm/meson/meson_drv.h | 49 +- - drivers/gpu/drm/meson/meson_encoder_cvbs.c | 61 +- - drivers/gpu/drm/meson/meson_encoder_hdmi.c | 69 +- - drivers/gpu/drm/meson/meson_plane.c | 37 +- - drivers/gpu/drm/meson/meson_transwitch_hdmi.c | 1579 +++++++++++++++++ - drivers/gpu/drm/meson/meson_transwitch_hdmi.h | 536 ++++++ - drivers/gpu/drm/meson/meson_vclk.c | 146 ++ - drivers/gpu/drm/meson/meson_venc.c | 44 +- - drivers/gpu/drm/meson/meson_viu.c | 18 +- - drivers/phy/amlogic/Kconfig | 10 + - drivers/phy/amlogic/Makefile | 1 + - drivers/phy/amlogic/phy-meson-cvbs-dac.c | 375 ++++ + Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml | 16 + + Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml | 81 + + arch/arm/boot/dts/amlogic/meson.dtsi | 13 + + arch/arm/boot/dts/amlogic/meson8.dtsi | 168 +- + arch/arm/boot/dts/amlogic/meson8b.dtsi | 171 +- + arch/arm/boot/dts/amlogic/meson8m2.dtsi | 4 + + drivers/gpu/drm/meson/Kconfig | 9 + + drivers/gpu/drm/meson/Makefile | 1 + + drivers/gpu/drm/meson/meson_drv.c | 313 +- + drivers/gpu/drm/meson/meson_drv.h | 49 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 61 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 69 +- + drivers/gpu/drm/meson/meson_plane.c | 37 +- + drivers/gpu/drm/meson/meson_transwitch_hdmi.c | 1579 ++++++++++ + drivers/gpu/drm/meson/meson_transwitch_hdmi.h | 536 ++++ + drivers/gpu/drm/meson/meson_vclk.c | 146 + + drivers/gpu/drm/meson/meson_venc.c | 44 +- + drivers/gpu/drm/meson/meson_viu.c | 18 +- + drivers/phy/amlogic/Kconfig | 10 + + drivers/phy/amlogic/Makefile | 1 + + drivers/phy/amlogic/phy-meson-cvbs-dac.c | 375 +++ 21 files changed, 3576 insertions(+), 125 deletions(-) - create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml - create mode 100644 drivers/gpu/drm/meson/meson_transwitch_hdmi.c - create mode 100644 drivers/gpu/drm/meson/meson_transwitch_hdmi.h - create mode 100644 drivers/phy/amlogic/phy-meson-cvbs-dac.c diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml -index cb0a90f0..96c32747 100644 +index 111111111111..222222222222 100644 --- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml +++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml @@ -66,8 +66,12 @@ properties: @@ -80,7 +75,7 @@ index cb0a90f0..96c32747 100644 reg = <0>; diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml new file mode 100644 -index 00000000..d73cb12c +index 000000000000..111111111111 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/amlogic,meson-cvbs-dac-phy.yaml @@ -0,0 +1,81 @@ @@ -166,7 +161,7 @@ index 00000000..d73cb12c + clocks = <&vdac_clock>; + }; diff --git a/arch/arm/boot/dts/amlogic/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi -index 8e3860d5..9a56cdf7 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/meson.dtsi +++ b/arch/arm/boot/dts/amlogic/meson.dtsi @@ -35,6 +35,19 @@ hhi: system-controller@4000 { @@ -190,7 +185,7 @@ index 8e3860d5..9a56cdf7 100644 aiu: audio-controller@5400 { diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi -index 59932fbf..6c27d520 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/meson8.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8.dtsi @@ -314,6 +314,113 @@ mali: gpu@c0000 { @@ -426,7 +421,7 @@ index 59932fbf..6c27d520 100644 &hwrng { diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi -index 5198f517..da9216ee 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/meson8b.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi @@ -276,6 +276,116 @@ mali: gpu@c0000 { @@ -665,7 +660,7 @@ index 5198f517..da9216ee 100644 &hwrng { diff --git a/arch/arm/boot/dts/amlogic/meson8m2.dtsi b/arch/arm/boot/dts/amlogic/meson8m2.dtsi -index 6725dd9f..fcb2ad97 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/meson8m2.dtsi +++ b/arch/arm/boot/dts/amlogic/meson8m2.dtsi @@ -96,6 +96,10 @@ &usb1_phy { @@ -680,7 +675,7 @@ index 6725dd9f..fcb2ad97 100644 compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt"; }; diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig -index 615fdd0c..eff3e34b 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/Kconfig +++ b/drivers/gpu/drm/meson/Kconfig @@ -10,6 +10,7 @@ config DRM_MESON @@ -704,7 +699,7 @@ index 615fdd0c..eff3e34b 100644 + select REGMAP_MMIO + select SND_SOC_HDMI_CODEC if SND_SOC diff --git a/drivers/gpu/drm/meson/Makefile b/drivers/gpu/drm/meson/Makefile -index 43071bdb..c44cb6c5 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/Makefile +++ b/drivers/gpu/drm/meson/Makefile @@ -7,3 +7,4 @@ meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o @@ -713,7 +708,7 @@ index 43071bdb..c44cb6c5 100644 obj-$(CONFIG_DRM_MESON_DW_MIPI_DSI) += meson_dw_mipi_dsi.o +obj-$(CONFIG_DRM_MESON_TRANSWITCH_HDMI) += meson_transwitch_hdmi.o diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c -index cb674966..e8134e4c 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -12,6 +12,7 @@ @@ -1173,7 +1168,7 @@ index cb674966..e8134e4c 100644 .data = (void *)&meson_drm_gxbb_data }, { .compatible = "amlogic,meson-gxl-vpu", diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv.h -index 3f9345c1..59f80fcc 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_drv.h +++ b/drivers/gpu/drm/meson/meson_drv.h @@ -7,21 +7,28 @@ @@ -1258,7 +1253,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 111111111111..222222222222 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 +1370,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 111111111111..222222222222 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, @@ -1501,7 +1496,7 @@ index 25ea7655..a3e6f86e 100644 pdev = of_find_device_by_node(remote); of_node_put(remote); diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c -index 815dfe30..27e39577 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_plane.c +++ b/drivers/gpu/drm/meson/meson_plane.c @@ -200,8 +200,11 @@ static void meson_plane_atomic_update(struct drm_plane *plane, @@ -1573,7 +1568,7 @@ index 815dfe30..27e39577 100644 diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.c b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c new file mode 100644 -index 00000000..e88bdba7 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.c @@ -0,0 +1,1579 @@ @@ -3158,7 +3153,7 @@ index 00000000..e88bdba7 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/meson/meson_transwitch_hdmi.h b/drivers/gpu/drm/meson/meson_transwitch_hdmi.h new file mode 100644 -index 00000000..14929475 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/gpu/drm/meson/meson_transwitch_hdmi.h @@ -0,0 +1,536 @@ @@ -3699,7 +3694,7 @@ index 00000000..14929475 + +#endif /* __MESON_TRANSWITCH_HDMI_H__ */ diff --git a/drivers/gpu/drm/meson/meson_vclk.c b/drivers/gpu/drm/meson/meson_vclk.c -index 2a82119e..a2c1bf1a 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_vclk.c +++ b/drivers/gpu/drm/meson/meson_vclk.c @@ -732,6 +732,11 @@ meson_vclk_dmt_supported_freq(struct meson_drm *priv, unsigned int freq) @@ -3877,7 +3872,7 @@ index 2a82119e..a2c1bf1a 100644 meson_venci_cvbs_clock_config(priv); return; diff --git a/drivers/gpu/drm/meson/meson_venc.c b/drivers/gpu/drm/meson/meson_venc.c -index 3bf0d6e4..d834359c 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_venc.c +++ b/drivers/gpu/drm/meson/meson_venc.c @@ -62,10 +62,6 @@ @@ -3952,7 +3947,7 @@ index 3bf0d6e4..d834359c 100644 /* Disable HDMI */ writel_bits_relaxed(VPU_HDMI_ENCI_DATA_TO_HDMI | diff --git a/drivers/gpu/drm/meson/meson_viu.c b/drivers/gpu/drm/meson/meson_viu.c -index cd399b0b..bdfa342c 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_viu.c +++ b/drivers/gpu/drm/meson/meson_viu.c @@ -448,13 +448,17 @@ void meson_viu_init(struct meson_drm *priv) @@ -3981,7 +3976,7 @@ index cd399b0b..bdfa342c 100644 /* Disable VD1 AFBC */ /* di_mif0_en=0 mif0_to_vpp_en=0 di_mad_en=0 and afbc vd1 set=0*/ diff --git a/drivers/phy/amlogic/Kconfig b/drivers/phy/amlogic/Kconfig -index ce7ba3eb..671435b6 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/amlogic/Kconfig +++ b/drivers/phy/amlogic/Kconfig @@ -25,6 +25,16 @@ config PHY_MESON8B_USB2 @@ -4002,7 +3997,7 @@ index ce7ba3eb..671435b6 100644 tristate "Meson GXL and GXM USB2 PHY drivers" default ARCH_MESON diff --git a/drivers/phy/amlogic/Makefile b/drivers/phy/amlogic/Makefile -index 91e3b979..f6c38f73 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/amlogic/Makefile +++ b/drivers/phy/amlogic/Makefile @@ -1,6 +1,7 @@ @@ -4015,7 +4010,7 @@ index 91e3b979..f6c38f73 100644 obj-$(CONFIG_PHY_MESON_G12A_USB3_PCIE) += phy-meson-g12a-usb3-pcie.o diff --git a/drivers/phy/amlogic/phy-meson-cvbs-dac.c b/drivers/phy/amlogic/phy-meson-cvbs-dac.c new file mode 100644 -index 00000000..96549e63 +index 000000000000..111111111111 --- /dev/null +++ b/drivers/phy/amlogic/phy-meson-cvbs-dac.c @@ -0,0 +1,375 @@ @@ -4395,5 +4390,5 @@ index 00000000..96549e63 +MODULE_DESCRIPTION("Amlogic Meson CVBS DAC driver"); +MODULE_LICENSE("GPL v2"); -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson-6.6/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch b/patch/kernel/archive/meson-6.6/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch index 3756b076f4..8a73fa26c6 100644 --- a/patch/kernel/archive/meson-6.6/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch +++ b/patch/kernel/archive/meson-6.6/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch @@ -1,7 +1,7 @@ -From cb981ffba971bc50770dd4d816f42b3d2467211c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hzy Date: Fri, 17 Nov 2023 22:54:18 +0800 -Subject: [PATCH 3/3] drm/meson: Support meson{8,8b}-hdmi-tx components +Subject: drm/meson: Support meson{8,8b}-hdmi-tx components Signed-off-by: hzy --- @@ -9,7 +9,7 @@ Signed-off-by: hzy 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c -index e8134e4c..c3e8fef9 100644 +index 111111111111..222222222222 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -668,6 +668,8 @@ static void meson_drv_shutdown(struct platform_device *pdev) @@ -22,5 +22,5 @@ index e8134e4c..c3e8fef9 100644 { .compatible = "amlogic,meson-gxl-dw-hdmi" }, { .compatible = "amlogic,meson-gxm-dw-hdmi" }, -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson-6.6/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch b/patch/kernel/archive/meson-6.6/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch index d546497d93..79eb924548 100644 --- a/patch/kernel/archive/meson-6.6/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch +++ b/patch/kernel/archive/meson-6.6/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch @@ -1,18 +1,18 @@ -From bde767e5a71e397dd4488de48d6b323d2916f477 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hzy Date: Sat, 18 Nov 2023 01:22:04 +0800 -Subject: [PATCH] Revert "mmc: core: Set HS clock speed before sending HS CMD13" +Subject: Revert "mmc: core: Set HS clock speed before sending HS CMD13" This reverts commit 4bc31edebde51fcf8ad0794763b8679a7ecb5ec0. --- - drivers/mmc/core/mmc.c | 23 ++++------------------- + 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 111111111111..222222222222 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) +@@ -1393,17 +1393,13 @@ static int mmc_select_hs400es(struct mmc_card *card) goto out_err; } @@ -32,7 +32,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) +@@ -1461,7 +1457,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 +41,7 @@ index 4a4bab9a..2af8f1e5 100644 int err = -EINVAL; u8 val; -@@ -1490,17 +1486,8 @@ static int mmc_select_hs200(struct mmc_card *card) +@@ -1492,17 +1488,8 @@ static int mmc_select_hs200(struct mmc_card *card) false, true, MMC_CMD_RETRIES); if (err) goto err; @@ -59,7 +59,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) +@@ -1515,10 +1502,8 @@ static int mmc_select_hs200(struct mmc_card *card) * mmc_select_timing() assumes timing has not changed if * it is a switch error. */ @@ -72,5 +72,5 @@ index 4a4bab9a..2af8f1e5 100644 err: if (err) { -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson-6.6/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch b/patch/kernel/archive/meson-6.6/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch index 775450aaeb..848cd3e4d5 100644 --- a/patch/kernel/archive/meson-6.6/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch +++ b/patch/kernel/archive/meson-6.6/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch @@ -1,15 +1,16 @@ -From 764701e2399b2fa66991e4339e3735a836203c87 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hzy Date: Sat, 18 Nov 2023 01:22:04 +0800 -Subject: [PATCH] Revert "pwm: meson: modify and simplify calculation in meson_pwm_get_state" +Subject: Revert "pwm: meson: modify and simplify calculation in + meson_pwm_get_state" This reverts commit 6b9352f3f8a1a35faf0efc1ad1807ee303467796. --- - drivers/pwm/pwm-meson.c | 14 ++++++++++++-- + 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 111111111111..222222222222 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, @@ -34,5 +35,5 @@ index 25519cdd..63cf9719 100644 state->polarity = PWM_POLARITY_NORMAL; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson-6.6/odroidc1-dts-Enable-HDMI.patch b/patch/kernel/archive/meson-6.6/odroidc1-dts-Enable-HDMI.patch index 4edaefe9ac..6611e274d1 100644 --- a/patch/kernel/archive/meson-6.6/odroidc1-dts-Enable-HDMI.patch +++ b/patch/kernel/archive/meson-6.6/odroidc1-dts-Enable-HDMI.patch @@ -1,18 +1,17 @@ -From e9d0d7bb75ff8234d717fb640c020ffe303a8d11 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Fri, 20 Mar 2020 15:17:51 +0100 -Subject: [PATCH] ARM: dts: meson8b: odroid-c1: enable HDMI for the - Odroid-C1 - WiP +Subject: ARM: dts: meson8b: odroid-c1: enable HDMI for the Odroid-C1 - WiP WiP Signed-off-by: Martin Blumenstingl --- - .../arm/boot/dts/amlogic/meson8b-odroidc1.dts | 59 +++++++++++++++++++ + arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts | 59 ++++++++++ 1 file changed, 59 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts -index 94168284..7e43212e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts @@ -32,6 +32,17 @@ emmc_pwrseq: emmc-pwrseq { @@ -103,5 +102,5 @@ index 94168284..7e43212e 100644 status = "okay"; pinctrl-0 = <&ir_recv_pins>; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson-6.6/onecloud-0001-add-dts.patch b/patch/kernel/archive/meson-6.6/onecloud-0001-add-dts.patch index 288f6569d4..b9d9cc535d 100644 --- a/patch/kernel/archive/meson-6.6/onecloud-0001-add-dts.patch +++ b/patch/kernel/archive/meson-6.6/onecloud-0001-add-dts.patch @@ -1,17 +1,16 @@ -From f7a9f2d3a662144708437726ec8b1a9f19ffff2b Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hzy Date: Sat, 1 Apr 2023 13:24:42 +0800 -Subject: [PATCH 1/2] ARM: dts: meson8b: Add DTS for Xunlei Onecloud +Subject: ARM: dts: meson8b: Add DTS for Xunlei Onecloud Signed-off-by: hzy --- - arch/arm/boot/dts/amlogic/Makefile | 1 + - .../arm/boot/dts/amlogic/meson8b-onecloud.dts | 410 ++++++++++++++++++ + arch/arm/boot/dts/amlogic/Makefile | 1 + + arch/arm/boot/dts/amlogic/meson8b-onecloud.dts | 410 ++++++++++ 2 files changed, 411 insertions(+) - create mode 100644 arch/arm/boot/dts/amlogic/meson8b-onecloud.dts diff --git a/arch/arm/boot/dts/amlogic/Makefile b/arch/arm/boot/dts/amlogic/Makefile -index a8431078..4ef5d491 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/Makefile +++ b/arch/arm/boot/dts/amlogic/Makefile @@ -6,4 +6,5 @@ dtb-$(CONFIG_MACH_MESON8) += \ @@ -22,7 +21,7 @@ index a8431078..4ef5d491 100644 meson8m2-mxiii-plus.dtb diff --git a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts new file mode 100644 -index 00000000..1fa5420f +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts @@ -0,0 +1,410 @@ @@ -437,5 +436,5 @@ index 00000000..1fa5420f + pinctrl-names = "default"; +}; -- -2.34.1 +Armbian diff --git a/patch/kernel/archive/meson-6.6/onecloud-0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-6.6/onecloud-0002-dts-Support-HDMI.patch index 5cdfe3594f..597a2676b2 100644 --- a/patch/kernel/archive/meson-6.6/onecloud-0002-dts-Support-HDMI.patch +++ b/patch/kernel/archive/meson-6.6/onecloud-0002-dts-Support-HDMI.patch @@ -1,15 +1,15 @@ -From 5c20db97babb4c37d18a61d4a226f1ea5aa5924a Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: hzy Date: Sat, 1 Apr 2023 10:26:14 +0800 -Subject: [PATCH 2/2] ARM: dts: meson8b: onecloud: Support HDMI +Subject: ARM: dts: meson8b: onecloud: Support HDMI Signed-off-by: hzy --- - .../arm/boot/dts/amlogic/meson8b-onecloud.dts | 58 +++++++++++++++++++ + arch/arm/boot/dts/amlogic/meson8b-onecloud.dts | 58 ++++++++++ 1 file changed, 58 insertions(+) diff --git a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts -index 1fa5420f..6ed19522 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts +++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts @@ -80,6 +80,48 @@ blue { @@ -92,5 +92,5 @@ index 1fa5420f..6ed19522 100644 status = "okay"; pinctrl-0 = <&ir_recv_pins>; -- -2.34.1 +Armbian