mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
This commit is contained in:
commit
0de9a00fd6
13 changed files with 26 additions and 23 deletions
|
@ -250,20 +250,17 @@
|
|||
|
||||
#define cpu_is_pxa930() \
|
||||
({ \
|
||||
unsigned int id = read_cpuid(CPUID_ID); \
|
||||
__cpu_is_pxa930(id); \
|
||||
__cpu_is_pxa930(read_cpuid_id()); \
|
||||
})
|
||||
|
||||
#define cpu_is_pxa935() \
|
||||
({ \
|
||||
unsigned int id = read_cpuid(CPUID_ID); \
|
||||
__cpu_is_pxa935(id); \
|
||||
__cpu_is_pxa935(read_cpuid_id()); \
|
||||
})
|
||||
|
||||
#define cpu_is_pxa950() \
|
||||
({ \
|
||||
unsigned int id = read_cpuid(CPUID_ID); \
|
||||
__cpu_is_pxa950(id); \
|
||||
__cpu_is_pxa950(read_cpuid_id()); \
|
||||
})
|
||||
|
||||
|
||||
|
|
|
@ -381,7 +381,7 @@ static int magician_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int magician_backlight_notify(int brightness)
|
||||
static int magician_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(EGPIO_MAGICIAN_BL_POWER, brightness);
|
||||
if (brightness >= 200) {
|
||||
|
|
|
@ -270,7 +270,7 @@ static int palmld_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int palmld_backlight_notify(int brightness)
|
||||
static int palmld_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(GPIO_NR_PALMLD_BL_POWER, brightness);
|
||||
gpio_set_value(GPIO_NR_PALMLD_LCD_POWER, brightness);
|
||||
|
|
|
@ -209,7 +209,7 @@ static int palmt5_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int palmt5_backlight_notify(int brightness)
|
||||
static int palmt5_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(GPIO_NR_PALMT5_BL_POWER, brightness);
|
||||
gpio_set_value(GPIO_NR_PALMT5_LCD_POWER, brightness);
|
||||
|
|
|
@ -185,7 +185,7 @@ static int palmtc_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int palmtc_backlight_notify(int brightness)
|
||||
static int palmtc_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
/* backlight is on when GPIO16 AF0 is high */
|
||||
gpio_set_value(GPIO_NR_PALMTC_BL_POWER, brightness);
|
||||
|
|
|
@ -181,7 +181,7 @@ static int palmte2_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int palmte2_backlight_notify(int brightness)
|
||||
static int palmte2_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(GPIO_NR_PALMTE2_BL_POWER, brightness);
|
||||
gpio_set_value(GPIO_NR_PALMTE2_LCD_POWER, brightness);
|
||||
|
|
|
@ -375,7 +375,7 @@ static int treo_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int treo_backlight_notify(int brightness)
|
||||
static int treo_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(GPIO_NR_TREO_BL_POWER, brightness);
|
||||
return TREO_MAX_INTENSITY - brightness;
|
||||
|
|
|
@ -269,7 +269,7 @@ static int palmtx_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int palmtx_backlight_notify(int brightness)
|
||||
static int palmtx_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(GPIO_NR_PALMTX_BL_POWER, brightness);
|
||||
gpio_set_value(GPIO_NR_PALMTX_LCD_POWER, brightness);
|
||||
|
|
|
@ -196,7 +196,7 @@ static int palmz72_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int palmz72_backlight_notify(int brightness)
|
||||
static int palmz72_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(GPIO_NR_PALMZ72_BL_POWER, brightness);
|
||||
gpio_set_value(GPIO_NR_PALMZ72_LCD_POWER, brightness);
|
||||
|
|
|
@ -389,13 +389,13 @@ static struct gpio_keys_button spitz_gpio_keys[] = {
|
|||
.type = EV_SW,
|
||||
.code = 0,
|
||||
.gpio = SPITZ_GPIO_SWA,
|
||||
.desc = "Display Down",
|
||||
.desc = "Display Down",
|
||||
},
|
||||
{
|
||||
.type = EV_SW,
|
||||
.code = 1,
|
||||
.gpio = SPITZ_GPIO_SWB,
|
||||
.desc = "Lid Closed",
|
||||
.desc = "Lid Closed",
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -379,7 +379,7 @@ static int viper_backlight_init(struct device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int viper_backlight_notify(int brightness)
|
||||
static int viper_backlight_notify(struct device *dev, int brightness)
|
||||
{
|
||||
gpio_set_value(VIPER_LCD_EN_GPIO, !!brightness);
|
||||
gpio_set_value(VIPER_BCKLIGHT_EN_GPIO, !!brightness);
|
||||
|
|
|
@ -221,15 +221,14 @@ static int __init xsc3_l2_init(void)
|
|||
if (!cpu_is_xsc3() || !xsc3_l2_present())
|
||||
return 0;
|
||||
|
||||
if (!(get_cr() & CR_L2)) {
|
||||
if (get_cr() & CR_L2) {
|
||||
pr_info("XScale3 L2 cache enabled.\n");
|
||||
adjust_cr(CR_L2, CR_L2);
|
||||
xsc3_l2_inv_all();
|
||||
}
|
||||
|
||||
outer_cache.inv_range = xsc3_l2_inv_range;
|
||||
outer_cache.clean_range = xsc3_l2_clean_range;
|
||||
outer_cache.flush_range = xsc3_l2_flush_range;
|
||||
outer_cache.inv_range = xsc3_l2_inv_range;
|
||||
outer_cache.clean_range = xsc3_l2_clean_range;
|
||||
outer_cache.flush_range = xsc3_l2_flush_range;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -407,6 +407,13 @@ __xsc3_setup:
|
|||
|
||||
adr r5, xsc3_crval
|
||||
ldmia r5, {r5, r6}
|
||||
|
||||
#ifdef CONFIG_CACHE_XSC3L2
|
||||
mrc p15, 1, r0, c0, c0, 1 @ get L2 present information
|
||||
ands r0, r0, #0xf8
|
||||
orrne r6, r6, #(1 << 26) @ enable L2 if present
|
||||
#endif
|
||||
|
||||
mrc p15, 0, r0, c1, c0, 0 @ get control register
|
||||
bic r0, r0, r5 @ ..V. ..R. .... ..A.
|
||||
orr r0, r0, r6 @ ..VI Z..S .... .C.M (mmu)
|
||||
|
|
Loading…
Reference in a new issue