linux-next: build failure after merge of the sunxi tree

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

Hi Maxime,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR (phandle_references): Reference to non-existent node or label "pwm1_pins_a"
ERROR: Input tree has errors, aborting (use -f to force output)
scripts/Makefile.lib:313: recipe for target 'arch/arm/boot/dts/ntc-gr8-chip-pro.dtb' failed

Caused by commit

  f49f86fa3b49 ("ARM: gr8: Add CHIP Pro support")

I have used the sunxi tree from next-20161024 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 759 bytes --]

On Tue, Oct 25, 2016 at 11:26:28AM +1100, Stephen Rothwell wrote:
> Hi Maxime,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> ERROR (phandle_references): Reference to non-existent node or label "pwm1_pins_a"
> ERROR: Input tree has errors, aborting (use -f to force output)
> scripts/Makefile.lib:313: recipe for target 'arch/arm/boot/dts/ntc-gr8-chip-pro.dtb' failed
> 
> Caused by commit
> 
>   f49f86fa3b49 ("ARM: gr8: Add CHIP Pro support")
> 
> I have used the sunxi tree from next-20161024 for today.

Ugh, sorry for that. The commit is fixed now...

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2479 bytes --]

Hi all,

After merging the sunxi tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c: In function 'suniv_f1c100s_ccu_setup':
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:532:39: error: 'pdev' undeclared (first use in this function)
  532 |  reg = devm_platform_ioremap_resource(pdev, 0);
      |                                       ^~~~
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:532:39: note: each undeclared identifier is reported only once for each function it appears in
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:534:10: error: 'return' with a value, in function returning void [-Werror=return-type]
  534 |   return PTR_ERR(reg);
      |          ^~~~~~~~~~~~
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: note: declared here
  526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:543:10: error: 'return' with a value, in function returning void [-Werror=return-type]
  543 |   return ret;
      |          ^~~
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: note: declared here
  526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:552:9: error: 'return' with a value, in function returning void [-Werror=return-type]
  552 |  return 0;
      |         ^
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: note: declared here
  526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c: At top level:
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:561:11: error: 'suniv_f1c100s_ccu_probe' undeclared here (not in a function); did you mean 'suniv_f1c100s_ccu_driver'?
  561 |  .probe = suniv_f1c100s_ccu_probe,
      |           ^~~~~~~~~~~~~~~~~~~~~~~
      |           suniv_f1c100s_ccu_driver
drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: error: 'suniv_f1c100s_ccu_setup' defined but not used [-Werror=unused-function]
  526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
      |                    ^~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  72dc8e122383 ("clk: sunxi-ng: Convert early providers to platform drivers")

I have used the sunxi tree from next-20211118 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 2693 bytes --]

Hi,

On Tue, Nov 23, 2021 at 10:27:17AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c: In function 'suniv_f1c100s_ccu_setup':
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:532:39: error: 'pdev' undeclared (first use in this function)
>   532 |  reg = devm_platform_ioremap_resource(pdev, 0);
>       |                                       ^~~~
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:532:39: note: each undeclared identifier is reported only once for each function it appears in
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:534:10: error: 'return' with a value, in function returning void [-Werror=return-type]
>   534 |   return PTR_ERR(reg);
>       |          ^~~~~~~~~~~~
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: note: declared here
>   526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
>       |                    ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:543:10: error: 'return' with a value, in function returning void [-Werror=return-type]
>   543 |   return ret;
>       |          ^~~
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: note: declared here
>   526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
>       |                    ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:552:9: error: 'return' with a value, in function returning void [-Werror=return-type]
>   552 |  return 0;
>       |         ^
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: note: declared here
>   526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
>       |                    ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c: At top level:
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:561:11: error: 'suniv_f1c100s_ccu_probe' undeclared here (not in a function); did you mean 'suniv_f1c100s_ccu_driver'?
>   561 |  .probe = suniv_f1c100s_ccu_probe,
>       |           ^~~~~~~~~~~~~~~~~~~~~~~
>       |           suniv_f1c100s_ccu_driver
> drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c:526:20: error: 'suniv_f1c100s_ccu_setup' defined but not used [-Werror=unused-function]
>   526 | static void __init suniv_f1c100s_ccu_setup(struct device_node *node)
>       |                    ^~~~~~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   72dc8e122383 ("clk: sunxi-ng: Convert early providers to platform drivers")
> 
> I have used the sunxi tree from next-20211118 for today.

I fixed it and pushed to the sunxi tree, it should be good tomorrow

Thanks!
Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/boot/dts/sun8i-h3-zeropi.dts:53.25-63.4: ERROR (phandle_references): /gmac-3v3: Reference to non-existent node or label "gmac_power_pin_nanopi"

ERROR: Input tree has errors, aborting (use -f to force output)

Caused by commit

  89cfb6d76fdc ("ARM: dts: sun8i: add FriendlyArm ZeroPi support")

I have reverted that commit for today.



-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

Hi Stephen,

On Tue, Oct 27, 2020 at 10:42:20AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/sun8i-h3-zeropi.dts:53.25-63.4: ERROR (phandle_references): /gmac-3v3: Reference to non-existent node or label "gmac_power_pin_nanopi"
> 
> ERROR: Input tree has errors, aborting (use -f to force output)
> 
> Caused by commit
> 
>   89cfb6d76fdc ("ARM: dts: sun8i: add FriendlyArm ZeroPi support")
> 
> I have reverted that commit for today.

Sorry for that, Yu-Tung sent a fix for it that is now in my branch for
next, so all should be good tomorrow.

Thanks!
Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 4096 bytes --]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [scripts/Makefile.lib:292: arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dtb] Error 2
arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [scripts/Makefile.lib:292: arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dtb] Error 2
arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [scripts/Makefile.lib:292: arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dtb] Error 2

I am not sure which commits caused this.  I have used the sunxi tree
from next-20200106 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 4248 bytes --]

Hi,

On Tue, Jan 07, 2020 at 09:20:17AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [scripts/Makefile.lib:292: arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dtb] Error 2
> arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [scripts/Makefile.lib:292: arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dtb] Error 2
> arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:656.21-669.5: ERROR (phandle_references): /soc/spi@1c05000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:671.21-684.5: ERROR (phandle_references): /soc/spi@1c06000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:686.21-699.5: ERROR (phandle_references): /soc/spi@1c07000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
> arch/arm/boot/dts/sun8i-r40.dtsi:701.21-714.5: ERROR (phandle_references): /soc/spi@1c0f000: Reference to non-existent node or label "dma"
> ERROR: Input tree has errors, aborting (use -f to force output)
> make[2]: *** [scripts/Makefile.lib:292: arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dtb] Error 2
>
> I am not sure which commits caused this.  I have used the sunxi tree
> from next-20200106 for today.

I just (~1 minute ago) pushed a fix for this.

sorry for the troubles.

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

In file included from arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts:45:0:
arch/arm/boot/dts/sun8i-r40.dtsi:47:10: fatal error: dt-bindings/clock/sun8i-tcon-top.h: No such file or directory
 #include <dt-bindings/clock/sun8i-tcon-top.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts:44:0:
arch/arm/boot/dts/sun8i-r40.dtsi:47:10: fatal error: dt-bindings/clock/sun8i-tcon-top.h: No such file or directory
 #include <dt-bindings/clock/sun8i-tcon-top.h>
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  2324106f7e43 ("ARM: dts: sun8i: r40: Add HDMI pipeline")

I have used the sunxi tree from next-20180627 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dtb: ERROR (phandle_references): Reference to non-existent node or label "mmc2_8bits_pins"

Caused by commit

  89fd776b2b9f ("dts: sunxi: Add eMMC for NanoPi M1 Plus")

I have merged the version of the sunxi tree from next-20180307 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the sunxi tree

[Emmanuel Vadot]

 Hi All,

On Thu, 8 Mar 2018 09:35:32 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dtb: ERROR (phandle_references): Reference to non-existent node or label "mmc2_8bits_pins"
> 
> Caused by commit
> 
>   89fd776b2b9f ("dts: sunxi: Add eMMC for NanoPi M1 Plus")
> 
> I have merged the version of the sunxi tree from next-20180307 for today.
> 
> -- 
> Cheers,
> Stephen Rothwell

 I don't even know how I managed to screw this patch.
 Maxime, Chen-Yu,  how would you like this problem to be handled ?

 Cheers,

-- 
Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>

Re: linux-next: build failure after merge of the sunxi tree

[Chen-Yu Tsai]

Hi,

On Thu, Mar 8, 2018 at 10:37 AM, Emmanuel Vadot <manu@bidouilliste.com> wrote:
>
>  Hi All,
>
> On Thu, 8 Mar 2018 09:35:32 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi all,
>>
>> After merging the sunxi tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dtb: ERROR (phandle_references): Reference to non-existent node or label "mmc2_8bits_pins"
>>
>> Caused by commit
>>
>>   89fd776b2b9f ("dts: sunxi: Add eMMC for NanoPi M1 Plus")
>>
>> I have merged the version of the sunxi tree from next-20180307 for today.
>>
>> --
>> Cheers,
>> Stephen Rothwell
>
>  I don't even know how I managed to screw this patch.
>  Maxime, Chen-Yu,  how would you like this problem to be handled ?

There was a typo: "mmc2_8bits_pins" should have been "mmc2_8bit_pins".

I've fixed it and updated our branches.

ChenYu

>
>  Cheers,
>
> --
> Emmanuel Vadot <manu@bidouilliste.com> <manu@freebsd.org>

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dtb: ERROR (phandle_references): Reference to non-existent node or label "reg_gmac_3v3"

ERROR: Input tree has errors, aborting (use -f to force output)

Caused by commit

  547a66779cbd ("ARM: dts: sunxi: Restore EMAC changes (boards)")

I have used the sunxi tree from next-20171018 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the sunxi tree

[Corentin Labbe]

On Wed, Nov 01, 2017 at 07:43:45AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dtb: ERROR (phandle_references): Reference to non-existent node or label "reg_gmac_3v3"
> 
> ERROR: Input tree has errors, aborting (use -f to force output)
> 
> Caused by commit
> 
>   547a66779cbd ("ARM: dts: sunxi: Restore EMAC changes (boards)")
> 
> I have used the sunxi tree from next-20171018 for today.
> 

Sorry that's my fault.

I will send the fix soon.

Regards

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank':
drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv'
  struct sun4i_drv *drv = scrtc->drv;
                               ^
drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank':
drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv'
  struct sun4i_drv *drv = scrtc->drv;
                               ^

Caused by commit

  50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")

from the drm-misc tree interacting with commit

  1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc")

from the sunxi tree.

I added this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Mar 2017 11:06:45 +1100
Subject: [PATCH] drm: sun4i: fixup for struct sun4i_crtc changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/sun4i/sun4i_crtc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
index a1634ff6eb40..7bbcedff9f07 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
@@ -106,11 +106,10 @@ static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = {
 static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc)
 {
 	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
-	struct sun4i_drv *drv = scrtc->drv;
 
 	DRM_DEBUG_DRIVER("Enabling VBLANK on crtc %p\n", crtc);
 
-	sun4i_tcon_enable_vblank(drv->tcon, true);
+	sun4i_tcon_enable_vblank(scrtc->tcon, true);
 
 	return 0;
 }
@@ -118,11 +117,10 @@ static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc)
 static void sun4i_crtc_disable_vblank(struct drm_crtc *crtc)
 {
 	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
-	struct sun4i_drv *drv = scrtc->drv;
 
 	DRM_DEBUG_DRIVER("Disabling VBLANK on crtc %p\n", crtc);
 
-	sun4i_tcon_enable_vblank(drv->tcon, false);
+	sun4i_tcon_enable_vblank(scrtc->tcon, false);
 }
 
 static const struct drm_crtc_funcs sun4i_crtc_funcs = {
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

Hi all,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank':
drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv'
  struct sun4i_drv *drv = scrtc->drv;
                               ^
drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank':
drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv'
  struct sun4i_drv *drv = scrtc->drv;
                               ^

Caused by commit

  50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")

from the drm-misc tree interacting with commit

  1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc")

from the sunxi tree.

I added this merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 7 Mar 2017 11:06:45 +1100
Subject: [PATCH] drm: sun4i: fixup for struct sun4i_crtc changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/sun4i/sun4i_crtc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
index a1634ff6eb40..7bbcedff9f07 100644
--- a/drivers/gpu/drm/sun4i/sun4i_crtc.c
+++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
@@ -106,11 +106,10 @@ static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = {
 static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc)
 {
 	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
-	struct sun4i_drv *drv = scrtc->drv;
 
 	DRM_DEBUG_DRIVER("Enabling VBLANK on crtc %p\n", crtc);
 
-	sun4i_tcon_enable_vblank(drv->tcon, true);
+	sun4i_tcon_enable_vblank(scrtc->tcon, true);
 
 	return 0;
 }
@@ -118,11 +117,10 @@ static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc)
 static void sun4i_crtc_disable_vblank(struct drm_crtc *crtc)
 {
 	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
-	struct sun4i_drv *drv = scrtc->drv;
 
 	DRM_DEBUG_DRIVER("Disabling VBLANK on crtc %p\n", crtc);
 
-	sun4i_tcon_enable_vblank(drv->tcon, false);
+	sun4i_tcon_enable_vblank(scrtc->tcon, false);
 }
 
 static const struct drm_crtc_funcs sun4i_crtc_funcs = {
-- 
2.11.0

-- 
Cheers,
Stephen Rothwell
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

Hi Stephen, Daniel,

On Tue, Mar 07, 2017 at 11:10:19AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank':
> drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv'
>   struct sun4i_drv *drv = scrtc->drv;
>                                ^
> drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank':
> drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv'
>   struct sun4i_drv *drv = scrtc->drv;
>                                ^
> 
> Caused by commit
> 
>   50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")
> 
> from the drm-misc tree interacting with commit
> 
>   1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc")
> 
> from the sunxi tree.

I just rebased my tree on top of the latest drm-misc tag
(drm-misc-next-2017-03-06). It should compile, and not have merge
conflicts anymore.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1.1: Type: text/plain, Size: 1261 bytes --]

Hi Stephen, Daniel,

On Tue, Mar 07, 2017 at 11:10:19AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_enable_vblank':
> drivers/gpu/drm/sun4i/sun4i_crtc.c:109:31: error: 'struct sun4i_crtc' has no member named 'drv'
>   struct sun4i_drv *drv = scrtc->drv;
>                                ^
> drivers/gpu/drm/sun4i/sun4i_crtc.c: In function 'sun4i_crtc_disable_vblank':
> drivers/gpu/drm/sun4i/sun4i_crtc.c:121:31: error: 'struct sun4i_crtc' has no member named 'drv'
>   struct sun4i_drv *drv = scrtc->drv;
>                                ^
> 
> Caused by commit
> 
>   50480a78e282 ("drm: sun4i: use vblank hooks in struct drm_crtc_funcs")
> 
> from the drm-misc tree interacting with commit
> 
>   1b8d109585df ("drm/sun4i: Add backend and tcon pointers to sun4i_crtc")
> 
> from the sunxi tree.

I just rebased my tree on top of the latest drm-misc tag
(drm-misc-next-2017-03-06). It should compile, and not have merge
conflicts anymore.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: linux-next: build failure after merge of the sunxi tree

[Jani Nikula]

On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> I just rebased my tree on top of the latest drm-misc tag
> (drm-misc-next-2017-03-06). It should compile, and not have merge
> conflicts anymore.

Conflicts happen. Rebasing should not be the standard operating
procedure for fixing them.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center

Re: linux-next: build failure after merge of the sunxi tree

[Jani Nikula]

On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> I just rebased my tree on top of the latest drm-misc tag
> (drm-misc-next-2017-03-06). It should compile, and not have merge
> conflicts anymore.

Conflicts happen. Rebasing should not be the standard operating
procedure for fixing them.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: linux-next: build failure after merge of the sunxi tree

[Daniel Vetter]

On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote:
> On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> > I just rebased my tree on top of the latest drm-misc tag
> > (drm-misc-next-2017-03-06). It should compile, and not have merge
> > conflicts anymore.
> 
> Conflicts happen. Rebasing should not be the standard operating
> procedure for fixing them.

I think for this one here it's ok, very early in the feature cycle, few
patches, nasty conflict. But yeah the same thing right before the merge
window opens wouldn't be cool.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

Re: linux-next: build failure after merge of the sunxi tree

[Daniel Vetter]

On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote:
> On Tue, 07 Mar 2017, Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> > I just rebased my tree on top of the latest drm-misc tag
> > (drm-misc-next-2017-03-06). It should compile, and not have merge
> > conflicts anymore.
> 
> Conflicts happen. Rebasing should not be the standard operating
> procedure for fixing them.

I think for this one here it's ok, very early in the feature cycle, few
patches, nasty conflict. But yeah the same thing right before the merge
window opens wouldn't be cool.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

linux-next: build failure after merge of the sunxi tree

[Stephen Rothwell]

Hi Maxime,

After merging the sunxi tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/clk/sunxi/clk-sunxi.c: In function 'sunxi_mux_clk_setup':
drivers/clk/sunxi/clk-sunxi.c:712:2: warning: 'return' with no value, in function returning non-void [-Wreturn-type]
  return;
  ^
drivers/clk/sunxi/clk-sunxi.c:718:20: error: invalid storage class for function 'sun4i_cpu_clk_setup'
 static void __init sun4i_cpu_clk_setup(struct device_node *node)
                    ^
drivers/clk/sunxi/clk-sunxi.c:718:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
 static void __init sun4i_cpu_clk_setup(struct device_node *node)
 ^
In file included from include/linux/clk-provider.h:15:0,
                 from drivers/clk/sunxi/clk-sunxi.c:18:
include/linux/of.h:937:16: error: initializer element is not constant
        .data = (fn == (fn_type)NULL) ? fn : fn  }
                ^
include/linux/of.h:950:3: note: in expansion of macro '_OF_DECLARE'
   _OF_DECLARE(table, name, compat, fn, of_init_fn_1)
   ^

and on and on ...

Caused by commit

  1190461d5ad8 ("clk: sunxi: Remove clk_register_clkdev calls")

I have used the sunxi tree from next-20160204 for today.

-- 
Cheers,
Stephen Rothwell

Re: linux-next: build failure after merge of the sunxi tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1660 bytes --]

Hi Stephen,

On Fri, Feb 05, 2016 at 10:14:12AM +1100, Stephen Rothwell wrote:
> Hi Maxime,
> 
> After merging the sunxi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/clk/sunxi/clk-sunxi.c: In function 'sunxi_mux_clk_setup':
> drivers/clk/sunxi/clk-sunxi.c:712:2: warning: 'return' with no value, in function returning non-void [-Wreturn-type]
>   return;
>   ^
> drivers/clk/sunxi/clk-sunxi.c:718:20: error: invalid storage class for function 'sun4i_cpu_clk_setup'
>  static void __init sun4i_cpu_clk_setup(struct device_node *node)
>                     ^
> drivers/clk/sunxi/clk-sunxi.c:718:1: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
>  static void __init sun4i_cpu_clk_setup(struct device_node *node)
>  ^
> In file included from include/linux/clk-provider.h:15:0,
>                  from drivers/clk/sunxi/clk-sunxi.c:18:
> include/linux/of.h:937:16: error: initializer element is not constant
>         .data = (fn == (fn_type)NULL) ? fn : fn  }
>                 ^
> include/linux/of.h:950:3: note: in expansion of macro '_OF_DECLARE'
>    _OF_DECLARE(table, name, compat, fn, of_init_fn_1)
>    ^
> 
> and on and on ...
> 
> Caused by commit
> 
>   1190461d5ad8 ("clk: sunxi: Remove clk_register_clkdev calls")
> 
> I have used the sunxi tree from next-20160204 for today.

It was a flacky merge on my side, sorry for that.

It's fixed and pushed, hopefully it won't break in the next version.

Thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]