On Wed, 4 Sep 2024 10:02:16 +0530 Sumit Garg <sumit.g...@linaro.org> wrote:
Hi, > Hi Chris, > > On Fri, 30 Aug 2024 at 21:27, Chris Morgan <macroalph...@gmail.com> wrote: > > > > From: Chris Morgan <macromor...@hotmail.com> > > > > Add pinctrl nodes for the r_i2c node. Without the pinmux defined the > > r_i2c bus may fail to work, possibly if the bootloader uses rsb mode > > for the PMIC. > > > > Link: > > https://lore.kernel.org/linux-sunxi/172252952262.1669767.7675865282122079154.b4...@csie.org/ > > > > [ upstream commit: 7c9ea4ab76176f65f4f55aa144f9145a4bccaacb ] > > > > Signed-off-by: Chris Morgan <macromor...@hotmail.com> > > --- > > arch/arm/dts/sun50i-h616.dtsi | 2 ++ > > dts/upstream/src/arm64/allwinner/sun50i-h616.dtsi | 2 ++ > > 2 files changed, 4 insertions(+) > > > > diff --git a/arch/arm/dts/sun50i-h616.dtsi b/arch/arm/dts/sun50i-h616.dtsi > > index 921d5f61d8..41f2c23e07 100644 > > --- a/arch/arm/dts/sun50i-h616.dtsi > > +++ b/arch/arm/dts/sun50i-h616.dtsi > > @@ -836,6 +836,8 @@ > > clocks = <&r_ccu CLK_R_APB2_I2C>; > > dmas = <&dma 48>, <&dma 48>; > > dma-names = "rx", "tx"; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&r_i2c_pins>; > > This change is sufficient with !OF_UPSTREAM. > > > resets = <&r_ccu RST_R_APB2_I2C>; > > status = "disabled"; > > #address-cells = <1>; > > diff --git a/dts/upstream/src/arm64/allwinner/sun50i-h616.dtsi > > b/dts/upstream/src/arm64/allwinner/sun50i-h616.dtsi > > index 921d5f61d8..41f2c23e07 100644 > > --- a/dts/upstream/src/arm64/allwinner/sun50i-h616.dtsi > > +++ b/dts/upstream/src/arm64/allwinner/sun50i-h616.dtsi > > @@ -836,6 +836,8 @@ > > clocks = <&r_ccu CLK_R_APB2_I2C>; > > dmas = <&dma 48>, <&dma 48>; > > dma-names = "rx", "tx"; > > + pinctrl-names = "default"; > > + pinctrl-0 = <&r_i2c_pins>; > > Please don't manually patch dts/upstream subtree. It is meant to be > updated only with tools/update-subtree.sh script. Also, it isn't > needed as well since you haven't converted to OF_UPSTREAM at this > point. Same applies to patch #8 as well. Yes, but the H616 OF_UPSTREAM patch is already on the list, and this series will intersect at some point. The change above is already in the queue for the kernel tree, so we will pick it up once it appears in the repo. I will sort this all out when merging, but meanwhile it's good to have some functioning series on the list. Cheers, Andre > > -Sumit > > > resets = <&r_ccu RST_R_APB2_I2C>; > > status = "disabled"; > > #address-cells = <1>; > > -- > > 2.34.1 > >
