Will this patch and the patch Tushar just posted apply cleanly with each other? You are both touching mach-origen.c, changing origen_devices, and adding support for video output so it might be good in a future situations such as this to post as one patch series with both of your sign-offs.
Thanks, ~Deepak On 7 September 2011 03:54, Sachin Kamat <sachin.ka...@linaro.org> wrote: > This patch adds HDMI (TVout) support for Origen board. > > This patch is based on for-next branch of Kukjin Kim's tree: > http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git;a=summary > > This patch is tested using Hatim's patch: > http://www.spinics.net/lists/linux-samsung-soc/msg06367.html > > Signed-off-by: Sachin Kamat <sachin.ka...@linaro.org> > --- > arch/arm/mach-exynos4/Kconfig | 2 ++ > arch/arm/mach-exynos4/mach-origen.c | 4 ++++ > 2 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig > index 181fb04..4f908f7 100644 > --- a/arch/arm/mach-exynos4/Kconfig > +++ b/arch/arm/mach-exynos4/Kconfig > @@ -225,6 +225,8 @@ config MACH_ORIGEN > select S3C_DEV_WDT > select S3C_DEV_HSMMC2 > select EXYNOS4_SETUP_SDHCI > + select S5P_DEV_I2C_HDMIPHY > + select S5P_DEV_TV > help > Machine support for ORIGEN based on Samsung EXYNOS4210 > > diff --git a/arch/arm/mach-exynos4/mach-origen.c > b/arch/arm/mach-exynos4/mach-origen.c > index ed59f86..6ec68ee 100644 > --- a/arch/arm/mach-exynos4/mach-origen.c > +++ b/arch/arm/mach-exynos4/mach-origen.c > @@ -81,8 +81,11 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata > __initdata = { > > static struct platform_device *origen_devices[] __initdata = { > &s3c_device_hsmmc2, > + &s5p_device_i2c_hdmiphy, > &s3c_device_rtc, > &s3c_device_wdt, > + &s5p_device_hdmi, > + &s5p_device_mixer, > }; > > static void __init origen_map_io(void) > @@ -95,6 +98,7 @@ static void __init origen_map_io(void) > static void __init origen_machine_init(void) > { > s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata); > + s5p_i2c_hdmiphy_set_platdata(NULL); > platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices)); > } > > -- > 1.7.4.1 > > > _______________________________________________ > linaro-dev mailing list > linaro-dev@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-dev > _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev
