Commit 961a238c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'v3.4-samsung-fixes-2' of... 

Merge branch 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
  ARM: EXYNOS: Remove broken config values for touchscren for NURI board
  ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
  ARM: EXYNOS: fix regulator name for NURI board
  ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
  ARM: EXYNOS: Add PDMA and MDMA physical base address defines
  ARM: S5PV210: Fix compiler warning in dma.c file
  ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
  ARM: EXYNOS: Add missing definition for IRQ_I2S0
  ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
parents 47d9e44d 5ad14306

arch/arm/mach-exynos/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -368,6 +368,7 @@ comment "Flattened Device Tree based board for EXYNOS SoCs" 


config MACH_EXYNOS4_DT

	bool "Samsung Exynos4 Machine using device tree"

	depends on ARCH_EXYNOS4

	select CPU_EXYNOS4210

	select USE_OF

	select ARM_AMBA
@@ -380,6 +381,7 @@ config MACH_EXYNOS4_DT 


config MACH_EXYNOS5_DT

	bool "SAMSUNG EXYNOS5 Machine using device tree"

	depends on ARCH_EXYNOS5

	select SOC_EXYNOS5250

	select USE_OF

	select ARM_AMBA

arch/arm/mach-exynos/include/mach/irqs.h

+2 −0
Original line number Diff line number Diff line
@@ -212,6 +212,8 @@ 
#define IRQ_MFC				EXYNOS4_IRQ_MFC

#define IRQ_SDO				EXYNOS4_IRQ_SDO



#define IRQ_I2S0			EXYNOS4_IRQ_I2S0



#define IRQ_ADC				EXYNOS4_IRQ_ADC0

#define IRQ_TC				EXYNOS4_IRQ_PEN0

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

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ 
#define EXYNOS4_PA_MDMA1		0x12840000

#define EXYNOS4_PA_PDMA0		0x12680000

#define EXYNOS4_PA_PDMA1		0x12690000

#define EXYNOS5_PA_MDMA0		0x10800000

#define EXYNOS5_PA_MDMA1		0x11C10000

#define EXYNOS5_PA_PDMA0		0x121A0000

#define EXYNOS5_PA_PDMA1		0x121B0000



#define EXYNOS4_PA_SYSMMU_MDMA		0x10A40000

#define EXYNOS4_PA_SYSMMU_SSS		0x10A50000

arch/arm/mach-exynos/include/mach/regs-clock.h

+6 −0
Original line number Diff line number Diff line
@@ -255,9 +255,15 @@ 


/* For EXYNOS5250 */



#define EXYNOS5_APLL_LOCK			EXYNOS_CLKREG(0x00000)

#define EXYNOS5_APLL_CON0			EXYNOS_CLKREG(0x00100)

#define EXYNOS5_CLKSRC_CPU			EXYNOS_CLKREG(0x00200)

#define EXYNOS5_CLKMUX_STATCPU			EXYNOS_CLKREG(0x00400)

#define EXYNOS5_CLKDIV_CPU0			EXYNOS_CLKREG(0x00500)

#define EXYNOS5_CLKDIV_CPU1			EXYNOS_CLKREG(0x00504)

#define EXYNOS5_CLKDIV_STATCPU0			EXYNOS_CLKREG(0x00600)

#define EXYNOS5_CLKDIV_STATCPU1			EXYNOS_CLKREG(0x00604)



#define EXYNOS5_MPLL_CON0			EXYNOS_CLKREG(0x04100)

#define EXYNOS5_CLKSRC_CORE1			EXYNOS_CLKREG(0x04204)

arch/arm/mach-exynos/mach-exynos5-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { 
				"exynos4210-uart.3", NULL),

	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL),

	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL),

	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.2", NULL),

	OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL),

	{},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE