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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA2E3C001DE for ; Mon, 7 Aug 2023 07:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231433AbjHGHIJ (ORCPT ); Mon, 7 Aug 2023 03:08:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231528AbjHGHIG (ORCPT ); Mon, 7 Aug 2023 03:08:06 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D052F95 for ; Mon, 7 Aug 2023 00:08:00 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 63EF8615AF for ; Mon, 7 Aug 2023 07:08:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F489C433C8; Mon, 7 Aug 2023 07:07:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691392079; bh=F73dfEksqPgRocDgpmPvTeMW+wxhwbA+zIAGmCB8tKk=; h=Subject:To:Cc:From:Date:From; b=NB+cMuYRriQIaGaDzb+1VoneUp+vIq+jFX+dnfQWOTggL5as35SbzN0dG2ulBxR53 0yO3WuvfNVdGYy+FSA0N8KAE1+lIlApOaEvgmGt9Jd2i6z7aocQI5C61KjrOOTlSym +FOVBOz20bUsV849Enw0D+yoBVDqtsk67Dz43OCo= Subject: FAILED: patch "[PATCH] ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node" failed to apply to 6.1-stable tree To: xu.yang_2@nxp.com, shawnguo@kernel.org, stable@vger.kernel.org Cc: From: Date: Mon, 07 Aug 2023 09:07:52 +0200 Message-ID: <2023080752-nearness-skeleton-c950@gregkh> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x ee70b908f77a9d8f689dea986f09e6d7dc481934 # git commit -s git send-email --to '' --in-reply-to '2023080752-nearness-skeleton-c950@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: ee70b908f77a ("ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ee70b908f77a9d8f689dea986f09e6d7dc481934 Mon Sep 17 00:00:00 2001 From: Xu Yang Date: Mon, 17 Jul 2023 10:28:33 +0800 Subject: [PATCH] ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node Property name "phy-3p0-supply" is used instead of "phy-reg_3p0-supply". Fixes: 9f30b6b1a957 ("ARM: dts: imx: Add basic dtsi file for imx6sll") cc: Signed-off-by: Xu Yang Signed-off-by: Shawn Guo diff --git a/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi index 2873369a57c0..3659fd5ecfa6 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi @@ -552,7 +552,7 @@ reg = <0x020ca000 0x1000>; interrupts = ; clocks = <&clks IMX6SLL_CLK_USBPHY2>; - phy-reg_3p0-supply = <®_3p0>; + phy-3p0-supply = <®_3p0>; fsl,anatop = <&anatop>; };