Re: linux-next: build failure after merge of the sunxi tree
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
signature.asc
Description: PGP signature
linux-next: build failure after merge of the sunxi tree
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
pgpP_gZmuKimp.pgp
Description: OpenPGP digital signature
linux-next: build failure after merge of the sunxi tree
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
^~~~
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
^~~~
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
pgpap6NjsFmrb.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the sunxi tree
Hi,
On Thu, Mar 8, 2018 at 10:37 AM, Emmanuel Vadot wrote:
>
> Hi All,
>
> On Thu, 8 Mar 2018 09:35:32 +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 "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
Re: linux-next: build failure after merge of the sunxi tree
Hi All,
On Thu, 8 Mar 2018 09:35:32 +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 "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
linux-next: build failure after merge of the sunxi tree
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
pgpUADWE9jmsG.pgp
Description: OpenPGP digital signature
Re: linux-next: build failure after merge of the sunxi tree
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
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
On Wed, Mar 08, 2017 at 10:26:54AM +0200, Jani Nikula wrote: > On Tue, 07 Mar 2017, Maxime Ripard 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
On Tue, 07 Mar 2017, Maxime Ripard 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
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
signature.asc
Description: PGP signature
linux-next: build failure after merge of the sunxi tree
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
Date: Tue, 7 Mar 2017 11:06:45 +1100
Subject: [PATCH] drm: sun4i: fixup for struct sun4i_crtc changes
Signed-off-by: Stephen Rothwell
---
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
Re: linux-next: build failure after merge of the sunxi tree
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
signature.asc
Description: PGP signature
linux-next: build failure after merge of the sunxi tree
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
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
signature.asc
Description: Digital signature
linux-next: build failure after merge of the sunxi tree
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
