From patchwork Wed Aug 14 18:46:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171332 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1202913ily; Wed, 14 Aug 2019 11:47:12 -0700 (PDT) X-Received: by 2002:a17:90a:ba93:: with SMTP id t19mr1008069pjr.139.1565808432599; Wed, 14 Aug 2019 11:47:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565808432; cv=none; d=google.com; s=arc-20160816; b=nWUMQv+PtvQrlYI08ZGaoSpbO9ReXZUQj7XZ6LoC7SiwwkGN0/SV2DjAo8jSt1Z1NM Mpc/UjY0JHYFf9aqWAWm4QIc9cNRZCxf33KmovG6/Dfqubq1e+EA3qyyPq2aRDyDJAJG DMOv1BO8hMtBuf9nR8hu5uFqSY7F1ci20I+msxKZ/1rLA7kFChob4TsAVXwyRFdyV4ee cd6244M9j1mV1FxslFzZM4BMx3E/rh2VXFNTtHTjs9uGpMumPA09iAtZBcqEFSz+K/Zo Oj7KuNhYjgHuz/0C+h4uV5W4S9FrHogs9OlYazH3vmNnY86KURiRk97iFPUZhR5OJCA1 qudg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ZyAGMPNMpuVXR2jkt8gh8WUfYnDQXgrGIfOGthyfg8o=; b=de9PFwblQShLppVvczfxA4mvF0/OWNv0Lsdgu52yLmLkzXI3NWL0elhE9DKrdwscXG q6XVuUj/6GCA8BU+N2wDmhJSZhJ+/s8fTo/lhhlRN2njSJOtjRgsGKdWe6asUwtsjMG+ cUoASywQTQ4JmyiQ72mqLzYlfJ4Z3a6f2pKD3+4etquo2nRwDkJ3qFapFRMUh7s7oEP5 N5IlVI+4O7Pg7ehKAVOKVwmA7u7Z6f+qtKBTlC4KZYEPio5OWLgY9ml7Eh10M3gVcaFX 4CxtTQxKqaBPiLF7m4Ba3LkJ8/FR0xO0euJrIf2bznWE/s1Lztwt28ebml3cbesgJOoY VJkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=new8xX0j; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id d1sor463612pju.23.2019.08.14.11.47.12 for (Google Transport Security); Wed, 14 Aug 2019 11:47:12 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=new8xX0j; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZyAGMPNMpuVXR2jkt8gh8WUfYnDQXgrGIfOGthyfg8o=; b=new8xX0jxsoxrQMLLTjQzxCi9sEMmOw0y08XqrmCsvQjSiFIOUH2oFECZQOjzm47Ew cXFDtMTKt5ft82uI3BfQLWS/OucPSunD0m00lu6dNFtnM4Yfuj6jLpUqfTpGMp3RlxqZ g9GZTqDt3eOQchKPiQOtPjF78VjyeoPaP7K5itoS/AY+LMzle2ccLPW5i621gwojmzeQ Udq8vzMc/+yOPa5NVaijaIrBenAGLaCwPGUnOG2Equi+zkUn4KWtg9NK6iSdxz+xP+kt Rs5sSj4j5c6LTIoBzwooGqYLjO6iXDjfUVaEVudnMBD8BHVXYJcYoiO7/SScGSbtiXo9 02zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZyAGMPNMpuVXR2jkt8gh8WUfYnDQXgrGIfOGthyfg8o=; b=dIO1P9GX0GksxUzSf1HMxLcvKUq08eL3BRL5ECkE3FhEWPC5jLUEGytrD/h341iNOj 5sqDEX0qVH/52mF5QSiQVAGFfigz57jHOZms3bTcYi8mCBKYv/uPfu13x7Boe//7QbLA C7Pp5idCFaChYA/sKx2qWlaPeFSiz4Q2oh9KpfBwKOctSgfUZ0TuBdYFgNwMMw0TeABs tCQfLBVxuhgmy3inni6KxvybSc5Hl4wv1ztJKjI1cOZ0YIy9tO1+nMzH5BZokDK3qa2h pNrTBWmLchOvl4IT8iwaO9eBWqE/WkLQWrBbLIiMq+xgsMVPc1mIvyJG9yGVf0bXMFj9 G/lg== X-Gm-Message-State: APjAAAWshfxLYyZ05DhD4FtCVkhs+wnEPedhRzSrbmo2iqxLg2mA4qDR ScNjWvdBxVYw6WGaZ+bVLlp6qMu4 X-Google-Smtp-Source: APXvYqx2ATmZWXgkLdV3QzZflhCxpHcPXcxbWBN7V0nc/tthxryzI4TQboQLFuMmgL6bwajwF4MfTQ== X-Received: by 2002:a17:90a:aa98:: with SMTP id l24mr1091282pjq.64.1565808432086; Wed, 14 Aug 2019 11:47:12 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id y16sm610855pfc.36.2019.08.14.11.47.10 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 14 Aug 2019 11:47:11 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [RESEND][PATCH v3 03/26] drm: kirin: Remove HISI_KIRIN_DW_DSI config option Date: Wed, 14 Aug 2019 18:46:39 +0000 Message-Id: <20190814184702.54275-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190814184702.54275-1-john.stultz@linaro.org> References: <20190814184702.54275-1-john.stultz@linaro.org> 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 Cc: Xinliang Liu Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel Cc: Sam Ravnborg Reviewed-by: Sam Ravnborg Signed-off-by: John Stultz --- drivers/gpu/drm/hisilicon/kirin/Kconfig | 10 +--------- drivers/gpu/drm/hisilicon/kirin/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) -- 2.17.1 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