[Letux-kernel] GTA04A5 suspend and 4.19-rc4

[H. Nikolaus Schaller]

Hi,

> Am 21.09.2018 um 21:04 schrieb Andreas Kemnade <andreas at kemnade.info>:
> 
> Hi,
> 
> On Fri, 21 Sep 2018 20:09:25 +0200
> "H. Nikolaus Schaller" <hns at goldelico.com> wrote:
> 
>> Hi,
>> 
>>> Am 21.09.2018 um 19:58 schrieb Andreas Kemnade <andreas at kemnade.info>:
>>> 
>>> On Fri, 21 Sep 2018 08:25:04 +0200
>>> Andreas Kemnade <andreas at kemnade.info> wrote:
>>> 
>>>> Hi,
>>>> 
>>>> after debugging more I found something interesting:
>>>> good: 4.19-rc4 mainline + letux-4.18 dtb
>>>> good: 4.19-rc4 letux + letux-4.18.dtb
>>>> bad: 4.19-rc4 mainline + letux-4.19-rc4 dtb
>>>> 
>>> bad: 4.19-rc4 mainline + letux-4.19-rc4 dtb +
>>>  git checkout letux-4.18 -- arch/arm/boot/dts/omap3-gta04a5.dts +
>>>  git checkout letux-4.18 -- arch/arm/boot/dts/omap3-gta04a5one.dts
>>> bad:
>>> the above +
>>> git checkout letux-4.18 -- arch/arm/boot/dts/omap3-gta04*
>>> 
>>> Now things get really interesting.
>> 
>> Indeed!
>> 
> well, I think I found something interesting:
> 
> andi at aktux:~/gta04/gta04-kernel/arch/arm/boot/dts$ git diff letux-4.19-rc1 letux-4.19-rc4 Makefile
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 0fb6a0842b85..a2f0d43ce403 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -657,7 +657,6 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
>        omap3-gta04a2.dtb \
>        omap3-gta04a3.dtb \
>        omap3-gta04a4.dtb \
> -       omap3-gta04a5one.dtb \
>        omap3-gta04a5.dtb \
>        omap3-gta04a3+b2.dtb \
>        omap3-gta04a4+b2.dtb \

Really intersting.

Well, this is some merge conflict. I hate this patch rewriting style of using git...

Either we are missing this in the upstream patch series or some other non-posted patch
removes it.

Let's look where we did loose it:

iMac:master hns$ git blame letux-4.19-rc1 arch/arm/boot/dts/Makefile | fgrep gta04a5one
iMac:master hns$
iMac:master hns$ git blame letux-4.18.8 arch/arm/boot/dts/Makefile | fgrep gta04a5one
e28da48cffb24 (H. Nikolaus Schaller             2018-04-07 18:47:07 +0200  643) 	omap3-gta04a5one.dtb \
iMac:master hns$

Ok, we did loose it from work/letux-base/dt-gta04a5-v2 already in 4.19-rc1

BTW: it will be missing upstream as well...

So I'll reformat the patch and submit upstream.

> So I was playing around with an experimental, broken
> omap3-gta04a5one.dtb which ended up in my tree.

That explains a lot.

BR and thanks for identifying the issue,
Nikolaus

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.goldelico.com/pipermail/letux-kernel/attachments/20180921/6cfe1e12/attachment.asc>