From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jeffery Date: Fri, 27 Sep 2024 15:27:25 +0930 Subject: [PATCH v1] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board In-Reply-To: <20240926024133.3786712-1-Delphine_CC_Chiu@wiwynn.com> References: <20240926024133.3786712-1-Delphine_CC_Chiu@wiwynn.com> Message-ID: List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Thu, 2024-09-26 at 10:41 +0800, Delphine CC Chiu wrote: > From: Ricky CX Wu > > Add I2C mux for CPLD IOE on Spider Board. > > Signed-off-by: Ricky CX Wu > Signed-off-by: Delphine CC Chiu > --- > .../aspeed/aspeed-bmc-facebook-yosemite4.dts | 67 +++++++++++++++++++ > 1 file changed, 67 insertions(+) > > diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts > index 98477792aa00..ea1a9c765483 100644 > --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts > +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts > @@ -17,6 +17,9 @@ aliases { > serial6 = &uart7; > serial7 = &uart8; > serial8 = &uart9; > + > + i2c28 = &imux28; > + i2c29 = &imux29; > }; > Have you tried to apply all of your individual yosemite4 patches together in one branch? I have, and unfortunately I can't apply them all, because they generate conflicts with each other. If your patches have context dependencies you need to send them as a single series and not separate patches that cannot be properly combined. Please assess the remaining yosemite4 devicetree patches (those you haven't received a thank-you email for) and send an appropriately constructed series so they can all be applied together, based on the tree here: https://github.com/amboar/linux/tree/for/bmc/dt Please also indicate in the cover letter (with links to lore) which remaining patches are truly independent that still need to be applied. Thanks, Andrew 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4912BCEBF76 for ; Fri, 27 Sep 2024 05:58:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version: Content-Transfer-Encoding:Content-Type:References:In-Reply-To:Date:Cc:To:From :Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=eGQo/HTGjs3ISaIHu6Q8vT0fMKDRuGcwPfT4rFP9Omc=; b=itDcYVUmGLigGPWyL9v42im9+7 hLNp20gzFCStv6+r0GP6UafbX7tHly2s30ghc3fCrj6dYAbpNCzBjv8wxmORdLCeYhJ/76ubQbiSF cYiCA12O71F/W3ttIg+4TsZvZhwn7/CT52nUVA/AGypA+nujZODimtcDDF15rwYf9VDNcMBGdA3Nr MUmu2nw6w2mqcUn26zVGHxIqxZvKq3deQJHaPg6jXd3zl2i+Iy1s5t3Of8r48EmxbLXwWGNhBsNc/ gyKDmTsqd8rRGvoUrI7gqF4XQm1++exKLV7jWk2wCSGiAMRALopRIw7ZjKLBjF8631M3DMHOJ3Tr/ pE0pQwzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1su404-0000000A7zs-017w; Fri, 27 Sep 2024 05:58:44 +0000 Received: from pi.codeconstruct.com.au ([203.29.241.158] helo=codeconstruct.com.au) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1su3ys-0000000A7na-1pc5 for linux-arm-kernel@lists.infradead.org; Fri, 27 Sep 2024 05:57:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1727416648; bh=eGQo/HTGjs3ISaIHu6Q8vT0fMKDRuGcwPfT4rFP9Omc=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=Bj5SYJBSHeTkNGOeTLidEjQytHkORHTbweHdN0NHnLekD0t4Rs2tqz1ONv0KhUFsY lLGDgZ+YgtK03IReFtcwJJdLBMABgMAwF1VxVK1l9vyFDYK1yu/o4a9WT/IOyZH9JV JYC9WxKzvgcktRgfXhy3XtzDnZ0uKZPdDRtg34msQ/01UgyFFjP1ew4Jvah9PNuOSd 5tb23z9fM3HdfgqmnJa5cBeXiZvZtXi+Qqb2/ms8x5cXD61UUBUJ3DWIEWGoDu6yNR +6Eitm5VBPJAJ7Q+o5Ewiym/fFSnMF1t8uqUw+lC624/gQtSB7Rws93GufUmzwpci5 rJ4+rmTd5/iLw== Received: from [192.168.68.112] (ppp118-210-187-73.adl-adc-lon-bras34.tpg.internode.on.net [118.210.187.73]) by mail.codeconstruct.com.au (Postfix) with ESMTPSA id B483A65029; Fri, 27 Sep 2024 13:57:27 +0800 (AWST) Message-ID: Subject: Re: [PATCH v1] ARM: dts: aspeed: yosemite4: Add i2c-mux for CPLD IOE on Spider Board From: Andrew Jeffery To: Delphine CC Chiu , patrick@stwcx.xyz, Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley Cc: Ricky CX Wu , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Date: Fri, 27 Sep 2024 15:27:25 +0930 In-Reply-To: <20240926024133.3786712-1-Delphine_CC_Chiu@wiwynn.com> References: <20240926024133.3786712-1-Delphine_CC_Chiu@wiwynn.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4-2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240926_225730_704911_8B314CF7 X-CRM114-Status: GOOD ( 13.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, 2024-09-26 at 10:41 +0800, Delphine CC Chiu wrote: > From: Ricky CX Wu >=20 > Add I2C mux for CPLD IOE on Spider Board. >=20 > Signed-off-by: Ricky CX Wu > Signed-off-by: Delphine CC Chiu > --- > .../aspeed/aspeed-bmc-facebook-yosemite4.dts | 67 +++++++++++++++++++ > 1 file changed, 67 insertions(+) >=20 > diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts b= /arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts > index 98477792aa00..ea1a9c765483 100644 > --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts > +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts > @@ -17,6 +17,9 @@ aliases { > serial6 =3D &uart7; > serial7 =3D &uart8; > serial8 =3D &uart9; > + > + i2c28 =3D &imux28; > + i2c29 =3D &imux29; > }; > =20 Have you tried to apply all of your individual yosemite4 patches together in one branch? I have, and unfortunately I can't apply them all, because they generate conflicts with each other. If your patches have context dependencies you need to send them as a single series and not separate patches that cannot be properly combined. Please assess the remaining yosemite4 devicetree patches (those you haven't received a thank-you email for) and send an appropriately constructed series so they can all be applied together, based on the tree here: https://github.com/amboar/linux/tree/for/bmc/dt Please also indicate in the cover letter (with links to lore) which remaining patches are truly independent that still need to be applied. Thanks, Andrew