[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1301302992-10671-1-git-send-email-par-gunnar.p.hjalmdahl@stericsson.com>
Date: Mon, 28 Mar 2011 11:03:12 +0200
From: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@...ricsson.com>
To: Greg Kroah-Hartman <gregkh@...e.de>, <devel@...verdev.osuosl.org>,
Linus Walleij <linus.walleij@...aro.org>
Cc: <linux-kernel@...r.kernel.org>, <linux-bluetooth@...r.kernel.org>,
Pavan Savoy <pavan_savoy@...y.com>,
Vitaly Wool <vitalywool@...il.com>,
Alan Cox <alan@...rguk.ukuu.org.uk>,
Arnd Bergmann <arnd@...db.de>,
Marcel Holtmann <marcel@...tmann.org>,
Lukasz Rymanowski <Lukasz.Rymanowski@...to.com>,
Linus Walleij <linus.walleij@...ricsson.com>,
Par-Gunnar Hjalmdahl <pghatwork@...il.com>,
Lee Jones <lee.jones@...aro.org>,
Mathieu Poirier <mathieu.poirier@...aro.org>,
Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@...ricsson.com>
Subject: [PATCH v2 2/2] mach-ux500: Add CG2900 devices
This patch adds the board specific data for the CG2900 driver
on a UX500 board.
Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@...ricsson.com>
Acked-by: Linus Walleij <linus.walleij@...aro.org>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists