Commit e3643b77 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup-exynos-clock' of... 

Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

* 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
  ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
  PM / devfreq: update the name of EXYNOS clock registers that were omitted
  PM / devfreq: update the name of EXYNOS clock register
  ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
  ARM: EXYNOS: use static declaration on regarding clock
  ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
  (includes an update to v3.3-rc6)
parents 86ca5b6f 44b2cef5

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -3780,7 +3780,7 @@ F: Documentation/kdump/ 


KERNEL AUTOMOUNTER v4 (AUTOFS4)

M:	Ian Kent <raven@themaw.net>

L:	autofs@linux.kernel.org

L:	autofs@vger.kernel.org

S:	Maintained

F:	fs/autofs4/
@@ -4685,7 +4685,7 @@ NTFS FILESYSTEM 
M:	Anton Altaparmakov <anton@tuxera.com>

L:	linux-ntfs-dev@lists.sourceforge.net

W:	http://www.tuxera.com/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git

S:	Supported

F:	Documentation/filesystems/ntfs.txt

F:	fs/ntfs/
@@ -7271,7 +7271,7 @@ WATCHDOG DEVICE DRIVERS 
M:	Wim Van Sebroeck <wim@iguana.be>

L:	linux-watchdog@vger.kernel.org

W:	http://www.linux-watchdog.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

T:	git git://www.linux-watchdog.org/linux-watchdog.git

S:	Maintained

F:	Documentation/watchdog/

F:	drivers/watchdog/

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/mach-exynos/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ obj- := 


# Core



obj-$(CONFIG_ARCH_EXYNOS4)	+= common.o clock.o

obj-$(CONFIG_ARCH_EXYNOS)	+= common.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= clock-exynos4.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o

obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o

arch/arm/mach-exynos/clock.c→arch/arm/mach-exynos/clock-exynos4.c

+1563 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-exynos/include/mach/exynos4-clock.h→arch/arm/mach-exynos/clock-exynos4.h

+30 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-exynos4/include/mach/exynos4-clock.h

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 * Copyright (c) 2011-2012 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Header file for exynos4 clock support
@@ -16,25 +14,14 @@ 


#include <linux/clk.h>



extern struct clk clk_sclk_hdmi27m;

extern struct clk clk_sclk_usbphy0;

extern struct clk clk_sclk_usbphy1;

extern struct clk clk_sclk_hdmiphy;



extern struct clksrc_clk clk_sclk_apll;

extern struct clksrc_clk clk_mout_mpll;

extern struct clksrc_clk clk_aclk_133;

extern struct clksrc_clk clk_mout_epll;

extern struct clksrc_clk clk_sclk_vpll;



extern struct clk *clkset_corebus_list[];

extern struct clksrc_sources clkset_mout_corebus;

extern struct clksrc_clk exynos4_clk_aclk_133;

extern struct clksrc_clk exynos4_clk_mout_mpll;



extern struct clk *clkset_aclk_top_list[];

extern struct clksrc_sources clkset_aclk;

extern struct clksrc_sources exynos4_clkset_mout_corebus;

extern struct clksrc_sources exynos4_clkset_group;



extern struct clk *clkset_group_list[];

extern struct clksrc_sources clkset_group;

extern struct clk *exynos4_clkset_aclk_top_list[];

extern struct clk *exynos4_clkset_group_list[];



extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable);

extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable);

CRA Git | Maintained and supported by SUSTech CRA and CCSE