aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2017-03-10 05:18:12 -0500
committerArchit Taneja <architt@codeaurora.org>2017-03-10 06:02:54 -0500
commit35dc8aabc8783d6322a59d774af2858e5955d2ab (patch)
tree648da35a7f8eec65c062b48fed4770812ac93b6e
parent80e2f97968b537fc9c1789fce1b7f61609a5aae4 (diff)
drm: bridge: dw-hdmi: Move the driver to a separate directory.
The driver is already made of 5 separate source files. Move it to a newly created directory named synopsys where more Synopsys bridge drivers can be added later (for the DisplayPort controller for instance). Suggested-by: Jose Abreu <Jose.Abreu@synopsys.com> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Jose Abreu <joabreu@synopsys.com> Signed-off-by: Archit Taneja <architt@codeaurora.org> Link: http://patchwork.freedesktop.org/patch/msgid/20170303172007.26541-10-laurent.pinchart+renesas@ideasonboard.com
-rw-r--r--drivers/gpu/drm/bridge/Kconfig26
-rw-r--r--drivers/gpu/drm/bridge/Makefile4
-rw-r--r--drivers/gpu/drm/bridge/synopsys/Kconfig23
-rw-r--r--drivers/gpu/drm/bridge/synopsys/Makefile5
-rw-r--r--drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c (renamed from drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c)0
-rw-r--r--drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h (renamed from drivers/gpu/drm/bridge/dw-hdmi-audio.h)0
-rw-r--r--drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c (renamed from drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c)0
-rw-r--r--drivers/gpu/drm/bridge/synopsys/dw-hdmi.c (renamed from drivers/gpu/drm/bridge/dw-hdmi.c)0
-rw-r--r--drivers/gpu/drm/bridge/synopsys/dw-hdmi.h (renamed from drivers/gpu/drm/bridge/dw-hdmi.h)0
9 files changed, 31 insertions, 27 deletions
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index fee4e1a72786..f6968d3b4b41 100644
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -33,30 +33,6 @@ config DRM_LVDS_ENCODER
33 Support for transparent parallel to LVDS encoders that don't require 33 Support for transparent parallel to LVDS encoders that don't require
34 any configuration. 34 any configuration.
35 35
36config DRM_DW_HDMI
37 tristate
38 select DRM_KMS_HELPER
39
40config DRM_DW_HDMI_AHB_AUDIO
41 tristate "Synopsis Designware AHB Audio interface"
42 depends on DRM_DW_HDMI && SND
43 select SND_PCM
44 select SND_PCM_ELD
45 select SND_PCM_IEC958
46 help
47 Support the AHB Audio interface which is part of the Synopsis
48 Designware HDMI block. This is used in conjunction with
49 the i.MX6 HDMI driver.
50
51config DRM_DW_HDMI_I2S_AUDIO
52 tristate "Synopsis Designware I2S Audio interface"
53 depends on SND_SOC
54 depends on DRM_DW_HDMI
55 select SND_SOC_HDMI_CODEC
56 help
57 Support the I2S Audio interface which is part of the Synopsis
58 Designware HDMI block.
59
60config DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW 36config DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW
61 tristate "MegaChips stdp4028-ge-b850v3-fw and stdp2690-ge-b850v3-fw" 37 tristate "MegaChips stdp4028-ge-b850v3-fw and stdp2690-ge-b850v3-fw"
62 depends on OF 38 depends on OF
@@ -121,4 +97,6 @@ source "drivers/gpu/drm/bridge/analogix/Kconfig"
121 97
122source "drivers/gpu/drm/bridge/adv7511/Kconfig" 98source "drivers/gpu/drm/bridge/adv7511/Kconfig"
123 99
100source "drivers/gpu/drm/bridge/synopsys/Kconfig"
101
124endmenu 102endmenu
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile
index 967d4314ba82..3fe2226ee2f2 100644
--- a/drivers/gpu/drm/bridge/Makefile
+++ b/drivers/gpu/drm/bridge/Makefile
@@ -3,9 +3,6 @@ ccflags-y := -Iinclude/drm
3obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o 3obj-$(CONFIG_DRM_ANALOGIX_ANX78XX) += analogix-anx78xx.o
4obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o 4obj-$(CONFIG_DRM_DUMB_VGA_DAC) += dumb-vga-dac.o
5obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o 5obj-$(CONFIG_DRM_LVDS_ENCODER) += lvds-encoder.o
6obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o
7obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o
8obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o
9obj-$(CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW) += megachips-stdpxxxx-ge-b850v3-fw.o 6obj-$(CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW) += megachips-stdpxxxx-ge-b850v3-fw.o
10obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o 7obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o
11obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o 8obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o
@@ -15,3 +12,4 @@ obj-$(CONFIG_DRM_TOSHIBA_TC358767) += tc358767.o
15obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/ 12obj-$(CONFIG_DRM_ANALOGIX_DP) += analogix/
16obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/ 13obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511/
17obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o 14obj-$(CONFIG_DRM_TI_TFP410) += ti-tfp410.o
15obj-y += synopsys/
diff --git a/drivers/gpu/drm/bridge/synopsys/Kconfig b/drivers/gpu/drm/bridge/synopsys/Kconfig
new file mode 100644
index 000000000000..40d2827a6d19
--- /dev/null
+++ b/drivers/gpu/drm/bridge/synopsys/Kconfig
@@ -0,0 +1,23 @@
1config DRM_DW_HDMI
2 tristate
3 select DRM_KMS_HELPER
4
5config DRM_DW_HDMI_AHB_AUDIO
6 tristate "Synopsys Designware AHB Audio interface"
7 depends on DRM_DW_HDMI && SND
8 select SND_PCM
9 select SND_PCM_ELD
10 select SND_PCM_IEC958
11 help
12 Support the AHB Audio interface which is part of the Synopsys
13 Designware HDMI block. This is used in conjunction with
14 the i.MX6 HDMI driver.
15
16config DRM_DW_HDMI_I2S_AUDIO
17 tristate "Synopsys Designware I2S Audio interface"
18 depends on SND_SOC
19 depends on DRM_DW_HDMI
20 select SND_SOC_HDMI_CODEC
21 help
22 Support the I2S Audio interface which is part of the Synopsys
23 Designware HDMI block.
diff --git a/drivers/gpu/drm/bridge/synopsys/Makefile b/drivers/gpu/drm/bridge/synopsys/Makefile
new file mode 100644
index 000000000000..17aa7a65b57e
--- /dev/null
+++ b/drivers/gpu/drm/bridge/synopsys/Makefile
@@ -0,0 +1,5 @@
1#ccflags-y := -Iinclude/drm
2
3obj-$(CONFIG_DRM_DW_HDMI) += dw-hdmi.o
4obj-$(CONFIG_DRM_DW_HDMI_AHB_AUDIO) += dw-hdmi-ahb-audio.o
5obj-$(CONFIG_DRM_DW_HDMI_I2S_AUDIO) += dw-hdmi-i2s-audio.o
diff --git a/drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c
index 8f2d1379c880..8f2d1379c880 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c
diff --git a/drivers/gpu/drm/bridge/dw-hdmi-audio.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
index fd1f745c6073..fd1f745c6073 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi-audio.h
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-audio.h
diff --git a/drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
index aaf287d2e91d..aaf287d2e91d 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 026a0dce7661..026a0dce7661 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
diff --git a/drivers/gpu/drm/bridge/dw-hdmi.h b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h
index 325b0b8ae639..325b0b8ae639 100644
--- a/drivers/gpu/drm/bridge/dw-hdmi.h
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.h