lkml.org 
[lkml]   [2022]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH v2 00/14] ARM: dts: imx6ull-colibri: device tree improvements
Date
Hi Shawn

On Thu, 2022-05-05 at 10:47 +0800, Shawn Guo wrote:

[snip]

> The dts series doesn't apply to my branch.
>
> Applying: ARM: dts: imx6ull-colibri: use pull-down for adc pins
> Applying: ARM: dts: imx6ull-colibri: change touch i2c parameters
> Applying: ARM: dts: imx6ull-colibri: add phy-supply to fec
> Applying: ARM: dts: imx6ull-colibri: add touchscreen device nodes
> Applying: ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling
> error: patch failed: arch/arm/boot/dts/imx6ull-colibri.dtsi:35
> error: arch/arm/boot/dts/imx6ull-colibri.dtsi: patch does not apply
> Patch failed at 0005 ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> Applying: ARM: dts: imx6ull-colibri: update device trees to support overlays
> Applying: ARM: dts: imx6ull-colibri: add gpio-line-names
> Applying: ARM: dts: imx6ull-colibri: add support for toradex iris carrier boards
> Applying: ARM: dts: imx6ull-colibri: add support for toradex aster carrier boards
> Applying: ARM: dts: imx6ull-colibri: fix nand bch geometry
> Applying: ARM: dts: imx6ull-colibri: add/update some comments
> error: patch failed: arch/arm/boot/dts/imx6ull-colibri.dtsi:251
> error: arch/arm/boot/dts/imx6ull-colibri.dtsi: patch does not apply
> Patch failed at 0011 ARM: dts: imx6ull-colibri: add/update some comments
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> Applying: ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi
> Applying: ARM: dts: imx6ull-colibri: improve pinctrl node names
> error: patch failed: arch/arm/boot/dts/imx6ull-colibri.dtsi:292
> error: arch/arm/boot/dts/imx6ull-colibri.dtsi: patch does not apply
> Patch failed at 0013 ARM: dts: imx6ull-colibri: improve pinctrl node names
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
>
> Shawn

I just now sent a v3 re-based on your imx/dt. I hope that applies now. Thanks!

Cheers

Marcel
\
 
 \ /
  Last update: 2022-05-06 15:46    [W:0.174 / U:0.388 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site