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 C978B1D016B; Wed, 2 Oct 2024 13:35:44 +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=1727876144; cv=none; b=LuYMmGdSvuzp2nGKnkyqYa8SA46xQ0jlM/Ulmv6CB3iVQ1INVkDcYXK++En7JEv+rSpPe02IkdArB3kGOREcYJPU+wKx3G02ZC2bkU3xhpBjkGxQve8CeWJXva4IXhhqVF7Gv5PnJi7r9fEELp+chPo5Z94rNkVOOqbAK68vrF4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876144; c=relaxed/simple; bh=/imL9UneOEdzxN1BVJF0zA92Qjs76P/gxiDAqLvJU9o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TwQhC4UiDGEOldjXevL2F9e4uS7aulSlF+Q9fA43z+9rERbi+RYZ3W/xDhoJZpuuoYTASWCCaofbspoMcETuM1vk9Zv83sI5mUh/hf13fmFATBH4RJ+ZCrrycf7Cq/QUnrDlqwFUXmBZaFhLg0BDkXvlCZn3PEyB6snlSnFgxrk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bBitFR6d; 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="bBitFR6d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 510B0C4CEC5; Wed, 2 Oct 2024 13:35:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727876144; bh=/imL9UneOEdzxN1BVJF0zA92Qjs76P/gxiDAqLvJU9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bBitFR6dE4Zwfn59C/iYYLL1fAB2/qZBzovRGFJV9tUIY/xqqWgkTzfVtdGu/ihT4 AvUbzfNhfmZpaVsgbPjRE2IGwXCViuHpS3Xk2wzadxEXAzvCngHGs4Wl8iieGK1Rd+ 6FTaXCPbXwtgDJ8TjJk5QvweXH/f6zKLDtQJ3dAY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sebastien Laveze , Oleksij Rempel , Abel Vesa , Sasha Levin Subject: [PATCH 6.11 343/695] clk: imx: imx6ul: fix default parent for enet*_ref_sel Date: Wed, 2 Oct 2024 14:55:41 +0200 Message-ID: <20241002125836.141995929@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sebastien Laveze [ Upstream commit e52fd71333b4ed78fd5bb43094bdc46476614d25 ] The clk_set_parent for "enet1_ref_sel" and "enet2_ref_sel" are incorrect, therefore the original requirements to have "enet_clk_ref" as output sourced by iMX ENET PLL as a default config is not met. Only "enet[1,2]_ref_125m" "enet[1,2]_ref_pad" are possible parents for "enet1_ref_sel" and "enet2_ref_sel". This was observed as a regression using a custom device tree which was expecting this default config. This can be fixed at the device tree level but having a default config matching the original behavior (before refclock mux) will avoid breaking existing configs. Fixes: 4e197ee880c2 ("clk: imx6ul: add ethernet refclock mux support") Link: https://lore.kernel.org/lkml/20230306020226.GC143566@dragon/T/ Signed-off-by: Sebastien Laveze Reviewed-by: Oleksij Rempel Link: https://lore.kernel.org/r/20240528151434.227602-1-slaveze@smartandconnective.com Signed-off-by: Abel Vesa Signed-off-by: Sasha Levin --- drivers/clk/imx/clk-imx6ul.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index f9394e94f69d7..05c7a82b751f3 100644 --- a/drivers/clk/imx/clk-imx6ul.c +++ b/drivers/clk/imx/clk-imx6ul.c @@ -542,8 +542,8 @@ static void __init imx6ul_clocks_init(struct device_node *ccm_node) clk_set_parent(hws[IMX6UL_CLK_ENFC_SEL]->clk, hws[IMX6UL_CLK_PLL2_PFD2]->clk); - clk_set_parent(hws[IMX6UL_CLK_ENET1_REF_SEL]->clk, hws[IMX6UL_CLK_ENET_REF]->clk); - clk_set_parent(hws[IMX6UL_CLK_ENET2_REF_SEL]->clk, hws[IMX6UL_CLK_ENET2_REF]->clk); + clk_set_parent(hws[IMX6UL_CLK_ENET1_REF_SEL]->clk, hws[IMX6UL_CLK_ENET1_REF_125M]->clk); + clk_set_parent(hws[IMX6UL_CLK_ENET2_REF_SEL]->clk, hws[IMX6UL_CLK_ENET2_REF_125M]->clk); imx_register_uart_clocks(); } -- 2.43.0