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 X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9252C43381 for ; Fri, 22 Mar 2019 12:00:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 868FA21939 for ; Fri, 22 Mar 2019 12:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256025; bh=cEXa/uw4hT9BjPxXnOJKAv4Ue4IUOygbNKomvdvYAs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G5mlGjwChogM1yYaXcDMHa6/PVKe3GZMLrpkvVY68HZAd7/jajj36lkoP+hbPtdIe e2uVu2HjslpN44LqdLU7UH/nso0gPrSVrhXDY+DLB8iF0xPAYQYvA5BJyICY/KDNRC YgULyYfnCXXoPcz4qdbO3f2yIoVJUwjvdm1tExSs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387743AbfCVMAX (ORCPT ); Fri, 22 Mar 2019 08:00:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:37522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732561AbfCVMAX (ORCPT ); Fri, 22 Mar 2019 08:00:23 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F9E82192D; Fri, 22 Mar 2019 12:00:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553256022; bh=cEXa/uw4hT9BjPxXnOJKAv4Ue4IUOygbNKomvdvYAs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jQFpOSNmv0RNHV10RbwPrr6/VByNYcUlyaoaTjvIYH7TYgMjrMGX+DaYOrISbKdP+ BPmY47PJTEaFd+acyhuvVTwgGvhnAtFHEMbMiZWxooyY6RL6Rh35cUMA6Z4xk6Va+Y 6XPqMytaxYOqC3A5jU2qL0uZdvy3iiNkmalF02OM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Kocialkowski , Maxime Ripard , Sasha Levin Subject: [PATCH 4.19 067/280] clk: sunxi-ng: v3s: Fix TCON reset de-assert bit Date: Fri, 22 Mar 2019 12:13:40 +0100 Message-Id: <20190322111310.059518666@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111306.356185024@linuxfoundation.org> References: <20190322111306.356185024@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 5c59801f7018acba11b12de59017a3fcdcf7421d ] According to the datasheet and the reference code from Allwinner, the bit used to de-assert the TCON reset is bit 4, not bit 3. Fix it in the V3s CCU driver. Signed-off-by: Paul Kocialkowski Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c index 621b1cd996db..ac12f261f8ca 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c @@ -542,7 +542,7 @@ static struct ccu_reset_map sun8i_v3s_ccu_resets[] = { [RST_BUS_OHCI0] = { 0x2c0, BIT(29) }, [RST_BUS_VE] = { 0x2c4, BIT(0) }, - [RST_BUS_TCON0] = { 0x2c4, BIT(3) }, + [RST_BUS_TCON0] = { 0x2c4, BIT(4) }, [RST_BUS_CSI] = { 0x2c4, BIT(8) }, [RST_BUS_DE] = { 0x2c4, BIT(12) }, [RST_BUS_DBG] = { 0x2c4, BIT(31) }, -- 2.19.1