xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next/drivers' into HEAD

Browse Source 
Conflicts:
	arch/arm/boot/dts/omap4.dtsi
	arch/arm/mach-clps711x/common.c
	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap1/board-h3.c
	arch/arm/mach-omap1/leds-h2p2-debug.c
	arch/arm/mach-omap1/leds.c
	arch/arm/mach-pnx4008/time.c
	arch/arm/plat-omap/debug-leds.c
	drivers/Makefile
	drivers/bus/omap_l3_noc.c
This commit is contained in:
Olof Johansson
2012-10-01 14:33:55 -07:00
parent 5c008d7029 04ef037c92
commit 8b1a13b028
162 changed files with 4914 additions and 3548 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-exynos/include/mach/map.h
View File

@@ -121,6 +121,11 @@
#define EXYNOS4_PA_SYSMMU_MFC_L 0x13620000
#define EXYNOS4_PA_SYSMMU_MFC_R 0x13630000
#define EXYNOS5_PA_GSC0 0x13E00000
#define EXYNOS5_PA_GSC1 0x13E10000
#define EXYNOS5_PA_GSC2 0x13E20000
#define EXYNOS5_PA_GSC3 0x13E30000
#define EXYNOS5_PA_SYSMMU_MDMA1 0x10A40000
#define EXYNOS5_PA_SYSMMU_SSS 0x10A50000
#define EXYNOS5_PA_SYSMMU_2D 0x10A60000