diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-12-06 04:59:48 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-24 07:49:43 -0500 |
commit | d850acf975bee46e43c3cd80d2d287010195c63b (patch) | |
tree | 0d61e0af191f2b3d818d93de29353c97deb34c43 /arch/sh/kernel/cpu/sh2a/setup-mxg.c | |
parent | ec09c5eb491834d4011c72538e58d8b7096076bd (diff) |
sh: Declare SCIF register base and IRQ as resources
Passing the register base address and IRQ through platform data is
deprecated. Use resources instead.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/sh/kernel/cpu/sh2a/setup-mxg.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/setup-mxg.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/setup-mxg.c b/arch/sh/kernel/cpu/sh2a/setup-mxg.c index f7f1cf2af302..9bdc61143f40 100644 --- a/arch/sh/kernel/cpu/sh2a/setup-mxg.c +++ b/arch/sh/kernel/cpu/sh2a/setup-mxg.c | |||
@@ -199,17 +199,22 @@ static struct platform_device mtu2_2_device = { | |||
199 | }; | 199 | }; |
200 | 200 | ||
201 | static struct plat_sci_port scif0_platform_data = { | 201 | static struct plat_sci_port scif0_platform_data = { |
202 | .mapbase = 0xff804000, | ||
203 | .flags = UPF_BOOT_AUTOCONF, | 202 | .flags = UPF_BOOT_AUTOCONF, |
204 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, | 203 | .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, |
205 | .scbrr_algo_id = SCBRR_ALGO_2, | 204 | .scbrr_algo_id = SCBRR_ALGO_2, |
206 | .type = PORT_SCIF, | 205 | .type = PORT_SCIF, |
207 | .irqs = SCIx_IRQ_MUXED(220), | 206 | }; |
207 | |||
208 | static struct resource scif0_resources[] = { | ||
209 | DEFINE_RES_MEM(0xff804000, 0x100), | ||
210 | DEFINE_RES_IRQ(220), | ||
208 | }; | 211 | }; |
209 | 212 | ||
210 | static struct platform_device scif0_device = { | 213 | static struct platform_device scif0_device = { |
211 | .name = "sh-sci", | 214 | .name = "sh-sci", |
212 | .id = 0, | 215 | .id = 0, |
216 | .resource = scif0_resources, | ||
217 | .num_resources = ARRAY_SIZE(scif0_resources), | ||
213 | .dev = { | 218 | .dev = { |
214 | .platform_data = &scif0_platform_data, | 219 | .platform_data = &scif0_platform_data, |
215 | }, | 220 | }, |