From patchwork Wed Jun 5 07:34:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 2665911 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 5A7F93FD4F for ; Wed, 5 Jun 2013 07:31:14 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk899-00065i-Nk; Wed, 05 Jun 2013 07:28:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk88R-0008SS-G0; Wed, 05 Jun 2013 07:27:55 +0000 Received: from mail-pd0-f176.google.com ([209.85.192.176]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uk88P-0008Ph-6E for linux-arm-kernel@lists.infradead.org; Wed, 05 Jun 2013 07:27:53 +0000 Received: by mail-pd0-f176.google.com with SMTP id r11so1410551pdi.21 for ; Wed, 05 Jun 2013 00:27:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=NaygkoUwO0K1+qHJwrVsFhjEEN2xAmlkQ67FC+9w+j4=; b=LIXkVMDmYo1qL7hae1ic3MNe2xs34OLW5hhsqokOi66yEHo26txIH4iOMS7GixXkwu nJFejHCYrtXo66U7K/6vvaBenkn3yJ2bOLluWreNeXAKV8FsTLbYxFZQRVl4FdtS/6k4 uESQD6vo64Du8F+uyVDBXNzQe6Ty6KHTTvUMPn/7GEbCfl9IMpnuqvRvmjiF69GFDOwG h4ctuFiaqNumijOB0eYuC/VKXSzTlB7ArENrNt0af8lLamerHI5riXh005WrvUesn699 b+6c/7NKQi+Ai3OPyfwXLgroFEPU89tX/NFWJPpUZNWJMHg3nUt/EswSJ1cz6HVDcL6j YseQ== X-Received: by 10.66.50.4 with SMTP id y4mr33105939pan.216.1370417251745; Wed, 05 Jun 2013 00:27:31 -0700 (PDT) Received: from [127.0.0.1] (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id at1sm66844972pbc.10.2013.06.05.00.27.29 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Jun 2013 00:27:31 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Wed, 05 Jun 2013 16:34:59 +0900 Message-Id: <20130605073459.15758.14086.sendpatchset@w520> In-Reply-To: <20130605073410.15758.37563.sendpatchset@w520> References: <20130605073410.15758.37563.sendpatchset@w520> Subject: [PATCH 06/06] ARM: shmobile: Marzen memory size fixup X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130605_032753_309615_01231811 X-CRM114-Status: GOOD ( 10.59 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (magnus.damm[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.176 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Magnus Damm Specify the Marzen memory configuration via a board specific fixup callback, and also select ATAGS to make sure the callback is executed as expected. Signed-off-by: Magnus Damm --- arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/board-marzen.c | 4 ++++ 2 files changed, 5 insertions(+) --- 0008/arch/arm/mach-shmobile/Kconfig +++ work/arch/arm/mach-shmobile/Kconfig 2013-06-04 15:30:05.000000000 +0900 @@ -143,6 +143,7 @@ config MACH_BOCKW config MACH_MARZEN bool "MARZEN board" depends on ARCH_R8A7779 + select ATAGS select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR --- 0001/arch/arm/mach-shmobile/board-marzen.c +++ work/arch/arm/mach-shmobile/board-marzen.c 2013-06-04 15:34:21.000000000 +0900 @@ -46,6 +46,7 @@ #include #include #include +#include #include /* Fixed 3.3V regulator to be used by SDHI0 */ @@ -409,7 +410,10 @@ static void __init marzen_init(void) platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); } +SHMOBILE_FIXUP(marzen, 0x60000000, 0x10000000) + MACHINE_START(MARZEN, "marzen") + .fixup = marzen_fixup, .smp = smp_ops(r8a7779_smp_ops), .map_io = r8a7779_map_io, .init_early = r8a7779_add_early_devices,