* [PATCH 0/2] arm: AT91: device-tree fixes for AT91SAM9G45 @ 2017-08-29 20:08 Michał Mirosław 2017-08-29 20:08 ` [PATCH 1/2] arm: AT91: enable ac97 controller for at91sam9g45 Michał Mirosław 2017-08-29 20:08 ` [PATCH 2/2] arm: AT91: fix DT duplicate node name Michał Mirosław 0 siblings, 2 replies; 8+ messages in thread From: Michał Mirosław @ 2017-08-29 20:08 UTC (permalink / raw) To: linux-arm-kernel Two simple fixes for AT91SAM9G45-based board. Micha? Miros?aw (2): arm: AT91: enable ac97 controller for at91sam9g45 arm: AT91: fix DT duplicate node name arch/arm/boot/dts/at91sam9g45.dtsi | 21 ++++++++++++++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 52 ++++++++++++++++++---------------- 2 files changed, 49 insertions(+), 24 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] arm: AT91: enable ac97 controller for at91sam9g45 2017-08-29 20:08 [PATCH 0/2] arm: AT91: device-tree fixes for AT91SAM9G45 Michał Mirosław @ 2017-08-29 20:08 ` Michał Mirosław 2017-08-29 20:25 ` Alexandre Belloni 2017-08-29 20:08 ` [PATCH 2/2] arm: AT91: fix DT duplicate node name Michał Mirosław 1 sibling, 1 reply; 8+ messages in thread From: Michał Mirosław @ 2017-08-29 20:08 UTC (permalink / raw) To: linux-arm-kernel Add AC97 controller node as present on AT91SAM9G45-EKES board. Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> --- arch/arm/boot/dts/at91sam9g45.dtsi | 21 +++++++++++++++++++++ arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index e567d5fd3f9d..0e69a97695cd 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -846,6 +846,16 @@ }; }; + ac97 { + pinctrl_ac97: ac97-0 { + atmel,pins = + <AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD8 periph A AC97FS pin */ + AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD9 periph A AC97CK pin */ + AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD7 periph A AC97TX pin */ + AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD6 periph A AC97RX pin */ + }; + }; + pioA: gpio at fffff200 { compatible = "atmel,at91rm9200-gpio"; reg = <0xfffff200 0x200>; @@ -965,6 +975,17 @@ status = "disabled"; }; + ac97: sound at fffac000 { + compatible = "atmel,at91sam9263-ac97c"; + reg = <0xfffac000 0x4000>; + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 5>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ac97>; + clocks = <&ac97_clk>; + clock-names = "ac97_clk"; + status = "disabled"; + }; + macb0: ethernet at fffbc000 { compatible = "cdns,at91sam9260-macb", "cdns,macb"; reg = <0xfffbc000 0x100>; diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 2400c99134f7..9cf1f5163fbd 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -47,6 +47,10 @@ status = "okay"; }; + ac97: sound at fffac000 { + status = "okay"; + }; + macb0: ethernet at fffbc000 { phy-mode = "rmii"; status = "okay"; -- 2.11.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] arm: AT91: enable ac97 controller for at91sam9g45 2017-08-29 20:08 ` [PATCH 1/2] arm: AT91: enable ac97 controller for at91sam9g45 Michał Mirosław @ 2017-08-29 20:25 ` Alexandre Belloni 0 siblings, 0 replies; 8+ messages in thread From: Alexandre Belloni @ 2017-08-29 20:25 UTC (permalink / raw) To: linux-arm-kernel Hi, I have that in my tree which seems similar enough: https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git/commit/?h=at91-dt&id=1a9f9af07e806dd4d5df109c61ac0d5c74fe9b32 On 29/08/2017 at 22:08:53 +0200, Micha? Miros?aw wrote: > Add AC97 controller node as present on AT91SAM9G45-EKES board. > > Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> > --- > arch/arm/boot/dts/at91sam9g45.dtsi | 21 +++++++++++++++++++++ > arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 ++++ > 2 files changed, 25 insertions(+) > > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index e567d5fd3f9d..0e69a97695cd 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -846,6 +846,16 @@ > }; > }; > > + ac97 { > + pinctrl_ac97: ac97-0 { > + atmel,pins = > + <AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD8 periph A AC97FS pin */ > + AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD9 periph A AC97CK pin */ > + AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD7 periph A AC97TX pin */ > + AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD6 periph A AC97RX pin */ > + }; > + }; > + > pioA: gpio at fffff200 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff200 0x200>; > @@ -965,6 +975,17 @@ > status = "disabled"; > }; > > + ac97: sound at fffac000 { > + compatible = "atmel,at91sam9263-ac97c"; > + reg = <0xfffac000 0x4000>; > + interrupts = <24 IRQ_TYPE_LEVEL_HIGH 5>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_ac97>; > + clocks = <&ac97_clk>; > + clock-names = "ac97_clk"; > + status = "disabled"; > + }; > + > macb0: ethernet at fffbc000 { > compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xfffbc000 0x100>; > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index 2400c99134f7..9cf1f5163fbd 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -47,6 +47,10 @@ > status = "okay"; > }; > > + ac97: sound at fffac000 { > + status = "okay"; > + }; > + > macb0: ethernet at fffbc000 { > phy-mode = "rmii"; > status = "okay"; > -- > 2.11.0 > -- Alexandre Belloni, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] arm: AT91: fix DT duplicate node name 2017-08-29 20:08 [PATCH 0/2] arm: AT91: device-tree fixes for AT91SAM9G45 Michał Mirosław 2017-08-29 20:08 ` [PATCH 1/2] arm: AT91: enable ac97 controller for at91sam9g45 Michał Mirosław @ 2017-08-29 20:08 ` Michał Mirosław 2017-09-14 16:53 ` Nicolas Ferre 1 sibling, 1 reply; 8+ messages in thread From: Michał Mirosław @ 2017-08-29 20:08 UTC (permalink / raw) To: linux-arm-kernel Fix following warning at bootup: device-tree: Duplicate name in fb at 0x00500000, renamed to "display#1" Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> --- arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 9cf1f5163fbd..272af5867403 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -223,30 +223,6 @@ fb0: fb at 0x00500000 { display = <&display0>; status = "okay"; - - display0: display { - bits-per-pixel = <32>; - atmel,lcdcon-backlight; - atmel,dmacon = <0x1>; - atmel,lcdcon2 = <0x80008002>; - atmel,guard-time = <9>; - atmel,lcd-wiring-mode = "RGB"; - - display-timings { - native-mode = <&timing0>; - timing0: timing0 { - clock-frequency = <9000000>; - hactive = <480>; - vactive = <272>; - hback-porch = <1>; - hfront-porch = <1>; - vback-porch = <40>; - vfront-porch = <1>; - hsync-len = <45>; - vsync-len = <1>; - }; - }; - }; }; nand0: nand at 40000000 { @@ -293,6 +269,30 @@ }; }; + display0: display { + bits-per-pixel = <32>; + atmel,lcdcon-backlight; + atmel,dmacon = <0x1>; + atmel,lcdcon2 = <0x80008002>; + atmel,guard-time = <9>; + atmel,lcd-wiring-mode = "RGB"; + + display-timings { + native-mode = <&timing0>; + timing0: 480x272 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hback-porch = <1>; + hfront-porch = <1>; + vback-porch = <40>; + vfront-porch = <1>; + hsync-len = <45>; + vsync-len = <1>; + }; + }; + }; + pwmleds { compatible = "pwm-leds"; -- 2.11.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] arm: AT91: fix DT duplicate node name @ 2017-09-14 16:53 ` Nicolas Ferre 0 siblings, 0 replies; 8+ messages in thread From: Nicolas Ferre @ 2017-09-14 16:53 UTC (permalink / raw) To: linux-arm-kernel On 29/08/2017 at 22:08, Micha? Miros?aw wrote: > Fix following warning at bootup: > > device-tree: Duplicate name in fb at 0x00500000, renamed to "display#1" > > Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> > --- > arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++----------------- > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index 9cf1f5163fbd..272af5867403 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -223,30 +223,6 @@ > fb0: fb at 0x00500000 { > display = <&display0>; > status = "okay"; > - > - display0: display { Micha?, thanks for your patch. Actually the DT binding requires this: Documentation/devicetree/bindings/video/atmel,lcdc.txt So it's somehow a bigger issue. Moreover, several boards have exactly the same arrangement than the at91sam9m10g45ek, so you probably need to modify them all at the same time. After a brief look at drivers/video/fbdev/atmel_lcdfb.c it seems that the name of the node is not so much important, so we can modify it (something like display0: lcd-display {}) . I suggest that you modify the binding, the board files affected and re-submit a patch. Best regards, > - bits-per-pixel = <32>; > - atmel,lcdcon-backlight; > - atmel,dmacon = <0x1>; > - atmel,lcdcon2 = <0x80008002>; > - atmel,guard-time = <9>; > - atmel,lcd-wiring-mode = "RGB"; > - > - display-timings { > - native-mode = <&timing0>; > - timing0: timing0 { > - clock-frequency = <9000000>; > - hactive = <480>; > - vactive = <272>; > - hback-porch = <1>; > - hfront-porch = <1>; > - vback-porch = <40>; > - vfront-porch = <1>; > - hsync-len = <45>; > - vsync-len = <1>; > - }; > - }; > - }; > }; > > nand0: nand at 40000000 { > @@ -293,6 +269,30 @@ > }; > }; > > + display0: display { > + bits-per-pixel = <32>; > + atmel,lcdcon-backlight; > + atmel,dmacon = <0x1>; > + atmel,lcdcon2 = <0x80008002>; > + atmel,guard-time = <9>; > + atmel,lcd-wiring-mode = "RGB"; > + > + display-timings { > + native-mode = <&timing0>; > + timing0: 480x272 { > + clock-frequency = <9000000>; > + hactive = <480>; > + vactive = <272>; > + hback-porch = <1>; > + hfront-porch = <1>; > + vback-porch = <40>; > + vfront-porch = <1>; > + hsync-len = <45>; > + vsync-len = <1>; > + }; > + }; > + }; > + > pwmleds { > compatible = "pwm-leds"; > > -- Nicolas Ferre ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] arm: AT91: fix DT duplicate node name @ 2017-09-14 16:53 ` Nicolas Ferre 0 siblings, 0 replies; 8+ messages in thread From: Nicolas Ferre @ 2017-09-14 16:53 UTC (permalink / raw) To: Michał Mirosław, Alexandre Belloni Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org On 29/08/2017 at 22:08, Michał Mirosław wrote: > Fix following warning at bootup: > > device-tree: Duplicate name in fb@0x00500000, renamed to "display#1" > > Signed-off-by: Michał Mirosław <mirq-linux-CoA6ZxLDdyEEUmgCuDUIdw@public.gmane.org> > --- > arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++----------------- > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index 9cf1f5163fbd..272af5867403 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -223,30 +223,6 @@ > fb0: fb@0x00500000 { > display = <&display0>; > status = "okay"; > - > - display0: display { Michał, thanks for your patch. Actually the DT binding requires this: Documentation/devicetree/bindings/video/atmel,lcdc.txt So it's somehow a bigger issue. Moreover, several boards have exactly the same arrangement than the at91sam9m10g45ek, so you probably need to modify them all at the same time. After a brief look at drivers/video/fbdev/atmel_lcdfb.c it seems that the name of the node is not so much important, so we can modify it (something like display0: lcd-display {}) . I suggest that you modify the binding, the board files affected and re-submit a patch. Best regards, > - bits-per-pixel = <32>; > - atmel,lcdcon-backlight; > - atmel,dmacon = <0x1>; > - atmel,lcdcon2 = <0x80008002>; > - atmel,guard-time = <9>; > - atmel,lcd-wiring-mode = "RGB"; > - > - display-timings { > - native-mode = <&timing0>; > - timing0: timing0 { > - clock-frequency = <9000000>; > - hactive = <480>; > - vactive = <272>; > - hback-porch = <1>; > - hfront-porch = <1>; > - vback-porch = <40>; > - vfront-porch = <1>; > - hsync-len = <45>; > - vsync-len = <1>; > - }; > - }; > - }; > }; > > nand0: nand@40000000 { > @@ -293,6 +269,30 @@ > }; > }; > > + display0: display { > + bits-per-pixel = <32>; > + atmel,lcdcon-backlight; > + atmel,dmacon = <0x1>; > + atmel,lcdcon2 = <0x80008002>; > + atmel,guard-time = <9>; > + atmel,lcd-wiring-mode = "RGB"; > + > + display-timings { > + native-mode = <&timing0>; > + timing0: 480x272 { > + clock-frequency = <9000000>; > + hactive = <480>; > + vactive = <272>; > + hback-porch = <1>; > + hfront-porch = <1>; > + vback-porch = <40>; > + vfront-porch = <1>; > + hsync-len = <45>; > + vsync-len = <1>; > + }; > + }; > + }; > + > pwmleds { > compatible = "pwm-leds"; > > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] arm: AT91: fix DT duplicate node name 2017-09-14 16:53 ` Nicolas Ferre @ 2017-10-04 21:20 ` Michał Mirosław -1 siblings, 0 replies; 8+ messages in thread From: Michał Mirosław @ 2017-10-04 21:20 UTC (permalink / raw) To: linux-arm-kernel On Thu, Sep 14, 2017 at 06:53:30PM +0200, Nicolas Ferre wrote: > On 29/08/2017 at 22:08, Micha? Miros?aw wrote: > > Fix following warning at bootup: > > > > device-tree: Duplicate name in fb at 0x00500000, renamed to "display#1" > > > > Signed-off-by: Micha? Miros?aw <mirq-linux@rere.qmqm.pl> > > --- > > arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++----------------- > > 1 file changed, 24 insertions(+), 24 deletions(-) > > > > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > > index 9cf1f5163fbd..272af5867403 100644 > > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > > @@ -223,30 +223,6 @@ > > fb0: fb at 0x00500000 { > > display = <&display0>; > > status = "okay"; > > - > > - display0: display { > > Micha?, thanks for your patch. > > Actually the DT binding requires this: > Documentation/devicetree/bindings/video/atmel,lcdc.txt > > So it's somehow a bigger issue. > Moreover, several boards have exactly the same arrangement than the > at91sam9m10g45ek, so you probably need to modify them all at the same time. > > After a brief look at drivers/video/fbdev/atmel_lcdfb.c it seems that > the name of the node is not so much important, so we can modify it > (something like display0: lcd-display {}) . > > I suggest that you modify the binding, the board files affected and > re-submit a patch. It looks like the binding documentation is wrong. The driver code does of_parse_phandle(np, "display", 0); so it expects a phandle, not a node. Best Regards, Micha? Miros?aw ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/2] arm: AT91: fix DT duplicate node name @ 2017-10-04 21:20 ` Michał Mirosław 0 siblings, 0 replies; 8+ messages in thread From: Michał Mirosław @ 2017-10-04 21:20 UTC (permalink / raw) To: Nicolas Ferre Cc: devicetree@vger.kernel.org, Alexandre Belloni, linux-arm-kernel On Thu, Sep 14, 2017 at 06:53:30PM +0200, Nicolas Ferre wrote: > On 29/08/2017 at 22:08, Michał Mirosław wrote: > > Fix following warning at bootup: > > > > device-tree: Duplicate name in fb@0x00500000, renamed to "display#1" > > > > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> > > --- > > arch/arm/boot/dts/at91sam9m10g45ek.dts | 48 +++++++++++++++++----------------- > > 1 file changed, 24 insertions(+), 24 deletions(-) > > > > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > > index 9cf1f5163fbd..272af5867403 100644 > > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts > > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > > @@ -223,30 +223,6 @@ > > fb0: fb@0x00500000 { > > display = <&display0>; > > status = "okay"; > > - > > - display0: display { > > Michał, thanks for your patch. > > Actually the DT binding requires this: > Documentation/devicetree/bindings/video/atmel,lcdc.txt > > So it's somehow a bigger issue. > Moreover, several boards have exactly the same arrangement than the > at91sam9m10g45ek, so you probably need to modify them all at the same time. > > After a brief look at drivers/video/fbdev/atmel_lcdfb.c it seems that > the name of the node is not so much important, so we can modify it > (something like display0: lcd-display {}) . > > I suggest that you modify the binding, the board files affected and > re-submit a patch. It looks like the binding documentation is wrong. The driver code does of_parse_phandle(np, "display", 0); so it expects a phandle, not a node. Best Regards, Michał Mirosław ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-10-04 21:20 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-08-29 20:08 [PATCH 0/2] arm: AT91: device-tree fixes for AT91SAM9G45 Michał Mirosław 2017-08-29 20:08 ` [PATCH 1/2] arm: AT91: enable ac97 controller for at91sam9g45 Michał Mirosław 2017-08-29 20:25 ` Alexandre Belloni 2017-08-29 20:08 ` [PATCH 2/2] arm: AT91: fix DT duplicate node name Michał Mirosław 2017-09-14 16:53 ` Nicolas Ferre 2017-09-14 16:53 ` Nicolas Ferre 2017-10-04 21:20 ` Michał Mirosław 2017-10-04 21:20 ` Michał Mirosław
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.