ARM: shmobile: r8a7740: Prepare for reference DT setup
We need three steps to prepare for the new Armadillo reference DT board code:
- Split the device list into r8a7740_early_devices used by the old platform
data setup (board-armadillo.c) and r8a7740_devices_dt used by both
setup variants.
- Introduce new r8a7740_init_delay() to be more flexible about calling
shmobile_setup_delay().
- For the generic r8a7740 support, we switch to device tree setup for
the GIC, the irqpin devices and the I2C controllers.
This is slightly similar to commit 3b00f93426
"ARM: shmobile: sh73a0: Do not use early devices with DT reference"
Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
This commit is contained in:
Bastian Hecht
Simon Horman
parent
f9b4df4a4d
commit
744fdc8dc0
|
|
@ -18,4 +18,121 @@
|
|||
compatible = "arm,cortex-a9";
|
||||
};
|
||||
};
|
||||
|
||||
gic: interrupt-controller@c2800000 {
|
||||
compatible = "arm,cortex-a9-gic";
|
||||
#interrupt-cells = <3>;
|
||||
#address-cells = <1>;
|
||||
interrupt-controller;
|
||||
reg = <0xc2800000 0x1000>,
|
||||
<0xc2000000 0x1000>;
|
||||
};
|
||||
|
||||
/* irqpin0: IRQ0 - IRQ7 */
|
||||
irqpin0: irqpin@e6900000 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe6900000 4>,
|
||||
<0xe6900010 4>,
|
||||
<0xe6900020 1>,
|
||||
<0xe6900040 1>,
|
||||
<0xe6900060 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
/* irqpin1: IRQ8 - IRQ15 */
|
||||
irqpin1: irqpin@e6900004 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe6900004 4>,
|
||||
<0xe6900014 4>,
|
||||
<0xe6900024 1>,
|
||||
<0xe6900044 1>,
|
||||
<0xe6900064 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
/* irqpin2: IRQ16 - IRQ23 */
|
||||
irqpin2: irqpin@e6900008 {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe6900008 4>,
|
||||
<0xe6900018 4>,
|
||||
<0xe6900028 1>,
|
||||
<0xe6900048 1>,
|
||||
<0xe6900068 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
/* irqpin3: IRQ24 - IRQ31 */
|
||||
irqpin3: irqpin@e690000c {
|
||||
compatible = "renesas,intc-irqpin";
|
||||
#interrupt-cells = <2>;
|
||||
interrupt-controller;
|
||||
reg = <0xe690000c 4>,
|
||||
<0xe690001c 4>,
|
||||
<0xe690002c 1>,
|
||||
<0xe690004c 1>,
|
||||
<0xe690006c 1>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4
|
||||
0 149 0x4>;
|
||||
};
|
||||
|
||||
i2c0: i2c@fff20000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "renesas,rmobile-iic";
|
||||
reg = <0xfff20000 0x425>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 201 0x4
|
||||
0 202 0x4
|
||||
0 203 0x4
|
||||
0 204 0x4>;
|
||||
};
|
||||
|
||||
i2c1: i2c@e6c20000 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
compatible = "renesas,rmobile-iic";
|
||||
reg = <0xe6c20000 0x425>;
|
||||
interrupt-parent = <&gic>;
|
||||
interrupts = <0 70 0x4
|
||||
0 71 0x4
|
||||
0 72 0x4
|
||||
0 73 0x4>;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -533,11 +533,13 @@ enum {
|
|||
};
|
||||
|
||||
extern void r8a7740_meram_workaround(void);
|
||||
extern void r8a7740_init_delay(void);
|
||||
extern void r8a7740_init_irq(void);
|
||||
extern void r8a7740_init_irq_of(void);
|
||||
extern void r8a7740_map_io(void);
|
||||
extern void r8a7740_add_early_devices(void);
|
||||
extern void r8a7740_add_standard_devices(void);
|
||||
extern void r8a7740_add_standard_devices_dt(void);
|
||||
extern void r8a7740_clock_init(u8 md_ck);
|
||||
extern void r8a7740_pinmux_init(void);
|
||||
extern void r8a7740_pm_init(void);
|
||||
|
|
|
|||
|
|
@ -531,11 +531,7 @@ static struct platform_device ipmmu_device = {
|
|||
.num_resources = ARRAY_SIZE(ipmmu_resources),
|
||||
};
|
||||
|
||||
static struct platform_device *r8a7740_early_devices[] __initdata = {
|
||||
&irqpin0_device,
|
||||
&irqpin1_device,
|
||||
&irqpin2_device,
|
||||
&irqpin3_device,
|
||||
static struct platform_device *r8a7740_devices_dt[] __initdata = {
|
||||
&scif0_device,
|
||||
&scif1_device,
|
||||
&scif2_device,
|
||||
|
|
@ -546,6 +542,13 @@ static struct platform_device *r8a7740_early_devices[] __initdata = {
|
|||
&scif7_device,
|
||||
&scifb_device,
|
||||
&cmt10_device,
|
||||
};
|
||||
|
||||
static struct platform_device *r8a7740_early_devices[] __initdata = {
|
||||
&irqpin0_device,
|
||||
&irqpin1_device,
|
||||
&irqpin2_device,
|
||||
&irqpin3_device,
|
||||
&tmu00_device,
|
||||
&tmu01_device,
|
||||
&tmu02_device,
|
||||
|
|
@ -965,6 +968,8 @@ void __init r8a7740_add_standard_devices(void)
|
|||
/* add devices */
|
||||
platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
platform_add_devices(r8a7740_devices_dt,
|
||||
ARRAY_SIZE(r8a7740_devices_dt));
|
||||
platform_add_devices(r8a7740_late_devices,
|
||||
ARRAY_SIZE(r8a7740_late_devices));
|
||||
|
||||
|
|
@ -986,6 +991,8 @@ void __init r8a7740_add_early_devices(void)
|
|||
{
|
||||
early_platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
early_platform_add_devices(r8a7740_devices_dt,
|
||||
ARRAY_SIZE(r8a7740_devices_dt));
|
||||
|
||||
/* setup early console here as well */
|
||||
shmobile_setup_console();
|
||||
|
|
@ -993,33 +1000,29 @@ void __init r8a7740_add_early_devices(void)
|
|||
|
||||
#ifdef CONFIG_USE_OF
|
||||
|
||||
void __init r8a7740_add_early_devices_dt(void)
|
||||
{
|
||||
shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
|
||||
|
||||
early_platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
|
||||
/* setup early console here as well */
|
||||
shmobile_setup_console();
|
||||
}
|
||||
|
||||
static const struct of_dev_auxdata r8a7740_auxdata_lookup[] __initconst = {
|
||||
{ }
|
||||
};
|
||||
|
||||
void __init r8a7740_add_standard_devices_dt(void)
|
||||
{
|
||||
/* clocks are setup late during boot in the case of DT */
|
||||
r8a7740_clock_init(0);
|
||||
|
||||
platform_add_devices(r8a7740_early_devices,
|
||||
ARRAY_SIZE(r8a7740_early_devices));
|
||||
|
||||
platform_add_devices(r8a7740_devices_dt,
|
||||
ARRAY_SIZE(r8a7740_devices_dt));
|
||||
of_platform_populate(NULL, of_default_bus_match_table,
|
||||
r8a7740_auxdata_lookup, NULL);
|
||||
}
|
||||
|
||||
void __init r8a7740_init_delay(void)
|
||||
{
|
||||
shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
|
||||
};
|
||||
|
||||
static void __init r8a7740_generic_init(void)
|
||||
{
|
||||
r8a7740_clock_init(0);
|
||||
r8a7740_add_standard_devices_dt();
|
||||
}
|
||||
|
||||
static const char *r8a7740_boards_compat_dt[] __initdata = {
|
||||
"renesas,r8a7740",
|
||||
NULL,
|
||||
|
|
@ -1027,9 +1030,10 @@ static const char *r8a7740_boards_compat_dt[] __initdata = {
|
|||
|
||||
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
|
||||
.map_io = r8a7740_map_io,
|
||||
.init_early = r8a7740_add_early_devices_dt,
|
||||
.init_irq = r8a7740_init_irq,
|
||||
.init_machine = r8a7740_add_standard_devices_dt,
|
||||
.init_early = r8a7740_init_delay,
|
||||
.init_irq = r8a7740_init_irq_of,
|
||||
.init_machine = r8a7740_generic_init,
|
||||
.init_time = shmobile_timer_init,
|
||||
.dt_compat = r8a7740_boards_compat_dt,
|
||||
MACHINE_END
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue