* [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements
@ 2013-02-19 2:56 Simon Horman
2013-02-19 2:56 ` [PATCH 1/5] ARM: shmobile: r8a7779: Do not use early devices with DT reference Simon Horman
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-19 2:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This series:
* Removes the use of early devices from reference marzen reference DT
* Initialises i2c as a late device (non reference DT boot)
* Moves ethernet controller from SoC to marzen board DT file
Merge:
My plan to merge this is:
* Add r8a7779 patches to an soc branch.
* Rebase a boards branch on top of the soc branch.
* Apply marzen patches, squashing them to into existing commits
to avoid breaking bisection.
Simon Horman (5):
ARM: shmobile: r8a7779: Do not use early devices with DT reference
ARM: shmobile: marzen: Do not use early devices
ARM: shmobile: r8a7779: Do not initialise i2c as an early device
ARM: shmobile: r8a7779: Remove lan from dtsi
ARM: shmobile: marzen: Add lan to dts file
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 14 +++++++---
arch/arm/boot/dts/r8a7779.dtsi | 9 -------
arch/arm/mach-shmobile/board-marzen-reference.c | 2 +-
arch/arm/mach-shmobile/include/mach/common.h | 2 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 33 +++++++++--------------
5 files changed, 24 insertions(+), 36 deletions(-)
--
1.7.10.4
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/5] ARM: shmobile: r8a7779: Do not use early devices with DT reference
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
@ 2013-02-19 2:56 ` Simon Horman
2013-02-19 2:56 ` [PATCH 2/5] ARM: shmobile: marzen: Do not use early devices Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-19 2:56 UTC (permalink / raw)
To: linux-arm-kernel
Do not initialise any early devices when using the minimal DT reference
code. Only the delay needs to be initialised.
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/common.h | 2 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 25 +++++++++----------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index 84dcaa4..98aecdf 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -58,12 +58,12 @@ extern void r8a7740_clock_init(u8 md_ck);
extern void r8a7740_pinmux_init(void);
extern void r8a7740_pm_init(void);
+extern void r8a7779_init_delay(void);
extern void r8a7779_init_irq(void);
extern void r8a7779_init_irq_dt(void);
extern void r8a7779_map_io(void);
extern void r8a7779_earlytimer_init(void);
extern void r8a7779_add_early_devices(void);
-extern void r8a7779_add_early_devices_dt(void);
extern void r8a7779_add_standard_devices(void);
extern void r8a7779_add_standard_devices_dt(void);
extern void r8a7779_clock_init(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 922dd4d..b1f7a45 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -322,7 +322,7 @@ static struct platform_device i2c3_device = {
.num_resources = ARRAY_SIZE(rcar_i2c3_res),
};
-static struct platform_device *r8a7779_early_devices_dt[] __initdata = {
+static struct platform_device *r8a7779_devices_dt[] __initdata = {
&scif0_device,
&scif1_device,
&scif2_device,
@@ -350,8 +350,8 @@ void __init r8a7779_add_standard_devices(void)
r8a7779_init_pm_domains();
- platform_add_devices(r8a7779_early_devices_dt,
- ARRAY_SIZE(r8a7779_early_devices_dt));
+ platform_add_devices(r8a7779_devices_dt,
+ ARRAY_SIZE(r8a7779_devices_dt));
platform_add_devices(r8a7779_early_devices,
ARRAY_SIZE(r8a7779_early_devices));
}
@@ -368,8 +368,8 @@ void __init r8a7779_earlytimer_init(void)
void __init r8a7779_add_early_devices(void)
{
- early_platform_add_devices(r8a7779_early_devices_dt,
- ARRAY_SIZE(r8a7779_early_devices_dt));
+ early_platform_add_devices(r8a7779_devices_dt,
+ ARRAY_SIZE(r8a7779_devices_dt));
early_platform_add_devices(r8a7779_early_devices,
ARRAY_SIZE(r8a7779_early_devices));
@@ -391,16 +391,9 @@ void __init r8a7779_add_early_devices(void)
}
#ifdef CONFIG_USE_OF
-void __init r8a7779_add_early_devices_dt(void)
+void __init r8a7779_init_delay(void)
{
shmobile_setup_delay(1000, 2, 4); /* Cortex-A9 @ 1000MHz */
-
- early_platform_add_devices(r8a7779_early_devices_dt,
- ARRAY_SIZE(r8a7779_early_devices_dt));
-
- /* Early serial console setup is not included here.
- * See comment in r8a7779_add_early_devices().
- */
}
static const struct of_dev_auxdata r8a7779_auxdata_lookup[] __initconst = {
@@ -412,8 +405,8 @@ void __init r8a7779_add_standard_devices_dt(void)
/* clocks are setup late during boot in the case of DT */
r8a7779_clock_init();
- platform_add_devices(r8a7779_early_devices_dt,
- ARRAY_SIZE(r8a7779_early_devices_dt));
+ platform_add_devices(r8a7779_devices_dt,
+ ARRAY_SIZE(r8a7779_devices_dt));
of_platform_populate(NULL, of_default_bus_match_table,
r8a7779_auxdata_lookup, NULL);
}
@@ -425,7 +418,7 @@ static const char *r8a7779_compat_dt[] __initdata = {
DT_MACHINE_START(SH73A0_DT, "Generic R8A7779 (Flattened Device Tree)")
.map_io = r8a7779_map_io,
- .init_early = r8a7779_add_early_devices_dt,
+ .init_early = r8a7779_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = r8a7779_add_standard_devices_dt,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] ARM: shmobile: marzen: Do not use early devices
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
2013-02-19 2:56 ` [PATCH 1/5] ARM: shmobile: r8a7779: Do not use early devices with DT reference Simon Horman
@ 2013-02-19 2:56 ` Simon Horman
2013-02-19 2:56 ` [PATCH 3/5] ARM: shmobile: r8a7779: Do not initialise i2c as an early device Simon Horman
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-19 2:56 UTC (permalink / raw)
To: linux-arm-kernel
Do not initialise any early devices when using the minimal DT reference
code. Only the delay needs to be initialised.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 47df64d..a126f07 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -63,7 +63,7 @@ static const char *marzen_boards_compat_dt[] __initdata = {
DT_MACHINE_START(MARZEN, "marzen")
.smp = smp_ops(r8a7779_smp_ops),
.map_io = r8a7779_map_io,
- .init_early = r8a7779_add_early_devices_dt,
+ .init_early = r8a7779_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = marzen_init,
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] ARM: shmobile: r8a7779: Do not initialise i2c as an early device
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
2013-02-19 2:56 ` [PATCH 1/5] ARM: shmobile: r8a7779: Do not use early devices with DT reference Simon Horman
2013-02-19 2:56 ` [PATCH 2/5] ARM: shmobile: marzen: Do not use early devices Simon Horman
@ 2013-02-19 2:56 ` Simon Horman
2013-02-19 2:56 ` [PATCH 4/5] ARM: shmobile: r8a7779: Remove lan from dtsi Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-19 2:56 UTC (permalink / raw)
To: linux-arm-kernel
It is sufficient to initialise i2c as a late device.
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7779.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index b1f7a45..7f8daf1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -333,7 +333,7 @@ static struct platform_device *r8a7779_devices_dt[] __initdata = {
&tmu01_device,
};
-static struct platform_device *r8a7779_early_devices[] __initdata = {
+static struct platform_device *r8a7779_late_devices[] __initdata = {
&i2c0_device,
&i2c1_device,
&i2c2_device,
@@ -352,8 +352,8 @@ void __init r8a7779_add_standard_devices(void)
platform_add_devices(r8a7779_devices_dt,
ARRAY_SIZE(r8a7779_devices_dt));
- platform_add_devices(r8a7779_early_devices,
- ARRAY_SIZE(r8a7779_early_devices));
+ platform_add_devices(r8a7779_late_devices,
+ ARRAY_SIZE(r8a7779_late_devices));
}
/* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
@@ -370,8 +370,6 @@ void __init r8a7779_add_early_devices(void)
{
early_platform_add_devices(r8a7779_devices_dt,
ARRAY_SIZE(r8a7779_devices_dt));
- early_platform_add_devices(r8a7779_early_devices,
- ARRAY_SIZE(r8a7779_early_devices));
/* Early serial console setup is not included here due to
* memory map collisions. The SCIF serial ports in r8a7779
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] ARM: shmobile: r8a7779: Remove lan from dtsi
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
` (2 preceding siblings ...)
2013-02-19 2:56 ` [PATCH 3/5] ARM: shmobile: r8a7779: Do not initialise i2c as an early device Simon Horman
@ 2013-02-19 2:56 ` Simon Horman
2013-02-19 2:56 ` [PATCH 5/5] ARM: shmobile: marzen: Add lan to dts file Simon Horman
2013-02-26 8:55 ` [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-19 2:56 UTC (permalink / raw)
To: linux-arm-kernel
The ethernet controller is not part of the r8a7779 SoC.
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779.dtsi | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 2913759..0016302 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -83,13 +83,4 @@
interrupt-parent = <&gic>;
interrupts = <0 81 0x4>;
};
-
- lan0: lan0 at 18000000 {
- compatible = "smsc,lan9220", "smsc,lan9115";
- reg = <0x18000000 0x100>;
- phy-mode = "mii";
- interrupt-parent = <&gic>;
- interrupts = <0 28 0x4>;
- reg-io-width = <4>;
- };
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] ARM: shmobile: marzen: Add lan to dts file
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
` (3 preceding siblings ...)
2013-02-19 2:56 ` [PATCH 4/5] ARM: shmobile: r8a7779: Remove lan from dtsi Simon Horman
@ 2013-02-19 2:56 ` Simon Horman
2013-02-26 8:55 ` [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-19 2:56 UTC (permalink / raw)
To: linux-arm-kernel
The ethernet controller is part of the marzen board so add it to
the dts file.
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
index 377d8df..72be4c8 100644
--- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
@@ -33,9 +33,15 @@
regulator-boot-on;
regulator-always-on;
};
-};
-&lan0 {
- vddvario-supply = <&fixedregulator3v3>;
- vdd33a-supply = <&fixedregulator3v3>;
+ lan0 at 18000000 {
+ compatible = "smsc,lan9220", "smsc,lan9115";
+ reg = <0x18000000 0x100>;
+ phy-mode = "mii";
+ interrupt-parent = <&gic>;
+ interrupts = <0 28 0x4>;
+ reg-io-width = <4>;
+ vddvario-supply = <&fixedregulator3v3>;
+ vdd33a-supply = <&fixedregulator3v3>;
+ };
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
` (4 preceding siblings ...)
2013-02-19 2:56 ` [PATCH 5/5] ARM: shmobile: marzen: Add lan to dts file Simon Horman
@ 2013-02-26 8:55 ` Simon Horman
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2013-02-26 8:55 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 19, 2013 at 11:56:05AM +0900, Simon Horman wrote:
> Hi,
>
> This series:
>
> * Removes the use of early devices from reference marzen reference DT
> * Initialises i2c as a late device (non reference DT boot)
> * Moves ethernet controller from SoC to marzen board DT file
>
> Merge:
>
> My plan to merge this is:
> * Add r8a7779 patches to an soc branch.
> * Rebase a boards branch on top of the soc branch.
> * Apply marzen patches, squashing them to into existing commits
> to avoid breaking bisection.
Applied as described above.
The soc branch was soc5.
The boards branch was boards3.
>
> Simon Horman (5):
> ARM: shmobile: r8a7779: Do not use early devices with DT reference
> ARM: shmobile: marzen: Do not use early devices
> ARM: shmobile: r8a7779: Do not initialise i2c as an early device
> ARM: shmobile: r8a7779: Remove lan from dtsi
> ARM: shmobile: marzen: Add lan to dts file
>
> arch/arm/boot/dts/r8a7779-marzen-reference.dts | 14 +++++++---
> arch/arm/boot/dts/r8a7779.dtsi | 9 -------
> arch/arm/mach-shmobile/board-marzen-reference.c | 2 +-
> arch/arm/mach-shmobile/include/mach/common.h | 2 +-
> arch/arm/mach-shmobile/setup-r8a7779.c | 33 +++++++++--------------
> 5 files changed, 24 insertions(+), 36 deletions(-)
>
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-26 8:55 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-19 2:56 [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements Simon Horman
2013-02-19 2:56 ` [PATCH 1/5] ARM: shmobile: r8a7779: Do not use early devices with DT reference Simon Horman
2013-02-19 2:56 ` [PATCH 2/5] ARM: shmobile: marzen: Do not use early devices Simon Horman
2013-02-19 2:56 ` [PATCH 3/5] ARM: shmobile: r8a7779: Do not initialise i2c as an early device Simon Horman
2013-02-19 2:56 ` [PATCH 4/5] ARM: shmobile: r8a7779: Remove lan from dtsi Simon Horman
2013-02-19 2:56 ` [PATCH 5/5] ARM: shmobile: marzen: Add lan to dts file Simon Horman
2013-02-26 8:55 ` [PATCH 0/5] ARM: shmobile: r8a7779 and marzen initialisation enhancements 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).