Re: [GIT PULL 1/3] bcm2835-dt-next-2019-01-29

From: Florian Fainelli
Date: Fri Feb 01 2019 - 00:03:57 EST




On 1/31/19 8:10 PM, Florian Fainelli wrote:
>
>
> On 1/29/19 10:53 AM, Stefan Wahren wrote:
>> Hi Florian,
>>
>> sorry for being that late and hoping it's not too late.
>>
>> The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c:
>>
>> Linux 5.0-rc1 (2019-01-06 17:08:20 -0800)
>>
>> are available in the git repository at:
>>
>> git://github.com/anholt/linux tags/bcm2835-dt-next-2019-01-29
>>
>> for you to fetch changes up to 14117e0af4a853b2b37925f526b2bfe1cfc7b285:
>>
>> ARM: dts: bcm2835-rpi-zero-w: Drop unnecessary pinctrl (2019-01-22 07:25:59 +0100)
>>
>> ----------------------------------------------------------------
>> This pull request adds the necessary changes for the new BCM2835 PM driver,
>> support for the new Raspberry Pi 3 A+ and the missing GPIO labels for RPi 2/3.
>> Additionally it contains some minor DT fixes.
>>
>> ----------------------------------------------------------------
>
> Merged into devicetree/next, thanks Stefan!

And backed out, integration failed with the following results:

[X] aiaiai build results:
Tested the patch(es) on top of the following commits:
bfeffd155283 Linux 5.0-rc1
85e1ffbd42f6 Merge tag 'kbuild-v4.21-3' of
git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
ac5eed2b4177 Merge branch 'perf-urgent-for-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
574823bfab82 Change mincore() to count "mapped" pages rather than
"cached" pages

--------------------------------------------------------------------------------
Failed to build : 22065550c391 ARM: dts: bcm2835-rpi-zero-w: Drop
unnecessary pinctrl
Configuration: "multi_v7_defconfig, architecture arm".


In file included from arch/arm/boot/dts/bcm2835.dtsi:2:0,
from arch/arm/boot/dts/bcm2835-rpi-a.dts:3:
arch/arm/boot/dts/bcm283x.dtsi:6:10: fatal error:
dt-bindings/soc/bcm2835-pm.h: No such file or directory
#include <dt-bindings/soc/bcm2835-pm.h>
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
compilation terminated.
make[2]: *** [arch/arm/boot/dts/bcm2835-rpi-a.dtb] Error 1

--------------------------------------------------------------------------------
Failed to build : 22065550c391 ARM: dts: bcm2835-rpi-zero-w: Drop
unnecessary pinctrl
Configuration: "bcm2835_defconfig, architecture arm".

It looks like commit "ARM: bcm283x: Switch V3D over to using the PM
driver instead of firmware." is failing here and we should also have
"soc: bcm: bcm2835-pm: Add support for power domains under a new
binding." present as a preriquisite to build this branch.

Alternatively, if you prefer to put "ARM: bcm283x: Switch V3D over to
using the PM driver instead of firmware." in your drivers pull request,
that might work too.

I have kept pull request 2 and 3 applied for now, let me know how you
want to proceed.
--
Florian