lkml.org 
[lkml]   [2019]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option
    Date
    The CONFIG_HISI_KIRIN_DW_DSI option is only used w/ kirin
    driver, so cut out the middleman and condense the config
    logic down.

    Cc: Rongrong Zou <zourongrong@gmail.com>
    Cc: Xinliang Liu <z.liuxinliang@hisilicon.com>
    Cc: David Airlie <airlied@linux.ie>
    Cc: Daniel Vetter <daniel@ffwll.ch>
    Cc: dri-devel <dri-devel@lists.freedesktop.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Xinliang Liu <z.liuxinliang@hisilicon.com>
    Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
    Signed-off-by: John Stultz <john.stultz@linaro.org>
    ---
    drivers/gpu/drm/hisilicon/kirin/Kconfig | 10 +---------
    drivers/gpu/drm/hisilicon/kirin/Makefile | 4 ++--
    2 files changed, 3 insertions(+), 11 deletions(-)

    diff --git a/drivers/gpu/drm/hisilicon/kirin/Kconfig b/drivers/gpu/drm/hisilicon/kirin/Kconfig
    index 0fa29af08ad0..290553e2f6b4 100644
    --- a/drivers/gpu/drm/hisilicon/kirin/Kconfig
    +++ b/drivers/gpu/drm/hisilicon/kirin/Kconfig
    @@ -5,16 +5,8 @@ config DRM_HISI_KIRIN
    select DRM_KMS_HELPER
    select DRM_GEM_CMA_HELPER
    select DRM_KMS_CMA_HELPER
    - select HISI_KIRIN_DW_DSI
    + select DRM_MIPI_DSI
    help
    Choose this option if you have a hisilicon Kirin chipsets(hi6220).
    If M is selected the module will be called kirin-drm.

    -config HISI_KIRIN_DW_DSI
    - tristate "HiSilicon Kirin specific extensions for Synopsys DW MIPI DSI"
    - depends on DRM_HISI_KIRIN
    - select DRM_MIPI_DSI
    - help
    - This selects support for HiSilicon Kirin SoC specific extensions for
    - the Synopsys DesignWare DSI driver. If you want to enable MIPI DSI on
    - hi6220 based SoC, you should selet this option.
    diff --git a/drivers/gpu/drm/hisilicon/kirin/Makefile b/drivers/gpu/drm/hisilicon/kirin/Makefile
    index c0501fa3fe53..c50606cfbbdb 100644
    --- a/drivers/gpu/drm/hisilicon/kirin/Makefile
    +++ b/drivers/gpu/drm/hisilicon/kirin/Makefile
    @@ -1,7 +1,7 @@
    # SPDX-License-Identifier: GPL-2.0-only
    kirin-drm-y := kirin_drm_drv.o \
    - kirin_drm_ade.o
    + kirin_drm_ade.o \
    + dw_drm_dsi.o

    obj-$(CONFIG_DRM_HISI_KIRIN) += kirin-drm.o

    -obj-$(CONFIG_HISI_KIRIN_DW_DSI) += dw_drm_dsi.o
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-20 01:07    [W:4.195 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site