diff options
author | Thierry Reding <treding@nvidia.com> | 2015-04-14 09:39:51 -0400 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2015-08-14 15:34:24 -0400 |
commit | 330b48bd700d5cdc3d1922c4e50f0626ab8ec002 (patch) | |
tree | 5fd6fe56bb708b4aaf999875a25629454e5b6128 | |
parent | 9ef7e25ff62033065ec019425a9c769374455a1a (diff) |
drm/bridge: Add vendor prefixes
Use vendor prefixes for Kconfig symbols and filenames. This should make
it easier to identify the various bridge drivers and to organize the
directory.
v2: fix object name for dw-hdmi (Fabio Estevam)
Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r-- | arch/arm/configs/exynos_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/bridge/Kconfig | 10 | ||||
-rw-r--r-- | drivers/gpu/drm/bridge/Makefile | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/bridge/nxp-ptn3460.c (renamed from drivers/gpu/drm/bridge/ptn3460.c) | 0 | ||||
-rw-r--r-- | drivers/gpu/drm/bridge/parade-ps8622.c (renamed from drivers/gpu/drm/bridge/ps8622.c) | 0 |
6 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index 1d8f98c61c55..3eaf8fbaf603 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig | |||
@@ -124,8 +124,8 @@ CONFIG_REGULATOR_S2MPS11=y | |||
124 | CONFIG_REGULATOR_S5M8767=y | 124 | CONFIG_REGULATOR_S5M8767=y |
125 | CONFIG_REGULATOR_TPS65090=y | 125 | CONFIG_REGULATOR_TPS65090=y |
126 | CONFIG_DRM=y | 126 | CONFIG_DRM=y |
127 | CONFIG_DRM_PTN3460=y | 127 | CONFIG_DRM_NXP_PTN3460=y |
128 | CONFIG_DRM_PS8622=y | 128 | CONFIG_DRM_PARADE_PS8622=y |
129 | CONFIG_DRM_EXYNOS=y | 129 | CONFIG_DRM_EXYNOS=y |
130 | CONFIG_DRM_EXYNOS_FIMD=y | 130 | CONFIG_DRM_EXYNOS_FIMD=y |
131 | CONFIG_DRM_EXYNOS_DSI=y | 131 | CONFIG_DRM_EXYNOS_DSI=y |
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 44abecc16d5b..48b0362a0f0e 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -430,8 +430,8 @@ CONFIG_VIDEO_RENESAS_VSP1=m | |||
430 | CONFIG_VIDEO_ADV7180=m | 430 | CONFIG_VIDEO_ADV7180=m |
431 | CONFIG_VIDEO_ML86V7667=m | 431 | CONFIG_VIDEO_ML86V7667=m |
432 | CONFIG_DRM=y | 432 | CONFIG_DRM=y |
433 | CONFIG_DRM_PTN3460=m | 433 | CONFIG_DRM_NXP_PTN3460=m |
434 | CONFIG_DRM_PS8622=m | 434 | CONFIG_DRM_PARADE_PS8622=m |
435 | CONFIG_DRM_EXYNOS=m | 435 | CONFIG_DRM_EXYNOS=m |
436 | CONFIG_DRM_EXYNOS_DSI=y | 436 | CONFIG_DRM_EXYNOS_DSI=y |
437 | CONFIG_DRM_EXYNOS_FIMD=y | 437 | CONFIG_DRM_EXYNOS_FIMD=y |
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index acef3223772c..adac3250684b 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig | |||
@@ -3,16 +3,16 @@ config DRM_DW_HDMI | |||
3 | depends on DRM | 3 | depends on DRM |
4 | select DRM_KMS_HELPER | 4 | select DRM_KMS_HELPER |
5 | 5 | ||
6 | config DRM_PTN3460 | 6 | config DRM_NXP_PTN3460 |
7 | tristate "PTN3460 DP/LVDS bridge" | 7 | tristate "NXP PTN3460 DP/LVDS bridge" |
8 | depends on DRM | 8 | depends on DRM |
9 | depends on OF | 9 | depends on OF |
10 | select DRM_KMS_HELPER | 10 | select DRM_KMS_HELPER |
11 | select DRM_PANEL | 11 | select DRM_PANEL |
12 | ---help--- | 12 | ---help--- |
13 | ptn3460 eDP-LVDS bridge chip driver. | 13 | NXP PTN3460 eDP-LVDS bridge chip driver. |
14 | 14 | ||
15 | config DRM_PS8622 | 15 | config DRM_PARADE_PS8622 |
16 | tristate "Parade eDP/LVDS bridge" | 16 | tristate "Parade eDP/LVDS bridge" |
17 | depends on DRM | 17 | depends on DRM |
18 | depends on OF | 18 | depends on OF |
@@ -21,4 +21,4 @@ config DRM_PS8622 | |||
21 | select BACKLIGHT_LCD_SUPPORT | 21 | select BACKLIGHT_LCD_SUPPORT |
22 | select BACKLIGHT_CLASS_DEVICE | 22 | select BACKLIGHT_CLASS_DEVICE |
23 | ---help--- | 23 | ---help--- |
24 | parade eDP-LVDS bridge chip driver. | 24 | Parade eDP-LVDS bridge chip driver. |
diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index 8dfebd984370..e2eef1c2f4c3 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | ccflags-y := -Iinclude/drm | 1 | ccflags-y := -Iinclude/drm |
2 | 2 | ||
3 | obj-$(CONFIG_DRM_PS8622) += ps8622.o | ||
4 | obj-$(CONFIG_DRM_PTN3460) += ptn3460.o | ||
5 | obj-$(CONFIG_DRM_DW_HDMI) += dw_hdmi.o | 3 | obj-$(CONFIG_DRM_DW_HDMI) += dw_hdmi.o |
4 | obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o | ||
5 | obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o | ||
diff --git a/drivers/gpu/drm/bridge/ptn3460.c b/drivers/gpu/drm/bridge/nxp-ptn3460.c index 1b1bf2384815..1b1bf2384815 100644 --- a/drivers/gpu/drm/bridge/ptn3460.c +++ b/drivers/gpu/drm/bridge/nxp-ptn3460.c | |||
diff --git a/drivers/gpu/drm/bridge/ps8622.c b/drivers/gpu/drm/bridge/parade-ps8622.c index 1a6607beb29f..1a6607beb29f 100644 --- a/drivers/gpu/drm/bridge/ps8622.c +++ b/drivers/gpu/drm/bridge/parade-ps8622.c | |||