From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AAB84A28; Wed, 5 Feb 2025 14:15:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764956; cv=none; b=D4tNsI862BTkdw56XoEkLgL4NSHvXqE2eJZ/IbegPcsIwQXyWRcOwnc3i2A4mUtN/+2e64YfFAxGNXSi6gLsjp7BI9p/QWTzPksKMwE4lgc4chkbvfW+e83FpAqUTGo5DNpYL91aJNPx0aalNsY8MZkquI9zVH6LoZ+EeW/JfXo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738764956; c=relaxed/simple; bh=Qrf7GcsoCH0KiFZWxdf04mkMg6NTmITpfcUdB2ToeO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DXjOmFkDx8kpjSYzFvnm2yiovpmZ0np2HIuWEfBRj04pah4SWWHIktAxFrH+gLHm4FhuAL3AP6GQH30JpWUkvLwnRE2gblZozIVA+ESI7p5HVUYKAVnZ8o/9NEbZuv6RReDHBQ4mJ1FqMXHPXK2LYepGQtXhJcGJc/x8nMZKV4E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=nXPgqDQ5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="nXPgqDQ5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 224C0C4CED1; Wed, 5 Feb 2025 14:15:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738764955; bh=Qrf7GcsoCH0KiFZWxdf04mkMg6NTmITpfcUdB2ToeO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nXPgqDQ5UTqiLpbjEl+Ufx3StVywBoMogmUKojHGoRheevYEV1UfW6cPAD+Dx8eiL QkCLWXZ4US8Sv742BVFSeRigkiimzLvTfVXgX8qKWcTV6Zg+I2xXhNNNtsyZf48kHB 8UNXcYvt6ISp3UJNaqwt9cXaF2hYtbGEKYuGbikE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marek Vasut , Peng Fan , Abel Vesa , Sasha Levin Subject: [PATCH 6.13 130/623] clk: imx8mp: Fix clkout1/2 support Date: Wed, 5 Feb 2025 14:37:52 +0100 Message-ID: <20250205134501.202508746@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134456.221272033@linuxfoundation.org> References: <20250205134456.221272033@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marek Vasut [ Upstream commit a9b7c84d22fb1687d63ca2a386773015cf59436b ] The CLKOUTn may be fed from PLL1/2/3, but the PLL1/2/3 has to be enabled first by setting PLL_CLKE bit 11 in CCM_ANALOG_SYS_PLLn_GEN_CTRL register. The CCM_ANALOG_SYS_PLLn_GEN_CTRL bit 11 is modeled by plln_out clock. Fix the clock tree and place the clkout1/2 under plln_sel instead of plain plln to let the clock subsystem correctly control the bit 11 and enable the PLL in case the CLKOUTn is supplied by PLL1/2/3. Fixes: 43896f56b59e ("clk: imx8mp: add clkout1/2 support") Signed-off-by: Marek Vasut Reviewed-by: Peng Fan Link: https://lore.kernel.org/r/20241112013718.333771-1-marex@denx.de Signed-off-by: Abel Vesa Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-imx8mp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c index 516dbd170c8a3..fb18f507f1213 100644 --- a/drivers/clk/imx/clk-imx8mp.c +++ b/drivers/clk/imx/clk-imx8mp.c @@ -399,8 +399,9 @@ static const char * const imx8mp_dram_core_sels[] = {"dram_pll_out", "dram_alt_r static const char * const imx8mp_clkout_sels[] = {"audio_pll1_out", "audio_pll2_out", "video_pll1_out", "dummy", "dummy", "gpu_pll_out", "vpu_pll_out", - "arm_pll_out", "sys_pll1", "sys_pll2", "sys_pll3", - "dummy", "dummy", "osc_24m", "dummy", "osc_32k"}; + "arm_pll_out", "sys_pll1_out", "sys_pll2_out", + "sys_pll3_out", "dummy", "dummy", "osc_24m", + "dummy", "osc_32k"}; static struct clk_hw **hws; static struct clk_hw_onecell_data *clk_hw_data; -- 2.39.5