mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +00:00
ARM: EXYNOS4: Enable MFC on Samsung NURI
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
parent
b14f04dbdc
commit
4c0f0a3ea1
@ -201,7 +201,9 @@ config MACH_NURI
|
|||||||
select S3C_DEV_I2C1
|
select S3C_DEV_I2C1
|
||||||
select S3C_DEV_I2C3
|
select S3C_DEV_I2C3
|
||||||
select S3C_DEV_I2C5
|
select S3C_DEV_I2C5
|
||||||
|
select S5P_DEV_MFC
|
||||||
select S5P_DEV_USB_EHCI
|
select S5P_DEV_USB_EHCI
|
||||||
|
select EXYNOS4_DEV_PD
|
||||||
select EXYNOS4_SETUP_I2C1
|
select EXYNOS4_SETUP_I2C1
|
||||||
select EXYNOS4_SETUP_I2C3
|
select EXYNOS4_SETUP_I2C3
|
||||||
select EXYNOS4_SETUP_I2C5
|
select EXYNOS4_SETUP_I2C5
|
||||||
|
@ -41,6 +41,8 @@
|
|||||||
#include <plat/clock.h>
|
#include <plat/clock.h>
|
||||||
#include <plat/gpio-cfg.h>
|
#include <plat/gpio-cfg.h>
|
||||||
#include <plat/iic.h>
|
#include <plat/iic.h>
|
||||||
|
#include <plat/mfc.h>
|
||||||
|
#include <plat/pd.h>
|
||||||
|
|
||||||
#include <mach/map.h>
|
#include <mach/map.h>
|
||||||
|
|
||||||
@ -1100,6 +1102,10 @@ static struct platform_device *nuri_devices[] __initdata = {
|
|||||||
&i2c9_gpio,
|
&i2c9_gpio,
|
||||||
&s3c_device_adc,
|
&s3c_device_adc,
|
||||||
&s3c_device_rtc,
|
&s3c_device_rtc,
|
||||||
|
&s5p_device_mfc,
|
||||||
|
&s5p_device_mfc_l,
|
||||||
|
&s5p_device_mfc_r,
|
||||||
|
&exynos4_device_pd[PD_MFC],
|
||||||
|
|
||||||
/* NURI Devices */
|
/* NURI Devices */
|
||||||
&nuri_gpio_keys,
|
&nuri_gpio_keys,
|
||||||
@ -1116,6 +1122,11 @@ static void __init nuri_map_io(void)
|
|||||||
s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs));
|
s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void __init nuri_reserve(void)
|
||||||
|
{
|
||||||
|
s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
|
||||||
|
}
|
||||||
|
|
||||||
static void __init nuri_machine_init(void)
|
static void __init nuri_machine_init(void)
|
||||||
{
|
{
|
||||||
nuri_sdhci_init();
|
nuri_sdhci_init();
|
||||||
@ -1136,6 +1147,7 @@ static void __init nuri_machine_init(void)
|
|||||||
|
|
||||||
/* Last */
|
/* Last */
|
||||||
platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
|
platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
|
||||||
|
s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
|
||||||
}
|
}
|
||||||
|
|
||||||
MACHINE_START(NURI, "NURI")
|
MACHINE_START(NURI, "NURI")
|
||||||
@ -1145,4 +1157,5 @@ MACHINE_START(NURI, "NURI")
|
|||||||
.map_io = nuri_map_io,
|
.map_io = nuri_map_io,
|
||||||
.init_machine = nuri_machine_init,
|
.init_machine = nuri_machine_init,
|
||||||
.timer = &exynos4_timer,
|
.timer = &exynos4_timer,
|
||||||
|
.reserve = &nuri_reserve,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
Loading…
Reference in New Issue
Block a user