← 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-pxa/eseries.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-pxa/eseries.c
20
20
#include <linux/mfd/t7l66xb.h>
21
21
#include <linux/mtd/nand.h>
22
22
#include <linux/mtd/partitions.h>
 
23
#include <linux/usb/gpio_vbus.h>
23
24
 
24
25
#include <video/w100fb.h>
25
26
 
51
52
                mi->bank[0].size = (64*1024*1024);
52
53
}
53
54
 
54
 
struct pxa2xx_udc_mach_info e7xx_udc_mach_info = {
 
55
struct gpio_vbus_mach_info e7xx_udc_info = {
55
56
        .gpio_vbus   = GPIO_E7XX_USB_DISC,
56
57
        .gpio_pullup = GPIO_E7XX_USB_PULLUP,
57
58
        .gpio_pullup_inverted = 1
58
59
};
59
60
 
 
61
static struct platform_device e7xx_gpio_vbus = {
 
62
        .name   = "gpio-vbus",
 
63
        .id     = -1,
 
64
        .dev    = {
 
65
                .platform_data  = &e7xx_udc_info,
 
66
        },
 
67
};
 
68
 
60
69
struct pxaficp_platform_data e7xx_ficp_platform_data = {
61
70
        .gpio_pwdown            = GPIO_E7XX_IR_OFF,
62
71
        .transceiver_cap        = IR_SIRMODE | IR_OFF,
165
174
 
166
175
static struct platform_device *e330_devices[] __initdata = {
167
176
        &e330_tc6387xb_device,
 
177
        &e7xx_gpio_vbus,
168
178
};
169
179
 
170
180
static void __init e330_init(void)
175
185
        eseries_register_clks();
176
186
        eseries_get_tmio_gpios();
177
187
        platform_add_devices(ARRAY_AND_SIZE(e330_devices));
178
 
        pxa_set_udc_info(&e7xx_udc_mach_info);
179
188
}
180
189
 
181
190
MACHINE_START(E330, "Toshiba e330")
214
223
 
215
224
static struct platform_device *e350_devices[] __initdata = {
216
225
        &e350_t7l66xb_device,
 
226
        &e7xx_gpio_vbus,
217
227
};
218
228
 
219
229
static void __init e350_init(void)
224
234
        eseries_register_clks();
225
235
        eseries_get_tmio_gpios();
226
236
        platform_add_devices(ARRAY_AND_SIZE(e350_devices));
227
 
        pxa_set_udc_info(&e7xx_udc_mach_info);
228
237
}
229
238
 
230
239
MACHINE_START(E350, "Toshiba e350")
333
342
 
334
343
static struct platform_device *e400_devices[] __initdata = {
335
344
        &e400_t7l66xb_device,
 
345
        &e7xx_gpio_vbus,
336
346
};
337
347
 
338
348
static void __init e400_init(void)
344
354
        /* Fixme - e400 may have a switched clock */
345
355
        eseries_register_clks();
346
356
        eseries_get_tmio_gpios();
347
 
        set_pxa_fb_info(&e400_pxafb_mach_info);
 
357
        pxa_set_fb_info(NULL, &e400_pxafb_mach_info);
348
358
        platform_add_devices(ARRAY_AND_SIZE(e400_devices));
349
 
        pxa_set_udc_info(&e7xx_udc_mach_info);
350
359
}
351
360
 
352
361
MACHINE_START(E400, "Toshiba e400")
519
528
static struct platform_device *e740_devices[] __initdata = {
520
529
        &e740_fb_device,
521
530
        &e740_t7l66xb_device,
 
531
        &e7xx_gpio_vbus,
522
532
};
523
533
 
524
534
static void __init e740_init(void)
532
542
                        "UDCCLK", &pxa25x_device_udc.dev),
533
543
        eseries_get_tmio_gpios();
534
544
        platform_add_devices(ARRAY_AND_SIZE(e740_devices));
535
 
        pxa_set_udc_info(&e7xx_udc_mach_info);
536
545
        pxa_set_ac97_info(NULL);
537
546
        pxa_set_ficp_info(&e7xx_ficp_platform_data);
538
547
}
711
720
static struct platform_device *e750_devices[] __initdata = {
712
721
        &e750_fb_device,
713
722
        &e750_tc6393xb_device,
 
723
        &e7xx_gpio_vbus,
714
724
};
715
725
 
716
726
static void __init e750_init(void)
723
733
                        "GPIO11_CLK", NULL),
724
734
        eseries_get_tmio_gpios();
725
735
        platform_add_devices(ARRAY_AND_SIZE(e750_devices));
726
 
        pxa_set_udc_info(&e7xx_udc_mach_info);
727
736
        pxa_set_ac97_info(NULL);
728
737
        pxa_set_ficp_info(&e7xx_ficp_platform_data);
729
738
}
873
882
 
874
883
/* --------------------------- UDC definitions --------------------------- */
875
884
 
876
 
static struct pxa2xx_udc_mach_info e800_udc_mach_info = {
 
885
static struct gpio_vbus_mach_info e800_udc_info = {
877
886
        .gpio_vbus   = GPIO_E800_USB_DISC,
878
887
        .gpio_pullup = GPIO_E800_USB_PULLUP,
879
888
        .gpio_pullup_inverted = 1
880
889
};
881
890
 
 
891
static struct platform_device e800_gpio_vbus = {
 
892
        .name   = "gpio-vbus",
 
893
        .id     = -1,
 
894
        .dev    = {
 
895
                .platform_data  = &e800_udc_info,
 
896
        },
 
897
};
 
898
 
 
899
 
882
900
/* ----------------- e800 tc6393xb parameters ------------------ */
883
901
 
884
902
static struct tc6393xb_platform_data e800_tc6393xb_info = {
907
925
static struct platform_device *e800_devices[] __initdata = {
908
926
        &e800_fb_device,
909
927
        &e800_tc6393xb_device,
 
928
        &e800_gpio_vbus,
910
929
};
911
930
 
912
931
static void __init e800_init(void)
919
938
                        "GPIO11_CLK", NULL),
920
939
        eseries_get_tmio_gpios();
921
940
        platform_add_devices(ARRAY_AND_SIZE(e800_devices));
922
 
        pxa_set_udc_info(&e800_udc_mach_info);
923
941
        pxa_set_ac97_info(NULL);
924
942
}
925
943