Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb11bcd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 's5p-fixes-for-linus' of... 

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C2410: remove the now empty mach-s3c2410/irq.c
  ARM: S3C24XX: Move s3c24xx_irq_syscore_ops to plat-s3c24xx/irq.c
  ARM: S3C24xx: Fix missing struct for s3c2410_dma_chan
  ARM: SAMSUNG: Remove unused onenand plat functions
  ARM: EXYNOS4: Remove compiler warning on exynos4_pwm4_resume
  ARM: S5P: Fix compilation error for exynos4_defconfig
  ARM: S5P: Should be S3C_VA_USB_HSPHY instead of S5P_VA_XX
  ARM: S5P64X0: Fix SPI platform device name
  ARM: S5PV210: Fix possible null pointer dereference
parents 33a53883 2aec0d69

arch/arm/mach-exynos4/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC 
	help

	  Common setup code for the camera interfaces.



config EXYNOS4_SETUP_USB_PHY

	bool

	help

	  Common setup code for USB PHY controller



# machine support



menu "EXYNOS4 Machines"
@@ -176,6 +181,7 @@ config MACH_NURI 
	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C5

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select SAMSUNG_DEV_PWM

	help

	  Machine support for Samsung Mobile NURI Board.

arch/arm/mach-exynos4/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,4 +56,4 @@ 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
 
obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o

arch/arm/mach-exynos4/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct map_desc exynos4_iodesc[] __initdata = { 
		.length		= SZ_4K,

		.type		= MT_DEVICE,

	}, {

		.virtual	= (unsigned long)S5P_VA_USB_HSPHY,

		.virtual	= (unsigned long)S3C_VA_USB_HSPHY,

		.pfn		= __phys_to_pfn(EXYNOS4_PA_HSPHY),

		.length		= SZ_4K,

		.type		= MT_DEVICE,

arch/arm/mach-exynos4/include/mach/regs-usb-phy.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifndef __PLAT_S5P_REGS_USB_PHY_H

#define __PLAT_S5P_REGS_USB_PHY_H



#define EXYNOS4_HSOTG_PHYREG(x)		((x) + S5P_VA_USB_HSPHY)

#define EXYNOS4_HSOTG_PHYREG(x)		((x) + S3C_VA_USB_HSPHY)



#define EXYNOS4_PHYPWR			EXYNOS4_HSOTG_PHYREG(0x00)

#define PHY1_HSIC_NORMAL_MASK		(0xf << 9)