From: Archit Taneja <architt@codeaurora.org>
To: robdclark@gmail.com
Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: [PATCH v2 01/13] drm/msm/dsi: Create separate Makefile/Kconfig
Date: Mon, 15 Feb 2016 12:23:14 +0530 [thread overview]
Message-ID: <1455519206-12939-2-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1455519206-12939-1-git-send-email-architt@codeaurora.org>
The msm Makefile and Kconfig are getting conjusted. Move out
the DSI related stuff into separate Kconfig and Makefile.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/msm/Kconfig | 40 +---------------------------------------
drivers/gpu/drm/msm/Makefile | 22 ++++------------------
drivers/gpu/drm/msm/dsi/Kconfig | 40 ++++++++++++++++++++++++++++++++++++++++
drivers/gpu/drm/msm/dsi/Makefile | 13 +++++++++++++
4 files changed, 58 insertions(+), 57 deletions(-)
create mode 100644 drivers/gpu/drm/msm/dsi/Kconfig
create mode 100644 drivers/gpu/drm/msm/dsi/Makefile
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 967c6ee..83e0615 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -24,42 +24,4 @@ config DRM_MSM_REGISTER_LOGGING
that can be parsed by envytools demsm tool. If enabled, register
logging can be switched on via msm.reglog=y module param.
-config DRM_MSM_DSI
- bool "Enable DSI support in MSM DRM driver"
- depends on DRM_MSM
- select DRM_PANEL
- select DRM_MIPI_DSI
- default y
- help
- Choose this option if you have a need for MIPI DSI connector
- support.
-
-config DRM_MSM_DSI_PLL
- bool "Enable DSI PLL driver in MSM DRM"
- depends on DRM_MSM_DSI && COMMON_CLK
- default y
- help
- Choose this option to enable DSI PLL driver which provides DSI
- source clocks under common clock framework.
-
-config DRM_MSM_DSI_28NM_PHY
- bool "Enable DSI 28nm PHY driver in MSM DRM"
- depends on DRM_MSM_DSI
- default y
- help
- Choose this option if the 28nm DSI PHY is used on the platform.
-
-config DRM_MSM_DSI_20NM_PHY
- bool "Enable DSI 20nm PHY driver in MSM DRM"
- depends on DRM_MSM_DSI
- default y
- help
- Choose this option if the 20nm DSI PHY is used on the platform.
-
-config DRM_MSM_DSI_28NM_8960_PHY
- bool "Enable DSI 28nm 8960 PHY driver in MSM DRM"
- depends on DRM_MSM_DSI
- default y
- help
- Choose this option if the 28nm DSI PHY 8960 variant is used on the
- platform.
+source "drivers/gpu/drm/msm/dsi/Kconfig"
diff --git a/drivers/gpu/drm/msm/Makefile b/drivers/gpu/drm/msm/Makefile
index 065ad41..7ac7221 100644
--- a/drivers/gpu/drm/msm/Makefile
+++ b/drivers/gpu/drm/msm/Makefile
@@ -1,5 +1,4 @@
ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm
-ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi
msm-y := \
adreno/adreno_device.o \
@@ -50,25 +49,12 @@ msm-y := \
msm_rd.o \
msm_ringbuffer.o
+msm-$(CONFIG_DRM_MSM_DSI) += mdp/mdp4/mdp4_dsi_encoder.o \
+ mdp/mdp5/mdp5_cmd_encoder.o
+
msm-$(CONFIG_DRM_FBDEV_EMULATION) += msm_fbdev.o
msm-$(CONFIG_COMMON_CLK) += mdp/mdp4/mdp4_lvds_pll.o
-msm-$(CONFIG_DRM_MSM_DSI) += dsi/dsi.o \
- mdp/mdp4/mdp4_dsi_encoder.o \
- dsi/dsi_cfg.o \
- dsi/dsi_host.o \
- dsi/dsi_manager.o \
- dsi/phy/dsi_phy.o \
- mdp/mdp5/mdp5_cmd_encoder.o
-
-msm-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/phy/dsi_phy_28nm.o
-msm-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += dsi/phy/dsi_phy_20nm.o
-msm-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += dsi/phy/dsi_phy_28nm_8960.o
-
-ifeq ($(CONFIG_DRM_MSM_DSI_PLL),y)
-msm-y += dsi/pll/dsi_pll.o
-msm-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += dsi/pll/dsi_pll_28nm.o
-msm-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += dsi/pll/dsi_pll_28nm_8960.o
-endif
+obj-$(CONFIG_DRM_MSM_DSI) += dsi/
obj-$(CONFIG_DRM_MSM) += msm.o
diff --git a/drivers/gpu/drm/msm/dsi/Kconfig b/drivers/gpu/drm/msm/dsi/Kconfig
new file mode 100644
index 0000000..91dcf21
--- /dev/null
+++ b/drivers/gpu/drm/msm/dsi/Kconfig
@@ -0,0 +1,40 @@
+config DRM_MSM_DSI
+ bool "Enable DSI support in MSM DRM driver"
+ depends on DRM_MSM
+ select DRM_PANEL
+ select DRM_MIPI_DSI
+ default y
+ help
+ Choose this option if you have a need for MIPI DSI connector
+ support.
+
+if DRM_MSM_DSI
+
+config DRM_MSM_DSI_PLL
+ bool "Enable DSI PLL driver in MSM DRM"
+ default y
+ help
+ Choose this option to enable DSI PLL driver which provides DSI
+ source clocks under common clock framework.
+
+config DRM_MSM_DSI_28NM_PHY
+ bool "Enable DSI 28nm PHY driver in MSM DRM"
+ default y
+ help
+ Choose this option if the 28nm DSI PHY is used on the platform.
+
+config DRM_MSM_DSI_20NM_PHY
+ bool "Enable DSI 20nm PHY driver in MSM DRM"
+ default y
+ help
+ Choose this option if the 20nm DSI PHY is used on the platform.
+
+config DRM_MSM_DSI_28NM_8960_PHY
+ bool "Enable DSI 28nm 8960 PHY driver in MSM DRM"
+ depends on DRM_MSM_DSI
+ default y
+ help
+ Choose this option if the 28nm DSI PHY 8960 variant is used on the
+ platform.
+
+endif
diff --git a/drivers/gpu/drm/msm/dsi/Makefile b/drivers/gpu/drm/msm/dsi/Makefile
new file mode 100644
index 0000000..26c8fb6
--- /dev/null
+++ b/drivers/gpu/drm/msm/dsi/Makefile
@@ -0,0 +1,13 @@
+ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm -Idrivers/gpu/drm/msm/dsi
+
+obj-y := dsi.o dsi_cfg.o dsi_host.o dsi_manager.o phy/dsi_phy.o
+
+obj-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += phy/dsi_phy_28nm.o
+obj-$(CONFIG_DRM_MSM_DSI_20NM_PHY) += phy/dsi_phy_20nm.o
+obj-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += phy/dsi_phy_28nm_8960.o
+
+ifeq ($(CONFIG_DRM_MSM_DSI_PLL),y)
+obj-y += pll/dsi_pll.o
+obj-$(CONFIG_DRM_MSM_DSI_28NM_PHY) += pll/dsi_pll_28nm.o
+obj-$(CONFIG_DRM_MSM_DSI_28NM_8960_PHY) += pll/dsi_pll_28nm_8960.o
+endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-02-15 6:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-15 6:53 [PATCH v2 00/13] drm/msm/hdmi: HDMI support on MSM8996 Archit Taneja
2016-02-15 6:53 ` Archit Taneja [this message]
2016-02-15 6:53 ` [PATCH v2 02/13] drm/msm/hdmi: Create separate Makefile/Kconfig Archit Taneja
2016-02-15 6:53 ` [PATCH v2 03/13] drm/msm/edp: " Archit Taneja
2016-02-15 6:53 ` [PATCH v2 04/13] drm/msm/hdmi: Clean up connector gpio usage Archit Taneja
2016-02-15 6:53 ` [PATCH v2 05/13] drm/msm/hdmi: Fix connector detect when there is no HPD gpio Archit Taneja
2016-02-15 6:53 ` [PATCH v2 06/13] drm/msm/hdmi: Create a separate HDMI PHY driver Archit Taneja
2016-02-15 6:53 ` [PATCH v2 07/13] drm/msm/hdmi: Manage HDMI PLL through " Archit Taneja
2016-02-15 6:53 ` [PATCH v2 08/13] drm/msm/hdmi: Make HDMI core get its PHY Archit Taneja
2016-02-15 6:53 ` [PATCH v2 09/13] drm/msm/hdmi: Convert PHY files according to new design Archit Taneja
2016-02-15 6:53 ` [PATCH v2 10/13] drm/msm/hdmi: Update generated headers to split PHY/PLL offsets Archit Taneja
2016-02-15 6:53 ` [PATCH v2 11/13] drm/msm/hdmi: Update generated headers for HDMI 8996 PHY Archit Taneja
2016-02-15 6:53 ` [PATCH v2 12/13] drm/msm/hdmi: HDMI 8996 PHY/PLL support Archit Taneja
2016-02-15 6:53 ` [PATCH v2 13/13] dt-bindings: msm/hdmi: Add HDMI PHY bindings Archit Taneja
2016-02-22 2:54 ` Rob Herring
2016-02-22 11:07 ` Archit Taneja
2016-02-22 19:27 ` Rob Herring
2016-02-23 9:36 ` Archit Taneja
2016-02-24 12:00 ` Kishon Vijay Abraham I
2016-02-25 5:40 ` Archit Taneja
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455519206-12939-2-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=robdclark@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.