sh: sh4a scif pdata (sh7343/sh7366/sh7722/sh7723/sh7724)
PATCH 5/7 sh: sh4a scif pdata (sh7343/sh7366/sh7722/sh7723/sh7724)
From: Magnus Damm <[email protected]>
This patch breaks out the sh4a scif serial port platform data from a shared platform device to one platform device per port. Also, add serial ports to the list of early platform devices.
Only sh4a SuperH Mobile processors are modified by this patch.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 112 ++++++++++++++-------- arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 39 +++---- arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 91 +++++++++++------- arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 160 +++++++++++++++++++++----------- arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 145 ++++++++++++++++++++--------- 5 files changed, 356 insertions(+), 191 deletions(-)
arch/sh/kernel/cpu/sh4a/setup-sh7343.c +73 -39
@@ -15,6 +15,71 @@#include <linux/sh_timer.h> #include <asm/clock.h> +/* Serial */ +static struct plat_sci_port scif0_platform_data = { + .mapbase =0xffe00000 , + .flags =UPF_BOOT_AUTOCONF , + .type =PORT_SCIF , + .irqs = {80 ,80 ,80 ,80 }, + .clk ="scif0" , +}; + +static struct platform_device scif0_device = { + .name ="sh-sci" , + .id =0 , + .dev = { + .platform_data = &scif0_platform_data, + }, +}; + +static struct plat_sci_port scif1_platform_data = { + .mapbase =0xffe10000 , + .flags =UPF_BOOT_AUTOCONF , + .type =PORT_SCIF , + .irqs = {81 ,81 ,81 ,81 }, + .clk ="scif1" , +}; + +static struct platform_device scif1_device = { + .name ="sh-sci" , + .id =1 , + .dev = { + .platform_data = &scif1_platform_data, + }, +}; + +static struct plat_sci_port scif2_platform_data = { + .mapbase =0xffe20000 , + .flags =UPF_BOOT_AUTOCONF , + .type =PORT_SCIF , + .irqs = {82 ,82 ,82 ,82 }, + .clk ="scif2" , +}; + +static struct platform_device scif2_device = { + .name ="sh-sci" , + .id =2 , + .dev = { + .platform_data = &scif2_platform_data, + }, +}; + +static struct plat_sci_port scif3_platform_data = { + .mapbase =0xffe30000 , + .flags =UPF_BOOT_AUTOCONF , + .type =PORT_SCIF , + .irqs = {83 ,83 ,83 ,83 }, + .clk ="scif3" , +}; + +static struct platform_device scif3_device = { + .name ="sh-sci" , + .id =3 , + .dev = { + .platform_data = &scif3_platform_data, + }, +}; +static struct resource iic0_resources[] = { [0 ] = { .name ="IIC0" ,
@@ -265,52 +330,17 @@ static struct platform_device tmu2_devic .num_resources = ARRAY_SIZE(tmu2_resources), }; -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase =0xffe00000 , - .flags =UPF_BOOT_AUTOCONF , - .type =PORT_SCIF , - .irqs = {80 ,80 ,80 ,80 }, - .clk ="scif0" , - }, { - .mapbase =0xffe10000 , - .flags =UPF_BOOT_AUTOCONF , - .type =PORT_SCIF , - .irqs = {81 ,81 ,81 ,81 }, - .clk ="scif1" , - }, { - .mapbase =0xffe20000 , - .flags =UPF_BOOT_AUTOCONF , - .type =PORT_SCIF , - .irqs = {82 ,82 ,82 ,82 }, - .clk ="scif2" , - }, { - .mapbase =0xffe30000 , - .flags =UPF_BOOT_AUTOCONF , - .type =PORT_SCIF , - .irqs = {83 ,83 ,83 ,83 }, - .clk ="scif3" , - }, { - .flags =0 , - } -}; - -static struct platform_device sci_device = { - .name ="sh-sci" , - .id =-1 , - .dev = { - .platform_data = sci_platform_data, - }, -}; -static struct platform_device *sh7343_devices[]__initdata = { + &scif0_device, + &scif1_device, + &scif2_device, + &scif3_device, &cmt_device, &tmu0_device, &tmu1_device, &tmu2_device, &iic0_device, &iic1_device, - &sci_device, &vpu_device, &veu_device, &jpu_device,
@@ -328,6 +358,10 @@ static int __init sh7343_devices_setup(varch_initcall (sh7343_devices_setup);static struct platform_device *sh7343_early_devices[]__initdata = { + &scif0_device, + &scif1_device, + &scif2_device, + &scif3_device, &cmt_device, &tmu0_device, &tmu1_device,
arch/sh/kernel/cpu/sh4a/setup-sh7366.c +18 -21
@@ -18,6 +18,22 @@#include <linux/usb/r8a66597.h> #include <asm/clock.h> +static struct plat_sci_port scif0_platform_data = { + .mapbase =0xffe00000 , + .flags =UPF_BOOT_AUTOCONF , + .type =PORT_SCIF , + .irqs = {80 ,80 ,80 ,80 }, + .clk ="scif0" , +}; + +static struct platform_device scif0_device = { + .name ="sh-sci" , + .id =0 , + .dev = { + .platform_data = &scif0_platform_data, + }, +}; +static struct resource iic_resources[] = { [0 ] = { .name ="IIC" ,
@@ -276,33 +292,13 @@ static struct platform_device tmu2_devic .num_resources = ARRAY_SIZE(tmu2_resources), }; -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase =0xffe00000 , - .flags =UPF_BOOT_AUTOCONF , - .type =PORT_SCIF , - .irqs = {80 ,80 ,80 ,80 }, - .clk ="scif0" , - }, { - .flags =0 , - } -}; - -static struct platform_device sci_device = { - .name ="sh-sci" , - .id =-1 , - .dev = { - .platform_data = sci_platform_data, - }, -}; -static struct platform_device *sh7366_devices[]__initdata = { + &scif0_device, &cmt_device, &tmu0_device, &tmu1_device, &tmu2_device, &iic_device, - &sci_device, &usb_host_device, &vpu_device, &veu0_device,
@@ -321,6 +317,7 @@ static int __init sh7366_devices_setup(varch_initcall (sh7366_devices_setup);static struct platform_device *sh7366_early_devices[]__initdata = { + &scif0_device, &cmt_device, &tmu0_device, &tmu1_device,
arch/sh/kernel/cpu/sh4a/setup-sh7722.c +55 -36
121 lines not on this page · raw message
arch/sh/kernel/cpu/sh4a/setup-sh7723.c +109 -51
190 lines not on this page · raw message
arch/sh/kernel/cpu/sh4a/setup-sh7724.c +101 -44
173 lines not on this page · raw message