From patchwork Thu Aug 1 03:44:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 170282 Delivered-To: patches@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp4836011ile; Wed, 31 Jul 2019 20:44:50 -0700 (PDT) X-Received: by 2002:a17:90a:9903:: with SMTP id b3mr6194732pjp.80.1564631090892; Wed, 31 Jul 2019 20:44:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564631090; cv=none; d=google.com; s=arc-20160816; b=oN8snWb7jaAzgaBo6iiYEwv/quCkhtYrazbwYE8St5B/uBL/t9Syz/cWU60c8Xkw74 e59kwZzWZ49sjwCXrlgzvp4Y2f/00tubYiCmiqB0g4E9koGDfdfi/6Ysl8cTz2dIaZXp XfOhTXQiULjPxCj3XWDOMR1jp0PDOXXZ6txKxW2VgOF6nDz10V15nrfAWyxbL8kd5Rk1 txTciqy0hYD0Jf1+QxP0xa7e6vUz0KBD1v3KVUbFoRaWW9AxSnxVWGKL9EhYGToBF+0a qrud77GCvAF6qBn9aas6Bd9LiL5IRy3gMfHxpwfjZjM1ENLKaXVX4DlqKktCCfQTC+9f VfQw== 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=uNdkweGhIzbmbLSCXzyijf1WMLgtz0ZE8h2SpBy/OLo=; b=jQl/jWjZkea/4irdW/EpG83h0a4BnyOVjlMjTDlCFv5XnjKTRYRhCapyt+dxSvjYtv QBTZlkzSZnoTYeoT3aiovpHq+BMmJa0T6eVaYdlboe5+Xxav1V5Msp7UmADNNmAz1G+2 217HLfwqi7GU/MI3n6ZtIBzGRc8S2CWAq48+i+s59McUaUEolZjqXq8xoqQC1SgbDc0u 8zA2JtggL+728saZGsl2qHW5MKKslIsTPBj/r0SI2avU1ErP6pxeQFhlyWk0R+ITECxh cFHiLjaq6X85GI8ZthVGD88rT6fmCBzGE56GZ7UvhmUbh5hxrP9z3WtPVjfprlAV1wzo n/5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OGB11FXE; 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 q8sor33699359pgt.64.2019.07.31.20.44.50 for (Google Transport Security); Wed, 31 Jul 2019 20:44:50 -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=OGB11FXE; 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=uNdkweGhIzbmbLSCXzyijf1WMLgtz0ZE8h2SpBy/OLo=; b=OGB11FXENEPh4SmCX7T3rKxhiL7ZrFfQKMccbHnaw+keOQERXnl3rUByFY0rxtcueb 0gdBDp+kCsm2S46pdTzAUICilsvpQQGV6ye2oC5RONILIawaN//cDfc03LgJgGMhUWMe V+KS3Mgx3imySjEAjQXBFLa3TkfagcjTDMPhiUekfuwKIqg7FSXYRljXiI0RoNZsHziK sPJmToqUHV0pCU5f/YNVRIwuowSyESH0WKkJl+gQKOvtltdhQLTBQmQiTxYEaofcRPvv WzH7U4dT8+o9PR62Dv3+X6eK4loTM75es89zSiCneXGMPJUqwlyOz0Ef/PZhme7Lnk00 SR3Q== 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=uNdkweGhIzbmbLSCXzyijf1WMLgtz0ZE8h2SpBy/OLo=; b=D+JnyzZ3eE6Vm+rmUcI4uUurKUzdHe2duOFLNyLZ4aToHaxjQrh4vuw+7vLUijF4WL GKY86CmDd7IBl+3O29sE0BLnWaYSWlJccJjbQNiJS+OSRkkWPzzWuXvKhGugmCuza5OA OdeaDKYCYW2qQw8dLlQuQVVQbkYDYIMp+RR7d1EhrXgQj3S+B0ANyEgPGuSB0iZw1aML vh8JvwfT//eBye3EFTIUriGHNiYXbr4BN61rMrlKiOm1vhF2HJVZ6tPmOJKC+LBmxBu5 qVl4stcdp91xdWp1CMDJN4XG2Lufs2Azatg1ybr8ztytuXGa2d6f9L3w7iPayZFhOonk IlAg== X-Gm-Message-State: APjAAAVYaxiVfqCjDTXj8EtL55Sm6E8mBYG9fE+ZdtnnnxgKCY922SKn g9cL+AvNfSVm129R31dsDeihLee4 X-Google-Smtp-Source: APXvYqwfB0iIhvHh7a7X5V8dzwGo5czS7fwWeWmrOVxTrJtTjuJRuF+OuaL2VM1n+uRJALrGYlIXlg== X-Received: by 2002:a63:5c7:: with SMTP id 190mr114581537pgf.67.1564631090362; Wed, 31 Jul 2019 20:44:50 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id h70sm64775674pgc.36.2019.07.31.20.44.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 31 Jul 2019 20:44:49 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [PATCH v3 03/26] drm: kirin: Remove HISI_KIRIN_DW_DSI config option Date: Thu, 1 Aug 2019 03:44:16 +0000 Message-Id: <20190801034439.98227-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190801034439.98227-1-john.stultz@linaro.org> References: <20190801034439.98227-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: 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