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: 2665851 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id DF1A63FD4F for ; Wed, 5 Jun 2013 07:27:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752449Ab3FEH1c (ORCPT ); Wed, 5 Jun 2013 03:27:32 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:60728 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752309Ab3FEH1c (ORCPT ); Wed, 5 Jun 2013 03:27:32 -0400 Received: by mail-pd0-f172.google.com with SMTP id t10so1425154pdi.17 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 Cc: arnd@arndb.de, horms@verge.net.au, laurent.pinchart@ideasonboard.com, olof@lixom.net, Magnus Damm , linux-arm-kernel@lists.infradead.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 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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,