← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/board-cm-t3517.c
167
167
#define HSUSB2_RESET_GPIO       (147)
168
168
#define USB_HUB_RESET_GPIO      (152)
169
169
 
170
 
static struct ehci_hcd_omap_platform_data cm_t3517_ehci_pdata __initdata = {
171
 
        .port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
172
 
        .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
173
 
        .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
 
170
static struct usbhs_omap_board_data cm_t3517_ehci_pdata __initdata = {
 
171
        .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
 
172
        .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
 
173
        .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
174
174
 
175
175
        .phy_reset  = true,
176
176
        .reset_gpio_port[0]  = HSUSB1_RESET_GPIO,
192
192
                msleep(1);
193
193
        }
194
194
 
195
 
        usb_ehci_init(&cm_t3517_ehci_pdata);
 
195
        usbhs_init(&cm_t3517_ehci_pdata);
196
196
 
197
197
        return 0;
198
198
}
254
254
static struct omap_board_config_kernel cm_t3517_config[] __initdata = {
255
255
};
256
256
 
257
 
static void __init cm_t3517_init_irq(void)
 
257
static void __init cm_t3517_init_early(void)
258
258
{
259
 
        omap_board_config = cm_t3517_config;
260
 
        omap_board_config_size = ARRAY_SIZE(cm_t3517_config);
261
 
 
262
259
        omap2_init_common_infrastructure();
263
260
        omap2_init_common_devices(NULL, NULL);
264
 
        omap_init_irq();
265
261
}
266
262
 
 
263
#ifdef CONFIG_OMAP_MUX
267
264
static struct omap_board_mux board_mux[] __initdata = {
268
265
        /* GPIO186 - Green LED */
269
266
        OMAP3_MUX(SYS_CLKOUT2, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
289
286
 
290
287
        { .reg_offset = OMAP_MUX_TERMINATOR },
291
288
};
 
289
#endif
292
290
 
293
291
static void __init cm_t3517_init(void)
294
292
{
295
293
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
296
294
        omap_serial_init();
 
295
        omap_board_config = cm_t3517_config;
 
296
        omap_board_config_size = ARRAY_SIZE(cm_t3517_config);
297
297
        cm_t3517_init_leds();
298
298
        cm_t3517_init_nand();
299
299
        cm_t3517_init_rtc();
303
303
 
304
304
MACHINE_START(CM_T3517, "Compulab CM-T3517")
305
305
        .boot_params    = 0x80000100,
 
306
        .reserve        = omap_reserve,
306
307
        .map_io         = omap3_map_io,
307
 
        .reserve        = omap_reserve,
308
 
        .init_irq       = cm_t3517_init_irq,
 
308
        .init_early     = cm_t3517_init_early,
 
309
        .init_irq       = omap_init_irq,
309
310
        .init_machine   = cm_t3517_init,
310
311
        .timer          = &omap_timer,
311
312
MACHINE_END