Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754017Ab1C1JD5 (ORCPT ); Mon, 28 Mar 2011 05:03:57 -0400 Received: from eu1sys200aog109.obsmtp.com ([207.126.144.127]:58612 "EHLO eu1sys200aog109.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753485Ab1C1JDe (ORCPT ); Mon, 28 Mar 2011 05:03:34 -0400 From: Par-Gunnar Hjalmdahl To: Greg Kroah-Hartman , , Linus Walleij Cc: , , Pavan Savoy , Vitaly Wool , Alan Cox , Arnd Bergmann , Marcel Holtmann , Lukasz Rymanowski , Linus Walleij , Par-Gunnar Hjalmdahl , Lee Jones , Mathieu Poirier , Par-Gunnar Hjalmdahl Subject: [PATCH v2 2/2] mach-ux500: Add CG2900 devices Date: Mon, 28 Mar 2011 11:03:12 +0200 Message-ID: <1301302992-10671-1-git-send-email-par-gunnar.p.hjalmdahl@stericsson.com> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1521 Lines: 43 This patch adds the board specific data for the CG2900 driver on a UX500 board. Signed-off-by: Par-Gunnar Hjalmdahl Acked-by: Linus Walleij --- arch/arm/mach-ux500/board-mop500.c | 2 ++ arch/arm/mach-ux500/board-mop500.h | 3 +++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index d8e5a52..16b7343 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -417,6 +417,8 @@ static void __init mop500_init_machine(void) platform_device_register(&ab8500_device); + cg2900_init_board(); + i2c_register_board_info(0, mop500_i2c0_devices, ARRAY_SIZE(mop500_i2c0_devices)); i2c_register_board_info(2, mop500_i2c2_devices, diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 56722f4..7c89993 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -39,4 +39,7 @@ void __init mop500_pins_init(void); void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info, unsigned n); +/* Function located in drivers/staging/cg2900 */ +extern void cg2900_init_board(void); + #endif -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/