diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release
which was tagged LSDK-20.04-V5.4.
https://source.codeaurora.org/external/qoriq/qoriq-components/linux/
For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in
LSDK, port the dts patches from 4.14.
The patches are sorted into the following categories:
301-arch-xxxx
302-dts-xxxx
303-core-xxxx
701-net-xxxx
801-audio-xxxx
802-can-xxxx
803-clock-xxxx
804-crypto-xxxx
805-display-xxxx
806-dma-xxxx
807-gpio-xxxx
808-i2c-xxxx
809-jailhouse-xxxx
810-keys-xxxx
811-kvm-xxxx
812-pcie-xxxx
813-pm-xxxx
814-qe-xxxx
815-sata-xxxx
816-sdhc-xxxx
817-spi-xxxx
818-thermal-xxxx
819-uart-xxxx
820-usb-xxxx
821-vfio-xxxx
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch b/target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch new file mode 100644 index 0000000000..5596fc0fa8 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/805-display-0051-LF-296-drm-mhdp-build-mhdp-sub-modules-into-one-driv.patch @@ -0,0 +1,75 @@ +From 2b8caa86c969cb14e295e60ddc21995b47dc2efe Mon Sep 17 00:00:00 2001 +From: Sandor Yu <Sandor.yu@nxp.com> +Date: Mon, 2 Dec 2019 16:14:09 +0800 +Subject: [PATCH] LF-296: drm: mhdp: build mhdp sub-modules into one driver + module + +mhdp kernel driver support build as module. +All mhdp sub-modules are built into one driver module. + +Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> +Reviewed-by: Robby Cai <robby.cai@nxp.com> +(cherry picked from commit f516f7769a52fdda185920a89efa3de9a1ddb9e8) +[rebase] +Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> +--- + drivers/gpu/drm/bridge/cadence/Makefile | 14 +++++++++----- + drivers/gpu/drm/imx/Makefile | 4 +++- + include/drm/bridge/cdns-mhdp-common.h | 4 ---- + 3 files changed, 12 insertions(+), 10 deletions(-) + +--- a/drivers/gpu/drm/bridge/cadence/Makefile ++++ b/drivers/gpu/drm/bridge/cadence/Makefile +@@ -1,5 +1,9 @@ +-obj-$(CONFIG_DRM_CDNS_MHDP) += cdns-mhdp-common.o cdns-mhdp-hdmi.o +-obj-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o +-obj-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o +-obj-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o +-obj-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o ++ ++cdns_mhdp_drmcore-y := cdns-mhdp-common.o cdns-mhdp-hdmi.o ++ ++cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI) += cdns-hdmi-core.o ++cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_DP) += cdns-dp-core.o ++cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_AUDIO) += cdns-mhdp-audio.o ++cdns_mhdp_drmcore-$(CONFIG_DRM_CDNS_HDMI_CEC) += cdns-mhdp-cec.o ++ ++obj-$(CONFIG_DRM_CDNS_MHDP) += cdns_mhdp_drmcore.o +--- a/drivers/gpu/drm/imx/Makefile ++++ b/drivers/gpu/drm/imx/Makefile +@@ -9,4 +9,6 @@ obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o + obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o + + obj-$(CONFIG_DRM_IMX_HDMI) += dw_hdmi-imx.o +-obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdn-mhdp-imxdrv.o cdn-mhdp-dp-phy.o cdn-mhdp-hdmi-phy.o cdn-mhdp-imx8qm.o cdn-mhdp-ls1028a.o ++ ++cdns_mhdp_imx-objs := cdn-mhdp-imxdrv.o cdn-mhdp-dp-phy.o cdn-mhdp-hdmi-phy.o cdn-mhdp-imx8qm.o cdn-mhdp-ls1028a.o ++obj-$(CONFIG_DRM_IMX_CDNS_MHDP) += cdns_mhdp_imx.o +--- a/include/drm/bridge/cdns-mhdp-common.h ++++ b/include/drm/bridge/cdns-mhdp-common.h +@@ -621,7 +621,6 @@ struct cdns_mhdp_connector { + struct cdns_mhdp_bridge *bridge; + }; + +-#ifdef CONFIG_DRM_CDNS_HDMI_CEC + struct cdns_mhdp_cec { + struct cec_adapter *adap; + struct device *dev; +@@ -630,7 +629,6 @@ struct cdns_mhdp_cec { + struct cec_msg msg; + struct task_struct *cec_worker; + }; +-#endif + + struct cdns_plat_data { + /* Vendor PHY support */ +@@ -704,9 +702,7 @@ struct cdns_mhdp_device { + bool can_mst; + } dp; + struct _hdmi_data { +-#ifdef CONFIG_DRM_CDNS_HDMI_CEC + struct cdns_mhdp_cec cec; +-#endif + u32 char_rate; + u32 hdmi_type; + } hdmi; |