diff mbox series

[02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option

Message ID 1556061656-1733-3-git-send-email-john.stultz@linaro.org
State Superseded
Headers show
Series drm: Kirin driver cleanups to prep for Kirin960 support | expand

Commit Message

John Stultz April 23, 2019, 11:20 p.m. UTC
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: Xinliang Liu <z.liuxinliang@hisilicon.com>
Cc: Rongrong Zou <zourongrong@gmail.com>
Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Cc: Chen Feng <puck.chen@hisilicon.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: dri-devel <dri-devel@lists.freedesktop.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(-)

-- 
2.7.4

Comments

John Stultz April 24, 2019, 4:49 p.m. UTC | #1
On Wed, Apr 24, 2019 at 9:39 AM Sam Ravnborg <sam@ravnborg.org> wrote:
>

> Hi John.

>

> On Tue, Apr 23, 2019 at 04:20:33PM -0700, John Stultz wrote:

> > 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: Xinliang Liu <z.liuxinliang@hisilicon.com>

> > Cc: Rongrong Zou <zourongrong@gmail.com>

> > Cc: Xinwei Kong <kong.kongxinwei@hisilicon.com>

> > Cc: Chen Feng <puck.chen@hisilicon.com>

> > Cc: David Airlie <airlied@linux.ie>

> > Cc: Daniel Vetter <daniel@ffwll.ch>

> > Cc: dri-devel <dri-devel@lists.freedesktop.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 499f644..6ef7906 100644

> > --- a/drivers/gpu/drm/hisilicon/kirin/Kconfig

> > +++ b/drivers/gpu/drm/hisilicon/kirin/Kconfig

> > @@ -4,16 +4,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.

>

> Nice simplification. We are now down to two very small Kconfig files.

> Consider to merge them into one Kconfig file in the top-level dir.

>


Part of this cleanup is so that we can add another device option in a
later commit (though not in this series), so unless folks are
generally wanting to consolidate Kconfigs into the top level, it may
be premature to do so now only to later undo it when there are more
kirin specific options. I'm fine with whichever, I just want to make
sure that's clear.

thanks
-john
Sam Ravnborg April 24, 2019, 4:56 p.m. UTC | #2
Hi John.

> >

> > Nice simplification. We are now down to two very small Kconfig files.

> > Consider to merge them into one Kconfig file in the top-level dir.

> >

> 

> Part of this cleanup is so that we can add another device option in a

> later commit (though not in this series), so unless folks are

> generally wanting to consolidate Kconfigs into the top level, it may

> be premature to do so now only to later undo it when there are more

> kirin specific options. I'm fine with whichever, I just want to make

> sure that's clear.

I am just passing my reflections forward in a mail as I read the
patches.
Unless there is something that resemble a real bug then always do what
you consider best. In this case keep the two Kconfig files.

	Sam
diff mbox series

Patch

diff --git a/drivers/gpu/drm/hisilicon/kirin/Kconfig b/drivers/gpu/drm/hisilicon/kirin/Kconfig
index 499f644..6ef7906 100644
--- a/drivers/gpu/drm/hisilicon/kirin/Kconfig
+++ b/drivers/gpu/drm/hisilicon/kirin/Kconfig
@@ -4,16 +4,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 cdf6158..3585327 100644
--- a/drivers/gpu/drm/hisilicon/kirin/Makefile
+++ b/drivers/gpu/drm/hisilicon/kirin/Makefile
@@ -1,6 +1,6 @@ 
 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