From patchwork Tue Apr 23 23:20:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 162739 Delivered-To: patches@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4354504jan; Tue, 23 Apr 2019 16:21:03 -0700 (PDT) X-Received: by 2002:a63:6b82:: with SMTP id g124mr25033221pgc.246.1556061663807; Tue, 23 Apr 2019 16:21:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556061663; cv=none; d=google.com; s=arc-20160816; b=ftxrvf7L8i8t7pN3JeeZNzweLpDE058C6F1Q5J2bP3jPf9bEpNCG7YiM9N5iJP1pPz BuP2X/bCk89/KvrDZkt7SdfpRcuRT6R4FcfA+QuLIReWB1TPIK0f9QXf4hoM4kCIRQ7C CNBEzu0z1qGWA96KymprE8dz/8EZhyaldGZdvviTJvF2ILHQrxKuoFUzDWfPx5Z30Wxz K8k6S53/vd/53WBUw9nJk0HD3NOSpbBnP/6qrjZ8mQFKYah+nKFhtk0LryOI2hRcPlOU ewbzmkR7mPGQ3H2E9Sc6aX4VzKkeon+ZHkSmqAduKykOCfEl4+9LTwsltHEGITc9xNZT xGqw== 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=ffq6t3h4iha2b8rRhkjsypDQIKuHdAwEEoooYwQNUbA=; b=y1TUC7qo9RnNYnTZIHckkEcvcryrsIO0cWM4GC45sTmUo+V6463+8ZjI43RVbSU6KY GXGeHx9SCrszSYznQOAucM0DJG6GoFRn1VGkkdiJCGhrczwpqeyoP1dquUdNmv9WlY8z kkcBzWORzOpmzrfozdW7gkZ3goXFA087gn/1JfLDAMF4o/YabT+OcI+95DBPXZgrokOh Cqj0zcxv0LhoobsdSrfnWiplrILl/ywCjMP1nSSkKOrBGzJva/1j5OxlnE/mcHQ4ypRB LLJuMEHKxAC9wjOegkgw8N5VBqA2LaLWnvzNxx/LLpwogpt9IJc/YYa0GIVJ43w46nJP KlTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pbjIoTJH; 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 j23sor7297588pgh.83.2019.04.23.16.21.03 for (Google Transport Security); Tue, 23 Apr 2019 16:21:03 -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=pbjIoTJH; 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=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=OLkXscS79Tg9Qnf9Sx1xjYQ0UNRqiSnf4W63IbqfioABtEss1g6PefMDVbaXOFDKwt EZ0J7gJZU2ItxylOVrBNTRqWU4TemS4w12d3kkogmLWMorH+1lQMNplQmBNkHzq0Ky3R 6FAK93pd0ZVFt7KNRW8ybcyhNI9K+hxu0Mte/pYjzdSPhquCJFWepVhPkhVeMz111a+Y Dl5EVsa0EnkO5WSn5GDEdbc+g5WCMWfPE2N3Ie79FTXHUBndRd93IeD0dez/MrwEncka jojjG+gUjwmpXKsIBepzT0C0SzotNDbcgfgeQ3leQMmw5TLw3ZnBbCJ7RHkvHz5KjHhI QLXw== X-Gm-Message-State: APjAAAW+9sazzhD/04t575BtoGTjpqg4uhOmyJB0u/EBYSbljRP4oCix iYAYaSVSOUHh849Oyq0ljjPgLDPXUbRTTQ== 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) Return-Path: 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> 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(-) -- 2.7.4 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