← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/mach-at91/at91cap9_devices.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-at91/at91cap9_devices.c
16
16
#include <asm/mach/irq.h>
17
17
 
18
18
#include <linux/dma-mapping.h>
 
19
#include <linux/gpio.h>
19
20
#include <linux/platform_device.h>
20
21
#include <linux/i2c-gpio.h>
21
22
 
23
24
 
24
25
#include <mach/board.h>
25
26
#include <mach/cpu.h>
26
 
#include <mach/gpio.h>
27
27
#include <mach/at91cap9.h>
28
28
#include <mach/at91cap9_matrix.h>
29
29
#include <mach/at91sam9_smc.h>
80
80
                        at91_set_gpio_output(data->vbus_pin[i], 0);
81
81
        }
82
82
 
 
83
        /* Enable overcurrent notification */
 
84
        for (i = 0; i < data->ports; i++) {
 
85
                if (data->overcurrent_pin[i])
 
86
                        at91_set_gpio_input(data->overcurrent_pin[i], 1);
 
87
        }
 
88
 
83
89
        usbh_data = *data;
84
90
        platform_device_register(&at91_usbh_device);
85
91
}
92
98
 *  USB HS Device (Gadget)
93
99
 * -------------------------------------------------------------------- */
94
100
 
95
 
#if defined(CONFIG_USB_GADGET_ATMEL_USBA) || defined(CONFIG_USB_GADGET_ATMEL_USBA_MODULE)
 
101
#if defined(CONFIG_USB_ATMEL_USBA) || defined(CONFIG_USB_ATMEL_USBA_MODULE)
96
102
 
97
103
static struct resource usba_udc_resources[] = {
98
104
        [0] = {
1015
1021
#if defined(CONFIG_SERIAL_ATMEL)
1016
1022
static struct resource dbgu_resources[] = {
1017
1023
        [0] = {
1018
 
                .start  = AT91_VA_BASE_SYS + AT91_DBGU,
1019
 
                .end    = AT91_VA_BASE_SYS + AT91_DBGU + SZ_512 - 1,
 
1024
                .start  = AT91_BASE_SYS + AT91_DBGU,
 
1025
                .end    = AT91_BASE_SYS + AT91_DBGU + SZ_512 - 1,
1020
1026
                .flags  = IORESOURCE_MEM,
1021
1027
        },
1022
1028
        [1] = {
1029
1035
static struct atmel_uart_data dbgu_data = {
1030
1036
        .use_dma_tx     = 0,
1031
1037
        .use_dma_rx     = 0,            /* DBGU not capable of receive DMA */
1032
 
        .regs           = (void __iomem *)(AT91_VA_BASE_SYS + AT91_DBGU),
1033
1038
};
1034
1039
 
1035
1040
static u64 dbgu_dmamask = DMA_BIT_MASK(32);