From patchwork Mon Aug 19 23:02:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 171731 Delivered-To: patches@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3595694ily; Mon, 19 Aug 2019 16:03:29 -0700 (PDT) X-Received: by 2002:a17:90a:f0c7:: with SMTP id fa7mr23605123pjb.115.1566255809741; Mon, 19 Aug 2019 16:03:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566255809; cv=none; d=google.com; s=arc-20160816; b=LDeRVIPXrJ+Aqslym+L50Y4c2kRsBzt92TG93grfzbFKzMetw9E5yweNaiXc0wdhJN kzwSDq6jGIbcT3IyneXSlVQF9iMrD5qn8dd3L+9bG3Dzg5oHNVXu+rSbhVq7RSBbChhS LxgJ4iwpRP37nMsfMQusd+vylbbJ3EsacyBD6o8sd8aytL4jRtH7AnuGiwrnL/qzHrhb OESFzRizyNfiNt6yZojCXTey91zB5YAu6HOogoQ3TilAKr+OQHfa0si28zEPDeETaFsv QzZdcOv1lLfj1TIx0OlHLqNbqMMzsUGyEqPUA3mxvpkOcKrIzMSucL3dD3Xvq2G4VQAq 5Byw== 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=rFkDVdxMKmvjHBJyGmUApN9b++k2zTF9quw3rYo2m6Q=; b=awEgc81Fuuy2JVR3YJgANo3yKNYeWHt7KLJ/nlCT6H3M2BBfGofKByWwEIy6qXfTYg aErxPS/4cd+ID81LZxnt294oeM56jJGVr3WoClXyANczY7yej5RKOJmMjOgTUnFa9/T1 jYliyNUJuxUlpE7LLFSBcuY093ukRmws8JQm9oI1Fm0y/eyuWZNMkDzyoEvmZLXjz8O5 Gm/C78ozClOUagEkAjHORyfQfeN4QcfQJ05oTUFiGehEjCzyALE6MEWSXwTKvSMrMU/l EZ4I0ZJ1Z+0/8tVkqy5BivtpJEg7msXyDWIsdav9afuR7vO5fLTg5/PXy3QL8vVqI5ye l5Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ssMY1vMB; 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 f6sor2048392pfd.46.2019.08.19.16.03.29 for (Google Transport Security); Mon, 19 Aug 2019 16:03:29 -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=ssMY1vMB; 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=rFkDVdxMKmvjHBJyGmUApN9b++k2zTF9quw3rYo2m6Q=; b=ssMY1vMBnfYeQHZ6nmDqVi7HELDW9OJq5zbSs5hi/zO5WohansKLHoLyT6vZCgdmS5 y+MUgWtI7G5QQk354TwljfgSKN81Oh5F3pCuFAqUag8woabn0i2BKkxVwoGOKtonZ5v8 DuvmOf07K8pwmeF7yM3CuTrM5rFeK1D/5oVG+MseohPlAXVE+1zF/Ryh8cz0sQwV5ggH QWEZKhBNYi2hDaXgnsH6zoSfdgCcxe5DxE9Dqp44qcSr2qxJrZvyCAalA1aEKUV6hyu2 fCz8qdMyhY1r94feRwEO0f57ma5gBoDkxaxsja/NG8U1UQOUpWjHCVxqTW2acvn9RrTf aMQw== 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=rFkDVdxMKmvjHBJyGmUApN9b++k2zTF9quw3rYo2m6Q=; b=B2QaklM3/8scsnPpOFId2tqP/xrJl82Mss6Ub52D0j3P2/b8nsOHxr/ED59fzecfh9 PWlB+1psZmroYnYHP3CsX2vIPXosTsiDLTRAeqaGiNC23nt/ishqZJB35LiAzwluW8+T Fur/JXGLvcLUFdkP8VprinKhRdeQXSiuTtR+uhvcO3pLuHD5sxcSZQdPNsSRm/Pn+0CE e6ppOLzZRMk3vjQhM8CMD7bdnrycBZoBKox7LjMx5othMv1UpETwSFFoVQqolnHYxqlM tP94XndfdMcKo1FY2HF+j3gaM5YzRpZknpY9/Lqap9LHrUrdpLWbNpkoGvVmGabbBJgI +ceg== X-Gm-Message-State: APjAAAVNyXYaOY4FPKa9X/xZdLN1Il4mdc3B1PaDmDC3McS03FptN/rY EG4cfCY9d/uo1vSXfxXeMnB+1lKA X-Google-Smtp-Source: APXvYqzTHLA7lx1VrFQUleoFllBiaEBYpVMyojNmAKc5BgBc6sj6Wpv2qDv54wM2tzLv9aWlq/ZHjQ== X-Received: by 2002:aa7:946d:: with SMTP id t13mr27405973pfq.121.1566255808902; Mon, 19 Aug 2019 16:03:28 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id j15sm17256509pfr.146.2019.08.19.16.03.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 16:03:28 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Rongrong Zou , Xinliang Liu , David Airlie , Daniel Vetter , dri-devel , Sam Ravnborg Subject: [PATCH v4 02/25] drm: kirin: Remove HISI_KIRIN_DW_DSI config option Date: Mon, 19 Aug 2019 23:02:58 +0000 Message-Id: <20190819230321.56480-3-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190819230321.56480-1-john.stultz@linaro.org> References: <20190819230321.56480-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 --- 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