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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 515A1C8B4D7 for ; Mon, 16 Nov 2020 12:40:17 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CACF72224B for ; Mon, 16 Nov 2020 12:40:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EeyyE0wD"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aF8hjcXS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CACF72224B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Pp5/1j28q8lGC1ubcSN5JjwPck0YAMYgpX477y7i5bQ=; b=EeyyE0wD6xpyURdQQvUtSSpjuQ Ok4oSkSPs3x1x51Qfz8tZbRndTJ2oH8LtcO+YCguq1aydRD3q9djFyLE/7e5fo+o/Tsr75L4NPIOZ uUNb0V9Oc5lRKJy8JUWsOIsqinH5PbFVP5bLNHX9Kld6Ag0Rb/ftCGxPibYs9SsWa17P2qk2+nsOv /kjzfgV1HApGWAb15jhRN8pSlGq007/83DNEwwu5mlu5dbjnqqEDz4YwP7KPJW4MkTawuY7JZQRNd mZJe46PxqFwOWAZWjP43N5T1Cy4Gqf4v/Jbc6zUv5ZVP8kKfDg95Ksrd2lig/RsGSN3jeg57GoODT 9XRPVAIA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedbD-0007D1-SX; Mon, 16 Nov 2020 12:27:11 +0000 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kedb5-0007A0-QS; Mon, 16 Nov 2020 12:27:05 +0000 Received: by mail-ed1-x544.google.com with SMTP id ay21so18539780edb.2; Mon, 16 Nov 2020 04:27:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mXd0/BioOUY4fbAfXivgHmV1JXCJNPj02bKxYT4teDw=; b=aF8hjcXSWh9E6HYJxpooFJWzfO1PGXseh1vu93W4ZUf9JbyYgZDV+Dtb08e2hzOLZE RvSkB6qzSlW4QYiDz4zAYNvvVltV9co3rCsJwUxHywMM5QWQuKrqJ+HVS5VVYUb6ZXdD zP4dD+VCvNyL7UPPJ44fOtS1l/Ofc7dsRTxkiTifl7vsn1VQ6+pajohv0Gw2fGIqjAEH c+robE9EUGVtf652RofdnwpDVJYuHIt4XsPEetOayyXMjsq/j66cEOYC0+IQNCjY+093 wRxlJ3BPw6T7nbOQvT3CnPHTaVv7oPtGCzxEsUjb6hqxcxMwmwCgCidQVKenl05jDLfh yFlw== 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; bh=mXd0/BioOUY4fbAfXivgHmV1JXCJNPj02bKxYT4teDw=; b=rVZtXdHdVvgAJuL9X3uaDgM5VLPEvPESF60+hxsh5LscW49D9bN0YM03WMg9Dwo+na desfb9RgTuE50OEybbCKI9nFzjHfHKuRYMA/wdWyh6uB8DcNf+XKb/WP421r2yaiusx+ Hb6cF9i0E/E3u+SeS5vU+lYwgSXvnhWYTX8v4zfv88VtBlG97ses3ofDbqaAM7lOWHzR sG1NrL4T71ZvcGA6+LKLTbmX/cZkhAtGRfo7mH/2oOEV5XJoTOdEQ1TV1Z3xQWLhC0iS vRYR/9Sh9Z3aIvnEGZZLNhzScfCKtKSPXzEzEdhai3T70LuQuSwTaqU719TzYQVpY7kh Ts0Q== X-Gm-Message-State: AOAM532wGxZPdKnvkyOckcGjFmd+fjSaZofwbHyfGiDwlJV7vOctGgp1 tzIGxyQvtLXwdXL6771UzxU= X-Google-Smtp-Source: ABdhPJx2PP7o7ipSQcri+CX6ZywaZ+1Bgit2Zrm/xG3cmUz3vjVE46tKFKxIG83Uj+s7MT1QYxBczg== X-Received: by 2002:a05:6402:14cf:: with SMTP id f15mr15262633edx.18.1605529620686; Mon, 16 Nov 2020 04:27:00 -0800 (PST) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id n22sm10704848edr.11.2020.11.16.04.26.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Nov 2020 04:27:00 -0800 (PST) From: Johan Jonker To: heiko@sntech.de Subject: [PATCH v3 2/2] clk: rockchip: fix i2s gate bits on rk3066 and rk3188 Date: Mon, 16 Nov 2020 13:26:51 +0100 Message-Id: <20201116122651.4215-2-jbx6244@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20201116122651.4215-1-jbx6244@gmail.com> References: <20201116122651.4215-1-jbx6244@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201116_072703_923994_C7DC9B9A X-CRM114-Status: GOOD ( 14.40 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sboyd@kernel.org, mturquette@baylibre.com, zhangqing@rock-chips.com, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 The Rockchip PX2/RK3066 uses these bits in CRU_CLKGATE7_CON: hclk_i2s_8ch_gate_en bit 4 (dtsi: i2s0) hclk_i2s0_2ch_gate_en bit 2 (dtsi: i2s1) hclk_i2s1_2ch_gate_en bit 3 (dtsi: i2s2) The Rockchip PX3/RK3188 uses this bit in CRU_CLKGATE7_CON: hclk_i2s_2ch_gate_en bit 2 (dtsi: i2s0) The bits got somehow mixed up in the clk-rk3188.c file. The labels in the dtsi files are not suppose to change. The sclk and hclk names should match for "trace_event=clk_disable,clk_enable", so remove GATE HCLK_I2S0 from the common clock tree and fix the bits in the rk3066 and rk3188 clock tree. Signed-off-by: Johan Jonker --- Changed V3: reword --- drivers/clk/rockchip/clk-rk3188.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index 81ecf348e..362d068a4 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c @@ -449,7 +449,6 @@ static struct rockchip_clk_branch common_clk_branches[] __initdata = { /* hclk_cpu gates */ GATE(HCLK_ROM, "hclk_rom", "hclk_cpu", 0, RK2928_CLKGATE_CON(5), 6, GFLAGS), - GATE(HCLK_I2S0, "hclk_i2s0", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), GATE(HCLK_SPDIF, "hclk_spdif", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 1, GFLAGS), GATE(0, "hclk_cpubus", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 8, GFLAGS), /* hclk_ahb2apb is part of a clk branch */ @@ -634,8 +633,9 @@ static struct rockchip_clk_branch rk3066a_clk_branches[] __initdata = { RK2928_CLKGATE_CON(0), 12, GFLAGS, &rk3066a_i2s2_fracmux), - GATE(HCLK_I2S1, "hclk_i2s1", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), - GATE(HCLK_I2S2, "hclk_i2s2", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS), + GATE(HCLK_I2S0, "hclk_i2s0", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 4, GFLAGS), + GATE(HCLK_I2S1, "hclk_i2s1", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), + GATE(HCLK_I2S2, "hclk_i2s2", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 3, GFLAGS), GATE(HCLK_CIF1, "hclk_cif1", "hclk_cpu", 0, RK2928_CLKGATE_CON(6), 6, GFLAGS), GATE(HCLK_HDMI, "hclk_hdmi", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), @@ -728,6 +728,7 @@ static struct rockchip_clk_branch rk3188_clk_branches[] __initdata = { RK2928_CLKGATE_CON(0), 10, GFLAGS, &rk3188_i2s0_fracmux), + GATE(HCLK_I2S0, "hclk_i2s0", "hclk_cpu", 0, RK2928_CLKGATE_CON(7), 2, GFLAGS), GATE(0, "hclk_imem0", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 14, GFLAGS), GATE(0, "hclk_imem1", "hclk_cpu", 0, RK2928_CLKGATE_CON(4), 15, GFLAGS), -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel