From: Olof Johansson Date: Fri, 30 Nov 2012 17:25:16 +0000 (-0800) Subject: Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=823c9faefc5534273aceaca12d845dbc11782a6d;p=linux-beck.git Merge branch 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc From Kukjin Kim: Just adding camif gpio setup and clkdev. * 'next/cam-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: S3C24XX: Add clkdev entry for camif-upll clock ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers + Linux 3.7-rc6 Conflicts due to the 3.7-rc6 sync: arch/arm/mach-highbank/system.c include/linux/clk-provider.h, resolved as in other branches. Signed-off-by: Olof Johansson --- 823c9faefc5534273aceaca12d845dbc11782a6d diff --cc arch/arm/mach-highbank/system.c index 194a5bbb7363,86e37cd9376c..aed96ad9bd4a --- a/arch/arm/mach-highbank/system.c +++ b/arch/arm/mach-highbank/system.c @@@ -26,6 -27,8 +26,7 @@@ void highbank_restart(char mode, const else hignbank_set_pwr_soft_reset(); - cpu_do_idle(); - scu_power_mode(scu_base_addr, SCU_PM_POWEROFF); + while (1) + cpu_do_idle(); } diff --cc include/linux/clk-provider.h index 0dce3d31eae5,f9f5e9eeb9dd..172d5bdaf03d --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@@ -339,11 -335,11 +339,11 @@@ const char *__clk_get_name(struct clk * struct clk_hw *__clk_get_hw(struct clk *clk); u8 __clk_get_num_parents(struct clk *clk); struct clk *__clk_get_parent(struct clk *clk); - inline unsigned int __clk_get_enable_count(struct clk *clk); - inline unsigned int __clk_get_prepare_count(struct clk *clk); -int __clk_get_enable_count(struct clk *clk); -int __clk_get_prepare_count(struct clk *clk); ++unsigned int __clk_get_enable_count(struct clk *clk); ++unsigned int __clk_get_prepare_count(struct clk *clk); unsigned long __clk_get_rate(struct clk *clk); unsigned long __clk_get_flags(struct clk *clk); -int __clk_is_enabled(struct clk *clk); +bool __clk_is_enabled(struct clk *clk); struct clk *__clk_lookup(const char *name); /*