hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes

This commit is contained in:
Russell King 2011-02-11 22:56:19 +00:00
parent 66e1cfe6d5 285ca2ee31
commit e3329cba82
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/colibri-evalboard.c
View File

@ -50,7 +50,7 @@ static void __init colibri_mmc_init(void)
GPIO0_COLIBRI_PXA270_SD_DETECT; GPIO0_COLIBRI_PXA270_SD_DETECT;
if (machine_is_colibri300()) /* PXA300 Colibri */ if (machine_is_colibri300()) /* PXA300 Colibri */
colibri_mci_platform_data.gpio_card_detect = colibri_mci_platform_data.gpio_card_detect =
GPIO39_COLIBRI_PXA300_SD_DETECT; GPIO13_COLIBRI_PXA300_SD_DETECT;
else /* PXA320 Colibri */ else /* PXA320 Colibri */
colibri_mci_platform_data.gpio_card_detect = colibri_mci_platform_data.gpio_card_detect =
GPIO28_COLIBRI_PXA320_SD_DETECT; GPIO28_COLIBRI_PXA320_SD_DETECT;

2
arch/arm/mach-pxa/colibri-pxa300.c
View File

@ -41,7 +41,7 @@ static mfp_cfg_t colibri_pxa300_evalboard_pin_config[] __initdata = {
GPIO4_MMC1_DAT1, GPIO4_MMC1_DAT1,
GPIO5_MMC1_DAT2, GPIO5_MMC1_DAT2,
GPIO6_MMC1_DAT3, GPIO6_MMC1_DAT3,
GPIO39_GPIO, /* SD detect */ GPIO13_GPIO, /* GPIO13_COLIBRI_PXA300_SD_DETECT */
/* UHC */ /* UHC */
GPIO0_2_USBH_PEN, GPIO0_2_USBH_PEN,

2
arch/arm/mach-pxa/include/mach/colibri.h
View File

@ -60,7 +60,7 @@ static inline void colibri_pxa3xx_init_nand(void) {}
#define GPIO113_COLIBRI_PXA270_TS_IRQ 113 #define GPIO113_COLIBRI_PXA270_TS_IRQ 113
/* GPIO definitions for Colibri PXA300/310 */ /* GPIO definitions for Colibri PXA300/310 */
#define GPIO39_COLIBRI_PXA300_SD_DETECT 39 #define GPIO13_COLIBRI_PXA300_SD_DETECT 13
/* GPIO definitions for Colibri PXA320 */ /* GPIO definitions for Colibri PXA320 */
#define GPIO28_COLIBRI_PXA320_SD_DETECT 28 #define GPIO28_COLIBRI_PXA320_SD_DETECT 28

2
arch/arm/mach-pxa/palm27x.c
View File

@ -323,7 +323,7 @@ static struct platform_pwm_backlight_data palm27x_backlight_data = {
.pwm_id = 0, .pwm_id = 0,
.max_brightness = 0xfe, .max_brightness = 0xfe,
.dft_brightness = 0x7e, .dft_brightness = 0x7e,
.pwm_period_ns = 3500, .pwm_period_ns = 3500 * 1024,
.init = palm27x_backlight_init, .init = palm27x_backlight_init,
.notify = palm27x_backlight_notify, .notify = palm27x_backlight_notify,
.exit = palm27x_backlight_exit, .exit = palm27x_backlight_exit,

4
arch/arm/mach-pxa/pm.c
View File

@ -33,7 +33,7 @@ int pxa_pm_enter(suspend_state_t state)
#endif #endif
/* skip registers saving for standby */ /* skip registers saving for standby */
if (state != PM_SUSPEND_STANDBY) { if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->save) {
pxa_cpu_pm_fns->save(sleep_save); pxa_cpu_pm_fns->save(sleep_save);
/* before sleeping, calculate and save a checksum */ /* before sleeping, calculate and save a checksum */
for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++) for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
@ -44,7 +44,7 @@ int pxa_pm_enter(suspend_state_t state)
pxa_cpu_pm_fns->enter(state); pxa_cpu_pm_fns->enter(state);
cpu_init(); cpu_init();
if (state != PM_SUSPEND_STANDBY) { if (state != PM_SUSPEND_STANDBY && pxa_cpu_pm_fns->restore) {
/* after sleeping, validate the checksum */ /* after sleeping, validate the checksum */
for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++) for (i = 0; i < pxa_cpu_pm_fns->save_count - 1; i++)
checksum += sleep_save[i]; checksum += sleep_save[i];

8
arch/arm/plat-pxa/mfp.c
View File

@ -139,10 +139,11 @@ static const unsigned long mfpr_edge[] = {
#define mfp_configured(p) ((p)->config != -1) #define mfp_configured(p) ((p)->config != -1)
/* /*
* perform a read-back of any MFPR register to make sure the * perform a read-back of any valid MFPR register to make sure the
* previous writings are finished * previous writings are finished
*/ */
#define mfpr_sync() (void)__raw_readl(mfpr_mmio_base + 0) static unsigned long mfpr_off_readback;
#define mfpr_sync() (void)__raw_readl(mfpr_mmio_base + mfpr_off_readback)
static inline void __mfp_config_run(struct mfp_pin *p) static inline void __mfp_config_run(struct mfp_pin *p)
{ {
@ -248,6 +249,9 @@ void __init mfp_init_addr(struct mfp_addr_map *map)
spin_lock_irqsave(&mfp_spin_lock, flags); spin_lock_irqsave(&mfp_spin_lock, flags);
/* mfp offset for readback */
mfpr_off_readback = map[0].offset;
for (p = map; p->start != MFP_PIN_INVALID; p++) { for (p = map; p->start != MFP_PIN_INVALID; p++) {
offset = p->offset; offset = p->offset;
i = p->start; i = p->start;