From patchwork Thu Aug 6 14:15:36 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 39616 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 n76EJvxA029796 for ; Thu, 6 Aug 2009 14:19:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751972AbZHFOTz (ORCPT ); Thu, 6 Aug 2009 10:19:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751426AbZHFOTz (ORCPT ); Thu, 6 Aug 2009 10:19:55 -0400 Received: from mail-pz0-f196.google.com ([209.85.222.196]:49451 "EHLO mail-pz0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751972AbZHFOTy (ORCPT ); Thu, 6 Aug 2009 10:19:54 -0400 Received: by pzk34 with SMTP id 34so928064pzk.4 for ; Thu, 06 Aug 2009 07:19:55 -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=IMdiTz8H1jVxnBRvlY6og1ZfM01MM+sCvAm0c+3ogoQ=; b=MgCNrd4162E6ctc2pKY/VfHwSdSYlJh+SWWK3fL7J6EEu/Ptc2FNNcZ1QJGzFoTGhz P0eZGqgbP3h8QYSUbzwy+uVAPoCFiP+LY79mALvjxen+C77oLd8cWn1MzQWjB6cG48vT Te+Vm+QxWdNq0k+bBcgFNn3FR3jcgIRVlNUqY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=NIjlb2QqhYzBuU7UHqO/MvKDVH4Rd87IsT2KX/qyKaWWEPjmBfzTWiYRptghqnQtou 268c2k8XZ60NOXtG62PwUUXU/LPqGOMhD1c8oBELgQOQ5GdEe7CreP+gCP1LghO6fw4G lJ47Rp+ins+bLGs7XpiR80ducKs2NOCkyjB9I= Received: by 10.115.95.14 with SMTP id x14mr13335497wal.223.1249568388837; Thu, 06 Aug 2009 07:19:48 -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 n9sm65571wag.23.2009.08.06.07.19.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 06 Aug 2009 07:19:48 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Thu, 06 Aug 2009 23:15:36 +0900 Message-Id: <20090806141536.28146.17373.sendpatchset@rx1.opensource.se> Subject: [PATCH] sh: fix i2c init order on Migo-R Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Convert the Migo-R board code to register i2c devices from arch_initcall() instead of __initcall(). This fix unbreaks migor_ts touch screen driver support. Signed-off-by: Magnus Damm --- Suitable for 2.6.31-rc. arch/sh/boards/mach-migor/setup.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/mach-migor/setup.c +++ work/arch/sh/boards/mach-migor/setup.c 2009-07-30 17:22:47.000000000 +0900 @@ -405,6 +405,15 @@ static struct i2c_board_info migor_i2c_d }, }; +static int __init migor_devices_i2c_setup(void) +{ + i2c_register_board_info(0, migor_i2c_devices, + ARRAY_SIZE(migor_i2c_devices)); + + return 0; +} +arch_initcall(migor_devices_i2c_setup); + static struct i2c_board_info migor_i2c_camera[] = { { I2C_BOARD_INFO("ov772x", 0x21), @@ -600,9 +609,6 @@ static int __init migor_devices_setup(vo platform_resource_setup_memory(&migor_ceu_device, "ceu", 4 << 20); - i2c_register_board_info(0, migor_i2c_devices, - ARRAY_SIZE(migor_i2c_devices)); - spi_register_board_info(migor_spi_devices, ARRAY_SIZE(migor_spi_devices));