← 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-mx5/board-cpuimx51sd.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-mx5/board-cpuimx51sd.c
42
42
 
43
43
#include "devices-imx51.h"
44
44
#include "devices.h"
 
45
#include "cpu_op-mx51.h"
45
46
 
46
47
#define USBH1_RST               IMX_GPIO_NR(2, 28)
47
48
#define ETH_RST                 IMX_GPIO_NR(2, 31)
109
110
 
110
111
        /* Touchscreen */
111
112
        /* IRQ */
112
 
        _MX51_PAD_CSI1_D8__GPIO3_12 | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
 
113
        _MX51_PAD_GPIO_NAND__GPIO_NAND | MUX_PAD_CTRL(PAD_CTL_PUS_22K_UP |
113
114
                        PAD_CTL_PKE | PAD_CTL_SRE_FAST |
114
115
                        PAD_CTL_DSE_HIGH | PAD_CTL_PUE | PAD_CTL_HYS),
115
116
};
118
119
        .flags = IMXUART_HAVE_RTSCTS,
119
120
};
120
121
 
121
 
static int ts_get_pendown_state(void)
122
 
{
123
 
        return gpio_get_value(TSC2007_IRQGPIO) ? 0 : 1;
124
 
}
125
 
 
126
122
static struct tsc2007_platform_data tsc2007_info = {
127
123
        .model                  = 2007,
128
124
        .x_plate_ohms           = 180,
129
 
        .get_pendown_state      = ts_get_pendown_state,
130
125
};
131
126
 
132
127
static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {
167
162
        v |= MX51_USB_PLL_DIV_19_2_MHZ;
168
163
        __raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
169
164
        iounmap(usb_base);
170
 
        return 0;
 
165
 
 
166
        mdelay(10);
 
167
 
 
168
        return mx51_initialize_usb_hw(0, MXC_EHCI_INTERNAL_PHY);
171
169
}
172
170
 
173
171
static int initialize_usbh1_port(struct platform_device *pdev)
186
184
        __raw_writel(v | MX51_USB_CTRL_UH1_EXT_CLK_EN,
187
185
                        usbother_base + MX51_USB_CTRL_1_OFFSET);
188
186
        iounmap(usb_base);
189
 
        return 0;
 
187
 
 
188
        mdelay(10);
 
189
 
 
190
        return mx51_initialize_usb_hw(1, MXC_EHCI_POWER_PINS_ENABLED |
 
191
                        MXC_EHCI_ITC_NO_THRESHOLD);
190
192
}
191
193
 
192
194
static struct mxc_usbh_platform_data dr_utmi_config = {
193
195
        .init           = initialize_otg_port,
194
196
        .portsc = MXC_EHCI_UTMI_16BIT,
195
 
        .flags  = MXC_EHCI_INTERNAL_PHY,
196
197
};
197
198
 
198
199
static struct fsl_usb2_platform_data usb_pdata = {
203
204
static struct mxc_usbh_platform_data usbh1_config = {
204
205
        .init           = initialize_usbh1_port,
205
206
        .portsc = MXC_EHCI_MODE_ULPI,
206
 
        .flags  = (MXC_EHCI_POWER_PINS_ENABLED | MXC_EHCI_ITC_NO_THRESHOLD),
207
207
};
208
208
 
209
209
static int otg_mode_host;
242
242
static struct spi_board_info cpuimx51sd_spi_device[] = {
243
243
        {
244
244
                .modalias        = "mcp2515",
245
 
                .max_speed_hz    = 6500000,
 
245
                .max_speed_hz    = 10000000,
246
246
                .bus_num         = 0,
247
247
                .mode           = SPI_MODE_0,
248
248
                .chip_select     = 0,
269
269
        mxc_iomux_v3_setup_multiple_pads(eukrea_cpuimx51sd_pads,
270
270
                                        ARRAY_SIZE(eukrea_cpuimx51sd_pads));
271
271
 
 
272
#if defined(CONFIG_CPU_FREQ_IMX)
 
273
        get_cpu_op = mx51_get_cpu_op;
 
274
#endif
 
275
 
272
276
        imx51_add_imx_uart(0, &uart_pdata);
273
277
        imx51_add_mxc_nand(&eukrea_cpuimx51sd_nand_board_info);
274
278
 
329
333
        /* Maintainer: Eric Bénard <eric@eukrea.com> */
330
334
        .boot_params = MX51_PHYS_OFFSET + 0x100,
331
335
        .map_io = mx51_map_io,
 
336
        .init_early = imx51_init_early,
332
337
        .init_irq = mx51_init_irq,
 
338
        .timer = &mxc_timer,
333
339
        .init_machine = eukrea_cpuimx51sd_init,
334
 
        .timer = &mxc_timer,
335
340
MACHINE_END