Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Orion5x: replace KEY_WLAN with KEY_WPS_BUTTON [ARM] Kirkwood: WPS button keycode mapping pxa168fb: fix incorrect resource calculation [ARM] pxa/raumfeld: fix button name [ARM] pxa/raumfeld: remove duplicated #include [ARM] locomo: fix unpaired spin_lock_irqsave [ARM] locomo: fix SPI register offset [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm [ARM] pxa: remove unnecessary 'select FB_W100' from some platforms [ARM] pxa: remove spi cs gpio direction to avoid clash with driver [ARM] mmp: fix for variables in uncompress.h being discarded [ARM] pxa: fix for variables in uncompress.h being discarded ARM: Update mach-types ARM: Fix IXP23xx build error in mach/memory.h
This commit is contained in:
commit
1ff31056fb
12 changed files with 103 additions and 32 deletions
|
@ -290,7 +290,7 @@ static int locomo_suspend(struct platform_device *dev, pm_message_t state)
|
||||||
save->LCM_GPO = locomo_readl(lchip->base + LOCOMO_GPO); /* GPIO */
|
save->LCM_GPO = locomo_readl(lchip->base + LOCOMO_GPO); /* GPIO */
|
||||||
locomo_writel(0x00, lchip->base + LOCOMO_GPO);
|
locomo_writel(0x00, lchip->base + LOCOMO_GPO);
|
||||||
save->LCM_SPICT = locomo_readl(lchip->base + LOCOMO_SPI + LOCOMO_SPICT); /* SPI */
|
save->LCM_SPICT = locomo_readl(lchip->base + LOCOMO_SPI + LOCOMO_SPICT); /* SPI */
|
||||||
locomo_writel(0x40, lchip->base + LOCOMO_SPICT);
|
locomo_writel(0x40, lchip->base + LOCOMO_SPI + LOCOMO_SPICT);
|
||||||
save->LCM_GPE = locomo_readl(lchip->base + LOCOMO_GPE); /* GPIO */
|
save->LCM_GPE = locomo_readl(lchip->base + LOCOMO_GPE); /* GPIO */
|
||||||
locomo_writel(0x00, lchip->base + LOCOMO_GPE);
|
locomo_writel(0x00, lchip->base + LOCOMO_GPE);
|
||||||
save->LCM_ASD = locomo_readl(lchip->base + LOCOMO_ASD); /* ADSTART */
|
save->LCM_ASD = locomo_readl(lchip->base + LOCOMO_ASD); /* ADSTART */
|
||||||
|
@ -418,7 +418,7 @@ __locomo_probe(struct device *me, struct resource *mem, int irq)
|
||||||
/* Longtime timer */
|
/* Longtime timer */
|
||||||
locomo_writel(0, lchip->base + LOCOMO_LTINT);
|
locomo_writel(0, lchip->base + LOCOMO_LTINT);
|
||||||
/* SPI */
|
/* SPI */
|
||||||
locomo_writel(0, lchip->base + LOCOMO_SPIIE);
|
locomo_writel(0, lchip->base + LOCOMO_SPI + LOCOMO_SPIIE);
|
||||||
|
|
||||||
locomo_writel(6 + 8 + 320 + 30 - 10, lchip->base + LOCOMO_ASD);
|
locomo_writel(6 + 8 + 320 + 30 - 10, lchip->base + LOCOMO_ASD);
|
||||||
r = locomo_readl(lchip->base + LOCOMO_ASD);
|
r = locomo_readl(lchip->base + LOCOMO_ASD);
|
||||||
|
@ -707,7 +707,7 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int
|
||||||
udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */
|
udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */
|
||||||
if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */
|
if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */
|
||||||
printk(KERN_WARNING "locomo: m62332_senddata Error 1\n");
|
printk(KERN_WARNING "locomo: m62332_senddata Error 1\n");
|
||||||
return;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Send Sub address (LSB is channel select) */
|
/* Send Sub address (LSB is channel select) */
|
||||||
|
@ -735,7 +735,7 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int
|
||||||
udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */
|
udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */
|
||||||
if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */
|
if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */
|
||||||
printk(KERN_WARNING "locomo: m62332_senddata Error 2\n");
|
printk(KERN_WARNING "locomo: m62332_senddata Error 2\n");
|
||||||
return;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Send DAC data */
|
/* Send DAC data */
|
||||||
|
@ -760,9 +760,9 @@ void locomo_m62332_senddata(struct locomo_dev *ldev, unsigned int dac_data, int
|
||||||
udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */
|
udelay(DAC_SCL_HIGH_HOLD_TIME); /* 4.7 usec */
|
||||||
if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */
|
if (locomo_readl(mapbase + LOCOMO_DAC) & LOCOMO_DAC_SDAOEB) { /* High is error */
|
||||||
printk(KERN_WARNING "locomo: m62332_senddata Error 3\n");
|
printk(KERN_WARNING "locomo: m62332_senddata Error 3\n");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
/* stop */
|
/* stop */
|
||||||
r = locomo_readl(mapbase + LOCOMO_DAC);
|
r = locomo_readl(mapbase + LOCOMO_DAC);
|
||||||
r &= ~(LOCOMO_DAC_SCLOEB);
|
r &= ~(LOCOMO_DAC_SCLOEB);
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
*/
|
*/
|
||||||
#define PHYS_OFFSET (0x00000000)
|
#define PHYS_OFFSET (0x00000000)
|
||||||
|
|
||||||
#define IXP23XX_PCI_SDRAM_OFFSET (*((volatile int *)IXP23XX_PCI_SDRAM_BAR) & 0xfffffff0))
|
#define IXP23XX_PCI_SDRAM_OFFSET (*((volatile int *)IXP23XX_PCI_SDRAM_BAR) & 0xfffffff0)
|
||||||
|
|
||||||
#define __phys_to_bus(x) ((x) + (IXP23XX_PCI_SDRAM_OFFSET - PHYS_OFFSET))
|
#define __phys_to_bus(x) ((x) + (IXP23XX_PCI_SDRAM_OFFSET - PHYS_OFFSET))
|
||||||
#define __bus_to_phys(x) ((x) - (IXP23XX_PCI_SDRAM_OFFSET - PHYS_OFFSET))
|
#define __bus_to_phys(x) ((x) - (IXP23XX_PCI_SDRAM_OFFSET - PHYS_OFFSET))
|
||||||
|
|
|
@ -74,9 +74,9 @@ static struct gpio_keys_button mv88f6281gtw_ge_button_pins[] = {
|
||||||
.desc = "SWR Button",
|
.desc = "SWR Button",
|
||||||
.active_low = 1,
|
.active_low = 1,
|
||||||
}, {
|
}, {
|
||||||
.code = KEY_F1,
|
.code = KEY_WPS_BUTTON,
|
||||||
.gpio = 46,
|
.gpio = 46,
|
||||||
.desc = "WPS Button(F1)",
|
.desc = "WPS Button",
|
||||||
.active_low = 1,
|
.active_low = 1,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
#define UART2_BASE (APB_PHYS_BASE + 0x17000)
|
#define UART2_BASE (APB_PHYS_BASE + 0x17000)
|
||||||
#define UART3_BASE (APB_PHYS_BASE + 0x18000)
|
#define UART3_BASE (APB_PHYS_BASE + 0x18000)
|
||||||
|
|
||||||
static volatile unsigned long *UART = (unsigned long *)UART2_BASE;
|
static volatile unsigned long *UART;
|
||||||
|
|
||||||
static inline void putc(char c)
|
static inline void putc(char c)
|
||||||
{
|
{
|
||||||
|
@ -37,6 +37,9 @@ static inline void flush(void)
|
||||||
|
|
||||||
static inline void arch_decomp_setup(void)
|
static inline void arch_decomp_setup(void)
|
||||||
{
|
{
|
||||||
|
/* default to UART2 */
|
||||||
|
UART = (unsigned long *)UART2_BASE;
|
||||||
|
|
||||||
if (machine_is_avengers_lite())
|
if (machine_is_avengers_lite())
|
||||||
UART = (unsigned long *)UART3_BASE;
|
UART = (unsigned long *)UART3_BASE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,7 +77,7 @@ static struct gpio_keys_button wrt350n_v2_buttons[] = {
|
||||||
.desc = "Reset Button",
|
.desc = "Reset Button",
|
||||||
.active_low = 1,
|
.active_low = 1,
|
||||||
}, {
|
}, {
|
||||||
.code = KEY_WLAN,
|
.code = KEY_WPS_BUTTON,
|
||||||
.gpio = 2,
|
.gpio = 2,
|
||||||
.desc = "WPS Button",
|
.desc = "WPS Button",
|
||||||
.active_low = 1,
|
.active_low = 1,
|
||||||
|
|
|
@ -272,7 +272,6 @@ config MACH_H5000
|
||||||
config MACH_HIMALAYA
|
config MACH_HIMALAYA
|
||||||
bool "HTC Himalaya Support"
|
bool "HTC Himalaya Support"
|
||||||
select CPU_PXA26x
|
select CPU_PXA26x
|
||||||
select FB_W100
|
|
||||||
|
|
||||||
config MACH_MAGICIAN
|
config MACH_MAGICIAN
|
||||||
bool "Enable HTC Magician Support"
|
bool "Enable HTC Magician Support"
|
||||||
|
@ -454,6 +453,13 @@ config PXA_SHARPSL
|
||||||
config SHARPSL_PM
|
config SHARPSL_PM
|
||||||
bool
|
bool
|
||||||
select APM_EMULATION
|
select APM_EMULATION
|
||||||
|
select SHARPSL_PM_MAX1111
|
||||||
|
|
||||||
|
config SHARPSL_PM_MAX1111
|
||||||
|
bool
|
||||||
|
depends on !CORGI_SSP_DEPRECATED
|
||||||
|
select HWMON
|
||||||
|
select SENSORS_MAX1111
|
||||||
|
|
||||||
config CORGI_SSP_DEPRECATED
|
config CORGI_SSP_DEPRECATED
|
||||||
bool
|
bool
|
||||||
|
@ -547,7 +553,6 @@ config MACH_E740
|
||||||
bool "Toshiba e740"
|
bool "Toshiba e740"
|
||||||
default y
|
default y
|
||||||
depends on ARCH_PXA_ESERIES
|
depends on ARCH_PXA_ESERIES
|
||||||
select FB_W100
|
|
||||||
help
|
help
|
||||||
Say Y here if you intend to run this kernel on a Toshiba
|
Say Y here if you intend to run this kernel on a Toshiba
|
||||||
e740 family PDA.
|
e740 family PDA.
|
||||||
|
@ -556,7 +561,6 @@ config MACH_E750
|
||||||
bool "Toshiba e750"
|
bool "Toshiba e750"
|
||||||
default y
|
default y
|
||||||
depends on ARCH_PXA_ESERIES
|
depends on ARCH_PXA_ESERIES
|
||||||
select FB_W100
|
|
||||||
help
|
help
|
||||||
Say Y here if you intend to run this kernel on a Toshiba
|
Say Y here if you intend to run this kernel on a Toshiba
|
||||||
e750 family PDA.
|
e750 family PDA.
|
||||||
|
@ -573,7 +577,6 @@ config MACH_E800
|
||||||
bool "Toshiba e800"
|
bool "Toshiba e800"
|
||||||
default y
|
default y
|
||||||
depends on ARCH_PXA_ESERIES
|
depends on ARCH_PXA_ESERIES
|
||||||
select FB_W100
|
|
||||||
help
|
help
|
||||||
Say Y here if you intend to run this kernel on a Toshiba
|
Say Y here if you intend to run this kernel on a Toshiba
|
||||||
e800 family PDA.
|
e800 family PDA.
|
||||||
|
|
|
@ -559,10 +559,6 @@ static void __init imote2_init(void)
|
||||||
pxa_set_btuart_info(NULL);
|
pxa_set_btuart_info(NULL);
|
||||||
pxa_set_stuart_info(NULL);
|
pxa_set_stuart_info(NULL);
|
||||||
|
|
||||||
/* SPI chip select directions - all other directions should
|
|
||||||
* be handled by drivers.*/
|
|
||||||
gpio_direction_output(37, 0);
|
|
||||||
|
|
||||||
platform_add_devices(imote2_devices, ARRAY_SIZE(imote2_devices));
|
platform_add_devices(imote2_devices, ARRAY_SIZE(imote2_devices));
|
||||||
|
|
||||||
pxa2xx_set_spi_info(1, &pxa_ssp_master_0_info);
|
pxa2xx_set_spi_info(1, &pxa_ssp_master_0_info);
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
#define BTUART_BASE (0x40200000)
|
#define BTUART_BASE (0x40200000)
|
||||||
#define STUART_BASE (0x40700000)
|
#define STUART_BASE (0x40700000)
|
||||||
|
|
||||||
static unsigned long uart_base = FFUART_BASE;
|
static unsigned long uart_base;
|
||||||
static unsigned int uart_shift = 2;
|
static unsigned int uart_shift;
|
||||||
static unsigned int uart_is_pxa = 1;
|
static unsigned int uart_is_pxa;
|
||||||
|
|
||||||
static inline unsigned char uart_read(int offset)
|
static inline unsigned char uart_read(int offset)
|
||||||
{
|
{
|
||||||
|
@ -56,6 +56,11 @@ static inline void flush(void)
|
||||||
|
|
||||||
static inline void arch_decomp_setup(void)
|
static inline void arch_decomp_setup(void)
|
||||||
{
|
{
|
||||||
|
/* initialize to default */
|
||||||
|
uart_base = FFUART_BASE;
|
||||||
|
uart_shift = 2;
|
||||||
|
uart_is_pxa = 1;
|
||||||
|
|
||||||
if (machine_is_littleton() || machine_is_intelmote2()
|
if (machine_is_littleton() || machine_is_intelmote2()
|
||||||
|| machine_is_csb726() || machine_is_stargate2()
|
|| machine_is_csb726() || machine_is_stargate2()
|
||||||
|| machine_is_cm_x300() || machine_is_balloon3())
|
|| machine_is_cm_x300() || machine_is_balloon3())
|
||||||
|
|
|
@ -37,8 +37,6 @@
|
||||||
#include <linux/lis3lv02d.h>
|
#include <linux/lis3lv02d.h>
|
||||||
#include <linux/pda_power.h>
|
#include <linux/pda_power.h>
|
||||||
#include <linux/power_supply.h>
|
#include <linux/power_supply.h>
|
||||||
#include <linux/pda_power.h>
|
|
||||||
#include <linux/power_supply.h>
|
|
||||||
#include <linux/regulator/max8660.h>
|
#include <linux/regulator/max8660.h>
|
||||||
#include <linux/regulator/machine.h>
|
#include <linux/regulator/machine.h>
|
||||||
#include <linux/regulator/fixed.h>
|
#include <linux/regulator/fixed.h>
|
||||||
|
@ -444,7 +442,7 @@ static struct gpio_keys_button gpio_keys_button[] = {
|
||||||
.active_low = 0,
|
.active_low = 0,
|
||||||
.wakeup = 0,
|
.wakeup = 0,
|
||||||
.debounce_interval = 5, /* ms */
|
.debounce_interval = 5, /* ms */
|
||||||
.desc = "on/off button",
|
.desc = "on_off button",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -764,11 +764,6 @@ static void __init stargate2_init(void)
|
||||||
pxa_set_btuart_info(NULL);
|
pxa_set_btuart_info(NULL);
|
||||||
pxa_set_stuart_info(NULL);
|
pxa_set_stuart_info(NULL);
|
||||||
|
|
||||||
/* spi chip selects */
|
|
||||||
gpio_direction_output(37, 0);
|
|
||||||
gpio_direction_output(24, 0);
|
|
||||||
gpio_direction_output(39, 0);
|
|
||||||
|
|
||||||
platform_add_devices(ARRAY_AND_SIZE(stargate2_devices));
|
platform_add_devices(ARRAY_AND_SIZE(stargate2_devices));
|
||||||
|
|
||||||
pxa2xx_set_spi_info(1, &pxa_ssp_master_0_info);
|
pxa2xx_set_spi_info(1, &pxa_ssp_master_0_info);
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
#
|
#
|
||||||
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
# http://www.arm.linux.org.uk/developer/machines/?action=new
|
||||||
#
|
#
|
||||||
# Last update: Sat Feb 20 14:16:15 2010
|
# Last update: Sat Mar 20 15:35:41 2010
|
||||||
#
|
#
|
||||||
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
|
||||||
#
|
#
|
||||||
|
@ -2663,7 +2663,7 @@ reb01 MACH_REB01 REB01 2675
|
||||||
aquila MACH_AQUILA AQUILA 2676
|
aquila MACH_AQUILA AQUILA 2676
|
||||||
spark_sls_hw2 MACH_SPARK_SLS_HW2 SPARK_SLS_HW2 2677
|
spark_sls_hw2 MACH_SPARK_SLS_HW2 SPARK_SLS_HW2 2677
|
||||||
sheeva_esata MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
|
sheeva_esata MACH_ESATA_SHEEVAPLUG ESATA_SHEEVAPLUG 2678
|
||||||
surf7x30 MACH_SURF7X30 SURF7X30 2679
|
msm7x30_surf MACH_MSM7X30_SURF MSM7X30_SURF 2679
|
||||||
micro2440 MACH_MICRO2440 MICRO2440 2680
|
micro2440 MACH_MICRO2440 MICRO2440 2680
|
||||||
am2440 MACH_AM2440 AM2440 2681
|
am2440 MACH_AM2440 AM2440 2681
|
||||||
tq2440 MACH_TQ2440 TQ2440 2682
|
tq2440 MACH_TQ2440 TQ2440 2682
|
||||||
|
@ -2678,3 +2678,74 @@ vc088x MACH_VC088X VC088X 2690
|
||||||
mioa702 MACH_MIOA702 MIOA702 2691
|
mioa702 MACH_MIOA702 MIOA702 2691
|
||||||
hpmin MACH_HPMIN HPMIN 2692
|
hpmin MACH_HPMIN HPMIN 2692
|
||||||
ak880xak MACH_AK880XAK AK880XAK 2693
|
ak880xak MACH_AK880XAK AK880XAK 2693
|
||||||
|
arm926tomap850 MACH_ARM926TOMAP850 ARM926TOMAP850 2694
|
||||||
|
lkevm MACH_LKEVM LKEVM 2695
|
||||||
|
mw6410 MACH_MW6410 MW6410 2696
|
||||||
|
terastation_wxl MACH_TERASTATION_WXL TERASTATION_WXL 2697
|
||||||
|
cpu8000e MACH_CPU8000E CPU8000E 2698
|
||||||
|
catania MACH_CATANIA CATANIA 2699
|
||||||
|
tokyo MACH_TOKYO TOKYO 2700
|
||||||
|
msm7201a_surf MACH_MSM7201A_SURF MSM7201A_SURF 2701
|
||||||
|
msm7201a_ffa MACH_MSM7201A_FFA MSM7201A_FFA 2702
|
||||||
|
msm7x25_surf MACH_MSM7X25_SURF MSM7X25_SURF 2703
|
||||||
|
msm7x25_ffa MACH_MSM7X25_FFA MSM7X25_FFA 2704
|
||||||
|
msm7x27_surf MACH_MSM7X27_SURF MSM7X27_SURF 2705
|
||||||
|
msm7x27_ffa MACH_MSM7X27_FFA MSM7X27_FFA 2706
|
||||||
|
msm7x30_ffa MACH_MSM7X30_FFA MSM7X30_FFA 2707
|
||||||
|
qsd8x50_surf MACH_QSD8X50_SURF QSD8X50_SURF 2708
|
||||||
|
qsd8x50_comet MACH_QSD8X50_COMET QSD8X50_COMET 2709
|
||||||
|
qsd8x50_ffa MACH_QSD8X50_FFA QSD8X50_FFA 2710
|
||||||
|
qsd8x50a_surf MACH_QSD8X50A_SURF QSD8X50A_SURF 2711
|
||||||
|
qsd8x50a_ffa MACH_QSD8X50A_FFA QSD8X50A_FFA 2712
|
||||||
|
adx_xgcp10 MACH_ADX_XGCP10 ADX_XGCP10 2713
|
||||||
|
mcgwumts2a MACH_MCGWUMTS2A MCGWUMTS2A 2714
|
||||||
|
mobikt MACH_MOBIKT MOBIKT 2715
|
||||||
|
mx53_evk MACH_MX53_EVK MX53_EVK 2716
|
||||||
|
igep0030 MACH_IGEP0030 IGEP0030 2717
|
||||||
|
axell_h40_h50_ctrl MACH_AXELL_H40_H50_CTRL AXELL_H40_H50_CTRL 2718
|
||||||
|
dtcommod MACH_DTCOMMOD DTCOMMOD 2719
|
||||||
|
gould MACH_GOULD GOULD 2720
|
||||||
|
siberia MACH_SIBERIA SIBERIA 2721
|
||||||
|
sbc3530 MACH_SBC3530 SBC3530 2722
|
||||||
|
qarm MACH_QARM QARM 2723
|
||||||
|
mips MACH_MIPS MIPS 2724
|
||||||
|
mx27grb MACH_MX27GRB MX27GRB 2725
|
||||||
|
sbc8100 MACH_SBC8100 SBC8100 2726
|
||||||
|
saarb MACH_SAARB SAARB 2727
|
||||||
|
omap3mini MACH_OMAP3MINI OMAP3MINI 2728
|
||||||
|
cnmbook7se MACH_CNMBOOK7SE CNMBOOK7SE 2729
|
||||||
|
catan MACH_CATAN CATAN 2730
|
||||||
|
harmony MACH_HARMONY HARMONY 2731
|
||||||
|
tonga MACH_TONGA TONGA 2732
|
||||||
|
cybook_orizon MACH_CYBOOK_ORIZON CYBOOK_ORIZON 2733
|
||||||
|
htcrhodiumcdma MACH_HTCRHODIUMCDMA HTCRHODIUMCDMA 2734
|
||||||
|
epc_g45 MACH_EPC_G45 EPC_G45 2735
|
||||||
|
epc_lpc3250 MACH_EPC_LPC3250 EPC_LPC3250 2736
|
||||||
|
mxc91341evb MACH_MXC91341EVB MXC91341EVB 2737
|
||||||
|
rtw1000 MACH_RTW1000 RTW1000 2738
|
||||||
|
bobcat MACH_BOBCAT BOBCAT 2739
|
||||||
|
trizeps6 MACH_TRIZEPS6 TRIZEPS6 2740
|
||||||
|
msm7x30_fluid MACH_MSM7X30_FLUID MSM7X30_FLUID 2741
|
||||||
|
nedap9263 MACH_NEDAP9263 NEDAP9263 2742
|
||||||
|
netgear_ms2110 MACH_NETGEAR_MS2110 NETGEAR_MS2110 2743
|
||||||
|
bmx MACH_BMX BMX 2744
|
||||||
|
netstream MACH_NETSTREAM NETSTREAM 2745
|
||||||
|
vpnext_rcu MACH_VPNEXT_RCU VPNEXT_RCU 2746
|
||||||
|
vpnext_mpu MACH_VPNEXT_MPU VPNEXT_MPU 2747
|
||||||
|
bcmring_tablet_v1 MACH_BCMRING_TABLET_V1 BCMRING_TABLET_V1 2748
|
||||||
|
sgarm10 MACH_SGARM10 SGARM10 2749
|
||||||
|
cm_t3517 MACH_CM_T3517 CM_T3517 2750
|
||||||
|
omap3_cps MACH_OMAP3_CPS OMAP3_CPS 2751
|
||||||
|
axar1500_receiver MACH_AXAR1500_RECEIVER AXAR1500_RECEIVER 2752
|
||||||
|
wbd222 MACH_WBD222 WBD222 2753
|
||||||
|
mt65xx MACH_MT65XX MT65XX 2754
|
||||||
|
msm8x60_surf MACH_MSM8X60_SURF MSM8X60_SURF 2755
|
||||||
|
msm8x60_sim MACH_MSM8X60_SIM MSM8X60_SIM 2756
|
||||||
|
vmc300 MACH_VMC300 VMC300 2757
|
||||||
|
tcc8000_sdk MACH_TCC8000_SDK TCC8000_SDK 2758
|
||||||
|
nanos MACH_NANOS NANOS 2759
|
||||||
|
stamp9g10 MACH_STAMP9G10 STAMP9G10 2760
|
||||||
|
stamp9g45 MACH_STAMP9G45 STAMP9G45 2761
|
||||||
|
h6053 MACH_H6053 H6053 2762
|
||||||
|
smint01 MACH_SMINT01 SMINT01 2763
|
||||||
|
prtlvt2 MACH_PRTLVT2 PRTLVT2 2764
|
||||||
|
|
|
@ -668,7 +668,7 @@ static int __init pxa168fb_probe(struct platform_device *pdev)
|
||||||
/*
|
/*
|
||||||
* Map LCD controller registers.
|
* Map LCD controller registers.
|
||||||
*/
|
*/
|
||||||
fbi->reg_base = ioremap_nocache(res->start, res->end - res->start);
|
fbi->reg_base = ioremap_nocache(res->start, resource_size(res));
|
||||||
if (fbi->reg_base == NULL) {
|
if (fbi->reg_base == NULL) {
|
||||||
ret = -ENOMEM;
|
ret = -ENOMEM;
|
||||||
goto failed;
|
goto failed;
|
||||||
|
|
Loading…
Reference in a new issue