]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/kernel/omap/beagle/expansion/0011-Beagle-expansion-LSR-COM6L-Adapter-Board-also-initia.patch
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
[people/teissler/ipfire-2.x.git] / src / patches / kernel / omap / beagle / expansion / 0011-Beagle-expansion-LSR-COM6L-Adapter-Board-also-initia.patch
1 From 89eb49ac0268518799984fa035ac3fea0ae758ec Mon Sep 17 00:00:00 2001
2 From: Robert Nelson <robertcnelson@gmail.com>
3 Date: Mon, 21 Jan 2013 11:52:20 -0600
4 Subject: [PATCH 11/11] Beagle: expansion: LSR COM6L Adapter Board also
5 initialize the 24c256 eeprom
6
7 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
8 ---
9 arch/arm/mach-omap2/board-omap3beagle.c | 20 ++++++++++++++++++++
10 1 file changed, 20 insertions(+)
11
12 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
13 index 5a7e7b5..6797488 100644
14 --- a/arch/arm/mach-omap2/board-omap3beagle.c
15 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
16 @@ -39,6 +39,7 @@
17 #include <linux/regulator/machine.h>
18 #include <linux/regulator/fixed.h>
19 #include <linux/i2c/twl.h>
20 +#include <linux/i2c/at24.h>
21
22 #include <asm/mach-types.h>
23 #include <asm/mach/arch.h>
24 @@ -214,6 +215,7 @@ enum {
25 EXPANSION_I2C_NONE = 0,
26 EXPANSION_I2C_ZIPPY,
27 EXPANSION_I2C_7ULCD,
28 + EXPANSION_I2C_COM6L,
29 };
30
31 static struct {
32 @@ -856,6 +858,20 @@ static struct isp_platform_data beagle_isp_platform_data = {
33 };
34 #endif
35
36 +static struct at24_platform_data beagle_at24_eeprom_info = {
37 + .byte_len = (256*1024) / 8,
38 + .page_size = 64,
39 + .flags = AT24_FLAG_ADDR16,
40 + .context = (void *)NULL,
41 +};
42 +
43 +static struct i2c_board_info __initdata com6l_adpt_eeprom[] = {
44 + {
45 + I2C_BOARD_INFO("24c256", 0x50),
46 + .platform_data = &beagle_at24_eeprom_info,
47 + },
48 +};
49 +
50 static int __init omap3_beagle_i2c_init(void)
51 {
52 omap3_pmic_get_config(&beagle_twldata,
53 @@ -875,6 +891,9 @@ static int __init omap3_beagle_i2c_init(void)
54 case EXPANSION_I2C_ZIPPY:
55 omap_register_i2c_bus(2, 400, zippy_i2c2_rtc, ARRAY_SIZE(zippy_i2c2_rtc));
56 break;
57 + case EXPANSION_I2C_COM6L:
58 + omap_register_i2c_bus(2, 400, com6l_adpt_eeprom, ARRAY_SIZE(com6l_adpt_eeprom));
59 + break;
60 default:
61 omap_register_i2c_bus(2, 400, NULL, 0);
62 }
63 @@ -1155,6 +1174,7 @@ static void __init omap3_beagle_init(void)
64 omap_mux_init_signal("sdmmc2_dat3.sdmmc2_dat3", OMAP_PIN_INPUT_PULLUP);
65
66 expansion_config.mmc_settings = EXPANSION_MMC_WIFI;
67 + expansion_config.i2c_settings = EXPANSION_I2C_COM6L;
68 #endif
69 }
70
71 --
72 1.7.10.4
73