← 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-2430sdp.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-2430sdp.c
26
26
#include <linux/err.h>
27
27
#include <linux/clk.h>
28
28
#include <linux/io.h>
 
29
#include <linux/gpio.h>
29
30
 
30
31
#include <mach/hardware.h>
31
32
#include <asm/mach-types.h>
32
33
#include <asm/mach/arch.h>
33
34
#include <asm/mach/map.h>
34
35
 
35
 
#include <mach/gpio.h>
36
36
#include <plat/board.h>
37
37
#include <plat/common.h>
38
38
#include <plat/gpmc.h>
41
41
 
42
42
#include "mux.h"
43
43
#include "hsmmc.h"
 
44
#include "common-board-devices.h"
44
45
 
45
46
#define SDP2430_CS0_BASE        0x04000000
46
47
#define SECONDARY_LCD_GPIO              147
180
181
        .vmmc1          = &sdp2430_vmmc1,
181
182
};
182
183
 
183
 
static struct i2c_board_info __initdata sdp2430_i2c_boardinfo[] = {
184
 
        {
185
 
                I2C_BOARD_INFO("twl4030", 0x48),
186
 
                .flags = I2C_CLIENT_WAKE,
187
 
                .irq = INT_24XX_SYS_NIRQ,
188
 
                .platform_data = &sdp2430_twldata,
189
 
        },
190
 
};
191
 
 
192
184
static struct i2c_board_info __initdata sdp2430_i2c1_boardinfo[] = {
193
185
        {
194
186
                I2C_BOARD_INFO("isp1301_omap", 0x2D),
201
193
{
202
194
        omap_register_i2c_bus(1, 100, sdp2430_i2c1_boardinfo,
203
195
                        ARRAY_SIZE(sdp2430_i2c1_boardinfo));
204
 
        omap_register_i2c_bus(2, 2600, sdp2430_i2c_boardinfo,
205
 
                        ARRAY_SIZE(sdp2430_i2c_boardinfo));
 
196
        omap2_pmic_init("twl4030", &sdp2430_twldata);
206
197
        return 0;
207
198
}
208
199
 
217
208
        {}      /* Terminator */
218
209
};
219
210
 
220
 
static struct omap_musb_board_data musb_board_data = {
221
 
        .interface_type         = MUSB_INTERFACE_ULPI,
222
 
        .mode                   = MUSB_OTG,
223
 
        .power                  = 100,
224
 
};
225
211
static struct omap_usb_config sdp2430_usb_config __initdata = {
226
212
        .otg            = 1,
227
213
#ifdef  CONFIG_USB_GADGET_OMAP
240
226
 
241
227
static void __init omap_2430sdp_init(void)
242
228
{
243
 
        int ret;
244
 
 
245
229
        omap2430_mux_init(board_mux, OMAP_PACKAGE_ZAC);
246
230
 
247
231
        omap_board_config = sdp2430_config;
255
239
        omap2_usbfs_init(&sdp2430_usb_config);
256
240
 
257
241
        omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);
258
 
        usb_musb_init(&musb_board_data);
 
242
        usb_musb_init(NULL);
259
243
 
260
244
        board_smc91x_init();
261
245
 
262
246
        /* Turn off secondary LCD backlight */
263
 
        ret = gpio_request(SECONDARY_LCD_GPIO, "Secondary LCD backlight");
264
 
        if (ret == 0)
265
 
                gpio_direction_output(SECONDARY_LCD_GPIO, 0);
 
247
        gpio_request_one(SECONDARY_LCD_GPIO, GPIOF_OUT_INIT_LOW,
 
248
                         "Secondary LCD backlight");
266
249
}
267
250
 
268
251
static void __init omap_2430sdp_map_io(void)