From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Stultz Subject: [PATCH 02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option Date: Tue, 23 Apr 2019 16:20:33 -0700 Message-ID: <1556061656-1733-3-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id D721289568 for ; Tue, 23 Apr 2019 23:21:03 +0000 (UTC) Received: by mail-pg1-x542.google.com with SMTP id l18so8226367pgj.6 for ; Tue, 23 Apr 2019 16:21:03 -0700 (PDT) In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: lkml Cc: David Airlie , Chen Feng , dri-devel , Xinliang Liu , Xinwei Kong , Rongrong Zou List-Id: dri-devel@lists.freedesktop.org VGhlIENPTkZJR19ISVNJX0tJUklOX0RXX0RTSSBvcHRpb24gaXMgb25seSB1c2VkIHcvIGtpcmlu CmRyaXZlciwgc28gY3V0IG91dCB0aGUgbWlkZGxlbWFuIGFuZCBjb25kZW5zZSB0aGUgY29uZmln CmxvZ2ljIGRvd24uCgpDYzogWGlubGlhbmcgTGl1IDx6LmxpdXhpbmxpYW5nQGhpc2lsaWNvbi5j b20+CkNjOiBSb25ncm9uZyBab3UgPHpvdXJvbmdyb25nQGdtYWlsLmNvbT4KQ2M6IFhpbndlaSBL b25nIDxrb25nLmtvbmd4aW53ZWlAaGlzaWxpY29uLmNvbT4KQ2M6IENoZW4gRmVuZyA8cHVjay5j aGVuQGhpc2lsaWNvbi5jb20+CkNjOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGludXguaWU+CkNj OiBEYW5pZWwgVmV0dGVyIDxkYW5pZWxAZmZ3bGwuY2g+CkNjOiBkcmktZGV2ZWwgPGRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmc+ClNpZ25lZC1vZmYtYnk6IEpvaG4gU3R1bHR6IDxqb2hu LnN0dWx0ekBsaW5hcm8ub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4v S2NvbmZpZyAgfCAxMCArLS0tLS0tLS0tCiBkcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29uL2tpcmlu L01ha2VmaWxlIHwgIDQgKystLQogMiBmaWxlcyBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKyksIDEx IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2ly aW4vS2NvbmZpZyBiL2RyaXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4vS2NvbmZpZwppbmRl eCA0OTlmNjQ0Li42ZWY3OTA2IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaGlzaWxpY29u L2tpcmluL0tjb25maWcKKysrIGIvZHJpdmVycy9ncHUvZHJtL2hpc2lsaWNvbi9raXJpbi9LY29u ZmlnCkBAIC00LDE2ICs0LDggQEAgY29uZmlnIERSTV9ISVNJX0tJUklOCiAJc2VsZWN0IERSTV9L TVNfSEVMUEVSCiAJc2VsZWN0IERSTV9HRU1fQ01BX0hFTFBFUgogCXNlbGVjdCBEUk1fS01TX0NN QV9IRUxQRVIKLQlzZWxlY3QgSElTSV9LSVJJTl9EV19EU0kKKwlzZWxlY3QgRFJNX01JUElfRFNJ CiAJaGVscAogCSAgQ2hvb3NlIHRoaXMgb3B0aW9uIGlmIHlvdSBoYXZlIGEgaGlzaWxpY29uIEtp cmluIGNoaXBzZXRzKGhpNjIyMCkuCiAJICBJZiBNIGlzIHNlbGVjdGVkIHRoZSBtb2R1bGUgd2ls bCBiZSBjYWxsZWQga2lyaW4tZHJtLgogCi1jb25maWcgSElTSV9LSVJJTl9EV19EU0kKLQl0cmlz dGF0ZSAiSGlTaWxpY29uIEtpcmluIHNwZWNpZmljIGV4dGVuc2lvbnMgZm9yIFN5bm9wc3lzIERX IE1JUEkgRFNJIgotCWRlcGVuZHMgb24gRFJNX0hJU0lfS0lSSU4KLQlzZWxlY3QgRFJNX01JUElf RFNJCi0JaGVscAotCSBUaGlzIHNlbGVjdHMgc3VwcG9ydCBmb3IgSGlTaWxpY29uIEtpcmluIFNv QyBzcGVjaWZpYyBleHRlbnNpb25zIGZvcgotCSB0aGUgU3lub3BzeXMgRGVzaWduV2FyZSBEU0kg ZHJpdmVyLiBJZiB5b3Ugd2FudCB0byBlbmFibGUgTUlQSSBEU0kgb24KLQkgaGk2MjIwIGJhc2Vk IFNvQywgeW91IHNob3VsZCBzZWxldCB0aGlzIG9wdGlvbi4KZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9oaXNpbGljb24va2lyaW4vTWFrZWZpbGUgYi9kcml2ZXJzL2dwdS9kcm0vaGlzaWxp Y29uL2tpcmluL01ha2VmaWxlCmluZGV4IGNkZjYxNTguLjM1ODUzMjcgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9oaXNpbGljb24va2lyaW4vTWFrZWZpbGUKKysrIGIvZHJpdmVycy9ncHUv ZHJtL2hpc2lsaWNvbi9raXJpbi9NYWtlZmlsZQpAQCAtMSw2ICsxLDYgQEAKIGtpcmluLWRybS15 IDo9IGtpcmluX2RybV9kcnYubyBcCi0JICAgICAgIGtpcmluX2RybV9hZGUubworCSAgICAgICBr aXJpbl9kcm1fYWRlLm8gXAorCSAgICAgICBkd19kcm1fZHNpLm8KIAogb2JqLSQoQ09ORklHX0RS TV9ISVNJX0tJUklOKSArPSBraXJpbi1kcm0ubwogCi1vYmotJChDT05GSUdfSElTSV9LSVJJTl9E V19EU0kpICs9IGR3X2RybV9kc2kubwotLSAKMi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVs QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbA== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB743C10F03 for ; Tue, 23 Apr 2019 23:23:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80ADF218D2 for ; Tue, 23 Apr 2019 23:23:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="pbjIoTJH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728993AbfDWXXK (ORCPT ); Tue, 23 Apr 2019 19:23:10 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:40348 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728660AbfDWXVE (ORCPT ); Tue, 23 Apr 2019 19:21:04 -0400 Received: by mail-pg1-f193.google.com with SMTP id d31so8361177pgl.7 for ; Tue, 23 Apr 2019 16:21:04 -0700 (PDT) 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=ffq6t3h4iha2b8rRhkjsypDQIKuHdAwEEoooYwQNUbA=; b=pbjIoTJHu8+xPePFhwY4xi9ya/ligccZ0pj7BpUULWYCP1l020YPTE4IeijEjdARQq tpgr7CKCzne4FecwXpBNa5o1486idq5SFsH9RMOUef8xBqn6yDeyN1Zii7clSuLcepNk +2h5o6st23kjLObnaMHmTvvU37Tbcl0EntgE8AiEy7MQjYedduMhHpmYLRrkGCYiJ9b9 sX5Ew3NodXoIrY/dAXLQB8uN6tBP5QQL0iR8wcrMUKaP7wkHj7HXdp8ubct0QQ0oqWLO ijP3pNdtoxkx1zxJxYHPGHqr6SO1x+MguxaOhkD4Li8luNGdQhZ5lKl1tgXyJ8Xstxj+ hQCA== 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=ffq6t3h4iha2b8rRhkjsypDQIKuHdAwEEoooYwQNUbA=; b=dLXnOBHgydnU3NiuIt3G4vlgFgcjyEFE/JgTUyINkkFG059cGO0ijNRTRUJ6fs4srz eDInyOjToYE9bObILoQPb37Hg4/3OFzde3Q7yrbUndggvUj7HNhglQO8b70sB0lvCaxy sIxzzAQ/rz1NQ8bhrmT/E5/1xrQcrxfL9iEG4q07oGP07zuYr0dQDgUqS5u2o//ywIuq Me/xwWaL/Q+uPcUgqWZ627c/R+Dp1omTtwfW1Hsdn8hSUvd+VcWgGQEJveYmscJznB14 Ze9cOBOM+VbYgW9bFq8q0ZeV9ohwQ0DgHrkeJ8Qm5uxFp4L5gE4H2oAa4o26XkBrb38C IhmA== X-Gm-Message-State: APjAAAWX4PPfGCIPzFBEmRswu5J6pk4xUfIFvKtuskuZ6IXGWc0mnCT+ YIsU3905WSRWwkgDXMHO0Lygrnl5amo= X-Google-Smtp-Source: APXvYqyy7+HL910ob3T/U/6+X+behbvUMZtG72iWdqYN0rvFz1h1auspIOq2AIb3SBVVn4K+kYH1dQ== X-Received: by 2002:a63:7e10:: with SMTP id z16mr28060734pgc.40.1556061663317; Tue, 23 Apr 2019 16:21:03 -0700 (PDT) Received: from localhost.localdomain ([2601:1c2:680:1319:4e72:b9ff:fe99:466a]) by smtp.gmail.com with ESMTPSA id c28sm6984235pgm.42.2019.04.23.16.21.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Apr 2019 16:21:02 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Xinliang Liu , Rongrong Zou , Xinwei Kong , Chen Feng , David Airlie , Daniel Vetter , dri-devel Subject: [PATCH 02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option Date: Tue, 23 Apr 2019 16:20:33 -0700 Message-Id: <1556061656-1733-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> References: <1556061656-1733-1-git-send-email-john.stultz@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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: Xinliang Liu Cc: Rongrong Zou Cc: Xinwei Kong Cc: Chen Feng Cc: David Airlie Cc: Daniel Vetter Cc: dri-devel 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(-) 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 -- 2.7.4