From patchwork Thu Aug 6 14:19:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 39617 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n76ENX58030250 for ; Thu, 6 Aug 2009 14:23:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752430AbZHFOXb (ORCPT ); Thu, 6 Aug 2009 10:23:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752781AbZHFOXb (ORCPT ); Thu, 6 Aug 2009 10:23:31 -0400 Received: from mail-pz0-f179.google.com ([209.85.222.179]:37133 "EHLO mail-pz0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752430AbZHFOXa (ORCPT ); Thu, 6 Aug 2009 10:23:30 -0400 Received: by pzk9 with SMTP id 9so961663pzk.21 for ; Thu, 06 Aug 2009 07:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=b3u53CE6gbQsSl0fltOFfEMgb5+yhU0IihiZewCprf0=; b=f91hqH9O+gWmHjBZhNFbPdeQjqGXVqaOYvCU6N09z0waP/fwTsZLxDDEb+r2GvN8Gy FER9hKHnhgM2mAjo16ZQuJ5v15OZyNApiMQxJwRsHuxh0LmuZY/S/wjl1eFJTQ++V+n6 Od2K6uOZ97iEM7VsQN6DCdw6snYrr1kb2iaLw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=Q1qj4zk84RXjnsidMWrLGx1fWp3CuDUpTyG0/z02z+3SLf0HqbQlXDEYYI6gjmY/Qx agk1nplTTSMjKlggB0mkopR/MyFqvbbq88dmTF/jjOUXQ9C3MK5pxV8a0MvmaCqK2rm7 3erodpg9Tod68DHuurGqrqJOGF/0fJ27BDE9M= Received: by 10.114.89.3 with SMTP id m3mr2238770wab.39.1249568611193; Thu, 06 Aug 2009 07:23:31 -0700 (PDT) Received: from rx1.opensource.se (210.5.32.202.bf.2iij.net [202.32.5.210]) by mx.google.com with ESMTPS id j31sm55694waf.49.2009.08.06.07.23.29 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 06 Aug 2009 07:23:30 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Thu, 06 Aug 2009 23:19:18 +0900 Message-Id: <20090806141918.3609.29170.sendpatchset@rx1.opensource.se> Subject: [PATCH] sh: fix i2c init order on ap325rxa Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Convert the AP325RXA board code to register i2c devices from arch_initcall() instead of __initcall(). This fix unbreaks pcf8563 RTC driver support. Signed-off-by: Magnus Damm --- Suitable for 2.6.31-rc. arch/sh/boards/board-ap325rxa.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 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 --- 0001/arch/sh/boards/board-ap325rxa.c +++ work/arch/sh/boards/board-ap325rxa.c 2009-08-05 18:36:47.000000000 +0900 @@ -399,6 +399,15 @@ static struct i2c_board_info __initdata }, }; +static int __init ap325rxa_devices_i2c_setup(void) +{ + i2c_register_board_info(0, ap325rxa_i2c_devices, + ARRAY_SIZE(ap325rxa_i2c_devices)); + + return 0; +} +arch_initcall(ap325rxa_devices_i2c_setup); + static struct i2c_board_info ap325rxa_i2c_camera[] = { { I2C_BOARD_INFO("ov772x", 0x21), @@ -538,9 +547,6 @@ static int __init ap325rxa_devices_setup platform_resource_setup_memory(&ceu_device, "ceu", 4 << 20); - i2c_register_board_info(0, ap325rxa_i2c_devices, - ARRAY_SIZE(ap325rxa_i2c_devices)); - spi_register_board_info(ap325rxa_spi_devices, ARRAY_SIZE(ap325rxa_spi_devices));