Received: by 2002:ac0:98c7:0:0:0:0:0 with SMTP id g7-v6csp1894775imd; Sun, 4 Nov 2018 11:55:46 -0800 (PST) X-Google-Smtp-Source: AJdET5cZhHKZNBSBLo3Ixw8HxlESDiFedm6ceP6/ze3i9Z9zFmYuO76wFCMTuxLTxQ8CONjFFc3+ X-Received: by 2002:a63:5765:: with SMTP id h37mr6656411pgm.423.1541361346933; Sun, 04 Nov 2018 11:55:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541361346; cv=none; d=google.com; s=arc-20160816; b=hyWj+beJRwppzW1zISUJo0yLs7XtEtgXn+4rGwolY+OXPkEz179QNckJ1n0dqJnVJW 7IdIu/Q3FdjA0G4zPjpJBQpnnm89pZfPRVzWiIhX+BHaBki6GsWnKLhqF7NjCWyPkM6v xNrsirLXlRbOm4qQqdfT9GceN/GM3AS3VccwBHjgESwopolTebwXPNLTPsa6R7qxzonu EMtu/QlkbbXJcCSzoOrOhKbKqRMIONw2UCbSfTlcn6OlfimCuJMaZjxqmq8x1nHiAp3L hrBOgx58ddly6LQrN3OYoxge8yHMwSRDoazdnD7ly5guoBTwkuM6UphNLpBJKJZmv+DT TRFA== 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=+roqYVh8RpzIFaROi91qaE+iTAQm0HS0pLFIqO/Rghc=; b=Z5rxTbr+MCc8yG7P1ihhjR/ojs+TGCOphb5Iq5EbOyma+qfyQJRUdK9L+CIyrvSwJq 7pgYgnI5mSEbtzzVNqEBdL0gg2GQwT740FzfCDvCUmw9FT4V4ON1GR3I19PSDkJ6xaM3 uH+BCjcH4D3OlxSWOctLNxSvpx0CD1espbZI4FuCx16L7e9l2WXtWX7DkcSM84QJtjBy 0Nmp0MT+fHX9AL8uTVNcAVOwAjLLQbhiV85j2K7L+2/wxkUqfOMlIjFOGvoTUoPFxJdc deFuaJhbOaqL4dNyKYpJDTziK4CRAoZX/y19KTdY8/7pwOUNITAYsqpLMWp7Lou0FHlP pDIw== 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 d16-v6si41459532pgd.555.2018.11.04.11.55.31; Sun, 04 Nov 2018 11:55:46 -0800 (PST) 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 S2387704AbeKEDoc (ORCPT + 99 others); Sun, 4 Nov 2018 22:44:32 -0500 Received: from mailoutvs47.siol.net ([185.57.226.238]:47684 "EHLO mail.siol.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2387692AbeKEDob (ORCPT ); Sun, 4 Nov 2018 22:44:31 -0500 Received: from localhost (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTP id 49C7C52015C; Sun, 4 Nov 2018 19:28:37 +0100 (CET) X-Virus-Scanned: amavisd-new at psrvmta11.zcs-production.pri Received: from mail.siol.net ([127.0.0.1]) by localhost (psrvmta11.zcs-production.pri [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id ygrmphSUTUlh; Sun, 4 Nov 2018 19:28:36 +0100 (CET) Received: from mail.siol.net (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTPS id D1622520373; Sun, 4 Nov 2018 19:28:36 +0100 (CET) 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 B3AED521292; Sun, 4 Nov 2018 19:28:33 +0100 (CET) From: Jernej Skrabec To: maxime.ripard@bootlin.com, wens@csie.org Cc: robh+dt@kernel.org, mturquette@baylibre.com, 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, jernej.skrabec@siol.net, Icenowy Zheng Subject: [PATCH v3 24/28] drm: sun4i: add quirks for TCON TOP Date: Sun, 4 Nov 2018 19:27:01 +0100 Message-Id: <20181104182705.18047-25-jernej.skrabec@siol.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181104182705.18047-1-jernej.skrabec@siol.net> References: <20181104182705.18047-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. Acked-by: Maxime Ripard Signed-off-by: Icenowy Zheng [Fixed code style and removed unnecessary initialization] Signed-off-by: Jernej Skrabec --- drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 37 +++++++++++++++++++------- 1 file changed, 28 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..e94e3fb1736b 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,17 @@ 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); =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); =20 for (i =3D 0; i < CLK_NUM; i++) if (IS_ERR(clk_data->hws[i])) { @@ -257,9 +268,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.1