Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 (f933b87e) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-mmp/include/mach/system.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@
		#ifndef __ASM_MACH_SYSTEM_H
		#define __ASM_MACH_SYSTEM_H

		#include <mach/cputype.h>

		static inline void arch_idle(void)
		{
		cpu_do_idle();
		@@ -16,6 +18,9 @@ static inline void arch_idle(void)

		static inline void arch_reset(char mode, const char *cmd)
		{
		if (cpu_is_pxa168())
		cpu_reset(0xffff0000);
		else
		cpu_reset(0);
		}
		#endif /* __ASM_MACH_SYSTEM_H */

+1 −2

Original line number	Diff line number	Diff line
		@@ -312,8 +312,7 @@ static int pxa_set_target(struct cpufreq_policy *policy,
		freqs.cpu = policy->cpu;

		if (freq_debug)
		pr_debug(KERN_INFO "Changing CPU frequency to %d Mhz, "
		"(SDRAM %d Mhz)\n",
		pr_debug("Changing CPU frequency to %d Mhz, (SDRAM %d Mhz)\n",
		freqs.new / 1000, (pxa_freq_settings[idx].div2) ?
		(new_freq_mem / 2000) : (new_freq_mem / 1000));

+12 −0

Original line number	Diff line number	Diff line
		@@ -264,23 +264,35 @@
		* <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
		* == 0x3 for pxa300/pxa310/pxa320
		*/
		#if defined(CONFIG_PXA25x) \|\| defined(CONFIG_PXA27x)
		#define __cpu_is_pxa2xx(id) \
		({ \
		unsigned int _id = (id) >> 13 & 0x7; \
		_id <= 0x2; \
		})
		#else
		#define __cpu_is_pxa2xx(id) (0)
		#endif

		#ifdef CONFIG_PXA3xx
		#define __cpu_is_pxa3xx(id) \
		({ \
		unsigned int _id = (id) >> 13 & 0x7; \
		_id == 0x3; \
		})
		#else
		#define __cpu_is_pxa3xx(id) (0)
		#endif

		#if defined(CONFIG_CPU_PXA930) \|\| defined(CONFIG_CPU_PXA935)
		#define __cpu_is_pxa93x(id) \
		({ \
		unsigned int _id = (id) >> 4 & 0xfff; \
		_id == 0x683 \|\| _id == 0x693; \
		})
		#else
		#define __cpu_is_pxa93x(id) (0)
		#endif

		#define cpu_is_pxa2xx() \
		({ \

+5 −1

Original line number	Diff line number	Diff line
		@@ -469,9 +469,13 @@ static struct i2c_board_info __initdata palm27x_pi2c_board_info[] = {
		},
		};

		static struct i2c_pxa_platform_data palm27x_i2c_power_info = {
		.use_pio = 1,
		};

		void __init palm27x_pmic_init(void)
		{
		i2c_register_board_info(1, ARRAY_AND_SIZE(palm27x_pi2c_board_info));
		pxa27x_set_i2c_power_info(NULL);
		pxa27x_set_i2c_power_info(&palm27x_i2c_power_info);
		}
		#endif

+1 −0

Original line number	Diff line number	Diff line
		@@ -240,6 +240,7 @@ static void __init vpac270_onenand_init(void) {}
		#if defined(CONFIG_MMC_PXA) \|\| defined(CONFIG_MMC_PXA_MODULE)
		static struct pxamci_platform_data vpac270_mci_platform_data = {
		.ocr_mask = MMC_VDD_32_33 \| MMC_VDD_33_34,
		.gpio_power = -1,
		.gpio_card_detect = GPIO53_VPAC270_SD_DETECT_N,
		.gpio_card_ro = GPIO52_VPAC270_SD_READONLY,
		.detect_delay_ms = 200,