← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/board-omap3logic.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/board-omap3logic.c
37
37
#include "hsmmc.h"
38
38
#include "timer-gp.h"
39
39
#include "control.h"
 
40
#include "common-board-devices.h"
40
41
 
41
42
#include <plat/mux.h>
42
43
#include <plat/board.h>
93
94
        .vmmc1          = &omap3logic_vmmc1,
94
95
};
95
96
 
96
 
static struct i2c_board_info __initdata omap3logic_i2c_boardinfo[] = {
97
 
        {
98
 
                I2C_BOARD_INFO("twl4030", 0x48),
99
 
                .flags = I2C_CLIENT_WAKE,
100
 
                .irq = INT_34XX_SYS_NIRQ,
101
 
                .platform_data = &omap3logic_twldata,
102
 
        },
103
 
};
104
 
 
105
97
static int __init omap3logic_i2c_init(void)
106
98
{
107
 
        omap_register_i2c_bus(1, 2600, omap3logic_i2c_boardinfo,
108
 
                                ARRAY_SIZE(omap3logic_i2c_boardinfo));
 
99
        omap3_pmic_init("twl4030", &omap3logic_twldata);
109
100
        return 0;
110
101
}
111
102
 
147
138
        .cs             = OMAP3LOGIC_SMSC911X_CS,
148
139
        .gpio_irq       = -EINVAL,
149
140
        .gpio_reset     = -EINVAL,
150
 
        .flags          = IORESOURCE_IRQ_LOWLEVEL,
151
141
};
152
142
 
153
143
/* TODO/FIXME (comment by Peter Barada, LogicPD):