Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp2373581imm; Sun, 7 Oct 2018 02:41:43 -0700 (PDT) X-Google-Smtp-Source: ACcGV60AciifawNfQTF9zNsHq4FiIz5kJEnz6SwZHhYkbFQINpwdCnsMm4pGijBrkUjPjwzYBf89 X-Received: by 2002:a62:e110:: with SMTP id q16-v6mr19774682pfh.75.1538905303376; Sun, 07 Oct 2018 02:41:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538905303; cv=none; d=google.com; s=arc-20160816; b=PwdA+M7p/PO2a2AAgwipmOwvaeBXN/fTLlRk/cHxNrcSLCCT0jlHQ7+0x4FUeLaknK NLlz3LgsJc2e3Fy/3pRCuLRQf6eXelSmlJpAhu83ktudqVBdTDRZiDpa13RHj7g4BUMS 5kbKd8V7ATdhgOk1vvh5YUgvTskLkEmBb+sTS7czR3/3/TEYYSOgtyyr+RO97rpW3rZK 0S1PscixmYUA1VsyjdbxBrSKNajmjQsnXsk/7yuZtAA+tkZM1t89QehlOihfYtub5lXL 5SZOlQicWQGah5kMvKXB1LWHhuVFTGqQbopyy7o39u0is1mfY+ZXeqpzb/GOkcZQnrxO skTA== 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; bh=eUaJITkpPvde20IFlTMr5wSTaZpgxFfCL05leAxZGLo=; b=MRb9BMRzmBC3UVOAB7jMzbk/W/PwXsZms17I+osOg3zsKYuKTpzLCVL/Mycn2u0Uos nAPi4AKvZHIVplvvyPgNRzuKiLBvQBNyInC7LXjhkVZdDMfipMu5O884VwNCWlho8J6N aVD1Gl33/3WnIeg9qTKKPFFcCsd6lSGYi9dXNbkpHW6xgnnysBGmpt+5Rn79TXSgVnln 9MmI/zRxd8qBSJp0Du1jwTA3aJx/8tECbHyB6UDHgi8Rwr8qUGECiBzXcbSfDoTZFN9E 6a8k6CVZt6deMPqkzANREQh9TnSo9EE9zNO+jPWIwVU5RTemJ3Nm7YxyjWY1BL3vonYz TB3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q9-v6si15163589pfk.27.2018.10.07.02.40.58; Sun, 07 Oct 2018 02:41:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728604AbeJGQrG (ORCPT + 99 others); Sun, 7 Oct 2018 12:47:06 -0400 Received: from mailoutvs7.siol.net ([185.57.226.198]:40162 "EHLO mail.siol.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728533AbeJGQrF (ORCPT ); Sun, 7 Oct 2018 12:47:05 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTP id 449255204AC; Sun, 7 Oct 2018 11:40:20 +0200 (CEST) X-Virus-Scanned: amavisd-new at psrvmta10.zcs-production.pri Received: from mail.siol.net ([127.0.0.1]) by localhost (psrvmta10.zcs-production.pri [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 9yU0msLKzA-P; Sun, 7 Oct 2018 11:40:19 +0200 (CEST) Received: from mail.siol.net (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTPS id E1AB8520A87; Sun, 7 Oct 2018 11:40:19 +0200 (CEST) Received: from localhost.localdomain (cpe1-8-82.cable.triera.net [213.161.8.82]) (Authenticated sender: 031275009) by mail.siol.net (Postfix) with ESMTPSA id 745035204AC; Sun, 7 Oct 2018 11:40:17 +0200 (CEST) From: Jernej Skrabec To: maxime.ripard@bootlin.com, wens@csie.org Cc: robh+dt@kernel.org, sboyd@kernel.org, airlied@linux.ie, architt@codeaurora.org, a.hajda@samsung.com, Laurent.pinchart@ideasonboard.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com, Icenowy Zheng Subject: [PATCH v2 25/29] drm: sun4i: add quirks for TCON TOP Date: Sun, 7 Oct 2018 11:39:01 +0200 Message-Id: <20181007093905.11253-26-jernej.skrabec@siol.net> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181007093905.11253-1-jernej.skrabec@siol.net> References: <20181007093905.11253-1-jernej.skrabec@siol.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Icenowy Zheng Some SoCs, such as H6, doesn't have a full-featured TCON TOP. Add quirks support for TCON TOP. Currently the presence of TCON_TV1 and DSI is controlled via the quirks structure. Signed-off-by: Icenowy Zheng --- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 43 ++++++++++++++++++++------ 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun= 4i/sun8i_tcon_top.c index 37158548b447..ed13233cad88 100644 --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c @@ -9,11 +9,17 @@ #include #include #include +#include #include #include =20 #include "sun8i_tcon_top.h" =20 +struct sun8i_tcon_top_quirks { + bool has_tcon_tv1; + bool has_dsi; +}; + static bool sun8i_tcon_top_node_is_tcon_top(struct device_node *node) { return !!of_match_node(sun8i_tcon_top_of_table, node); @@ -121,10 +127,13 @@ static int sun8i_tcon_top_bind(struct device *dev, = struct device *master, struct platform_device *pdev =3D to_platform_device(dev); struct clk_hw_onecell_data *clk_data; struct sun8i_tcon_top *tcon_top; + const struct sun8i_tcon_top_quirks *quirks; struct resource *res; void __iomem *regs; int ret, i; =20 + quirks =3D of_device_get_match_data(&pdev->dev); + tcon_top =3D devm_kzalloc(dev, sizeof(*tcon_top), GFP_KERNEL); if (!tcon_top) return -ENOMEM; @@ -187,15 +196,23 @@ static int sun8i_tcon_top_bind(struct device *dev, = struct device *master, &tcon_top->reg_lock, TCON_TOP_TCON_TV0_GATE, 0); =20 - clk_data->hws[CLK_TCON_TOP_TV1] =3D - sun8i_tcon_top_register_gate(dev, "tcon-tv1", regs, - &tcon_top->reg_lock, - TCON_TOP_TCON_TV1_GATE, 1); + if (quirks->has_tcon_tv1) { + clk_data->hws[CLK_TCON_TOP_TV1] =3D + sun8i_tcon_top_register_gate(dev, "tcon-tv1", regs, + &tcon_top->reg_lock, + TCON_TOP_TCON_TV1_GATE, 1); + } else { + clk_data->hws[CLK_TCON_TOP_TV1] =3D NULL; + } =20 - clk_data->hws[CLK_TCON_TOP_DSI] =3D - sun8i_tcon_top_register_gate(dev, "dsi", regs, - &tcon_top->reg_lock, - TCON_TOP_TCON_DSI_GATE, 2); + if (quirks->has_dsi) { + clk_data->hws[CLK_TCON_TOP_DSI] =3D + sun8i_tcon_top_register_gate(dev, "dsi", regs, + &tcon_top->reg_lock, + TCON_TOP_TCON_DSI_GATE, 2); + } else { + clk_data->hws[CLK_TCON_TOP_DSI] =3D NULL; + } =20 for (i =3D 0; i < CLK_NUM; i++) if (IS_ERR(clk_data->hws[i])) { @@ -257,9 +274,17 @@ static int sun8i_tcon_top_remove(struct platform_dev= ice *pdev) return 0; } =20 +const struct sun8i_tcon_top_quirks sun8i_r40_tcon_top_quirks =3D { + .has_tcon_tv1 =3D true, + .has_dsi =3D true, +}; + /* sun4i_drv uses this list to check if a device node is a TCON TOP */ const struct of_device_id sun8i_tcon_top_of_table[] =3D { - { .compatible =3D "allwinner,sun8i-r40-tcon-top" }, + { + .compatible =3D "allwinner,sun8i-r40-tcon-top", + .data =3D &sun8i_r40_tcon_top_quirks + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, sun8i_tcon_top_of_table); --=20 2.19.0