From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 05:37:50 +0000 (+1100)
Subject: Merge remote-tracking branch 'clk/clk-next'
X-Git-Tag: next-20130220~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=01ef3d665571254089b4ba8ca7a042bad2c87f09;p=karo-tx-linux.git

Merge remote-tracking branch 'clk/clk-next'

Conflicts:
	include/asm-generic/vmlinux.lds.h
---

01ef3d665571254089b4ba8ca7a042bad2c87f09
diff --cc drivers/clk/Makefile
index 653a409edc2d,0ad642fbe794..be9392edc548
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -20,10 -25,7 +25,9 @@@ endi
  obj-$(CONFIG_MACH_LOONGSON1)	+= clk-ls1x.o
  obj-$(CONFIG_ARCH_U8500)	+= ux500/
  obj-$(CONFIG_ARCH_VT8500)	+= clk-vt8500.o
- obj-$(CONFIG_ARCH_SUNXI)	+= clk-sunxi.o
  obj-$(CONFIG_ARCH_ZYNQ)		+= clk-zynq.o
 +obj-$(CONFIG_X86)		+= x86/
 +obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
  
  # Chip specific
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
diff --cc include/asm-generic/vmlinux.lds.h
index fc62ac5c6d4f,c1fe60ad1540..287ca288cdc7
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -149,25 -149,16 +149,34 @@@
  #define TRACE_SYSCALLS()
  #endif
  
 +#ifdef CONFIG_CLKSRC_OF
 +#define CLKSRC_OF_TABLES() . = ALIGN(8);				\
 +			   VMLINUX_SYMBOL(__clksrc_of_table) = .;	\
 +			   *(__clksrc_of_table)				\
 +			   *(__clksrc_of_table_end)
 +#else
 +#define CLKSRC_OF_TABLES()
 +#endif
 +
 +#ifdef CONFIG_IRQCHIP
 +#define IRQCHIP_OF_MATCH_TABLE()					\
 +	. = ALIGN(8);							\
 +	VMLINUX_SYMBOL(__irqchip_begin) = .;				\
 +	*(__irqchip_of_table)		  				\
 +	*(__irqchip_of_end)
 +#else
 +#define IRQCHIP_OF_MATCH_TABLE()
 +#endif
  
+ #ifdef CONFIG_COMMON_CLK
+ #define CLK_OF_TABLES() . = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__clk_of_table) = .;	\
+ 			*(__clk_of_table)			\
+ 			*(__clk_of_table_end)
+ #else
+ #define CLK_OF_TABLES()
+ #endif
+ 
  #define KERNEL_DTB()							\
  	STRUCT_ALIGN();							\
  	VMLINUX_SYMBOL(__dtb_start) = .;				\
@@@ -511,9 -502,8 +520,10 @@@
  	DEV_DISCARD(init.rodata)					\
  	CPU_DISCARD(init.rodata)					\
  	MEM_DISCARD(init.rodata)					\
 +	CLKSRC_OF_TABLES()						\
+ 	CLK_OF_TABLES()							\
 -	KERNEL_DTB()
 +	KERNEL_DTB()							\
 +	IRQCHIP_OF_MATCH_TABLE()
  
  #define INIT_TEXT							\
  	*(.init.text)							\