From patchwork Wed Jun 12 02:03:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 2707731 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7DEBB9F3DD for ; Wed, 12 Jun 2013 02:04:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7883D20265 for ; Wed, 12 Jun 2013 02:04:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C42D320258 for ; Wed, 12 Jun 2013 02:04:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754567Ab3FLCEC (ORCPT ); Tue, 11 Jun 2013 22:04:02 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:39968 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754129Ab3FLCEB (ORCPT ); Tue, 11 Jun 2013 22:04:01 -0400 Received: by mail-pa0-f43.google.com with SMTP id hz11so5285194pad.30 for ; Tue, 11 Jun 2013 19:04:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:from:subject:to:cc:mime-version:content-type; bh=p/tO5zw6ZXpsvyNPTOwsldiCPB1o1hAxOvVkn/lgT+k=; b=jjeQcMpDUwaTYCvSzakZ3aHOHROYvw/9Q1KtDggqVQl4ssw6mmH356U20E0Xj6wRWx 2AT/VlVRmcAq0A8EgyC1whG1rsqOfb8ydDLgTbHHD2d5shP/TCUv0PmWMezLYsO0VAFs ywGPyeKX1ibRNoGL+xIoyj2fF4XHvOOvj+IwMGNHzSfaZSDWA3YZ1PD24RtFT39Roqp8 ILMXXnEWaI+1nTC0J9fMMfGVieRZBgcCfCUZxWBg9sZ/84CuCd3c8lSsJ1vLhTFTwFeO 53n1QZxFetA7WbxduM1nheDXJ9g6ddaHAOHTYdpHQm3rMDocr0Y7FYLWkNrKOr6Zo0Nw zFRQ== X-Received: by 10.66.173.201 with SMTP id bm9mr21251472pac.27.1371002640612; Tue, 11 Jun 2013 19:04:00 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id so3sm18995192pac.14.2013.06.11.19.03.58 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 11 Jun 2013 19:03:59 -0700 (PDT) Date: Tue, 11 Jun 2013 19:03:59 -0700 (PDT) Message-ID: <87ehc86q5v.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH resend] ARM: shmobile: r8a7790: add __initdata on resource and device data To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These data will be kmemdup()'ed on platform_device_add_resources() and platform_device_add_data() This patch removed "const" to avoid section type conflict with r8a7790_boards_compat_dt Signed-off-by: Kuninori Morimoto --- >> Simon I couldn't find this patch on Simon's tree. This patch is resend patch, and is based on renesas-next-20130611v2 arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c index 75950c3..28f9475 100644 --- a/arch/arm/mach-shmobile/setup-r8a7790.c +++ b/arch/arm/mach-shmobile/setup-r8a7790.c @@ -30,17 +30,17 @@ #include #include -static const struct resource pfc_resources[] = { +static struct resource pfc_resources[] __initdata = { DEFINE_RES_MEM(0xe6060000, 0x250), }; #define R8A7790_GPIO(idx) \ -static struct resource r8a7790_gpio##idx##_resources[] = { \ +static struct resource r8a7790_gpio##idx##_resources[] __initdata = { \ DEFINE_RES_MEM(0xe6050000 + 0x1000 * (idx), 0x50), \ DEFINE_RES_IRQ(gic_spi(4 + (idx))), \ }; \ \ -static struct gpio_rcar_config r8a7790_gpio##idx##_platform_data = { \ +static struct gpio_rcar_config r8a7790_gpio##idx##_platform_data __initdata = { \ .gpio_base = 32 * (idx), \ .irq_base = 0, \ .number_of_pins = 32, \ @@ -111,7 +111,7 @@ void __init r8a7790_pinmux_init(void) enum { SCIFA0, SCIFA1, SCIFB0, SCIFB1, SCIFB2, SCIFA2, SCIF0, SCIF1, HSCIF0, HSCIF1 }; -static const struct plat_sci_port scif[] = { +static struct plat_sci_port scif[] __initdata = { SCIFA_DATA(SCIFA0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */ SCIFA_DATA(SCIFA1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */ SCIFB_DATA(SCIFB0, 0xe6c20000, gic_spi(148)), /* SCIFB0 */ @@ -130,11 +130,11 @@ static inline void r8a7790_register_scif(int idx) sizeof(struct plat_sci_port)); } -static struct renesas_irqc_config irqc0_data = { +static struct renesas_irqc_config irqc0_data __initdata = { .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */ }; -static struct resource irqc0_resources[] = { +static struct resource irqc0_resources[] __initdata = { DEFINE_RES_MEM(0xe61c0000, 0x200), /* IRQC Event Detector Block_0 */ DEFINE_RES_IRQ(gic_spi(0)), /* IRQ0 */ DEFINE_RES_IRQ(gic_spi(1)), /* IRQ1 */