Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2762954imj; Mon, 11 Feb 2019 08:06:56 -0800 (PST) X-Google-Smtp-Source: AHgI3IZvy31o/bEN90It1BtOqACRlGScDpGMyzohwNNF7ZeaokI5VsmXASXkQ5SuPdziYWr+JKH7 X-Received: by 2002:a63:d70e:: with SMTP id d14mr34268446pgg.159.1549901216549; Mon, 11 Feb 2019 08:06:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549901216; cv=none; d=google.com; s=arc-20160816; b=KNpfgLmKHvLH/0+0flzIIrmdgvl4h7mWsUhuago8cJKyoIl4h+dduCihnIDlUtyuRV TGVA0YGCGdLDemqUjRXtsgZ1lNdgbMXbEGSLJWvfRK1FQyrQRuR02/Ivfp4gKD3/3rjZ I/5XheB0CGMevsdL9RtrlvSuGCj5aHW7i+9eX9wo5rkS5X7O8TwJD5DT7fzxKtKOlW04 2nAEv9RKAR4vSWlptdO1UUpw9Si64I/3PvzQO+FOajMyW8iU3xCGX4C2qsC9nYJlEf/4 O0tHitaLSD8YNSXaSMmrTSr9m2VsqqmaM2Tdea1rGRP7qJMTQtFe4QgljdBMKaQRqX8u 1rew== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=REcGGyaCsbVPpxAb/H4tCq/CWIOnlWU5ge/04FGXp0g=; b=l4Ita1Z6hRMa0Zyxc15y6zECvMj7yVd63t09kGQDKiDQSuY85NnEyfhhMceBscbn5p u+Zkw/da8wE8bGLIx4EXh3zZtsrKcY7MlSOjcZZYxDW55f7vnfUOxeIkJPyt6xmqLRyM Zx14HXpphZiaQbb3T05eROdnlTfgTha/3qBTz1pqs/47HN4Q/Jf+PGDj3UMjh+LpR5QJ 0KpFbxaKXKF7J469uPAoHNYw2yk2rcdvP4oOmpOPEi1fpFzxpEn4b5jAZcZPUib45RZ1 PMwxqyAwAeNyFnKFverQleQCEYKy5zmB5LuW+J/vWydsFKGVoooUotj78MSrslG03f4i x7hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yZGNqKCt; 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 d16si10495480pfn.169.2019.02.11.08.06.39; Mon, 11 Feb 2019 08:06:56 -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; dkim=pass header.i=@kernel.org header.s=default header.b=yZGNqKCt; 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 S1729757AbfBKO1m (ORCPT + 99 others); Mon, 11 Feb 2019 09:27:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:33526 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729749AbfBKO1k (ORCPT ); Mon, 11 Feb 2019 09:27:40 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 C725B21B18; Mon, 11 Feb 2019 14:27:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895260; bh=1p/ts9oQsmRA3M5pNXkniRf3yCAbvPDJ8I2731+OzkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yZGNqKCtzt/XfJXtBXS7+CH7yAa6Wy6CY3k3YbMlp8cSsBL9Hm3zd5bMDMLJjIENn FFWSh9urB1XA5ryp/JsFsKgxQmtJ5TuN46MnvVoxiDqspgPmm6fO2troRvyS/i1JN3 W7Bi7+Yp9bH2HhHcrMbkv3LY/bqv/hhWtfRLI7Cs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chen-Yu Tsai , Maxime Ripard , Sasha Levin Subject: [PATCH 4.20 116/352] clk: sunxi-ng: a33: Set CLK_SET_RATE_PARENT for all audio module clocks Date: Mon, 11 Feb 2019 15:15:43 +0100 Message-Id: <20190211141853.258242509@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 6e6da2039c82271dd873b9ad2b902a692a7dd554 ] All the audio interfaces on Allwinner SoCs need to change their module clocks during operation, to switch between support for 44.1 kHz and 48 kHz family sample rates. The clock rate for the module clocks is governed by their upstream audio PLL. The module clocks themselves only have a gate, and sometimes a divider or mux. Thus any rate changes need to be propagated upstream. Set the CLK_SET_RATE_PARENT flag for all audio module clocks to achieve this. Signed-off-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c index 13eb5b23c5e7..c40d572a7602 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-a33.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-a33.c @@ -366,10 +366,10 @@ static SUNXI_CCU_MP_WITH_MUX_GATE(spi1_clk, "spi1", mod0_default_parents, 0x0a4, static const char * const i2s_parents[] = { "pll-audio-8x", "pll-audio-4x", "pll-audio-2x", "pll-audio" }; static SUNXI_CCU_MUX_WITH_GATE(i2s0_clk, "i2s0", i2s_parents, - 0x0b0, 16, 2, BIT(31), 0); + 0x0b0, 16, 2, BIT(31), CLK_SET_RATE_PARENT); static SUNXI_CCU_MUX_WITH_GATE(i2s1_clk, "i2s1", i2s_parents, - 0x0b4, 16, 2, BIT(31), 0); + 0x0b4, 16, 2, BIT(31), CLK_SET_RATE_PARENT); /* TODO: the parent for most of the USB clocks is not known */ static SUNXI_CCU_GATE(usb_phy0_clk, "usb-phy0", "osc24M", @@ -446,7 +446,7 @@ static SUNXI_CCU_M_WITH_GATE(ve_clk, "ve", "pll-ve", static SUNXI_CCU_GATE(ac_dig_clk, "ac-dig", "pll-audio", 0x140, BIT(31), CLK_SET_RATE_PARENT); static SUNXI_CCU_GATE(ac_dig_4x_clk, "ac-dig-4x", "pll-audio-4x", - 0x140, BIT(30), 0); + 0x140, BIT(30), CLK_SET_RATE_PARENT); static SUNXI_CCU_GATE(avs_clk, "avs", "osc24M", 0x144, BIT(31), 0); -- 2.19.1