* [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names
@ 2013-06-06 15:38 Guennadi Liakhovetski
2013-06-18 7:18 ` Simon Horman
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Guennadi Liakhovetski @ 2013-06-06 15:38 UTC (permalink / raw)
To: linux-sh
The convention for Device Tree node names is <device>@<hex-address>, where
the part after '@' shouldn't contain the "0x" prefix. Fix the sh73a0.dtsi
DT names.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com>
---
arch/arm/boot/dts/sh73a0.dtsi | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index ec40bf7..b977502 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -119,7 +119,7 @@
0 32 0x4>;
};
- i2c0: i2c@0xe6820000 {
+ i2c0: i2c@e6820000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,rmobile-iic";
@@ -131,7 +131,7 @@
0 170 0x4>;
};
- i2c1: i2c@0xe6822000 {
+ i2c1: i2c@e6822000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,rmobile-iic";
@@ -143,7 +143,7 @@
0 54 0x4>;
};
- i2c2: i2c@0xe6824000 {
+ i2c2: i2c@e6824000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,rmobile-iic";
@@ -155,7 +155,7 @@
0 174 0x4>;
};
- i2c3: i2c@0xe6826000 {
+ i2c3: i2c@e6826000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,rmobile-iic";
@@ -167,7 +167,7 @@
0 186 0x4>;
};
- i2c4: i2c@0xe6828000 {
+ i2c4: i2c@e6828000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "renesas,rmobile-iic";
@@ -179,7 +179,7 @@
0 190 0x4>;
};
- mmcif: mmcif@0x10010000 {
+ mmcif: mmcif@e6bd0000 {
compatible = "renesas,sh-mmcif";
reg = <0xe6bd0000 0x100>;
interrupt-parent = <&gic>;
@@ -189,7 +189,7 @@
status = "disabled";
};
- sdhi0: sdhi@0xee100000 {
+ sdhi0: sdhi@ee100000 {
compatible = "renesas,r8a7740-sdhi";
reg = <0xee100000 0x100>;
interrupt-parent = <&gic>;
@@ -201,7 +201,7 @@
};
/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
- sdhi1: sdhi@0xee120000 {
+ sdhi1: sdhi@ee120000 {
compatible = "renesas,r8a7740-sdhi";
reg = <0xee120000 0x100>;
interrupt-parent = <&gic>;
@@ -212,7 +212,7 @@
status = "disabled";
};
- sdhi2: sdhi@0xee140000 {
+ sdhi2: sdhi@ee140000 {
compatible = "renesas,r8a7740-sdhi";
reg = <0xee140000 0x100>;
interrupt-parent = <&gic>;
--
1.7.2.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names
2013-06-06 15:38 [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names Guennadi Liakhovetski
@ 2013-06-18 7:18 ` Simon Horman
2014-10-17 12:24 ` [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay() Geert Uytterhoeven
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2013-06-18 7:18 UTC (permalink / raw)
To: linux-sh
On Thu, Jun 06, 2013 at 05:38:12PM +0200, Guennadi Liakhovetski wrote:
> The convention for Device Tree node names is <device>@<hex-address>, where
> the part after '@' shouldn't contain the "0x" prefix. Fix the sh73a0.dtsi
> DT names.
Thanks, I have queued this up in the dt branch.
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
2013-06-06 15:38 [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names Guennadi Liakhovetski
2013-06-18 7:18 ` Simon Horman
@ 2014-10-17 12:24 ` Geert Uytterhoeven
2014-10-23 10:24 ` Laurent Pinchart
2014-10-24 2:09 ` Simon Horman
3 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2014-10-17 12:24 UTC (permalink / raw)
To: linux-sh
sh73a0_init_delay() just calls shmobile_init_delay(), hence replace
calls to it by direct calls to shmobile_init_delay().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 9 ++-------
arch/arm/mach-shmobile/sh73a0.h | 1 -
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index b7bd8e5096687960..0754b121ae836e75 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -740,17 +740,12 @@ void __init sh73a0_add_standard_devices(void)
ARRAY_SIZE(sh73a0_late_devices));
}
-void __init sh73a0_init_delay(void)
-{
- shmobile_init_delay();
-}
-
/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
void __init __weak sh73a0_register_twd(void) { }
void __init sh73a0_earlytimer_init(void)
{
- sh73a0_init_delay();
+ shmobile_init_delay();
sh73a0_clock_init();
shmobile_earlytimer_init();
sh73a0_register_twd();
@@ -783,7 +778,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata = {
DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.smp = smp_ops(sh73a0_smp_ops),
.map_io = sh73a0_map_io,
- .init_early = sh73a0_init_delay,
+ .init_early = shmobile_init_delay,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
.dt_compat = sh73a0_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
index 359b582dc270d6a9..f037c64b14fc0767 100644
--- a/arch/arm/mach-shmobile/sh73a0.h
+++ b/arch/arm/mach-shmobile/sh73a0.h
@@ -71,7 +71,6 @@ enum {
#define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
#define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
-extern void sh73a0_init_delay(void);
extern void sh73a0_init_irq(void);
extern void sh73a0_init_irq_dt(void);
extern void sh73a0_map_io(void);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
2013-06-06 15:38 [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names Guennadi Liakhovetski
2013-06-18 7:18 ` Simon Horman
2014-10-17 12:24 ` [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay() Geert Uytterhoeven
@ 2014-10-23 10:24 ` Laurent Pinchart
2014-10-24 2:09 ` Simon Horman
3 siblings, 0 replies; 5+ messages in thread
From: Laurent Pinchart @ 2014-10-23 10:24 UTC (permalink / raw)
To: linux-sh
Hi Geert,
Thank you for the patch.
On Friday 17 October 2014 14:24:39 Geert Uytterhoeven wrote:
> sh73a0_init_delay() just calls shmobile_init_delay(), hence replace
> calls to it by direct calls to shmobile_init_delay().
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> arch/arm/mach-shmobile/setup-sh73a0.c | 9 ++-------
> arch/arm/mach-shmobile/sh73a0.h | 1 -
> 2 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c
> b/arch/arm/mach-shmobile/setup-sh73a0.c index
> b7bd8e5096687960..0754b121ae836e75 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -740,17 +740,12 @@ void __init sh73a0_add_standard_devices(void)
> ARRAY_SIZE(sh73a0_late_devices));
> }
>
> -void __init sh73a0_init_delay(void)
> -{
> - shmobile_init_delay();
> -}
> -
> /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
> void __init __weak sh73a0_register_twd(void) { }
>
> void __init sh73a0_earlytimer_init(void)
> {
> - sh73a0_init_delay();
> + shmobile_init_delay();
> sh73a0_clock_init();
> shmobile_earlytimer_init();
> sh73a0_register_twd();
> @@ -783,7 +778,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata
> = { DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
> .smp = smp_ops(sh73a0_smp_ops),
> .map_io = sh73a0_map_io,
> - .init_early = sh73a0_init_delay,
> + .init_early = shmobile_init_delay,
> .init_machine = sh73a0_add_standard_devices_dt,
> .init_late = shmobile_init_late,
> .dt_compat = sh73a0_boards_compat_dt,
> diff --git a/arch/arm/mach-shmobile/sh73a0.h
> b/arch/arm/mach-shmobile/sh73a0.h index 359b582dc270d6a9..f037c64b14fc0767
> 100644
> --- a/arch/arm/mach-shmobile/sh73a0.h
> +++ b/arch/arm/mach-shmobile/sh73a0.h
> @@ -71,7 +71,6 @@ enum {
> #define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
> #define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
>
> -extern void sh73a0_init_delay(void);
> extern void sh73a0_init_irq(void);
> extern void sh73a0_init_irq_dt(void);
> extern void sh73a0_map_io(void);
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay()
2013-06-06 15:38 [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names Guennadi Liakhovetski
` (2 preceding siblings ...)
2014-10-23 10:24 ` Laurent Pinchart
@ 2014-10-24 2:09 ` Simon Horman
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-10-24 2:09 UTC (permalink / raw)
To: linux-sh
On Thu, Oct 23, 2014 at 01:24:59PM +0300, Laurent Pinchart wrote:
> Hi Geert,
>
> Thank you for the patch.
>
> On Friday 17 October 2014 14:24:39 Geert Uytterhoeven wrote:
> > sh73a0_init_delay() just calls shmobile_init_delay(), hence replace
> > calls to it by direct calls to shmobile_init_delay().
> >
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Thanks, I have queued this up.
> > ---
> > arch/arm/mach-shmobile/setup-sh73a0.c | 9 ++-------
> > arch/arm/mach-shmobile/sh73a0.h | 1 -
> > 2 files changed, 2 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c
> > b/arch/arm/mach-shmobile/setup-sh73a0.c index
> > b7bd8e5096687960..0754b121ae836e75 100644
> > --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> > +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> > @@ -740,17 +740,12 @@ void __init sh73a0_add_standard_devices(void)
> > ARRAY_SIZE(sh73a0_late_devices));
> > }
> >
> > -void __init sh73a0_init_delay(void)
> > -{
> > - shmobile_init_delay();
> > -}
> > -
> > /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
> > void __init __weak sh73a0_register_twd(void) { }
> >
> > void __init sh73a0_earlytimer_init(void)
> > {
> > - sh73a0_init_delay();
> > + shmobile_init_delay();
> > sh73a0_clock_init();
> > shmobile_earlytimer_init();
> > sh73a0_register_twd();
> > @@ -783,7 +778,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata
> > = { DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
> > .smp = smp_ops(sh73a0_smp_ops),
> > .map_io = sh73a0_map_io,
> > - .init_early = sh73a0_init_delay,
> > + .init_early = shmobile_init_delay,
> > .init_machine = sh73a0_add_standard_devices_dt,
> > .init_late = shmobile_init_late,
> > .dt_compat = sh73a0_boards_compat_dt,
> > diff --git a/arch/arm/mach-shmobile/sh73a0.h
> > b/arch/arm/mach-shmobile/sh73a0.h index 359b582dc270d6a9..f037c64b14fc0767
> > 100644
> > --- a/arch/arm/mach-shmobile/sh73a0.h
> > +++ b/arch/arm/mach-shmobile/sh73a0.h
> > @@ -71,7 +71,6 @@ enum {
> > #define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
> > #define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
> >
> > -extern void sh73a0_init_delay(void);
> > extern void sh73a0_init_irq(void);
> > extern void sh73a0_init_irq_dt(void);
> > extern void sh73a0_map_io(void);
>
> --
> Regards,
>
> Laurent Pinchart
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-10-24 2:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-06 15:38 [PATCH 2/2] ARM: shmobile: sh73a0: remove "0x" prefix from DT node names Guennadi Liakhovetski
2013-06-18 7:18 ` Simon Horman
2014-10-17 12:24 ` [PATCH 2/2] ARM: shmobile: sh73a0: Remove wrapper sh73a0_init_delay() Geert Uytterhoeven
2014-10-23 10:24 ` Laurent Pinchart
2014-10-24 2:09 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).