From patchwork Sat Jun 29 12:59:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 168148 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp721841ilk; Sat, 29 Jun 2019 06:02:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqxOty7AlAIwiGJwzFWiumteMYkYnLVMOv+veMXbgcJ503+GmbEETpq+9RMY5iEeoJLtxqpJ X-Received: by 2002:a17:90a:bc0c:: with SMTP id w12mr18287249pjr.111.1561813322248; Sat, 29 Jun 2019 06:02:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561813322; cv=none; d=google.com; s=arc-20160816; b=BrvoXYD8exzR/qzaOAYXRCq5gVRwGeH88Qf4yBKAYKA4vr/xJBfi0hff6IqysFqFMG lZiGSEqGh1d2j+nAQ6Qki6pXdsHLuoWINmFzivL1on7vVBS12Clyd+2EK08Mbt/OIlvX LXQkyv+wT4BNNIQrW2QDpj5OyuRzf+BSbgG7VGWl9kU6//P7JYPWsapjTJM/L5VlqpKk XyImN24sI6iRlQd8j6nzwCQA2sxUYHi5LBXG0wdPbCJvsKraTf13EwoLguq9zRRtqnOO O/ATxTYG2VElqVuojGVhe1XLlSLgdHgiOXuTs5dwz6iWVQvMH1LposYy91e2XiBvBtwq RLig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ji8jAojLPl8vD+gcsy1dZ2LAcjvPmFSVJ5glNsjtSak=; b=UNBy1Sq8nPTFJBiH47TTwcyrYJB4JyFBkfLsYSN/UR2ZNYZRrh5zJwKJCjZBysUrRQ iMg3+okDBfLi3qIrifW4Ud231qsdSgy/h5EwJ072vpVpzw0sRqzN/EbGCtpgHPRVIJTp KhxnQE8nLMNGH0mmWa5hPEWwv8SocsjaDHG3vOmlWT2It+oawvvY4wn14Rju8InUajKP eIvEcnVhHS7TPX0xesIor5SR+WxFyLzi69XzKeQWSqa1JevO7JOkarsWBeL6F7rXzfMd ovA86fdb2ufwN4utxxBOt1Kd62wYgKF+gwGmaJSZP3evhJZL5ChV6UZnuxsL0DHo58T4 wdgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nAjmGaNa; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j16si4972636pff.262.2019.06.29.06.02.01; Sat, 29 Jun 2019 06:02:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nAjmGaNa; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726801AbfF2NCB (ORCPT + 15 others); Sat, 29 Jun 2019 09:02:01 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:46556 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726716AbfF2NCB (ORCPT ); Sat, 29 Jun 2019 09:02:01 -0400 Received: by mail-lf1-f68.google.com with SMTP id z15so5729277lfh.13 for ; Sat, 29 Jun 2019 06:01:59 -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 :mime-version:content-transfer-encoding; bh=Ji8jAojLPl8vD+gcsy1dZ2LAcjvPmFSVJ5glNsjtSak=; b=nAjmGaNaoXOfVZnFCs0LUWx0cgkIpWqrZKexDYARBy6576kyG3UYP+U3tLv6Z7mbun 3mza7Rr4HNinHrz/Z+ZS8QeQeD2ig1Wuy5eIgVPImRlRcCxR6UE3d6lvjrMrektszXS+ 0CG3ahmSPlVFxu3mFx0uVQqdq4jNPLcFg8BC+yVu43Um7D3UMfNOpakEUcEVn6MuC8Ry X4Gx9ihORnId7aLMGMVG+MYoXUZ7qMgU1CSiYsMEXSOfdUiBe/5UWIg8MwtVDMvToc9k 2kG/2Li5Bv+dVCPKpJYsQ5s5V65k/L9JNU0oyZMgdR84ds/6gyw5txkGZP6EpXJbSn72 8DlA== 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:mime-version:content-transfer-encoding; bh=Ji8jAojLPl8vD+gcsy1dZ2LAcjvPmFSVJ5glNsjtSak=; b=l9jc3XcKpbNvBcbuuHxQG2PHW1Jq3YoW/lDL+awbBATZ4c5dkGjcvAAkh5eaDcxqGi KPM1jL/+mXNNzR9/PGxkJLOWgzi07UM+ANuMimoEtqyrq1fy4LBbAxEA8oMvUG5EEOnH RfpN2qnAPYky1TfKXPI1QLWburCqRNEEzkMw2jAXPHJtqAODudA+59aI0gIvZKqQ9WxB p2i+dnUwDBqkf6kAB8wzkgi1LizHLOHfWnPbfhZO80r/P53D7DBbQBBGf2VyS0vwMzlr CAAHhs9F9mUeSodxah9V8/vH7ANelLwQUMhtxpFKcuLBtY7kwswrD+3ifbQGV9ftU6gz 01Eg== X-Gm-Message-State: APjAAAULfB14GRFQSmfPfBjPpvsrV9mCVYO6eOQ5gMh2UUJnRlfbVqVc deZszVdpckXDysczRBOjk6LlYw== X-Received: by 2002:a19:f601:: with SMTP id x1mr7523920lfe.182.1561813318996; Sat, 29 Jun 2019 06:01:58 -0700 (PDT) Received: from localhost.localdomain (c-22cd225c.014-348-6c756e10.bbcust.telenor.se. [92.34.205.34]) by smtp.gmail.com with ESMTPSA id v2sm1354500lfi.52.2019.06.29.06.01.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sat, 29 Jun 2019 06:01:57 -0700 (PDT) From: Linus Walleij To: dri-devel@lists.freedesktop.org, Maarten Lankhorst , Maxime Ripard , Sean Paul Cc: linux-arm-kernel@lists.infradead.org, Linus Walleij , Rob Clark , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 3/7] drm/msm/dpu: Drop unused GPIO code Date: Sat, 29 Jun 2019 14:59:29 +0200 Message-Id: <20190629125933.679-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190629125933.679-1-linus.walleij@linaro.org> References: <20190629125933.679-1-linus.walleij@linaro.org> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The DPU has some kind of idea that it wants to be able to bring up power using GPIO lines. The struct dss_gpio is however completely unused and should this be done, it should be done using the GPIO descriptor framework rather than this API which relies on the global GPIO numberspace. Delete this code before anyone hurt themselves. The inclusion of was abused to get some OF and IRQ headers implicitly included into the DPU utilities, make these includes explicit and push them down into the actual implementation. Cc: Rob Clark Cc: Sean Paul Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Signed-off-by: Linus Walleij --- drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h | 9 --------- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 4 ++++ 3 files changed, 5 insertions(+), 9 deletions(-) -- 2.20.1 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c index 78833c2c27f8..78f04147839f 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c @@ -15,6 +15,7 @@ #include #include #include +#include #include diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h index bc07381d7429..a0498c7bd677 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.h @@ -13,7 +13,6 @@ #ifndef __DPU_IO_UTIL_H__ #define __DPU_IO_UTIL_H__ -#include #include #include @@ -22,12 +21,6 @@ #define DEV_WARN(fmt, args...) pr_warn(fmt, ##args) #define DEV_ERR(fmt, args...) pr_err(fmt, ##args) -struct dss_gpio { - unsigned int gpio; - unsigned int value; - char gpio_name[32]; -}; - enum dss_clk_type { DSS_CLK_AHB, /* no set rate. rate controlled through rpm */ DSS_CLK_PCLK, @@ -42,8 +35,6 @@ struct dss_clk { }; struct dss_module_power { - unsigned int num_gpio; - struct dss_gpio *gpio_config; unsigned int num_clk; struct dss_clk *clk_config; }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c index 7316b4ab1b85..9baabadc62bb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c @@ -3,6 +3,10 @@ * Copyright (c) 2018, The Linux Foundation */ +#include +#include +#include +#include #include "dpu_kms.h" #define to_dpu_mdss(x) container_of(x, struct dpu_mdss, base)