← 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/magician.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-pxa/magician.c
88
88
        GPIO112_MMC_CMD,
89
89
 
90
90
        /* LCD */
91
 
        GPIO58_LCD_LDD_0,
92
 
        GPIO59_LCD_LDD_1,
93
 
        GPIO60_LCD_LDD_2,
94
 
        GPIO61_LCD_LDD_3,
95
 
        GPIO62_LCD_LDD_4,
96
 
        GPIO63_LCD_LDD_5,
97
 
        GPIO64_LCD_LDD_6,
98
 
        GPIO65_LCD_LDD_7,
99
 
        GPIO66_LCD_LDD_8,
100
 
        GPIO67_LCD_LDD_9,
101
 
        GPIO68_LCD_LDD_10,
102
 
        GPIO69_LCD_LDD_11,
103
 
        GPIO70_LCD_LDD_12,
104
 
        GPIO71_LCD_LDD_13,
105
 
        GPIO72_LCD_LDD_14,
106
 
        GPIO73_LCD_LDD_15,
107
 
        GPIO74_LCD_FCLK,
108
 
        GPIO75_LCD_LCLK,
109
 
        GPIO76_LCD_PCLK,
110
 
        GPIO77_LCD_BIAS,
 
91
        GPIOxx_LCD_TFT_16BPP,
111
92
 
112
93
        /* QCI */
113
94
        GPIO12_CIF_DD_7,
381
362
        return ret;
382
363
}
383
364
 
384
 
static int magician_backlight_notify(int brightness)
 
365
static int magician_backlight_notify(struct device *dev, int brightness)
385
366
{
386
367
        gpio_set_value(EGPIO_MAGICIAN_BL_POWER, brightness);
387
368
        if (brightness >= 200) {
742
723
 
743
724
        pxa2xx_mfp_config(ARRAY_AND_SIZE(magician_pin_config));
744
725
 
 
726
        pxa_set_ffuart_info(NULL);
 
727
        pxa_set_btuart_info(NULL);
 
728
        pxa_set_stuart_info(NULL);
 
729
 
745
730
        platform_add_devices(ARRAY_AND_SIZE(devices));
746
731
 
747
732
        err = gpio_request(GPIO83_MAGICIAN_nIR_EN, "nIR_EN");
779
764
 
780
765
 
781
766
MACHINE_START(MAGICIAN, "HTC Magician")
782
 
        .phys_io = 0x40000000,
783
 
        .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
784
767
        .boot_params = 0xa0000100,
785
 
        .map_io = pxa_map_io,
 
768
        .map_io = pxa27x_map_io,
 
769
        .nr_irqs = MAGICIAN_NR_IRQS,
786
770
        .init_irq = pxa27x_init_irq,
787
771
        .init_machine = magician_init,
788
772
        .timer = &pxa_timer,