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

Commit 604eefeb authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Kukjin Kim
Browse files

ARM: S5P: Add platform definitions for FIMC3 



Add support for fourth FIMC platform device definition and define
resources for FIMC modules on EXYNOS4 machines.

Signed-off-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 9e65bbf2

arch/arm/mach-exynos4/cpu.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <plat/clock.h>

#include <plat/clock.h>

#include <plat/exynos4.h>

#include <plat/exynos4.h>

#include <plat/sdhci.h>

#include <plat/sdhci.h>

#include <plat/devs.h>

#include <plat/fimc-core.h>





#include <mach/regs-irq.h>

#include <mach/regs-irq.h>
@@ -120,6 +122,11 @@ void __init exynos4_map_io(void) 
	exynos4_default_sdhci1();

	exynos4_default_sdhci1();

	exynos4_default_sdhci2();

	exynos4_default_sdhci2();

	exynos4_default_sdhci3();

	exynos4_default_sdhci3();



	s3c_fimc_setname(0, "exynos4-fimc");

	s3c_fimc_setname(1, "exynos4-fimc");

	s3c_fimc_setname(2, "exynos4-fimc");

	s3c_fimc_setname(3, "exynos4-fimc");

}

}





void __init exynos4_init_clocks(int xtal)

void __init exynos4_init_clocks(int xtal)

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,11 @@ 
#define IRQ_MIPI_CSIS0		COMBINER_IRQ(30, 0)

#define IRQ_MIPI_CSIS0		COMBINER_IRQ(30, 0)

#define IRQ_MIPI_CSIS1		COMBINER_IRQ(30, 1)

#define IRQ_MIPI_CSIS1		COMBINER_IRQ(30, 1)





#define IRQ_FIMC0		COMBINER_IRQ(32, 0)

#define IRQ_FIMC1		COMBINER_IRQ(32, 1)

#define IRQ_FIMC2		COMBINER_IRQ(33, 0)

#define IRQ_FIMC3		COMBINER_IRQ(33, 1)



#define IRQ_ONENAND_AUDI	COMBINER_IRQ(34, 0)

#define IRQ_ONENAND_AUDI	COMBINER_IRQ(34, 0)





#define IRQ_MCT_L1		COMBINER_IRQ(35, 3)

#define IRQ_MCT_L1		COMBINER_IRQ(35, 3)

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,11 @@ 




#define EXYNOS4_PA_SYSRAM		0x02020000

#define EXYNOS4_PA_SYSRAM		0x02020000





#define EXYNOS4_PA_FIMC0		0x11800000

#define EXYNOS4_PA_FIMC1		0x11810000

#define EXYNOS4_PA_FIMC2		0x11820000

#define EXYNOS4_PA_FIMC3		0x11830000



#define EXYNOS4_PA_I2S0			0x03830000

#define EXYNOS4_PA_I2S0			0x03830000

#define EXYNOS4_PA_I2S1			0xE3100000

#define EXYNOS4_PA_I2S1			0xE3100000

#define EXYNOS4_PA_I2S2			0xE2A00000

#define EXYNOS4_PA_I2S2			0xE2A00000
@@ -120,6 +125,10 @@ 
#define S3C_PA_WDT			EXYNOS4_PA_WATCHDOG

#define S3C_PA_WDT			EXYNOS4_PA_WATCHDOG





#define S5P_PA_CHIPID			EXYNOS4_PA_CHIPID

#define S5P_PA_CHIPID			EXYNOS4_PA_CHIPID

#define S5P_PA_FIMC0			EXYNOS4_PA_FIMC0

#define S5P_PA_FIMC1			EXYNOS4_PA_FIMC1

#define S5P_PA_FIMC2			EXYNOS4_PA_FIMC2

#define S5P_PA_FIMC3			EXYNOS4_PA_FIMC3

#define S5P_PA_MIPI_CSIS0		EXYNOS4_PA_MIPI_CSIS0

#define S5P_PA_MIPI_CSIS0		EXYNOS4_PA_MIPI_CSIS0

#define S5P_PA_MIPI_CSIS1		EXYNOS4_PA_MIPI_CSIS1

#define S5P_PA_MIPI_CSIS1		EXYNOS4_PA_MIPI_CSIS1

#define S5P_PA_ONENAND			EXYNOS4_PA_ONENAND

#define S5P_PA_ONENAND			EXYNOS4_PA_ONENAND

arch/arm/plat-s5p/Kconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,11 @@ config S5P_DEV_FIMC2 
	help

	help

	  Compile in platform device definitions for FIMC controller 2

	  Compile in platform device definitions for FIMC controller 2





config S5P_DEV_FIMC3

	bool

	help

	  Compile in platform device definitions for FIMC controller 3



config S5P_DEV_ONENAND

config S5P_DEV_ONENAND

	bool

	bool

	help

	help

arch/arm/plat-s5p/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_S5P_HRT) += s5p-time.o 
obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o

obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o

obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o

obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o

obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o

obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o

obj-$(CONFIG_S5P_DEV_FIMC3)	+= dev-fimc3.o

obj-$(CONFIG_S5P_DEV_ONENAND)	+= dev-onenand.o

obj-$(CONFIG_S5P_DEV_ONENAND)	+= dev-onenand.o

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

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

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

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