JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

meson: edge: Bump v6.6

Browse Source
This commit is contained in:
hzy
2023-11-18 23:46:27 +08:00
committed by Igor
parent 72922908c5
commit d6ede78016
11 changed files with 75 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/kernel/linux-meson-edge.config
View File

@@ -4816,6 +4816,7 @@ CONFIG_DRM_DW_HDMI=y
# CONFIG_DRM_LOGICVC is not set
CONFIG_DRM_MESON=y
CONFIG_DRM_MESON_DW_HDMI=y
# CONFIG_DRM_MESON_DW_MIPI_DSI is not set
CONFIG_DRM_MESON_TRANSWITCH_HDMI=y
# CONFIG_DRM_ARCPGU is not set
# CONFIG_DRM_BOCHS is not set
@@ -4985,6 +4986,7 @@ CONFIG_SND_ARM=y
# CONFIG_SND_SPI is not set
CONFIG_SND_USB=y
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_USB_AUDIO_MIDI_V2=y
CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
CONFIG_SND_USB_UA101=m
CONFIG_SND_USB_CAIAQ=m
@@ -5650,6 +5652,7 @@ CONFIG_USB_CONFIGFS_F_UAC1=y
CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
CONFIG_USB_CONFIGFS_F_UAC2=y
CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_MIDI2=y
CONFIG_USB_CONFIGFS_F_HID=y
CONFIG_USB_CONFIGFS_F_UVC=y
CONFIG_USB_CONFIGFS_F_PRINTER=y
@@ -7005,6 +7008,7 @@ CONFIG_SYSFS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_TMPFS_XATTR=y
CONFIG_TMPFS_QUOTA=y
CONFIG_MEMFD_CREATE=y
CONFIG_CONFIGFS_FS=y
CONFIG_EFIVAR_FS=m
@@ -7089,6 +7093,7 @@ CONFIG_EROFS_FS_POSIX_ACL=y
CONFIG_EROFS_FS_SECURITY=y
CONFIG_EROFS_FS_ZIP=y
CONFIG_EROFS_FS_ZIP_LZMA=y
CONFIG_EROFS_FS_ZIP_DEFLATE=y
CONFIG_EROFS_FS_PCPU_KTHREAD=y
# CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI is not set
CONFIG_NETWORK_FILESYSTEMS=y

4
config/sources/families/include/meson_common.inc
View File

@@ -54,8 +54,8 @@ case $BRANCH in
edge)
declare -g KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel.
KERNELBRANCH="branch:linux-6.4.y"
declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel.
KERNELBRANCH="branch:linux-6.6.y"
KERNELPATCHDIR='meson-'$BRANCH
;;

58
patch/kernel/archive/meson-6.4/generic-0001-m8-m8b-m8m2-Support-HDMI.patch → patch/kernel/archive/meson-6.6/generic-0001-m8-m8b-m8m2-Support-HDMI.patch
View File

@@ -7,10 +7,10 @@ Special thank to Martin Blumenstingl.
---
.../bindings/display/amlogic,meson-vpu.yaml | 16 +
.../phy/amlogic,meson-cvbs-dac-phy.yaml | 81 +
arch/arm/boot/dts/meson.dtsi | 13 +
arch/arm/boot/dts/meson8.dtsi | 168 +-
arch/arm/boot/dts/meson8b.dtsi | 171 +-
arch/arm/boot/dts/meson8m2.dtsi | 4 +
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 | 315 +++-
@@ -162,10 +162,10 @@ index 00000000..d73cb12c
+
+ clocks = <&vdac_clock>;
+ };
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
diff --git a/arch/arm/boot/dts/amlogic/meson.dtsi b/arch/arm/boot/dts/amlogic/meson.dtsi
index 8e3860d5..9a56cdf7 100644
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
--- a/arch/arm/boot/dts/amlogic/meson.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson.dtsi
@@ -35,6 +35,19 @@ hhi: system-controller@4000 {
"simple-mfd",
"syscon";
@@ -186,10 +186,10 @@ index 8e3860d5..9a56cdf7 100644
};
aiu: audio-controller@5400 {
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
diff --git a/arch/arm/boot/dts/amlogic/meson8.dtsi b/arch/arm/boot/dts/amlogic/meson8.dtsi
index 4f22ab45..a9ed099f 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
--- a/arch/arm/boot/dts/amlogic/meson8.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8.dtsi
@@ -314,6 +314,113 @@ mali: gpu@c0000 {
operating-points-v2 = <&gpu_opp_table>;
#cooling-cells = <2>; /* min followed by max */
@@ -422,10 +422,10 @@ index 4f22ab45..a9ed099f 100644
};
&hwrng {
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
diff --git a/arch/arm/boot/dts/amlogic/meson8b.dtsi b/arch/arm/boot/dts/amlogic/meson8b.dtsi
index 5979209f..e75d07b5 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
--- a/arch/arm/boot/dts/amlogic/meson8b.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8b.dtsi
@@ -276,6 +276,116 @@ mali: gpu@c0000 {
operating-points-v2 = <&gpu_opp_table>;
#cooling-cells = <2>; /* min followed by max */
@@ -661,10 +661,10 @@ index 5979209f..e75d07b5 100644
};
&hwrng {
diff --git a/arch/arm/boot/dts/meson8m2.dtsi b/arch/arm/boot/dts/meson8m2.dtsi
diff --git a/arch/arm/boot/dts/amlogic/meson8m2.dtsi b/arch/arm/boot/dts/amlogic/meson8m2.dtsi
index 6725dd9f..fcb2ad97 100644
--- a/arch/arm/boot/dts/meson8m2.dtsi
+++ b/arch/arm/boot/dts/meson8m2.dtsi
--- a/arch/arm/boot/dts/amlogic/meson8m2.dtsi
+++ b/arch/arm/boot/dts/amlogic/meson8m2.dtsi
@@ -96,6 +96,10 @@ &usb1_phy {
compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy";
};
@@ -688,10 +688,10 @@ index 823909da..ba9f1bc8 100644
config DRM_MESON_DW_HDMI
tristate "HDMI Synopsys Controller support for Amlogic Meson Display"
@@ -17,3 +18,11 @@ config DRM_MESON_DW_HDMI
@@ -17,3 +18,11 @@ config DRM_MESON_DW_MIPI_DSI
default y if DRM_MESON
select DRM_DW_HDMI
imply DRM_DW_HDMI_I2S_AUDIO
select DRM_DW_MIPI_DSI
select GENERIC_PHY_MIPI_DPHY
+
+config DRM_MESON_TRANSWITCH_HDMI
+ tristate "Amlogic Meson8/8b/8m2 TranSwitch HDMI 1.4 Controller support"
@@ -705,9 +705,9 @@ index 3afa31bd..817a5270 100644
--- a/drivers/gpu/drm/meson/Makefile
+++ b/drivers/gpu/drm/meson/Makefile
@@ -6,3 +6,4 @@ meson-drm-y += meson_encoder_hdmi.o
obj-$(CONFIG_DRM_MESON) += meson-drm.o
obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o
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 bb72fda9..15f019ac 100644
@@ -1089,15 +1089,6 @@ index bb72fda9..15f019ac 100644
}
/* Encoder Initialization */
@@ -319,7 +509,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
ret = component_bind_all(drm->dev, drm);
if (ret) {
dev_err(drm->dev, "Couldn't bind all components\n");
- goto exit_afbcd;
+ goto exit_cvbs_dac_phy;
}
}
@@ -353,7 +543,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)
if (ret)
goto uninstall_irq;
@@ -1182,14 +1173,13 @@ diff --git a/drivers/gpu/drm/meson/meson_drv.h b/drivers/gpu/drm/meson/meson_drv
index c62ee358..fe0a8f87 100644
--- a/drivers/gpu/drm/meson/meson_drv.h
+++ b/drivers/gpu/drm/meson/meson_drv.h
@@ -7,22 +7,29 @@
@@ -7,21 +7,28 @@
#ifndef __MESON_DRV_H
#define __MESON_DRV_H
+#include <linux/clk.h>
#include <linux/device.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/regmap.h>
+#include <linux/reset.h>
@@ -3899,9 +3889,9 @@ index fcd532db..b28d4890 100644
struct meson_cvbs_enci_mode meson_cvbs_enci_pal = {
@@ -1749,31 +1745,47 @@ void meson_venc_enable_vsync(struct meson_drm *priv)
{
writel_relaxed(VENC_INTCTRL_ENCI_LNRST_INT_EN,
priv->io_base + _REG(VENC_INTCTRL));
writel_relaxed(VENC_INTCTRL_ENCI_LNRST_INT_EN,
priv->io_base + _REG(VENC_INTCTRL));
}
- regmap_update_bits(priv->hhi, HHI_GCLK_MPEG2, BIT(25), BIT(25));
+
+ if (priv->intr_clks[0].clk) {

0
patch/kernel/archive/meson-6.4/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch → patch/kernel/archive/meson-6.6/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch
View File

26
patch/kernel/archive/meson-6.6/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch Normal file
View File

@@ -0,0 +1,26 @@
From 52f7e89824d04588df6b634aaf815001d0f33c19 Mon Sep 17 00:00:00 2001
From: hzy <hzyitc@outlook.com>
Date: Fri, 17 Nov 2023 22:54:18 +0800
Subject: [PATCH 3/3] drm/meson: Support meson{8,8b}-hdmi-tx components
Signed-off-by: hzy <hzyitc@outlook.com>
---
drivers/gpu/drm/meson/meson_drv.c | 2 ++
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
--- 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)
* private structure for HHI registers.
*/
static const struct of_device_id components_dev_match[] = {
+ { .compatible = "amlogic,meson8-hdmi-tx" },
+ { .compatible = "amlogic,meson8b-hdmi-tx" },
{ .compatible = "amlogic,meson-gxbb-dw-hdmi" },
{ .compatible = "amlogic,meson-gxl-dw-hdmi" },
{ .compatible = "amlogic,meson-gxm-dw-hdmi" },
--
2.34.1

0
patch/kernel/archive/meson-6.4/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch → patch/kernel/archive/meson-6.6/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch
View File

0
patch/kernel/archive/meson-6.4/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch → patch/kernel/archive/meson-6.6/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch
View File

8
patch/kernel/archive/meson-6.4/odroidc1-dts-Enable-HDMI.patch → patch/kernel/archive/meson-6.6/odroidc1-dts-Enable-HDMI.patch
View File

@@ -8,13 +8,13 @@ WiP
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
arch/arm/boot/dts/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/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts
diff --git a/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts b/arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts
index 94168284..7e43212e 100644
--- a/arch/arm/boot/dts/meson8b-odroidc1.dts
+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts
--- 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 {
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
};

20
patch/kernel/archive/meson-6.4/onecloud-0001-add-dts.patch → patch/kernel/archive/meson-6.6/onecloud-0001-add-dts.patch
View File

@@ -5,28 +5,26 @@ Subject: [PATCH 1/2] ARM: dts: meson8b: Add DTS for Xunlei Onecloud
Signed-off-by: hzy <hzyitc@outlook.com>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/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/meson8b-onecloud.dts
create mode 100644 arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
diff --git a/arch/arm/boot/dts/amlogic/Makefile b/arch/arm/boot/dts/amlogic/Makefile
index 59829fc9..d45f45cc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -406,6 +406,7 @@ dtb-$(CONFIG_MACH_MESON8) += \
--- a/arch/arm/boot/dts/amlogic/Makefile
+++ b/arch/arm/boot/dts/amlogic/Makefile
@@ -406,4 +406,5 @@ dtb-$(CONFIG_MACH_MESON8) += \
meson8b-ec100.dtb \
meson8b-mxq.dtb \
meson8b-odroidc1.dtb \
+ meson8b-onecloud.dtb \
meson8m2-mxiii-plus.dtb
dtb-$(CONFIG_ARCH_MMP) += \
pxa168-aspenite.dtb \
diff --git a/arch/arm/boot/dts/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts
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
--- /dev/null
+++ b/arch/arm/boot/dts/meson8b-onecloud.dts
+++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
@@ -0,0 +1,410 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*

8
patch/kernel/archive/meson-6.4/onecloud-0002-dts-Support-HDMI.patch → patch/kernel/archive/meson-6.6/onecloud-0002-dts-Support-HDMI.patch
View File

@@ -5,13 +5,13 @@ Subject: [PATCH 2/2] ARM: dts: meson8b: onecloud: Support HDMI
Signed-off-by: hzy <hzyitc@outlook.com>
---
arch/arm/boot/dts/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/meson8b-onecloud.dts b/arch/arm/boot/dts/meson8b-onecloud.dts
diff --git a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
index 1fa5420f..6ed19522 100644
--- a/arch/arm/boot/dts/meson8b-onecloud.dts
+++ b/arch/arm/boot/dts/meson8b-onecloud.dts
--- a/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
+++ b/arch/arm/boot/dts/amlogic/meson8b-onecloud.dts
@@ -80,6 +80,48 @@ blue {
};
};

2
patch/kernel/meson-edge
View File

@@ -1 +1 @@
archive/meson-6.4
archive/meson-6.6