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

Commit c41d40b5 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: SAMSUNG: Ensure struct sys_device is declared in plat/pm.h
  ARM: S5PV310: Cleanup System MMU
  ARM: S5PV310: Add support System MMU on SMDKV310
parents a288465f a09e2b21

arch/arm/mach-s5pv310/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ config MACH_SMDKV310 
	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S5PV310_DEV_PD

	select S5PV310_DEV_SYSMMU

	select S5PV310_SETUP_I2C1

	select S5PV310_SETUP_SDHCI

	help

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

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ 
#define S5PV310_PA_SYSMMU_TV		0x12E20000

#define S5PV310_PA_SYSMMU_MFC_L		0x13620000

#define S5PV310_PA_SYSMMU_MFC_R		0x13630000

#define S5PV310_SYSMMU_TOTAL_IPNUM	16

#define S5P_SYSMMU_TOTAL_IPNUM		S5PV310_SYSMMU_TOTAL_IPNUM



/* compatibiltiy defines. */

#define S3C_PA_UART			S5PV310_PA_UART

arch/arm/mach-s5pv310/include/mach/sysmmu.h

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
#ifndef __ASM_ARM_ARCH_SYSMMU_H

#define __ASM_ARM_ARCH_SYSMMU_H __FILE__



#define S5PV310_SYSMMU_TOTAL_IPNUM	16

#define S5P_SYSMMU_TOTAL_IPNUM		S5PV310_SYSMMU_TOTAL_IPNUM



enum s5pv310_sysmmu_ips {

	SYSMMU_MDMA,

	SYSMMU_SSS,
@@ -32,7 +35,7 @@ enum s5pv310_sysmmu_ips { 
	SYSMMU_MFC_R,

};



static char *sysmmu_ips_name[S5P_SYSMMU_TOTAL_IPNUM] = {

static char *sysmmu_ips_name[S5PV310_SYSMMU_TOTAL_IPNUM] = {

	"SYSMMU_MDMA"	,

	"SYSMMU_SSS"	,

	"SYSMMU_FIMC0"	,

arch/arm/plat-s5p/Kconfig

+8 −16
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ config S5P_GPIO_INT 
	help

	  Common code for the GPIO interrupts (other than external interrupts.)



comment "System MMU"



config S5P_SYSTEM_MMU

	bool "S5P SYSTEM MMU"

	depends on ARCH_S5PV310

	help

	  Say Y here if you want to enable System MMU



config S5P_DEV_FIMC0

	bool

	help
@@ -66,19 +74,3 @@ config S5P_DEV_CSIS1 
	bool

	help

	  Compile in platform device definitions for MIPI-CSIS channel 1
 


menuconfig S5P_SYSMMU

	bool "SYSMMU support"

	depends on ARCH_S5PV310

	help

	  This is a System MMU driver for Samsung ARM based Soc.



if S5P_SYSMMU



config S5P_SYSMMU_DEBUG

	bool "Enables debug messages"

	depends on S5P_SYSMMU

	help

	  This enables SYSMMU driver debug massages.



endif

arch/arm/plat-s5p/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-y += clock.o 
obj-y				+= irq.o

obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o

obj-$(CONFIG_S5P_GPIO_INT)	+= irq-gpioint.o

obj-$(CONFIG_S5P_SYSTEM_MMU)	+= sysmmu.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= irq-pm.o
@@ -30,4 +31,3 @@ obj-$(CONFIG_S5P_DEV_FIMC2) += dev-fimc2.o 
obj-$(CONFIG_S5P_DEV_ONENAND)	+= dev-onenand.o

obj-$(CONFIG_S5P_DEV_CSIS0)	+= dev-csis0.o

obj-$(CONFIG_S5P_DEV_CSIS1)	+= dev-csis1.o
 
obj-$(CONFIG_S5P_SYSMMU)	+= sysmmu.o