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 91EEC1D7986 for ; Mon, 7 Oct 2024 15:43:58 +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=1728315838; cv=none; b=JI8B4mSEQUx3b1QfNJ7NcUmiWy6TaVBNQIRmYqlfaQ/1sSNpnSRO9MK+cNG7hMwEJ+d2mgJeyKsENJ1MGybNq3nbngqDcjnXzV5ozLVZLhe7EUrVheicv1EpJdfvfpVwAfFj4wIRUYsa+bTI82tHJdfSLNobpxLcACnqYntYnv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728315838; c=relaxed/simple; bh=UFiDv/sBFQF2T9eWzjcgocOhIHiYcm6Iy8Gw5jujtCs=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=D27eUm204EbZrYZeTzkPbolnikJV0zKgUCAX4nIWe6dkQhAJeyaXIYbpYw8WOs/KABJWAJn5UqnCXXYRLOGIfoCkAmmi3Y8qqQrEvpFQurmgGbxYMvlbTpXxnJB0E1dpSEDFAlFzfdGwBYlLOSydLGvVILkS2nZNRrzWYGjcYnQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gpTrFgIC; 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="gpTrFgIC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BEF6C4CECF; Mon, 7 Oct 2024 15:43:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728315838; bh=UFiDv/sBFQF2T9eWzjcgocOhIHiYcm6Iy8Gw5jujtCs=; h=Subject:To:Cc:From:Date:From; b=gpTrFgICSMT4llT/sFExJe5GJzonDW3zj+sRV+nnn9s7bSxW4kw135z98/zlufE0+ ueycrP2n4htd/nIEWRGsVLYYb2lDNwTsSXsNuwTBlBN7u+jV8X3OuOLTXa8s1gA5Sn 7ET8noBcTq2IUonRL5PdjBCjE6XO9dM+J+lcYo3A= Subject: FAILED: patch "[PATCH] clk: imx6ul: fix clock parent for IMX6UL_CLK_ENETx_REF_SEL" failed to apply to 5.10-stable tree To: Alex.Michel@wiedemann-group.com,abel.vesa@linaro.org,alex.michel@wiedemann-group.com,o.rempel@pengutronix.de Cc: From: Date: Mon, 07 Oct 2024 17:43:52 +0200 Message-ID: <2024100751-angler-silver-e615@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 32c055ef563c3a4a73a477839f591b1b170bde8e # git commit -s git send-email --to '' --in-reply-to '2024100751-angler-silver-e615@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^.. Possible dependencies: 32c055ef563c ("clk: imx6ul: fix clock parent for IMX6UL_CLK_ENETx_REF_SEL") 912d7af473f1 ("clk: imx6ul: retain early UART clocks during kernel init") 4e197ee880c2 ("clk: imx6ul: add ethernet refclock mux support") 5f82bfced611 ("clk: imx6ul: fix enet1 gate configuration") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 32c055ef563c3a4a73a477839f591b1b170bde8e Mon Sep 17 00:00:00 2001 From: Michel Alex Date: Mon, 2 Sep 2024 09:05:53 +0000 Subject: [PATCH] clk: imx6ul: fix clock parent for IMX6UL_CLK_ENETx_REF_SEL Commit 4e197ee880c24ecb63f7fe17449b3653bc64b03c ("clk: imx6ul: add ethernet refclock mux support") sets the internal clock as default ethernet clock. Since IMX6UL_CLK_ENET_REF cannot be parent for IMX6UL_CLK_ENET1_REF_SEL, the call to clk_set_parent() fails. IMX6UL_CLK_ENET1_REF_125M is the correct parent and shall be used instead. Same applies for IMX6UL_CLK_ENET2_REF_SEL, for which IMX6UL_CLK_ENET2_REF_125M is the correct parent. Cc: stable@vger.kernel.org Signed-off-by: Alex Michel Reviewed-by: Oleksij Rempel Link: https://lore.kernel.org/r/AS1P250MB0608F9CE4009DCE65C61EEDEA9922@AS1P250MB0608.EURP250.PROD.OUTLOOK.COM Signed-off-by: Abel Vesa diff --git a/drivers/clk/imx/clk-imx6ul.c b/drivers/clk/imx/clk-imx6ul.c index f9394e94f69d..05c7a82b751f 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(); }