Commit 50ee9339 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 2.6.39-rc4 into usb-next 



This is needed to help resolve some xhci issues and other minor
differences.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents f0e615c3 98346f7d

arch/arm/mach-exynos4/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ config MACH_NURI 
	select S3C_DEV_HSMMC3

	select S3C_DEV_I2C1

	select S3C_DEV_I2C5

	select S5P_DEV_USB_EHCI

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

arch/arm/mach-exynos4/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -54,3 +54,5 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o 
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o



obj-$(CONFIG_USB_SUPPORT)		+= usb-phy.o

arch/arm/mach-exynos4/cpu.c

+6 −1
Original line number Diff line number Diff line
@@ -97,7 +97,12 @@ static struct map_desc exynos4_iodesc[] __initdata = { 
		.pfn		= __phys_to_pfn(EXYNOS4_PA_SROMC),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	},

	}, {

		.virtual	= (unsigned long)S5P_VA_USB_HSPHY,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_HSPHY),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}

};



static void exynos4_idle(void)

arch/arm/mach-exynos4/include/mach/map.h

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,9 @@ 


#define EXYNOS4_PA_SROMC		0x12570000



#define EXYNOS4_PA_EHCI			0x12580000

#define EXYNOS4_PA_HSPHY		0x125B0000



#define EXYNOS4_PA_UART			0x13800000



#define EXYNOS4_PA_IIC(x)		(0x13860000 + ((x) * 0x10000))
@@ -143,6 +146,7 @@ 
#define S5P_PA_SROMC			EXYNOS4_PA_SROMC

#define S5P_PA_SYSCON			EXYNOS4_PA_SYSCON

#define S5P_PA_TIMER			EXYNOS4_PA_TIMER

#define S5P_PA_EHCI			EXYNOS4_PA_EHCI



#define SAMSUNG_PA_KEYPAD		EXYNOS4_PA_KEYPAD

arch/arm/mach-exynos4/include/mach/regs-pmu.h

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ 
#define S5P_EINT_WAKEUP_MASK			S5P_PMUREG(0x0604)

#define S5P_WAKEUP_MASK				S5P_PMUREG(0x0608)



#define S5P_USBHOST_PHY_CONTROL			S5P_PMUREG(0x0708)

#define S5P_USBHOST_PHY_ENABLE			(1 << 0)



#define S5P_MIPI_DPHY_CONTROL(n)		S5P_PMUREG(0x0710 + (n) * 4)

#define S5P_MIPI_DPHY_ENABLE			(1 << 0)

#define S5P_MIPI_DPHY_SRESETN			(1 << 1)