On 8/19/20 4:46 AM, Mauro Carvalho Chehab wrote: > Now that everything is in place, add the driver to the > building system. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> Hi Mauro, In this patch and in patch 01/49, please be consistent in capitalization on HiSilicon. more below: > --- > drivers/staging/hikey9xx/Kconfig | 3 ++ > drivers/staging/hikey9xx/Makefile | 1 + > drivers/staging/hikey9xx/gpu/Kconfig | 52 ++++++--------------------- > drivers/staging/hikey9xx/gpu/Makefile | 21 ++++------- > 4 files changed, 22 insertions(+), 55 deletions(-) > > diff --git a/drivers/staging/hikey9xx/Kconfig b/drivers/staging/hikey9xx/Kconfig > index 0e97b5b9a56a..b2ce886e1c4e 100644 > --- a/drivers/staging/hikey9xx/Kconfig > +++ b/drivers/staging/hikey9xx/Kconfig > @@ -36,3 +36,6 @@ config REGULATOR_HI6421V600 > This driver provides support for the voltage regulators on > HiSilicon Hi6421v600 PMU / Codec IC. > This is used on Kirin 3670 boards, like HiKey 970. > + > +# DRM/KMS driver > +source "drivers/staging/hikey9xx/gpu/Kconfig" > diff --git a/drivers/staging/hikey9xx/gpu/Kconfig b/drivers/staging/hikey9xx/gpu/Kconfig > index 5533ee624f29..957da13bcf81 100644 > --- a/drivers/staging/hikey9xx/gpu/Kconfig > +++ b/drivers/staging/hikey9xx/gpu/Kconfig > @@ -1,52 +1,22 @@ > -config DRM_HISI_KIRIN > - tristate "DRM Support for Hisilicon Kirin series SoCs Platform"> +config DRM_HISI_KIRIN9XX > + tristate "DRM Support for Hisilicon Kirin9xx series SoCs Platform" HiSilicon > depends on DRM && OF && ARM64 > select DRM_KMS_HELPER > select DRM_GEM_CMA_HELPER > select DRM_KMS_CMA_HELPER > - select HISI_KIRIN_DW_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 DRM_KIRIN_960 > - tristate "DRM Support for Hisilicon Kirin960 series SoCs Platform" > - depends on DRM && OF && ARM64 > - select DRM_KMS_HELPER > - select DRM_GEM_CMA_HELPER > - select DRM_KMS_CMA_HELPER > - select HISI_KIRIN_DW_DSI > - help > - Choose this option if you have a hisilicon Kirin chipsets(kirin960). > - 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 || DRM_KIRIN_960 > select DRM_MIPI_DSI > - select DRM_PANEL > 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. > + Choose this option if you have a HiSilicon Kirin960 or Kirin970. > + If M is selected the module will be called kirin9xx-drm. Indent with 1 tab + 2 spaces. > > -config DRM_PANEL_HIKEY960_NTE300NTS > - tristate "Hikey960 NTE300NTS video mode panel" > - depends on OF > - depends on DRM_MIPI_DSI > - help > - Say Y here if you want to enable LCD panel driver for Hikey960 boadr. > - Current support panel: NTE300NTS(1920X1200) > - > -config HISI_FB_970 > - tristate "DRM Support for Hisilicon Kirin970 series SoCs Platform" > - depends on DRM && OF && ARM64 > +config DRM_HISI_KIRIN970 > + bool "Enable support for Hisilicon Kirin970" HiSilicon > depends on DRM_MIPI_DSI > + depends on DRM_HISI_KIRIN9XX > help > Choose this option if you have a hisilicon Kirin chipsets(kirin970). HiSilicon > - If M is selected the module will be called kirin-drm. > > -config HDMI_ADV7511_AUDIO > - tristate "HDMI Support ADV7511 audio" > - help > - Choose this option to support HDMI ADV7511 audio. > +config DRM_HISI_KIRIN9XX_DSI > + tristate > + depends on DRM_HISI_KIRIN9XX > + default y thanks. -- ~Randy _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
