| Message ID | 092f01cd332c$00df3c60$029db520$%kim@samsung.com |
|---|---|
| State | New |
| Headers | show |
On Wednesday 16 May 2012, Kukjin Kim wrote: > Hi Arnd and Olof, > > Here is Samsung devel-2 for v3.5 and it is including update support for > EXYNOS5250 SoC. > > Please pull from: > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git > next/devel-exynos5250-1 > > Note, this branch has a dependency on next/cleanup-plat-s5p which is already > in next/cleanup2 of arm-soc. > > If any problems, please kindly let me know. Pulled into next/soc2 now, thanks, Arnd
Hi Arnd, Thomas has posted a patch [1] (available on Grant's tree) to fix this problem. [1] http://git.secretlab.ca/?p=linux-2.6.git;a=commitdiff;h=766644d2df254934d656a0a0628b636212c24f9e;hp=0034102808e0dbbf3a2394b82b1bb40b5778de9e On 17/05/2012, Arnd Bergmann <arnd@arndb.de> wrote: > On Wednesday 16 May 2012, Kukjin Kim wrote: > >> Note, this branch has a dependency on next/cleanup-plat-s5p which is >> already >> in next/cleanup2 of arm-soc. >> >> If any problems, please kindly let me know. > > I've hit a build problem with exynos4_defconfig, which I fixed using this > patch. > > Arnd > > commit 820f3dd7964f1889baaaaa0c2ba45d05bb619f66 > Author: Arnd Bergmann <arnd@arndb.de> > Date: Wed May 16 22:10:14 2012 +0200 > > ARM: exynos: fix building with CONFIG_OF disabled > > irq_of_parse_and_map does not have an empty definition for the > !CONFIG_OF case, so we should not try to call it then: > > arch/arm/mach-exynos/common.c: In function 'combiner_init': > arch/arm/mach-exynos/common.c:576:3: warning: implicit declaration of > function 'irq_of_parse_and_map' > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c > index 9900158..4913471 100644 > --- a/arch/arm/mach-exynos/common.c > +++ b/arch/arm/mach-exynos/common.c > @@ -568,7 +568,11 @@ void __init combiner_init(void __iomem *combiner_base, > struct device_node *np) > > for (i = 0; i < max_nr; i++) { > combiner_init_one(i, combiner_base + (i >> 2) * 0x10); > - irq = np ? irq_of_parse_and_map(np, i) : IRQ_SPI(i); > + irq = IRQ_SPI(i); > +#ifdef CONFIG_OF > + if (np) > + irq = irq_of_parse_and_map(np, i); > +#endif > combiner_cascade_irq(i, irq); > } > } > > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >
Sachin Kamat wrote: > > Hi Arnd, > > Thomas has posted a patch [1] (available on Grant's tree) to fix this > problem. > > [1] http://git.secretlab.ca/?p=linux- > 2.6.git;a=commitdiff;h=766644d2df254934d656a0a0628b636212c24f9e;hp=0034102 > 808e0dbbf3a2394b82b1bb40b5778de9e > > Yeah, I know that. But in this case, the Arnd's patch looks better to me and this helps to avoid build error in current arm-soc. I think, we can cleanup #ifdef CONFIG_OF in mach-exynos/ when we move on supporting DT for all of EXYNOS next time. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
Hi Arnd and Olof, Here is Samsung devel-2 for v3.5 and it is including update support for EXYNOS5250 SoC. Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-exynos5250-1 Note, this branch has a dependency on next/cleanup-plat-s5p which is already in next/cleanup2 of arm-soc. If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 0f58487b1e313e6abf500431e05f4d54f61736f2: Merge branch 'next/cleanup-plat-s5p' into next/devel-exynos5250-1 (2012-05-15 15:55:25 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-exynos5250-1 Changhwan Youn (2): ARM: EXYNOS: Modify the GIC physical address for static io-mapping ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition Kisoo Yu (1): ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll Kukjin Kim (1): ARM: EXYNOS: update irqs for EXYNOS5250 SoC Sangsu Park (1): ARM: EXYNOS: add GPC4 bank instance Thomas Abraham (6): ARM: EXYNOS: Add watchdog timer clock instance ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5 ARM: EXYNOS: Add irq_domain support for interrupt combiner ARM: EXYNOS: Add device tree support for interrupt combiner ARM: dts: Update device tree source files for EXYNOS5250 ARM: EXYNOS: Add AUXDATA for i2c controllers .../bindings/arm/samsung/interrupt-combiner.txt | 52 ++++++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 48 ++++++ arch/arm/boot/dts/exynos5250.dtsi | 60 ++++---- arch/arm/mach-exynos/clock-exynos5.c | 51 ++++++- arch/arm/mach-exynos/common.c | 178 +++++++++++++------- arch/arm/mach-exynos/include/mach/gpio.h | 9 +- arch/arm/mach-exynos/include/mach/irqs.h | 40 +++-- arch/arm/mach-exynos/include/mach/map.h | 4 +- arch/arm/mach-exynos/include/mach/regs-clock.h | 2 + arch/arm/mach-exynos/mach-exynos5-dt.c | 4 + arch/arm/mach-exynos/mct.c | 17 ++- arch/arm/mach-exynos/pm.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 2 +- arch/arm/plat-samsung/include/plat/s5p-clock.h | 4 + arch/arm/plat-samsung/s5p-clock.c | 30 ++++ drivers/gpio/gpio-samsung.c | 11 +- 16 files changed, 389 insertions(+), 125 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt