From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D10CD7C for ; Sun, 24 Apr 2022 20:06:09 +0000 (UTC) Received: by mail-ej1-f47.google.com with SMTP id i27so25935243ejd.9 for ; Sun, 24 Apr 2022 13:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88N/1qAZ8VIjuS2R1sRrs/MALWlEK6AkrWPDLccyzys=; b=K1edaGaOacjw80WVtueFnAw4giTEfU2sak5dGFtN6QQLPFylYk0rANxVN+weUL2Sed EYlRbQtra/oEBwdIisXjiI62T9ecUkEbHqCtePlXJY7WiGLcYETVAHRew6Pf+FxzNj0L p2BwMYyGxAPaaFedkJIvDfNh+pjmVFeExPl9OdAdECsbB6VpeKdmeMRWa5fux8NLPsI/ I4G4ixkWLXjUA0CQsN9ipzeRPtJssww5pZWMuwlU+7C8CDrpzhIQjf4fxsG7/00jmEgk ZVJpmSNWUIzopYiPkICQ5hQCGjtTMAxk+HTsDor5y5tBpq49ABc8WTCi8MMjDlb1npgi sAhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88N/1qAZ8VIjuS2R1sRrs/MALWlEK6AkrWPDLccyzys=; b=7uh4AtCDrvUKHoHwibWhVfhX3vxxI/Rj77MLhEMYSs4UTPW58ph/imi7FZg8k8inim oOJUwA3+/pHBGSW7kz1M/1KCAXRHyw0kRd8IN4VR2RiIy4LMm3SAp03ykq9o36fTjH91 y1ut9fHHP3GKKCnZ7DKdrNXMVTex01pmrHynuWVI09WgyNVKF62rkeN5HSfttIDm9G8P BnSABcGIUAuPyvXHhnRcwlNPeJfHd595DQAd0vEmo10WjWRvuuOlN1PRZgvoLazc9Rs8 nH2cM4JroXR48z44f7n3KNjKhGoHHdAMzljdSL2Cq8MVXhc/eSMBz6auo4LZZLSgVLOc jyfg== X-Gm-Message-State: AOAM531ulF//c/fMl/3XbWdgMSK95EsAJC/xrC05ZJc8um/2yIRZZ9ps KwAn8xdQ9DInYSGLhMrTuqM= X-Google-Smtp-Source: ABdhPJwPTndJLo/fj/nqzGhKpv1Odq/tnRLyRXZ6JHKhIo3rLA9hBiZqsjUjKlaQ5rMdlZP0TTa1hA== X-Received: by 2002:a17:906:4fc8:b0:6d8:5059:f998 with SMTP id i8-20020a1709064fc800b006d85059f998mr13536450ejw.487.1650830768172; Sun, 24 Apr 2022 13:06:08 -0700 (PDT) Received: from kista.localnet (cpe-86-58-32-107.static.triera.net. [86.58.32.107]) by smtp.gmail.com with ESMTPSA id b17-20020a170906195100b006e8be812f08sm2956838eje.0.2022.04.24.13.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 13:06:07 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Chen-Yu Tsai , Maxime Ripard , Samuel Holland Cc: Samuel Holland , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: Re: [PATCH v3 12/14] drm/sun4i: Add support for D1 TCON TOP Date: Sun, 24 Apr 2022 22:06:06 +0200 Message-ID: <13000910.uLZWGnKmhe@kista> In-Reply-To: <20220424162633.12369-13-samuel@sholland.org> References: <20220424162633.12369-1-samuel@sholland.org> <20220424162633.12369-13-samuel@sholland.org> Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Dne nedelja, 24. april 2022 ob 18:26:30 CEST je Samuel Holland napisal(a): > D1 has a TCON TOP with TCON TV0 and DSI, but no TCON TV1. This puts the > DSI clock name at index 1 in clock-output-names. Support this by only > incrementing the index for clocks that are actually supported. > > Signed-off-by: Samuel Holland Reviewed-by: Jernej Skrabec Best regards, Jernej Skrabec > --- > > (no changes since v1) > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/ sun8i_tcon_top.c > index 1b9b8b48f4a7..da97682b6835 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > @@ -189,22 +189,23 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > * if TVE is active on each TCON TV. If it is, mux should be switched > * to TVE clock parent. > */ > + i = 0; > clk_data->hws[CLK_TCON_TOP_TV0] = > sun8i_tcon_top_register_gate(dev, "tcon-tv0", regs, > &tcon_top- >reg_lock, > - TCON_TOP_TCON_TV0_GATE, 0); > + TCON_TOP_TCON_TV0_GATE, i++); > > if (quirks->has_tcon_tv1) > clk_data->hws[CLK_TCON_TOP_TV1] = > sun8i_tcon_top_register_gate(dev, "tcon- tv1", regs, > &tcon_top->reg_lock, > - TCON_TOP_TCON_TV1_GATE, 1); > + TCON_TOP_TCON_TV1_GATE, i++); > > if (quirks->has_dsi) > clk_data->hws[CLK_TCON_TOP_DSI] = > sun8i_tcon_top_register_gate(dev, "dsi", regs, > &tcon_top->reg_lock, > - TCON_TOP_TCON_DSI_GATE, 2); > + TCON_TOP_TCON_DSI_GATE, i++); > > for (i = 0; i < CLK_NUM; i++) > if (IS_ERR(clk_data->hws[i])) { > @@ -272,6 +273,10 @@ static const struct sun8i_tcon_top_quirks sun8i_r40_tcon_top_quirks = { > .has_dsi = true, > }; > > +static const struct sun8i_tcon_top_quirks sun20i_d1_tcon_top_quirks = { > + .has_dsi = true, > +}; > + > static const struct sun8i_tcon_top_quirks sun50i_h6_tcon_top_quirks = { > /* Nothing special */ > }; > @@ -282,6 +287,10 @@ const struct of_device_id sun8i_tcon_top_of_table[] = { > .compatible = "allwinner,sun8i-r40-tcon-top", > .data = &sun8i_r40_tcon_top_quirks > }, > + { > + .compatible = "allwinner,sun20i-d1-tcon-top", > + .data = &sun20i_d1_tcon_top_quirks > + }, > { > .compatible = "allwinner,sun50i-h6-tcon-top", > .data = &sun50i_h6_tcon_top_quirks > -- > 2.35.1 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 37117C433F5 for ; Sun, 24 Apr 2022 20:06:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C7D010E608; Sun, 24 Apr 2022 20:06:11 +0000 (UTC) Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by gabe.freedesktop.org (Postfix) with ESMTPS id 986D210E608 for ; Sun, 24 Apr 2022 20:06:09 +0000 (UTC) Received: by mail-ej1-x62d.google.com with SMTP id kq17so2809859ejb.4 for ; Sun, 24 Apr 2022 13:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88N/1qAZ8VIjuS2R1sRrs/MALWlEK6AkrWPDLccyzys=; b=K1edaGaOacjw80WVtueFnAw4giTEfU2sak5dGFtN6QQLPFylYk0rANxVN+weUL2Sed EYlRbQtra/oEBwdIisXjiI62T9ecUkEbHqCtePlXJY7WiGLcYETVAHRew6Pf+FxzNj0L p2BwMYyGxAPaaFedkJIvDfNh+pjmVFeExPl9OdAdECsbB6VpeKdmeMRWa5fux8NLPsI/ I4G4ixkWLXjUA0CQsN9ipzeRPtJssww5pZWMuwlU+7C8CDrpzhIQjf4fxsG7/00jmEgk ZVJpmSNWUIzopYiPkICQ5hQCGjtTMAxk+HTsDor5y5tBpq49ABc8WTCi8MMjDlb1npgi sAhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88N/1qAZ8VIjuS2R1sRrs/MALWlEK6AkrWPDLccyzys=; b=vHQ9Ys0ayhdr4Gf+Fb+psDuax1jebmh0a8v8KHYvHzHo6ZKYI/IrJH1l/NOLNG8KY2 gPECbnCGPkYAnyGCCLER+dppSCrDTgiOQfVqrTTM3O/qkRUag79wWHkFSW+8ygD+mfcT cnQLuFwttsBjLvYy8+mCYbdd8o/SuOJJSiMgnP1cggBRr1yA1WL+x/sfk+qAbPd4TDgn vYkBOM/Gi8S5JftTANaCOzIOyb/p/qHFzJslz/eKSPu6bZKl7XY2kTXszAV1nJ97apiJ QAxgatmnV8U8t1fHLx6bCX0mwb20jHRmhFQvAHGI1FxS4UYWJsz7svHbMT7EzTtPxf4g jXRw== X-Gm-Message-State: AOAM530wf7YjsP8vS+2SEjDHsTRqijKrjeZb8MVqU2ZLkLJhQooOjwiI p+4Omi9ScaRCysGDT/x9RN0= X-Google-Smtp-Source: ABdhPJwPTndJLo/fj/nqzGhKpv1Odq/tnRLyRXZ6JHKhIo3rLA9hBiZqsjUjKlaQ5rMdlZP0TTa1hA== X-Received: by 2002:a17:906:4fc8:b0:6d8:5059:f998 with SMTP id i8-20020a1709064fc800b006d85059f998mr13536450ejw.487.1650830768172; Sun, 24 Apr 2022 13:06:08 -0700 (PDT) Received: from kista.localnet (cpe-86-58-32-107.static.triera.net. [86.58.32.107]) by smtp.gmail.com with ESMTPSA id b17-20020a170906195100b006e8be812f08sm2956838eje.0.2022.04.24.13.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 13:06:07 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Chen-Yu Tsai , Maxime Ripard , Samuel Holland Subject: Re: [PATCH v3 12/14] drm/sun4i: Add support for D1 TCON TOP Date: Sun, 24 Apr 2022 22:06:06 +0200 Message-ID: <13000910.uLZWGnKmhe@kista> In-Reply-To: <20220424162633.12369-13-samuel@sholland.org> References: <20220424162633.12369-1-samuel@sholland.org> <20220424162633.12369-13-samuel@sholland.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Samuel Holland , David Airlie , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rob Herring , Krzysztof Kozlowski , linux-sunxi@lists.linux.dev, linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Dne nedelja, 24. april 2022 ob 18:26:30 CEST je Samuel Holland napisal(a): > D1 has a TCON TOP with TCON TV0 and DSI, but no TCON TV1. This puts the > DSI clock name at index 1 in clock-output-names. Support this by only > incrementing the index for clocks that are actually supported. > > Signed-off-by: Samuel Holland Reviewed-by: Jernej Skrabec Best regards, Jernej Skrabec > --- > > (no changes since v1) > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/ sun8i_tcon_top.c > index 1b9b8b48f4a7..da97682b6835 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > @@ -189,22 +189,23 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > * if TVE is active on each TCON TV. If it is, mux should be switched > * to TVE clock parent. > */ > + i = 0; > clk_data->hws[CLK_TCON_TOP_TV0] = > sun8i_tcon_top_register_gate(dev, "tcon-tv0", regs, > &tcon_top- >reg_lock, > - TCON_TOP_TCON_TV0_GATE, 0); > + TCON_TOP_TCON_TV0_GATE, i++); > > if (quirks->has_tcon_tv1) > clk_data->hws[CLK_TCON_TOP_TV1] = > sun8i_tcon_top_register_gate(dev, "tcon- tv1", regs, > &tcon_top->reg_lock, > - TCON_TOP_TCON_TV1_GATE, 1); > + TCON_TOP_TCON_TV1_GATE, i++); > > if (quirks->has_dsi) > clk_data->hws[CLK_TCON_TOP_DSI] = > sun8i_tcon_top_register_gate(dev, "dsi", regs, > &tcon_top->reg_lock, > - TCON_TOP_TCON_DSI_GATE, 2); > + TCON_TOP_TCON_DSI_GATE, i++); > > for (i = 0; i < CLK_NUM; i++) > if (IS_ERR(clk_data->hws[i])) { > @@ -272,6 +273,10 @@ static const struct sun8i_tcon_top_quirks sun8i_r40_tcon_top_quirks = { > .has_dsi = true, > }; > > +static const struct sun8i_tcon_top_quirks sun20i_d1_tcon_top_quirks = { > + .has_dsi = true, > +}; > + > static const struct sun8i_tcon_top_quirks sun50i_h6_tcon_top_quirks = { > /* Nothing special */ > }; > @@ -282,6 +287,10 @@ const struct of_device_id sun8i_tcon_top_of_table[] = { > .compatible = "allwinner,sun8i-r40-tcon-top", > .data = &sun8i_r40_tcon_top_quirks > }, > + { > + .compatible = "allwinner,sun20i-d1-tcon-top", > + .data = &sun20i_d1_tcon_top_quirks > + }, > { > .compatible = "allwinner,sun50i-h6-tcon-top", > .data = &sun50i_h6_tcon_top_quirks > -- > 2.35.1 > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E5E2BC433F5 for ; Sun, 24 Apr 2022 20:07:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=iR41FlgrroUALKll1DuZdoLhhTTSCc/Ym7YXyvAtMfk=; b=ct9qaOHghrqMLO 5S7At+Rwq8IctedL8eUCoKb5FC3gFwYO8aZcb7kBm08rywOaF8Fsl4/OLeNlPq1wr3qKsvywESpNB iUwHGwwI1UDBxSIiMs5rjWZX9tUa/XUWimF2ge2wDPumxxUwsHXp0w/yp1Jphbhw57dFWzt80PjCH F7/l42PiHegkxcQQZgD8dp4ojbLcuQjjGfq72el8WCAJLb6TSw0D74qTZ4LO/wBTpwMj3JFweZvMB QHIh+mgzh5METe53q/gIX05Z+mum0g/afatyWzBJ58GXlHhNyDg9ipfmCrG6i/rh4wFCEYjrePcjK z2+1V37U58gcUMj137Kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1niiUm-007KWL-Bz; Sun, 24 Apr 2022 20:06:12 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1niiUj-007KVd-Cw for linux-arm-kernel@lists.infradead.org; Sun, 24 Apr 2022 20:06:10 +0000 Received: by mail-ej1-x629.google.com with SMTP id dk23so2623508ejb.8 for ; Sun, 24 Apr 2022 13:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=88N/1qAZ8VIjuS2R1sRrs/MALWlEK6AkrWPDLccyzys=; b=K1edaGaOacjw80WVtueFnAw4giTEfU2sak5dGFtN6QQLPFylYk0rANxVN+weUL2Sed EYlRbQtra/oEBwdIisXjiI62T9ecUkEbHqCtePlXJY7WiGLcYETVAHRew6Pf+FxzNj0L p2BwMYyGxAPaaFedkJIvDfNh+pjmVFeExPl9OdAdECsbB6VpeKdmeMRWa5fux8NLPsI/ I4G4ixkWLXjUA0CQsN9ipzeRPtJssww5pZWMuwlU+7C8CDrpzhIQjf4fxsG7/00jmEgk ZVJpmSNWUIzopYiPkICQ5hQCGjtTMAxk+HTsDor5y5tBpq49ABc8WTCi8MMjDlb1npgi sAhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=88N/1qAZ8VIjuS2R1sRrs/MALWlEK6AkrWPDLccyzys=; b=gXYeniTfXfZ6VdG1L9mL4FjcsJMFZp+4IsxEGpkr0bRLsxHNidcwg4WolvvVcvX0ZT GELJkG1KwWZh83R24KfTflSuPaDUFcu+uwSW7g1pjiLjX6eEiCEXORUcxldTRxX4J88L 7EFk0NXfFHmXa2DQ91Dgr/Pq0CtaS771TjypyyC3eikG4SgUlvqRh1ycNuT63NJhf0YP bKIa2G/2V+kPUAwvEg9SfCQJtkwPvl9q/nMZHAka0l/yPQwJdlxg0W8NChkvtoVl/qun kjPA01eKtZ6NBT7jJHGPLzzoO3qd7Le1l4sL7UzO1/BhnkdHbaStioHxY1EC/oOF3CTT 9x9w== X-Gm-Message-State: AOAM530UJGoOLuW9RhFFVouaI+sQylmsfTZbuM5DgNeKh6B+VAwdQppp Ui50jsokQZXGkIkssAS5194= X-Google-Smtp-Source: ABdhPJwPTndJLo/fj/nqzGhKpv1Odq/tnRLyRXZ6JHKhIo3rLA9hBiZqsjUjKlaQ5rMdlZP0TTa1hA== X-Received: by 2002:a17:906:4fc8:b0:6d8:5059:f998 with SMTP id i8-20020a1709064fc800b006d85059f998mr13536450ejw.487.1650830768172; Sun, 24 Apr 2022 13:06:08 -0700 (PDT) Received: from kista.localnet (cpe-86-58-32-107.static.triera.net. [86.58.32.107]) by smtp.gmail.com with ESMTPSA id b17-20020a170906195100b006e8be812f08sm2956838eje.0.2022.04.24.13.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Apr 2022 13:06:07 -0700 (PDT) From: Jernej =?utf-8?B?xaBrcmFiZWM=?= To: Chen-Yu Tsai , Maxime Ripard , Samuel Holland Cc: Samuel Holland , Daniel Vetter , David Airlie , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@lists.linux.dev Subject: Re: [PATCH v3 12/14] drm/sun4i: Add support for D1 TCON TOP Date: Sun, 24 Apr 2022 22:06:06 +0200 Message-ID: <13000910.uLZWGnKmhe@kista> In-Reply-To: <20220424162633.12369-13-samuel@sholland.org> References: <20220424162633.12369-1-samuel@sholland.org> <20220424162633.12369-13-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220424_130609_487042_84AAC3A2 X-CRM114-Status: GOOD ( 22.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Dne nedelja, 24. april 2022 ob 18:26:30 CEST je Samuel Holland napisal(a): > D1 has a TCON TOP with TCON TV0 and DSI, but no TCON TV1. This puts the > DSI clock name at index 1 in clock-output-names. Support this by only > incrementing the index for clocks that are actually supported. > > Signed-off-by: Samuel Holland Reviewed-by: Jernej Skrabec Best regards, Jernej Skrabec > --- > > (no changes since v1) > > drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c b/drivers/gpu/drm/sun4i/ sun8i_tcon_top.c > index 1b9b8b48f4a7..da97682b6835 100644 > --- a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c > @@ -189,22 +189,23 @@ static int sun8i_tcon_top_bind(struct device *dev, struct device *master, > * if TVE is active on each TCON TV. If it is, mux should be switched > * to TVE clock parent. > */ > + i = 0; > clk_data->hws[CLK_TCON_TOP_TV0] = > sun8i_tcon_top_register_gate(dev, "tcon-tv0", regs, > &tcon_top- >reg_lock, > - TCON_TOP_TCON_TV0_GATE, 0); > + TCON_TOP_TCON_TV0_GATE, i++); > > if (quirks->has_tcon_tv1) > clk_data->hws[CLK_TCON_TOP_TV1] = > sun8i_tcon_top_register_gate(dev, "tcon- tv1", regs, > &tcon_top->reg_lock, > - TCON_TOP_TCON_TV1_GATE, 1); > + TCON_TOP_TCON_TV1_GATE, i++); > > if (quirks->has_dsi) > clk_data->hws[CLK_TCON_TOP_DSI] = > sun8i_tcon_top_register_gate(dev, "dsi", regs, > &tcon_top->reg_lock, > - TCON_TOP_TCON_DSI_GATE, 2); > + TCON_TOP_TCON_DSI_GATE, i++); > > for (i = 0; i < CLK_NUM; i++) > if (IS_ERR(clk_data->hws[i])) { > @@ -272,6 +273,10 @@ static const struct sun8i_tcon_top_quirks sun8i_r40_tcon_top_quirks = { > .has_dsi = true, > }; > > +static const struct sun8i_tcon_top_quirks sun20i_d1_tcon_top_quirks = { > + .has_dsi = true, > +}; > + > static const struct sun8i_tcon_top_quirks sun50i_h6_tcon_top_quirks = { > /* Nothing special */ > }; > @@ -282,6 +287,10 @@ const struct of_device_id sun8i_tcon_top_of_table[] = { > .compatible = "allwinner,sun8i-r40-tcon-top", > .data = &sun8i_r40_tcon_top_quirks > }, > + { > + .compatible = "allwinner,sun20i-d1-tcon-top", > + .data = &sun20i_d1_tcon_top_quirks > + }, > { > .compatible = "allwinner,sun50i-h6-tcon-top", > .data = &sun50i_h6_tcon_top_quirks > -- > 2.35.1 > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel