From patchwork Tue Aug 20 23:06:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171861 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp179861ily; Tue, 20 Aug 2019 16:06:33 -0700 (PDT) X-Received: by 2002:a65:5183:: with SMTP id h3mr26991166pgq.250.1566342393330; Tue, 20 Aug 2019 16:06:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566342393; cv=none; d=google.com; s=arc-20160816; b=h7a33I7h5xyyxverrakHgZ27GKUj2hBDd9qQjHpHy6aSI7eIA7tC9d3VX4ZQ27DFBQ q6HdaVlVIsWg8JGKrpWS6XiFwrlydobiRk72y8GDezlAl8ssiRSVjAJgEj7NEphpzv1i rpVsqOMEXh2eMWwAdMsGKjAbDCqeack7u1N973a0rzY+FltMZSCorp4NgnwHyNqEIwAk TCU/b31ZfYxiLE7UBPDX0A4U0Qrl3GK8q61bR7EyvZliihcc05COgQ5WbNYRUiunzM5d 2vVIuvxzD2LAe3MeOaPNnDPXiG862Xvn0H675Rpxm81PYi/VTXCqvmFbxf1ehrjmLeHR cmMw== 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=a1GVwhYagMUqR4YrGTGm12es7UZSRELJ0+S6Uqb2xtg=; b=NNgQKmIXYAmaePRYFHGkOr3c/9Z1UXWmlzq5zfIYqUH7UfVZvfdGTqPWQdnqTmbbzj 7mR42YB8Kkhx0tZPFK/3+bV8xW9JU8KiY+jadyeaKFtu330iAUmvP6TKaBFsBywGqnZK W6X9s/pHhX9uiG2MJys2WuO8XBT39BYK+NOQ9ZiEjDbk0UphDzYVUtJr5oxaHfPabkcF Aqx3hW4lXJnvv4bjRX95FcDmJ2g3ZDQxPzKBL/LKP+mlzbEDp2lM6t+9xZ3D7cNMkKDs G8zQ/HoSJ+eQPrwvAAi5YzfOJgcNLMWl76hqd07z0dolMkAQT50Qt/mdHhs22az83XZz h+Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=yFWWviao; 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 j21sor5585998pfi.64.2019.08.20.16.06.33 for (Google Transport Security); Tue, 20 Aug 2019 16:06:33 -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=yFWWviao; 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=a1GVwhYagMUqR4YrGTGm12es7UZSRELJ0+S6Uqb2xtg=; b=yFWWviaoJKvZh1gOUEEuvxQyXX8glgCMCwN+TIErGjfUlBngteyvmSPNhOofiL4Mii Zbop9rO9WeLspnC+iAyTRUzfQxjE0X7FR3LQ5A1amxtR1piWk0eyqPKNBvLkjhft2YgQ X0jPP1nB5GA03sEkSLeQwBSzMwgaNgn/joRlvd2tIjyt3cOwRVZk8+2tgd/HDUEH4wJ3 jue0x0mf0hH83Pi/S34CETHHke/BbfFjwoAfxSgh4OUtbGoO38fwqqCPgmvxQQDVgftO dM5+qSshsRvTfLN2y7XS1oZf1DVuar/RI+KH01AtphduE0GzPy0N2Y8o3LTivXll9sZS t7wg== 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=a1GVwhYagMUqR4YrGTGm12es7UZSRELJ0+S6Uqb2xtg=; b=CJzDQMzhZzAgfNhDTMepHkciEeh8L6m2aLcLQtST26j9NQKbCXEElOdacaPOQsewAU RaMyKe0HNPLTlK2fZHnJbWQmWKTb8IVrIzkzk8FOI6N3oro3cJq3ifToIC7ik9JzB2L3 ItjiLBGsP919jyIbLhktTGC1hIqVdzoS2kbkjtwYUMZDpLJnIH3PPVv/A7itiH/OsP1V /1Qqxuh7Mtk/8Yd6cm2dc+sz+62ui03ecSD3OyytHk75aLM1XJ1948qEo5MkNuadoqDh WmzNu2m4VoL3VeFJG5eFsIeEL2ScMdW5dqqVskLiIV56cCxQ8Uy+eJBVQzdCaRzGvDB4 VEcg== X-Gm-Message-State: APjAAAV6116SbpnIZLft2VRcm3eOWOqZ+Vckm3ly07OBThDn83gdT3TH 2PQcmXmcj90VeyLxqyKlvJQ4fP/h X-Google-Smtp-Source: APXvYqxT0eCJKaQPFDkMyQyR74+WfkWox/lmoKEdkV85flDMF6esaDLd5hpaiKtRGi2yjMmv8A+vDQ== X-Received: by 2002:aa7:96dc:: with SMTP id h28mr32692331pfq.86.1566342392992; Tue, 20 Aug 2019 16:06:32 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id q4sm27564747pff.183.2019.08.20.16.06.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2019 16:06:32 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [PATCH v5 02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option Date: Tue, 20 Aug 2019 23:06:03 +0000 Message-Id: <20190820230626.23253-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190820230626.23253-1-john.stultz@linaro.org> References: <20190820230626.23253-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 Acked-by: Xinliang Liu Reviewed-by: Sam Ravnborg Signed-off-by: John Stultz --- v5: Build fixup for module config noticed by Sam --- drivers/gpu/drm/hisilicon/kirin/Kconfig | 10 +--------- drivers/gpu/drm/hisilicon/kirin/Makefile | 3 +-- 2 files changed, 2 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..d9323f66a7d4 100644 --- a/drivers/gpu/drm/hisilicon/kirin/Makefile +++ b/drivers/gpu/drm/hisilicon/kirin/Makefile @@ -2,6 +2,5 @@ kirin-drm-y := kirin_drm_drv.o \ kirin_drm_ade.o -obj-$(CONFIG_DRM_HISI_KIRIN) += kirin-drm.o +obj-$(CONFIG_DRM_HISI_KIRIN) += kirin-drm.o dw_drm_dsi.o -obj-$(CONFIG_HISI_KIRIN_DW_DSI) += dw_drm_dsi.o