On 03/09/2011 11:55 PM, Kukjin Kim wrote: > Sylwester Nawrocki wrote: >> >> Add common code for MIPI-CSIS and MIPI-DSIM drivers to support >> their corresponding D-PHY's enable and reset control. >> Tested with S5PV210 and EXYNOS4 SoCs. >> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@xxxxxxxxxxx> >> Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> >> --- >> arch/arm/mach-exynos4/include/mach/regs-pmu.h | 5 ++ >> arch/arm/mach-s5pv210/include/mach/regs-clock.h | 5 +- >> arch/arm/plat-s5p/Kconfig | 5 ++ >> arch/arm/plat-s5p/Makefile | 1 + >> arch/arm/plat-s5p/setup-mipi.c | 68 >> +++++++++++++++++++++++ >> 5 files changed, 83 insertions(+), 1 deletions(-) >> create mode 100644 arch/arm/plat-s5p/setup-mipi.c ... >> diff --git a/arch/arm/plat-s5p/setup-mipi.c > b/arch/arm/plat-s5p/setup-mipi.c >> new file mode 100644 >> index 0000000..4d8ae96 >> --- /dev/null >> +++ b/arch/arm/plat-s5p/setup-mipi.c > > I think, "setup-mipiphy.c" is more clearly :) OK. > >> @@ -0,0 +1,68 @@ >> +/* >> + * Copyright (C) 2011 Samsung Electronics Co., Ltd >> + * >> + * S5P - Helper functions for MIPI-CSIS and MIPI-DSIM D-PHY control >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License version 2 as >> + * published by the Free Software Foundation. >> + */ >> + >> +#include <linux/kernel.h> >> +#include <linux/platform_device.h> >> +#include <linux/io.h> >> +#include <linux/spinlock.h> >> + >> +#ifdef CONFIG_ARCH_EXYNOS4 >> +#include <mach/regs-pmu.h> >> +#else >> +#include <mach/regs-clock.h> >> +#endif > > How about following? > > --- a/arch/arm/mach-exynos4/include/mach/regs-clock.h > +++ b/arch/arm/mach-exynos4/include/mach/regs-clock.h > @@ -160,7 +160,9 @@ > #define S5P_CLKDIV_BUS_GPLR_SHIFT (4) > #define S5P_CLKDIV_BUS_GPLR_MASK (0x7 << S5P_CLKDIV_BUS_GPLR_SHIFT) > > -/* Compatibility defines */ > +/* Compatibility defines and inclusion */ > + > +#include <mach/regs-pmu.h> > > #define S5P_EPLL_CON S5P_EPLL_CON0 > > Then, just adding regs-clock.h here. > > +#include <mach/regs-clock.h> > Yeah, that should do the trick, thanks. At least for now it's fine. But I think the concept of having common code for peripherals and just different headers for register address offset definitions for various ARCH_S5P* need to be reconsidered to be able to build single image for a few SoCs. >> + >> +static int __s5p_mipi_phy_control(struct platform_device *pdev, >> + bool on, u32 reset) ... Regards, -- Sylwester Nawrocki Samsung Poland R&D Center -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |