Merge tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jan 2014 02:56:08 +0000 (18:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jan 2014 02:56:08 +0000 (18:56 -0800)
Pull clk framework changes from Mike Turquette:
 "The first half of the clk framework pull request is made up almost
  entirely of new platform/driver support.  There are some conversions
  of existing drivers to the common-clock Device Tree binding, and a few
  non-critical fixes to the framework.

  Due to an entirely unnecessary cyclical dependency with the arm-soc
  tree this pull request is broken into two pieces.  The second piece
  will be sent out after arm-soc sends you the pull request that merged
  in core support for the HiSilicon 3620 platform.  That same pull
  request from arm-soc depends on this pull request to merge in those
  HiSilicon bits without causing build failures"

[ Just did the ARM SoC merges, so getting ready for the second clk tree
  pull request   - Linus ]

* tag 'clk-for-linus-3.14-part1' of git://git.linaro.org/people/mike.turquette/linux: (97 commits)
  devicetree: bindings: Document qcom,mmcc
  devicetree: bindings: Document qcom,gcc
  clk: qcom: Add support for MSM8660's global clock controller (GCC)
  clk: qcom: Add support for MSM8974's multimedia clock controller (MMCC)
  clk: qcom: Add support for MSM8974's global clock controller (GCC)
  clk: qcom: Add support for MSM8960's multimedia clock controller (MMCC)
  clk: qcom: Add support for MSM8960's global clock controller (GCC)
  clk: qcom: Add reset controller support
  clk: qcom: Add support for branches/gate clocks
  clk: qcom: Add support for root clock generators (RCGs)
  clk: qcom: Add support for phase locked loops (PLLs)
  clk: qcom: Add a regmap type clock struct
  clk: Add set_rate_and_parent() op
  reset: Silence warning in reset-controller.h
  clk: sirf: re-arch to make the codes support both prima2 and atlas6
  clk: composite: pass mux_hw into determine_rate
  clk: shmobile: Fix MSTP clock array initialization
  clk: shmobile: Fix MSTP clock index
  ARM: dts: Add clock provider specific properties to max77686 node
  clk: max77686: Register OF clock provider
  ...

1  2 
Documentation/devicetree/bindings/clock/exynos5250-clock.txt
MAINTAINERS
arch/arm/boot/dts/exynos4412-odroidx.dts
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm/boot/dts/exynos5250-cros-common.dtsi
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/boot/dts/exynos5420.dtsi
drivers/clk/Makefile
drivers/clk/samsung/clk-exynos4.c
drivers/clk/tegra/clk-periph.c
drivers/media/platform/omap3isp/isp.c

index 0f2f920e87348515995cb553ece45cf0949213b7,492ed09ea8c80088dc8d074a0704db7dbd863910..72ce617dea8210572f300501b4f9e79ad5aade78
@@@ -5,7 -5,7 +5,7 @@@ controllers within the Exynos5250 SoC
  
  Required Properties:
  
 -- comptible: should be one of the following.
 +- compatible: should be one of the following.
    - "samsung,exynos5250-clock" - controller compatible with Exynos5250 SoC.
  
  - reg: physical base address of the controller and length of memory mapped
@@@ -62,6 -62,7 +62,7 @@@ clock which they consume
    div_i2s1            157
    div_i2s2            158
    sclk_hdmiphy                159
+   div_pcm0            160
  
  
     [Peripheral Clock Gates]
diff --combined MAINTAINERS
index 64a783fb793193a319d10dddb0ebb1a151e8afa1,273311e10b5b73fe42fa58eab6eb85394b00f9fa..15802a32469efbd1d71fbff46a8e88b5af765c31
@@@ -484,6 -484,7 +484,6 @@@ M: Hannes Reinecke <hare@suse.de
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/aic7xxx/
 -F:    drivers/scsi/aic7xxx_old/
  
  AIMSLAB FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -538,13 -539,6 +538,13 @@@ F:       drivers/tty/serial/altera_jtaguart.
  F:    include/linux/altera_uart.h
  F:    include/linux/altera_jtaguart.h
  
 +AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
 +M:    Tom Lendacky <thomas.lendacky@amd.com>
 +L:    linux-crypto@vger.kernel.org
 +S:    Supported
 +F:    drivers/crypto/ccp/
 +F:    include/linux/ccp.h
 +
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
  M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
  L:    lm-sensors@lm-sensors.org
@@@ -772,12 -766,7 +772,12 @@@ ARM/Allwinner A1X SoC suppor
  M:    Maxime Ripard <maxime.ripard@free-electrons.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -F:    arch/arm/mach-sunxi/
 +N:    sun[x4567]i
 +
 +ARM/Allwinner SoC Clock Support
 +M:    Emilio López <emilio@elopez.com.ar>
 +S:    Maintained
 +F:    drivers/clk/sunxi/
  
  ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
  M:    Andrew Victor <linux@maxim.org.za>
@@@ -794,7 -783,7 +794,7 @@@ F: arch/arm/boot/dts/sama*.dt
  F:    arch/arm/boot/dts/sama*.dtsi
  
  ARM/CALXEDA HIGHBANK ARCHITECTURE
 -M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Rob Herring <robh@kernel.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
@@@ -878,12 -867,6 +878,12 @@@ S:       Maintaine
  F:    arch/arm/mach-ebsa110/
  F:    drivers/net/ethernet/amd/am79c961a.*
  
 +ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
 +M:    Uwe Kleine-König <kernel@pengutronix.de>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +N:    efm32
 +
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  M:    Daniel Ribeiro <drwyrm@gmail.com>
  M:    Stefan Schmidt <stefan@openezx.org>
@@@ -910,15 -893,20 +910,15 @@@ F:      arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 +M:    Shawn Guo <shawn.guo@linaro.org>
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
 +T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
  F:    arch/arm/mach-imx/
 +F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
  
 -ARM/FREESCALE IMX6
 -M:    Shawn Guo <shawn.guo@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 -F:    arch/arm/mach-imx/*imx6*
 -
  ARM/FREESCALE MXS ARM ARCHITECTURE
  M:    Shawn Guo <shawn.guo@linaro.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1025,8 -1013,6 +1025,8 @@@ M:      Santosh Shilimkar <santosh.shilimkar
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 +F:    drivers/clk/keystone/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/LOGICPD PXA270 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -1046,12 -1032,6 +1046,12 @@@ L:    linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-mvebu/
  
 +ARM/Marvell Berlin SoC support
 +M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-berlin/
 +
  ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
  M:    Jason Cooper <jason@lakedaemon.net>
  M:    Andrew Lunn <andrew@lunn.ch>
@@@ -1345,6 -1325,14 +1345,14 @@@ F:    drivers/rtc/rtc-ab8500.
  F:    drivers/rtc/rtc-pl031.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
  
+ ARM/Ux500 CLOCK FRAMEWORK SUPPORT
+ M:    Ulf Hansson <ulf.hansson@linaro.org>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ T:    git git://git.linaro.org/people/ulfh/clk.git
+ S:    Maintained
+ F:    drivers/clk/ux500/
+ F:    include/linux/platform_data/clk-ux500.h
  ARM/VFP SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1391,9 -1379,6 +1399,9 @@@ T:      git git://git.xilinx.com/linux-xlnx.
  S:    Supported
  F:    arch/arm/mach-zynq/
  F:    drivers/cpuidle/cpuidle-zynq.c
 +N:    zynq
 +N:    xilinx
 +F:    drivers/clocksource/cadence_ttc_timer.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <will.deacon@arm.com>
@@@ -1621,10 -1606,11 +1629,10 @@@ S:      Supporte
  F:      drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
 -M:    Al Viro <viro@zeniv.linux.org.uk>
  M:    Eric Paris <eparis@redhat.com>
  L:    linux-audit@redhat.com (subscribers-only)
  W:    http://people.redhat.com/sgrubb/audit/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
 +T:    git git://git.infradead.org/users/eparis/audit.git
  S:    Maintained
  F:    include/linux/audit.h
  F:    include/uapi/linux/audit.h
@@@ -1956,8 -1942,7 +1964,8 @@@ S:      Maintaine
  F:    drivers/gpio/gpio-bt8xx.c
  
  BTRFS FILE SYSTEM
 -M:    Chris Mason <chris.mason@fusionio.com>
 +M:    Chris Mason <clm@fb.com>
 +M:    Josef Bacik <jbacik@fb.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
  Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
@@@ -2160,17 -2145,11 +2168,17 @@@ S:   Maintaine
  F:    Documentation/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Alexander Shishkin <alexander.shishkin@linux.intel.com>
 +M:    Peter Chen <Peter.Chen@freescale.com>
 +T:    git://github.com/hzpeterchen/linux-usb.git
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/usb/chipidea/
  
 +CHROME HARDWARE PLATFORM SUPPORT
 +M:    Olof Johansson <olof@lixom.net>
 +S:    Maintained
 +F:    drivers/platform/chrome/
 +
  CISCO VIC ETHERNET NIC DRIVER
  M:    Christian Benvenuti <benve@cisco.com>
  M:    Sujith Sankar <ssujith@cisco.com>
@@@ -2641,7 -2620,7 +2649,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-laptop.c
  
  DELL LAPTOP SMM DRIVER
 -S:    Orphan
 +M:    Guenter Roeck <linux@roeck-us.net>
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -2660,7 -2639,7 +2668,7 @@@ DESIGNWARE USB2 DRD IP DRIVE
  M:    Paul Zimmerman <paulz@synopsys.com>
  L:    linux-usb@vger.kernel.org
  S:    Maintained
 -F:    drivers/staging/dwc2/
 +F:    drivers/usb/dwc2/
  
  DESIGNWARE USB3 DRD IP DRIVER
  M:    Felipe Balbi <balbi@ti.com>
@@@ -2850,10 -2829,8 +2858,10 @@@ F:    include/uapi/drm
  
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <daniel.vetter@ffwll.ch>
 +M:    Jani Nikula <jani.nikula@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
  L:    dri-devel@lists.freedesktop.org
 +Q:    http://patchwork.freedesktop.org/project/intel-gfx/
  T:    git git://people.freedesktop.org/~danvet/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915/
@@@ -3357,7 -3334,6 +3365,7 @@@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Chanwoo Choi <cw00.choi@samsung.com>
  L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
  S:    Maintained
  F:    drivers/extcon/
  F:    Documentation/extcon/
@@@ -3657,7 -3633,6 +3665,7 @@@ W:      http://en.wikipedia.org/wiki/F2F
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
  S:    Maintained
  F:    Documentation/filesystems/f2fs.txt
 +F:    Documentation/ABI/testing/sysfs-fs-f2fs
  F:    fs/f2fs/
  F:    include/linux/f2fs_fs.h
  
@@@ -3792,11 -3767,9 +3800,11 @@@ F:    include/uapi/linux/gigaset_dev.
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
 -S:    Maintained
 +M:    Alexandre Courbot <gnurou@gmail.com>
  L:    linux-gpio@vger.kernel.org
 -F:    Documentation/gpio.txt
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 +S:    Maintained
 +F:    Documentation/gpio/
  F:    drivers/gpio/
  F:    include/linux/gpio*
  F:    include/asm-generic/gpio.h
@@@ -3864,12 -3837,6 +3872,12 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/gspca/
  
 +GUID PARTITION TABLE (GPT)
 +M:    Davidlohr Bueso <davidlohr@hp.com>
 +L:    linux-efi@vger.kernel.org
 +S:    Maintained
 +F:    block/partitions/efi.*
 +
  STK1160 USB VIDEO CAPTURE DRIVER
  M:    Ezequiel Garcia <elezegarcia@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -4079,26 -4046,12 +4087,26 @@@ W:   http://artax.karlin.mff.cuni.cz/~mik
  S:    Maintained
  F:    fs/hpfs/
  
 +HSI SUBSYSTEM
 +M:    Sebastian Reichel <sre@debian.org>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-bus-hsi
 +F:    drivers/hsi/
 +F:    include/linux/hsi/
 +F:    include/uapi/linux/hsi/
 +
  HSO 3G MODEM DRIVER
  M:    Jan Dumon <j.dumon@option.com>
  W:    http://www.pharscape.org
  S:    Maintained
  F:    drivers/net/usb/hso.c
  
 +HSR NETWORK PROTOCOL
 +M:    Arvid Brodin <arvid.brodin@alten.se>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    net/hsr/
 +
  HTCPEN TOUCHSCREEN DRIVER
  M:    Pau Oliva Fora <pof@eslack.org>
  L:    linux-input@vger.kernel.org
@@@ -4505,8 -4458,10 +4513,8 @@@ M:     Bruce Allan <bruce.w.allan@intel.com
  M:    Carolyn Wyborny <carolyn.wyborny@intel.com>
  M:    Don Skidmore <donald.c.skidmore@intel.com>
  M:    Greg Rose <gregory.v.rose@intel.com>
 -M:    Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
  M:    Alex Duyck <alexander.h.duyck@intel.com>
  M:    John Ronciak <john.ronciak@intel.com>
 -M:    Tushar Dave <tushar.n.dave@intel.com>
  L:    e1000-devel@lists.sourceforge.net
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -4939,7 -4894,7 +4947,7 @@@ F:      include/linux/sunrpc
  F:    include/uapi/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Gleb Natapov <gleb@redhat.com>
 +M:    Gleb Natapov <gleb@kernel.org>
  M:    Paolo Bonzini <pbonzini@redhat.com>
  L:    kvm@vger.kernel.org
  W:    http://www.linux-kvm.org
@@@ -5165,11 -5120,6 +5173,11 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBLOCKDEP
 +M:    Sasha Levin <sasha.levin@oracle.com>
 +S:    Maintained
 +F:    tools/lib/lockdep/
 +
  LINUX FOR IBM pSERIES (RS/6000)
  M:    Paul Mackerras <paulus@au.ibm.com>
  W:    http://www.ibm.com/linux/ltc/projects/ppc
@@@ -5314,7 -5264,7 +5322,7 @@@ S:      Maintaine
  F:    Documentation/lockdep*.txt
  F:    Documentation/lockstat.txt
  F:    include/linux/lockdep.h
 -F:    kernel/lockdep*
 +F:    kernel/locking/
  
  LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
  M:    "Richard Russon (FlatCap)" <ldm@flatcap.org>
@@@ -5955,21 -5905,12 +5963,21 @@@ M:   Steffen Klassert <steffen.klassert@s
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  M:    "David S. Miller" <davem@davemloft.net>
  L:    netdev@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
  S:    Maintained
  F:    net/xfrm/
  F:    net/key/
  F:    net/ipv4/xfrm*
 +F:    net/ipv4/esp4.c
 +F:    net/ipv4/ah4.c
 +F:    net/ipv4/ipcomp.c
 +F:    net/ipv4/ip_vti.c
  F:    net/ipv6/xfrm*
 +F:    net/ipv6/esp6.c
 +F:    net/ipv6/ah6.c
 +F:    net/ipv6/ipcomp6.c
 +F:    net/ipv6/ip6_vti.c
  F:    include/uapi/linux/xfrm.h
  F:    include/net/xfrm.h
  
@@@ -6035,10 -5976,10 +6043,10 @@@ F:   drivers/nfc
  F:    include/linux/platform_data/pn544.h
  
  NFS, SUNRPC, AND LOCKD CLIENTS
 -M:    Trond Myklebust <Trond.Myklebust@netapp.com>
 +M:    Trond Myklebust <trond.myklebust@primarydata.com>
  L:    linux-nfs@vger.kernel.org
  W:    http://client.linux-nfs.org
 -T:    git git://git.linux-nfs.org/pub/linux/nfs-2.6.git
 +T:    git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
  S:    Maintained
  F:    fs/lockd/
  F:    fs/nfs/
@@@ -6290,7 -6231,7 +6298,7 @@@ F:      drivers/i2c/busses/i2c-ocores.
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE
  M:    Grant Likely <grant.likely@linaro.org>
 -M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Rob Herring <robh+dt@kernel.org>
  L:    devicetree@vger.kernel.org
  W:    http://fdt.secretlab.ca
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -6302,11 -6243,11 +6310,11 @@@ K:   of_get_propert
  K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
 -M:    Rob Herring <rob.herring@calxeda.com>
 +M:    Rob Herring <robh+dt@kernel.org>
  M:    Pawel Moll <pawel.moll@arm.com>
  M:    Mark Rutland <mark.rutland@arm.com>
 -M:    Stephen Warren <swarren@wwwdotorg.org>
  M:    Ian Campbell <ijc+devicetree@hellion.org.uk>
 +M:    Kumar Gala <galak@codeaurora.org>
  L:    devicetree@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/
@@@ -6516,52 -6457,19 +6524,52 @@@ F:   drivers/pci
  F:    include/linux/pci*
  F:    arch/x86/pci/
  
 +PCI DRIVER FOR IMX6
 +M:    Richard Zhu <r65037@freescale.com>
 +M:    Shawn Guo <shawn.guo@linaro.org>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*imx6*
 +
 +PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
 +M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Jason Cooper <jason@lakedaemon.net>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/pci/host/*mvebu*
 +
  PCI DRIVER FOR NVIDIA TEGRA
  M:    Thierry Reding <thierry.reding@gmail.com>
  L:    linux-tegra@vger.kernel.org
 +L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
  F:    drivers/pci/host/pci-tegra.c
  
 +PCI DRIVER FOR RENESAS R-CAR
 +M:    Simon Horman <horms@verge.net.au>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-sh@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pci/host/*rcar*
 +
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <jg1.han@samsung.com>
  L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/pci/host/pci-exynos.c
  
 +PCI DRIVER FOR SYNOPSIS DESIGNWARE
 +M:    Mohit Kumar <mohit.kumar@st.com>
 +M:    Jingoo Han <jg1.han@samsung.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pci/host/*designware*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
@@@ -6735,7 -6643,7 +6743,7 @@@ F:      include/linux/timer
  F:    kernel/*timer*
  
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 -M:    Anton Vorontsov <anton@enomsg.org>
 +M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    David Woodhouse <dwmw2@infradead.org>
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
@@@ -6954,7 -6862,8 +6962,7 @@@ S:      Maintaine
  F:    drivers/scsi/qla1280.[ch]
  
  QLOGIC QLA2XXX FC-SCSI DRIVER
 -M:    Andrew Vasquez <andrew.vasquez@qlogic.com>
 -M:    linux-driver@qlogic.com
 +M:    qla2xxx-upstream@qlogic.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla2xxx
@@@ -7127,12 -7036,6 +7135,12 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcu/torture.c
  
 +RCUTORTURE TEST FRAMEWORK
 +M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 +F:    tools/testing/selftests/rcutorture
 +
  RDC R-321X SoC
  M:    Florian Fainelli <florian@openwrt.org>
  S:    Maintained
@@@ -7431,6 -7334,12 +7439,12 @@@ L:    linux-media@vger.kernel.or
  S:    Supported
  F:    drivers/media/i2c/s5c73m3/*
  
+ SAMSUNG SOC CLOCK DRIVERS
+ M:    Tomasz Figa <t.figa@samsung.com>
+ S:    Supported
+ L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+ F:    drivers/clk/samsung/
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-serial@vger.kernel.org
@@@ -7485,6 -7394,7 +7499,6 @@@ S:      Maintaine
  F:    kernel/sched/
  F:    include/linux/sched.h
  F:    include/uapi/linux/sched.h
 -F:    kernel/wait.c
  F:    include/linux/wait.h
  
  SCORE ARCHITECTURE
@@@ -7514,9 -7424,8 +7528,9 @@@ F:      include/scsi/srp.
  SCSI SG DRIVER
  M:    Doug Gilbert <dgilbert@interlog.com>
  L:    linux-scsi@vger.kernel.org
 -W:    http://www.torque.net/sg
 +W:    http://sg.danny.cz/sg
  S:    Maintained
 +F:    Documentation/scsi/scsi-generic.txt
  F:    drivers/scsi/sg.c
  F:    include/scsi/sg.h
  
@@@ -8769,10 -8678,14 +8783,10 @@@ S:   Odd fixe
  F:    drivers/media/usb/tm6000/
  
  TPM DEVICE DRIVER
 -M:    Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
 -M:    Ashley Lai <ashley@ashleylai.com>
  M:    Peter Huewe <peterhuewe@gmx.de>
 -M:    Rajiv Andrade <mail@srajiv.net>
 -W:    http://tpmdd.sourceforge.net
 +M:    Ashley Lai <ashley@ashleylai.com>
  M:    Marcel Selhorst <tpmdd@selhorst.net>
 -M:    Sirrix AG <tpmdd@sirrix.com>
 -W:    http://www.sirrix.com
 +W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/char/tpm/
@@@ -9262,7 -9175,6 +9276,7 @@@ F:      include/media/videobuf2-
  
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit.shah@redhat.com>
 +L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    drivers/char/virtio_console.c
@@@ -9272,7 -9184,6 +9286,7 @@@ F:      include/uapi/linux/virtio_console.
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    Rusty Russell <rusty@rustcorp.com.au>
  M:    "Michael S. Tsirkin" <mst@redhat.com>
 +L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    drivers/virtio/
@@@ -9285,7 -9196,6 +9299,7 @@@ F:      include/uapi/linux/virtio_*.
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
 +L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -9583,7 -9493,6 +9597,7 @@@ M:      Konrad Rzeszutek Wilk <konrad.wilk@o
  M:    Boris Ostrovsky <boris.ostrovsky@oracle.com>
  M:    David Vrabel <david.vrabel@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
  S:    Supported
  F:    arch/x86/xen/
  F:    drivers/*/xen-*front.c
@@@ -9630,7 -9539,7 +9644,7 @@@ F:      drivers/xen/*swiotlb
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -M:    Dave Chinner <dchinner@fromorbit.com>
 +M:    Dave Chinner <david@fromorbit.com>
  M:    Ben Myers <bpm@sgi.com>
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
index 8aad5f72ced79d5c2123226ee392761d53a45cab,8d337cc8f4e6fdedc286f0c1a17c154bbd8da576..9804fcb71f8cb22338ffa1ddd92426f3c3bf98f3
@@@ -38,7 -38,9 +38,7 @@@
                };
        };
  
 -      mshc@12550000 {
 -              #address-cells = <1>;
 -              #size-cells = <0>;
 +      mmc@12550000 {
                pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
                pinctrl-names = "default";
                vmmc-supply = <&ldo20_reg &buck8_reg>;
@@@ -47,6 -49,7 +47,6 @@@
                num-slots = <1>;
                supports-highspeed;
                broken-cd;
 -              fifo-depth = <0x80>;
                card-detect-delay = <200>;
                samsung,dw-mshc-ciu-div = <3>;
                samsung,dw-mshc-sdr-timing = <2 3>;
                max77686: pmic@09 {
                        compatible = "maxim,max77686";
                        reg = <0x09>;
+                       #clock-cells = <1>;
  
                        voltage-regulators {
                                ldo1_reg: LDO1 {
index 890ad275cb85b8864fc5c4129c9c510603257fa0,c21a8b916bf13d21a3fcb429d20c193cd9fba448..4f851ccf40eb48831ebb78474dd458eebf873b58
                        interrupt-parent = <&gpx0>;
                        interrupts = <7 0>;
                        reg = <0x09>;
+                       #clock-cells = <1>;
  
                        voltage-regulators {
                                ldo1_reg: ldo1 {
                };
        };
  
 -      sdhci@12510000 {
 -              bus-width = <8>;
 +      mmc@12550000 {
 +              num-slots = <1>;
 +              supports-highspeed;
 +              broken-cd;
                non-removable;
 -              pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
 -              pinctrl-names = "default";
 +              card-detect-delay = <200>;
                vmmc-supply = <&vemmc_reg>;
 +              clock-frequency = <400000000>;
 +              samsung,dw-mshc-ciu-div = <0>;
 +              samsung,dw-mshc-sdr-timing = <2 3>;
 +              samsung,dw-mshc-ddr-timing = <1 2>;
 +              pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;
 +              pinctrl-names = "default";
                status = "okay";
 +
 +              slot@0 {
 +                      reg = <0>;
 +                      bus-width = <8>;
 +              };
        };
  
        serial@13800000 {
index 9a61494f45f514e1399a05b316f853489d9a9061,0000000000000000000000000000000000000000..2c1560d52f1aea24bec737694ba680ea8caa63f8
mode 100644,000000..100644
--- /dev/null
@@@ -1,318 -1,0 +1,319 @@@
 +/*
 + * Common device tree include for all Exynos 5250 boards based off of Daisy.
 + *
 + * Copyright (c) 2012 Google, Inc
 + *
 + * 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.
 +*/
 +
 +/ {
 +      aliases {
 +      };
 +
 +      memory {
 +              reg = <0x40000000 0x80000000>;
 +      };
 +
 +      chosen {
 +      };
 +
 +      pinctrl@11400000 {
 +              /*
 +               * Disabled pullups since external part has its own pullups and
 +               * double-pulling gets us out of spec in some cases.
 +               */
 +              i2c2_bus: i2c2-bus {
 +                      samsung,pin-pud = <0>;
 +              };
 +
 +              max77686_irq: max77686-irq {
 +                      samsung,pins = "gpx3-2";
 +                      samsung,pin-function = <0>;
 +                      samsung,pin-pud = <0>;
 +                      samsung,pin-drv = <0>;
 +              };
 +      };
 +
 +      i2c@12C60000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <378000>;
 +
 +              max77686@09 {
 +                      compatible = "maxim,max77686";
 +                      interrupt-parent = <&gpx3>;
 +                      interrupts = <2 0>;
 +                      pinctrl-names = "default";
 +                      pinctrl-0 = <&max77686_irq>;
 +                      wakeup-source;
 +                      reg = <0x09>;
++                      #clock-cells = <1>;
 +
 +                      voltage-regulators {
 +                              ldo1_reg: LDO1 {
 +                                      regulator-name = "P1.0V_LDO_OUT1";
 +                                      regulator-min-microvolt = <1000000>;
 +                                      regulator-max-microvolt = <1000000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo2_reg: LDO2 {
 +                                      regulator-name = "P1.8V_LDO_OUT2";
 +                                      regulator-min-microvolt = <1800000>;
 +                                      regulator-max-microvolt = <1800000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo3_reg: LDO3 {
 +                                      regulator-name = "P1.8V_LDO_OUT3";
 +                                      regulator-min-microvolt = <1800000>;
 +                                      regulator-max-microvolt = <1800000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo7_reg: LDO7 {
 +                                      regulator-name = "P1.1V_LDO_OUT7";
 +                                      regulator-min-microvolt = <1100000>;
 +                                      regulator-max-microvolt = <1100000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo8_reg: LDO8 {
 +                                      regulator-name = "P1.0V_LDO_OUT8";
 +                                      regulator-min-microvolt = <1000000>;
 +                                      regulator-max-microvolt = <1000000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo10_reg: LDO10 {
 +                                      regulator-name = "P1.8V_LDO_OUT10";
 +                                      regulator-min-microvolt = <1800000>;
 +                                      regulator-max-microvolt = <1800000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo12_reg: LDO12 {
 +                                      regulator-name = "P3.0V_LDO_OUT12";
 +                                      regulator-min-microvolt = <3000000>;
 +                                      regulator-max-microvolt = <3000000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo14_reg: LDO14 {
 +                                      regulator-name = "P1.8V_LDO_OUT14";
 +                                      regulator-min-microvolt = <1800000>;
 +                                      regulator-max-microvolt = <1800000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo15_reg: LDO15 {
 +                                      regulator-name = "P1.0V_LDO_OUT15";
 +                                      regulator-min-microvolt = <1000000>;
 +                                      regulator-max-microvolt = <1000000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              ldo16_reg: LDO16 {
 +                                      regulator-name = "P1.8V_LDO_OUT16";
 +                                      regulator-min-microvolt = <1800000>;
 +                                      regulator-max-microvolt = <1800000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              buck1_reg: BUCK1 {
 +                                      regulator-name = "vdd_mif";
 +                                      regulator-min-microvolt = <950000>;
 +                                      regulator-max-microvolt = <1300000>;
 +                                      regulator-always-on;
 +                                      regulator-boot-on;
 +                              };
 +
 +                              buck2_reg: BUCK2 {
 +                                      regulator-name = "vdd_arm";
 +                                      regulator-min-microvolt = <850000>;
 +                                      regulator-max-microvolt = <1350000>;
 +                                      regulator-always-on;
 +                                      regulator-boot-on;
 +                              };
 +
 +                              buck3_reg: BUCK3 {
 +                                      regulator-name = "vdd_int";
 +                                      regulator-min-microvolt = <900000>;
 +                                      regulator-max-microvolt = <1200000>;
 +                                      regulator-always-on;
 +                                      regulator-boot-on;
 +                              };
 +
 +                              buck4_reg: BUCK4 {
 +                                      regulator-name = "vdd_g3d";
 +                                      regulator-min-microvolt = <850000>;
 +                                      regulator-max-microvolt = <1300000>;
 +                                      regulator-always-on;
 +                                      regulator-boot-on;
 +                              };
 +
 +                              buck5_reg: BUCK5 {
 +                                      regulator-name = "P1.8V_BUCK_OUT5";
 +                                      regulator-min-microvolt = <1800000>;
 +                                      regulator-max-microvolt = <1800000>;
 +                                      regulator-always-on;
 +                                      regulator-boot-on;
 +                              };
 +
 +                              buck6_reg: BUCK6 {
 +                                      regulator-name = "P1.35V_BUCK_OUT6";
 +                                      regulator-min-microvolt = <1350000>;
 +                                      regulator-max-microvolt = <1350000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              buck7_reg: BUCK7 {
 +                                      regulator-name = "P2.0V_BUCK_OUT7";
 +                                      regulator-min-microvolt = <2000000>;
 +                                      regulator-max-microvolt = <2000000>;
 +                                      regulator-always-on;
 +                              };
 +
 +                              buck8_reg: BUCK8 {
 +                                      regulator-name = "P2.85V_BUCK_OUT8";
 +                                      regulator-min-microvolt = <2850000>;
 +                                      regulator-max-microvolt = <2850000>;
 +                                      regulator-always-on;
 +                              };
 +                      };
 +              };
 +      };
 +
 +      i2c@12C70000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <378000>;
 +
 +              trackpad {
 +                      reg = <0x67>;
 +                      compatible = "cypress,cyapa";
 +                      interrupts = <2 0>;
 +                      interrupt-parent = <&gpx1>;
 +                      wakeup-source;
 +              };
 +      };
 +
 +      i2c@12C80000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +
 +              hdmiddc@50 {
 +                      compatible = "samsung,exynos4210-hdmiddc";
 +                      reg = <0x50>;
 +              };
 +      };
 +
 +      i2c@12C90000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +      };
 +
 +      i2c@12CA0000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +      };
 +
 +      i2c@12CB0000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +      };
 +
 +      i2c@12CD0000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <66000>;
 +      };
 +
 +      i2c@12CE0000 {
 +              status = "okay";
 +              samsung,i2c-sda-delay = <100>;
 +              samsung,i2c-max-bus-freq = <378000>;
 +
 +              hdmiphy@38 {
 +                      compatible = "samsung,exynos4212-hdmiphy";
 +                      reg = <0x38>;
 +              };
 +      };
 +
 +      mmc@12200000 {
 +              num-slots = <1>;
 +              supports-highspeed;
 +              broken-cd;
 +              card-detect-delay = <200>;
 +              samsung,dw-mshc-ciu-div = <3>;
 +              samsung,dw-mshc-sdr-timing = <2 3>;
 +              samsung,dw-mshc-ddr-timing = <1 2>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_cd &sd0_bus4 &sd0_bus8>;
 +
 +              slot@0 {
 +                      reg = <0>;
 +                      bus-width = <8>;
 +              };
 +      };
 +
 +      mmc@12220000 {
 +              num-slots = <1>;
 +              supports-highspeed;
 +              card-detect-delay = <200>;
 +              samsung,dw-mshc-ciu-div = <3>;
 +              samsung,dw-mshc-sdr-timing = <2 3>;
 +              samsung,dw-mshc-ddr-timing = <1 2>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
 +
 +              slot@0 {
 +                      reg = <0>;
 +                      bus-width = <4>;
 +                      wp-gpios = <&gpc2 1 0>;
 +              };
 +      };
 +
 +      mmc@12230000 {
 +              num-slots = <1>;
 +              supports-highspeed;
 +              broken-cd;
 +              card-detect-delay = <200>;
 +              samsung,dw-mshc-ciu-div = <3>;
 +              samsung,dw-mshc-sdr-timing = <2 3>;
 +              samsung,dw-mshc-ddr-timing = <1 2>;
 +              /* See board-specific dts files for pin setup */
 +
 +              slot@0 {
 +                      reg = <0>;
 +                      bus-width = <4>;
 +              };
 +      };
 +
 +      spi_1: spi@12d30000 {
 +              status = "okay";
 +              samsung,spi-src-clk = <0>;
 +              num-cs = <1>;
 +      };
 +
 +      hdmi {
 +              hpd-gpio = <&gpx3 7 0>;
 +      };
 +
 +      gpio-keys {
 +              compatible = "gpio-keys";
 +
 +              power {
 +                      label = "Power";
 +                      gpios = <&gpx1 3 1>;
 +                      linux,code = <116>; /* KEY_POWER */
 +                      gpio-key,wakeup;
 +              };
 +      };
 +};
index 587dd3e36f6c32d0173a317854f8ac2a3330347b,c70843fe1e283bd518da6dfa6f79c5b6a4a1232a..b7dec41e32afd7ac6cce4d02022b0929b98aacac
                gsc1 = &gsc_1;
                gsc2 = &gsc_2;
                gsc3 = &gsc_3;
 -              mshc0 = &dwmmc_0;
 -              mshc1 = &dwmmc_1;
 -              mshc2 = &dwmmc_2;
 -              mshc3 = &dwmmc_3;
 +              mshc0 = &mmc_0;
 +              mshc1 = &mmc_1;
 +              mshc2 = &mmc_2;
 +              mshc3 = &mmc_3;
                i2c0 = &i2c_0;
                i2c1 = &i2c_1;
                i2c2 = &i2c_2;
                        device_type = "cpu";
                        compatible = "arm,cortex-a15";
                        reg = <0>;
 +                      clock-frequency = <1700000000>;
                };
                cpu@1 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a15";
                        reg = <1>;
 +                      clock-frequency = <1700000000>;
                };
        };
  
@@@ -90,6 -88,8 +90,8 @@@
                compatible = "samsung,exynos5250-audss-clock";
                reg = <0x03810000 0x0C>;
                #clock-cells = <1>;
+               clocks = <&clock 1>, <&clock 7>, <&clock 138>, <&clock 160>;
+               clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
        };
  
        timer {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c0_bus>;
 +              status = "disabled";
        };
  
        i2c_1: i2c@12C70000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c1_bus>;
 +              status = "disabled";
        };
  
        i2c_2: i2c@12C80000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c2_bus>;
 +              status = "disabled";
        };
  
        i2c_3: i2c@12C90000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c3_bus>;
 +              status = "disabled";
        };
  
        i2c_4: i2c@12CA0000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c4_bus>;
 +              status = "disabled";
        };
  
        i2c_5: i2c@12CB0000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c5_bus>;
 +              status = "disabled";
        };
  
        i2c_6: i2c@12CC0000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c6_bus>;
 +              status = "disabled";
        };
  
        i2c_7: i2c@12CD0000 {
                clock-names = "i2c";
                pinctrl-names = "default";
                pinctrl-0 = <&i2c7_bus>;
 +              status = "disabled";
        };
  
        i2c_8: i2c@12CE0000 {
                #size-cells = <0>;
                clocks = <&clock 302>;
                clock-names = "i2c";
 +              status = "disabled";
        };
  
        i2c@121D0000 {
                  #size-cells = <0>;
                clocks = <&clock 288>;
                clock-names = "i2c";
 +              status = "disabled";
        };
  
        spi_0: spi@12d20000 {
                compatible = "samsung,exynos4210-spi";
 +              status = "disabled";
                reg = <0x12d20000 0x100>;
                interrupts = <0 66 0>;
                dmas = <&pdma0 5
  
        spi_1: spi@12d30000 {
                compatible = "samsung,exynos4210-spi";
 +              status = "disabled";
                reg = <0x12d30000 0x100>;
                interrupts = <0 67 0>;
                dmas = <&pdma1 5
  
        spi_2: spi@12d40000 {
                compatible = "samsung,exynos4210-spi";
 +              status = "disabled";
                reg = <0x12d40000 0x100>;
                interrupts = <0 68 0>;
                dmas = <&pdma0 7
                pinctrl-0 = <&spi2_bus>;
        };
  
 -      dwmmc_0: dwmmc0@12200000 {
 +      mmc_0: mmc@12200000 {
 +              compatible = "samsung,exynos5250-dw-mshc";
 +              interrupts = <0 75 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                reg = <0x12200000 0x1000>;
                clocks = <&clock 280>, <&clock 139>;
                clock-names = "biu", "ciu";
 +              fifo-depth = <0x80>;
 +              status = "disabled";
        };
  
 -      dwmmc_1: dwmmc1@12210000 {
 +      mmc_1: mmc@12210000 {
 +              compatible = "samsung,exynos5250-dw-mshc";
 +              interrupts = <0 76 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                reg = <0x12210000 0x1000>;
                clocks = <&clock 281>, <&clock 140>;
                clock-names = "biu", "ciu";
 +              fifo-depth = <0x80>;
 +              status = "disabled";
        };
  
 -      dwmmc_2: dwmmc2@12220000 {
 +      mmc_2: mmc@12220000 {
 +              compatible = "samsung,exynos5250-dw-mshc";
 +              interrupts = <0 77 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                reg = <0x12220000 0x1000>;
                clocks = <&clock 282>, <&clock 141>;
                clock-names = "biu", "ciu";
 +              fifo-depth = <0x80>;
 +              status = "disabled";
        };
  
 -      dwmmc_3: dwmmc3@12230000 {
 +      mmc_3: mmc@12230000 {
                compatible = "samsung,exynos5250-dw-mshc";
                reg = <0x12230000 0x1000>;
                interrupts = <0 78 0>;
                #size-cells = <0>;
                clocks = <&clock 283>, <&clock 142>;
                clock-names = "biu", "ciu";
 +              fifo-depth = <0x80>;
 +              status = "disabled";
        };
  
        i2s0: i2s@03830000 {
                };
        };
  
 +      pwm: pwm@12dd0000 {
 +              compatible = "samsung,exynos4210-pwm";
 +              reg = <0x12dd0000 0x100>;
 +              samsung,pwm-outputs = <0>, <1>, <2>, <3>;
 +              #pwm-cells = <3>;
 +              clocks = <&clock 311>;
 +              clock-names = "timers";
 +      };
 +
        amba {
                #address-cells = <1>;
                #size-cells = <1>;
index 11dd202c54bb7c4a8d8c595a2251911ed1b8571b,25a1120d88a52f1df4eeacd1912948b061f6e498..8db792b26f79c1046523c584c4b2e9c910438d73
@@@ -22,9 -22,6 +22,9 @@@
        compatible = "samsung,exynos5420";
  
        aliases {
 +              mshc0 = &mmc_0;
 +              mshc1 = &mmc_1;
 +              mshc2 = &mmc_2;
                pinctrl0 = &pinctrl_0;
                pinctrl1 = &pinctrl_1;
                pinctrl2 = &pinctrl_2;
                i2c1 = &i2c_1;
                i2c2 = &i2c_2;
                i2c3 = &i2c_3;
 +              i2c4 = &hsi2c_4;
 +              i2c5 = &hsi2c_5;
 +              i2c6 = &hsi2c_6;
 +              i2c7 = &hsi2c_7;
 +              i2c8 = &hsi2c_8;
 +              i2c9 = &hsi2c_9;
 +              i2c10 = &hsi2c_10;
 +              gsc0 = &gsc_0;
 +              gsc1 = &gsc_1;
 +              spi0 = &spi_0;
 +              spi1 = &spi_1;
 +              spi2 = &spi_2;
        };
  
        cpus {
                        reg = <0x3>;
                        clock-frequency = <1800000000>;
                };
 +
 +              cpu4: cpu@100 {
 +                      device_type = "cpu";
 +                      compatible = "arm,cortex-a7";
 +                      reg = <0x100>;
 +                      clock-frequency = <1000000000>;
 +              };
 +
 +              cpu5: cpu@101 {
 +                      device_type = "cpu";
 +                      compatible = "arm,cortex-a7";
 +                      reg = <0x101>;
 +                      clock-frequency = <1000000000>;
 +              };
 +
 +              cpu6: cpu@102 {
 +                      device_type = "cpu";
 +                      compatible = "arm,cortex-a7";
 +                      reg = <0x102>;
 +                      clock-frequency = <1000000000>;
 +              };
 +
 +              cpu7: cpu@103 {
 +                      device_type = "cpu";
 +                      compatible = "arm,cortex-a7";
 +                      reg = <0x103>;
 +                      clock-frequency = <1000000000>;
 +              };
        };
  
        clock: clock-controller@10010000 {
                compatible = "samsung,exynos5420-audss-clock";
                reg = <0x03810000 0x0C>;
                #clock-cells = <1>;
-               clocks = <&clock 148>;
-               clock-names = "sclk_audio";
+               clocks = <&clock 1>, <&clock 5>, <&clock 148>, <&clock 149>;
+               clock-names = "pll_ref", "pll_in", "sclk_audio", "sclk_pcm_in";
        };
  
        codec@11000000 {
                clock-names = "mfc";
        };
  
 +      mmc_0: mmc@12200000 {
 +              compatible = "samsung,exynos5420-dw-mshc-smu";
 +              interrupts = <0 75 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              reg = <0x12200000 0x2000>;
 +              clocks = <&clock 351>, <&clock 132>;
 +              clock-names = "biu", "ciu";
 +              fifo-depth = <0x40>;
 +              status = "disabled";
 +      };
 +
 +      mmc_1: mmc@12210000 {
 +              compatible = "samsung,exynos5420-dw-mshc-smu";
 +              interrupts = <0 76 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              reg = <0x12210000 0x2000>;
 +              clocks = <&clock 352>, <&clock 133>;
 +              clock-names = "biu", "ciu";
 +              fifo-depth = <0x40>;
 +              status = "disabled";
 +      };
 +
 +      mmc_2: mmc@12220000 {
 +              compatible = "samsung,exynos5420-dw-mshc";
 +              interrupts = <0 77 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              reg = <0x12220000 0x1000>;
 +              clocks = <&clock 353>, <&clock 134>;
 +              clock-names = "biu", "ciu";
 +              fifo-depth = <0x40>;
 +              status = "disabled";
 +      };
 +
        mct@101C0000 {
                compatible = "samsung,exynos4210-mct";
                reg = <0x101C0000 0x800>;
                interrupt-controller;
                #interrups-cells = <1>;
                interrupt-parent = <&mct_map>;
 -              interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>;
 +              interrupts = <0>, <1>, <2>, <3>, <4>, <5>, <6>, <7>,
 +                              <8>, <9>, <10>, <11>;
                clocks = <&clock 1>, <&clock 315>;
                clock-names = "fin_pll", "mct";
  
                                        <4 &gic 0 120 0>,
                                        <5 &gic 0 121 0>,
                                        <6 &gic 0 122 0>,
 -                                      <7 &gic 0 123 0>;
 +                                      <7 &gic 0 123 0>,
 +                                      <8 &gic 0 128 0>,
 +                                      <9 &gic 0 129 0>,
 +                                      <10 &gic 0 130 0>,
 +                                      <11 &gic 0 131 0>;
                };
        };
  
                status = "okay";
        };
  
 +      amba {
 +              #address-cells = <1>;
 +              #size-cells = <1>;
 +              compatible = "arm,amba-bus";
 +              interrupt-parent = <&gic>;
 +              ranges;
 +
 +              pdma0: pdma@121A0000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x121A0000 0x1000>;
 +                      interrupts = <0 34 0>;
 +                      clocks = <&clock 362>;
 +                      clock-names = "apb_pclk";
 +                      #dma-cells = <1>;
 +                      #dma-channels = <8>;
 +                      #dma-requests = <32>;
 +              };
 +
 +              pdma1: pdma@121B0000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x121B0000 0x1000>;
 +                      interrupts = <0 35 0>;
 +                      clocks = <&clock 363>;
 +                      clock-names = "apb_pclk";
 +                      #dma-cells = <1>;
 +                      #dma-channels = <8>;
 +                      #dma-requests = <32>;
 +              };
 +
 +              mdma0: mdma@10800000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x10800000 0x1000>;
 +                      interrupts = <0 33 0>;
 +                      clocks = <&clock 473>;
 +                      clock-names = "apb_pclk";
 +                      #dma-cells = <1>;
 +                      #dma-channels = <8>;
 +                      #dma-requests = <1>;
 +              };
 +
 +              mdma1: mdma@11C10000 {
 +                      compatible = "arm,pl330", "arm,primecell";
 +                      reg = <0x11C10000 0x1000>;
 +                      interrupts = <0 124 0>;
 +                      clocks = <&clock 442>;
 +                      clock-names = "apb_pclk";
 +                      #dma-cells = <1>;
 +                      #dma-channels = <8>;
 +                      #dma-requests = <1>;
 +              };
 +      };
 +
 +      spi_0: spi@12d20000 {
 +              compatible = "samsung,exynos4210-spi";
 +              reg = <0x12d20000 0x100>;
 +              interrupts = <0 66 0>;
 +              dmas = <&pdma0 5
 +                      &pdma0 4>;
 +              dma-names = "tx", "rx";
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&spi0_bus>;
 +              clocks = <&clock 271>, <&clock 135>;
 +              clock-names = "spi", "spi_busclk0";
 +              status = "disabled";
 +      };
 +
 +      spi_1: spi@12d30000 {
 +              compatible = "samsung,exynos4210-spi";
 +              reg = <0x12d30000 0x100>;
 +              interrupts = <0 67 0>;
 +              dmas = <&pdma1 5
 +                      &pdma1 4>;
 +              dma-names = "tx", "rx";
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&spi1_bus>;
 +              clocks = <&clock 272>, <&clock 136>;
 +              clock-names = "spi", "spi_busclk0";
 +              status = "disabled";
 +      };
 +
 +      spi_2: spi@12d40000 {
 +              compatible = "samsung,exynos4210-spi";
 +              reg = <0x12d40000 0x100>;
 +              interrupts = <0 68 0>;
 +              dmas = <&pdma0 7
 +                      &pdma0 6>;
 +              dma-names = "tx", "rx";
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&spi2_bus>;
 +              clocks = <&clock 273>, <&clock 137>;
 +              clock-names = "spi", "spi_busclk0";
 +              status = "disabled";
 +      };
 +
        serial@12C00000 {
                clocks = <&clock 257>, <&clock 128>;
                clock-names = "uart", "clk_uart_baud0";
                clock-names = "uart", "clk_uart_baud0";
        };
  
 +      pwm: pwm@12dd0000 {
 +              compatible = "samsung,exynos4210-pwm";
 +              reg = <0x12dd0000 0x100>;
 +              samsung,pwm-outputs = <0>, <1>, <2>, <3>;
 +              #pwm-cells = <3>;
 +              clocks = <&clock 279>;
 +              clock-names = "timers";
 +      };
 +
        dp_phy: video-phy@10040728 {
                compatible = "samsung,exynos5250-dp-video-phy";
                reg = <0x10040728 4>;
                status = "disabled";
        };
  
 +      hsi2c_4: i2c@12CA0000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12CA0000 0x1000>;
 +              interrupts = <0 60 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c4_hs_bus>;
 +              clocks = <&clock 265>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
 +      hsi2c_5: i2c@12CB0000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12CB0000 0x1000>;
 +              interrupts = <0 61 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c5_hs_bus>;
 +              clocks = <&clock 266>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
 +      hsi2c_6: i2c@12CC0000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12CC0000 0x1000>;
 +              interrupts = <0 62 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c6_hs_bus>;
 +              clocks = <&clock 267>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
 +      hsi2c_7: i2c@12CD0000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12CD0000 0x1000>;
 +              interrupts = <0 63 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c7_hs_bus>;
 +              clocks = <&clock 268>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
 +      hsi2c_8: i2c@12E00000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12E00000 0x1000>;
 +              interrupts = <0 87 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c8_hs_bus>;
 +              clocks = <&clock 281>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
 +      hsi2c_9: i2c@12E10000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12E10000 0x1000>;
 +              interrupts = <0 88 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c9_hs_bus>;
 +              clocks = <&clock 282>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
 +      hsi2c_10: i2c@12E20000 {
 +              compatible = "samsung,exynos5-hsi2c";
 +              reg = <0x12E20000 0x1000>;
 +              interrupts = <0 203 0>;
 +              #address-cells = <1>;
 +              #size-cells = <0>;
 +              pinctrl-names = "default";
 +              pinctrl-0 = <&i2c10_hs_bus>;
 +              clocks = <&clock 283>;
 +              clock-names = "hsi2c";
 +              status = "disabled";
 +      };
 +
        hdmi@14530000 {
                compatible = "samsung,exynos4212-hdmi";
                reg = <0x14530000 0x70000>;
                clocks = <&clock 431>, <&clock 143>;
                clock-names = "mixer", "sclk_hdmi";
        };
 +
 +      gsc_0: video-scaler@13e00000 {
 +              compatible = "samsung,exynos5-gsc";
 +              reg = <0x13e00000 0x1000>;
 +              interrupts = <0 85 0>;
 +              clocks = <&clock 465>;
 +              clock-names = "gscl";
 +              samsung,power-domain = <&gsc_pd>;
 +      };
 +
 +      gsc_1: video-scaler@13e10000 {
 +              compatible = "samsung,exynos5-gsc";
 +              reg = <0x13e10000 0x1000>;
 +              interrupts = <0 86 0>;
 +              clocks = <&clock 466>;
 +              clock-names = "gscl";
 +              samsung,power-domain = <&gsc_pd>;
 +      };
 +
 +      tmu_cpu0: tmu@10060000 {
 +              compatible = "samsung,exynos5420-tmu";
 +              reg = <0x10060000 0x100>;
 +              interrupts = <0 65 0>;
 +              clocks = <&clock 318>;
 +              clock-names = "tmu_apbif";
 +      };
 +
 +      tmu_cpu1: tmu@10064000 {
 +              compatible = "samsung,exynos5420-tmu";
 +              reg = <0x10064000 0x100>;
 +              interrupts = <0 183 0>;
 +              clocks = <&clock 318>;
 +              clock-names = "tmu_apbif";
 +      };
 +
 +      tmu_cpu2: tmu@10068000 {
 +              compatible = "samsung,exynos5420-tmu-ext-triminfo";
 +              reg = <0x10068000 0x100>, <0x1006c000 0x4>;
 +              interrupts = <0 184 0>;
 +              clocks = <&clock 318>, <&clock 318>;
 +              clock-names = "tmu_apbif", "tmu_triminfo_apbif";
 +      };
 +
 +      tmu_cpu3: tmu@1006c000 {
 +              compatible = "samsung,exynos5420-tmu-ext-triminfo";
 +              reg = <0x1006c000 0x100>, <0x100a0000 0x4>;
 +              interrupts = <0 185 0>;
 +              clocks = <&clock 318>, <&clock 319>;
 +              clock-names = "tmu_apbif", "tmu_triminfo_apbif";
 +      };
 +
 +      tmu_gpu: tmu@100a0000 {
 +              compatible = "samsung,exynos5420-tmu-ext-triminfo";
 +              reg = <0x100a0000 0x100>, <0x10068000 0x4>;
 +              interrupts = <0 215 0>;
 +              clocks = <&clock 319>, <&clock 318>;
 +              clock-names = "tmu_apbif", "tmu_triminfo_apbif";
 +      };
  };
diff --combined drivers/clk/Makefile
index a3b7c5dd3c1672b0861cdd69fb18652cd937c876,972da894baa1c949f534016855b4dadda12ae76c..0c16e9cdfb87857c3fd528eebefa72f4af28f629
@@@ -14,13 -14,14 +14,14 @@@ obj-$(CONFIG_ARCH_BCM2835) += clk-bcm28
  obj-$(CONFIG_ARCH_EFM32)      += clk-efm32gg.o
  obj-$(CONFIG_ARCH_NOMADIK)    += clk-nomadik.o
  obj-$(CONFIG_ARCH_HIGHBANK)   += clk-highbank.o
+ obj-$(CONFIG_ARCH_HI3xxx)     += hisilicon/
  obj-$(CONFIG_ARCH_NSPIRE)     += clk-nspire.o
  obj-$(CONFIG_ARCH_MXS)                += mxs/
  obj-$(CONFIG_ARCH_SOCFPGA)    += socfpga/
  obj-$(CONFIG_PLAT_SPEAR)      += spear/
  obj-$(CONFIG_ARCH_U300)               += clk-u300.o
  obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/
- obj-$(CONFIG_ARCH_SIRF)               += clk-prima2.o
+ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
  obj-$(CONFIG_PLAT_ORION)      += mvebu/
  ifeq ($(CONFIG_COMMON_CLK), y)
  obj-$(CONFIG_ARCH_MMP)                += mmp/
@@@ -30,12 -31,12 +31,13 @@@ obj-$(CONFIG_ARCH_ROCKCHIP)        += rockchip
  obj-$(CONFIG_ARCH_SUNXI)      += sunxi/
  obj-$(CONFIG_ARCH_U8500)      += ux500/
  obj-$(CONFIG_ARCH_VT8500)     += clk-vt8500.o
+ obj-$(CONFIG_ARCH_SIRF)               += sirf/
  obj-$(CONFIG_ARCH_ZYNQ)               += zynq/
  obj-$(CONFIG_ARCH_TEGRA)      += tegra/
  obj-$(CONFIG_PLAT_SAMSUNG)    += samsung/
  obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
  obj-$(CONFIG_COMMON_CLK_KEYSTONE)     += keystone/
 +obj-$(CONFIG_COMMON_CLK_AT91) += at91/
  obj-$(CONFIG_ARCH_SHMOBILE_MULTI)     += shmobile/
  
  obj-$(CONFIG_X86)             += x86/
@@@ -45,6 -46,7 +47,7 @@@ obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += 
  obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o
  obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o
  obj-$(CONFIG_COMMON_CLK_SI5351) += clk-si5351.o
+ obj-$(CONFIG_COMMON_CLK_SI570) += clk-si570.o
  obj-$(CONFIG_COMMON_CLK_S2MPS11) += clk-s2mps11.o
  obj-$(CONFIG_CLK_TWL6040)     += clk-twl6040.o
  obj-$(CONFIG_CLK_PPC_CORENET) += clk-ppc-corenet.o
index 3852e44db0f83e75c6d87676118ba82e2071a777,2f7e440aebf88c56c630eec41e73ef227f832291..010f071af88321b288c0d9d0d5f17e5ed352fc01
@@@ -10,6 -10,7 +10,7 @@@
   * Common Clock Framework support for all Exynos4 SoCs.
  */
  
+ #include <dt-bindings/clock/exynos4.h>
  #include <linux/clk.h>
  #include <linux/clkdev.h>
  #include <linux/clk-provider.h>
@@@ -129,68 -130,6 +130,6 @@@ enum exynos4_plls 
        nr_plls                 /* number of PLLs */
  };
  
- /*
-  * Let each supported clock get a unique id. This id is used to lookup the clock
-  * for device tree based platforms. The clocks are categorized into three
-  * sections: core, sclk gate and bus interface gate clocks.
-  *
-  * When adding a new clock to this list, it is advised to choose a clock
-  * category and add it to the end of that category. That is because the the
-  * device tree source file is referring to these ids and any change in the
-  * sequence number of existing clocks will require corresponding change in the
-  * device tree files. This limitation would go away when pre-processor support
-  * for dtc would be available.
-  */
- enum exynos4_clks {
-       none,
-       /* core clocks */
-       xxti, xusbxti, fin_pll, fout_apll, fout_mpll, fout_epll, fout_vpll,
-       sclk_apll, sclk_mpll, sclk_epll, sclk_vpll, arm_clk, aclk200, aclk100,
-       aclk160, aclk133, mout_mpll_user_t, mout_mpll_user_c, mout_core,
-       mout_apll, /* 20 */
-       /* gate for special clocks (sclk) */
-       sclk_fimc0 = 128, sclk_fimc1, sclk_fimc2, sclk_fimc3, sclk_cam0,
-       sclk_cam1, sclk_csis0, sclk_csis1, sclk_hdmi, sclk_mixer, sclk_dac,
-       sclk_pixel, sclk_fimd0, sclk_mdnie0, sclk_mdnie_pwm0, sclk_mipi0,
-       sclk_audio0, sclk_mmc0, sclk_mmc1, sclk_mmc2, sclk_mmc3, sclk_mmc4,
-       sclk_sata, sclk_uart0, sclk_uart1, sclk_uart2, sclk_uart3, sclk_uart4,
-       sclk_audio1, sclk_audio2, sclk_spdif, sclk_spi0, sclk_spi1, sclk_spi2,
-       sclk_slimbus, sclk_fimd1, sclk_mipi1, sclk_pcm1, sclk_pcm2, sclk_i2s1,
-       sclk_i2s2, sclk_mipihsi, sclk_mfc, sclk_pcm0, sclk_g3d, sclk_pwm_isp,
-       sclk_spi0_isp, sclk_spi1_isp, sclk_uart_isp, sclk_fimg2d,
-       /* gate clocks */
-       fimc0 = 256, fimc1, fimc2, fimc3, csis0, csis1, jpeg, smmu_fimc0,
-       smmu_fimc1, smmu_fimc2, smmu_fimc3, smmu_jpeg, vp, mixer, tvenc, hdmi,
-       smmu_tv, mfc, smmu_mfcl, smmu_mfcr, g3d, g2d, rotator, mdma, smmu_g2d,
-       smmu_rotator, smmu_mdma, fimd0, mie0, mdnie0, dsim0, smmu_fimd0, fimd1,
-       mie1, dsim1, smmu_fimd1, pdma0, pdma1, pcie_phy, sata_phy, tsi, sdmmc0,
-       sdmmc1, sdmmc2, sdmmc3, sdmmc4, sata, sromc, usb_host, usb_device, pcie,
-       onenand, nfcon, smmu_pcie, gps, smmu_gps, uart0, uart1, uart2, uart3,
-       uart4, i2c0, i2c1, i2c2, i2c3, i2c4, i2c5, i2c6, i2c7, i2c_hdmi, tsadc,
-       spi0, spi1, spi2, i2s1, i2s2, pcm0, i2s0, pcm1, pcm2, pwm, slimbus,
-       spdif, ac97, modemif, chipid, sysreg, hdmi_cec, mct, wdt, rtc, keyif,
-       audss, mipi_hsi, mdma2, pixelasyncm0, pixelasyncm1, fimc_lite0,
-       fimc_lite1, ppmuispx, ppmuispmx, fimc_isp, fimc_drc, fimc_fd, mcuisp,
-       gicisp, smmu_isp, smmu_drc, smmu_fd, smmu_lite0, smmu_lite1, mcuctl_isp,
-       mpwm_isp, i2c0_isp, i2c1_isp, mtcadc_isp, pwm_isp, wdt_isp, uart_isp,
-       asyncaxim, smmu_ispcx, spi0_isp, spi1_isp, pwm_isp_sclk, spi0_isp_sclk,
-       spi1_isp_sclk, uart_isp_sclk, tmu_apbif,
-       /* mux clocks */
-       mout_fimc0 = 384, mout_fimc1, mout_fimc2, mout_fimc3, mout_cam0,
-       mout_cam1, mout_csis0, mout_csis1, mout_g3d0, mout_g3d1, mout_g3d,
-       aclk400_mcuisp,
-       /* div clocks */
-       div_isp0 = 450, div_isp1, div_mcuisp0, div_mcuisp1, div_aclk200,
-       div_aclk400_mcuisp,
-       nr_clks,
- };
  /*
   * list of controller registers to be saved and restored during a
   * suspend/resume cycle.
@@@ -347,256 -286,255 +286,256 @@@ PNAME(mout_user_aclk266_gps_p4x12) = {"
  
  /* fixed rate clocks generated outside the soc */
  static struct samsung_fixed_rate_clock exynos4_fixed_rate_ext_clks[] __initdata = {
-       FRATE(xxti, "xxti", NULL, CLK_IS_ROOT, 0),
-       FRATE(xusbxti, "xusbxti", NULL, CLK_IS_ROOT, 0),
+       FRATE(CLK_XXTI, "xxti", NULL, CLK_IS_ROOT, 0),
+       FRATE(CLK_XUSBXTI, "xusbxti", NULL, CLK_IS_ROOT, 0),
  };
  
  /* fixed rate clocks generated inside the soc */
  static struct samsung_fixed_rate_clock exynos4_fixed_rate_clks[] __initdata = {
-       FRATE(none, "sclk_hdmi24m", NULL, CLK_IS_ROOT, 24000000),
-       FRATE(none, "sclk_hdmiphy", NULL, CLK_IS_ROOT, 27000000),
-       FRATE(none, "sclk_usbphy0", NULL, CLK_IS_ROOT, 48000000),
+       FRATE(0, "sclk_hdmi24m", NULL, CLK_IS_ROOT, 24000000),
+       FRATE(0, "sclk_hdmiphy", NULL, CLK_IS_ROOT, 27000000),
+       FRATE(0, "sclk_usbphy0", NULL, CLK_IS_ROOT, 48000000),
  };
  
  static struct samsung_fixed_rate_clock exynos4210_fixed_rate_clks[] __initdata = {
-       FRATE(none, "sclk_usbphy1", NULL, CLK_IS_ROOT, 48000000),
+       FRATE(0, "sclk_usbphy1", NULL, CLK_IS_ROOT, 48000000),
  };
  
  /* list of mux clocks supported in all exynos4 soc's */
  static struct samsung_mux_clock exynos4_mux_clks[] __initdata = {
-       MUX_FA(mout_apll, "mout_apll", mout_apll_p, SRC_CPU, 0, 1,
+       MUX_FA(CLK_MOUT_APLL, "mout_apll", mout_apll_p, SRC_CPU, 0, 1,
                        CLK_SET_RATE_PARENT, 0, "mout_apll"),
-       MUX(none, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
-       MUX(none, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1),
-       MUX(none, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1),
-       MUX_F(mout_g3d1, "mout_g3d1", sclk_evpll_p, SRC_G3D, 4, 1,
+       MUX(0, "mout_hdmi", mout_hdmi_p, SRC_TV, 0, 1),
+       MUX(0, "mout_mfc1", sclk_evpll_p, SRC_MFC, 4, 1),
+       MUX(0, "mout_mfc", mout_mfc_p, SRC_MFC, 8, 1),
+       MUX_F(CLK_MOUT_G3D1, "mout_g3d1", sclk_evpll_p, SRC_G3D, 4, 1,
                        CLK_SET_RATE_PARENT, 0),
-       MUX_F(mout_g3d, "mout_g3d", mout_g3d_p, SRC_G3D, 8, 1,
+       MUX_F(CLK_MOUT_G3D, "mout_g3d", mout_g3d_p, SRC_G3D, 8, 1,
                        CLK_SET_RATE_PARENT, 0),
-       MUX(none, "mout_spdif", mout_spdif_p, SRC_PERIL1, 8, 2),
-       MUX(none, "mout_onenand1", mout_onenand1_p, SRC_TOP0, 0, 1),
-       MUX(sclk_epll, "sclk_epll", mout_epll_p, SRC_TOP0, 4, 1),
-       MUX(none, "mout_onenand", mout_onenand_p, SRC_TOP0, 28, 1),
+       MUX(0, "mout_spdif", mout_spdif_p, SRC_PERIL1, 8, 2),
+       MUX(0, "mout_onenand1", mout_onenand1_p, SRC_TOP0, 0, 1),
+       MUX(CLK_SCLK_EPLL, "sclk_epll", mout_epll_p, SRC_TOP0, 4, 1),
+       MUX(0, "mout_onenand", mout_onenand_p, SRC_TOP0, 28, 1),
  };
  
  /* list of mux clocks supported in exynos4210 soc */
  static struct samsung_mux_clock exynos4210_mux_early[] __initdata = {
-       MUX(none, "mout_vpllsrc", mout_vpllsrc_p, SRC_TOP1, 0, 1),
+       MUX(0, "mout_vpllsrc", mout_vpllsrc_p, SRC_TOP1, 0, 1),
  };
  
  static struct samsung_mux_clock exynos4210_mux_clks[] __initdata = {
-       MUX(none, "mout_aclk200", sclk_ampll_p4210, SRC_TOP0, 12, 1),
-       MUX(none, "mout_aclk100", sclk_ampll_p4210, SRC_TOP0, 16, 1),
-       MUX(none, "mout_aclk160", sclk_ampll_p4210, SRC_TOP0, 20, 1),
-       MUX(none, "mout_aclk133", sclk_ampll_p4210, SRC_TOP0, 24, 1),
-       MUX(none, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1),
-       MUX(none, "mout_dac", mout_dac_p4210, SRC_TV, 8, 1),
-       MUX(none, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1),
-       MUX(none, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1),
-       MUX(none, "mout_g2d", mout_g2d_p, E4210_SRC_IMAGE, 8, 1),
-       MUX(none, "mout_fimd1", group1_p4210, E4210_SRC_LCD1, 0, 4),
-       MUX(none, "mout_mipi1", group1_p4210, E4210_SRC_LCD1, 12, 4),
-       MUX(sclk_mpll, "sclk_mpll", mout_mpll_p, SRC_CPU, 8, 1),
-       MUX(mout_core, "mout_core", mout_core_p4210, SRC_CPU, 16, 1),
-       MUX(sclk_vpll, "sclk_vpll", sclk_vpll_p4210, SRC_TOP0, 8, 1),
-       MUX(mout_fimc0, "mout_fimc0", group1_p4210, SRC_CAM, 0, 4),
-       MUX(mout_fimc1, "mout_fimc1", group1_p4210, SRC_CAM, 4, 4),
-       MUX(mout_fimc2, "mout_fimc2", group1_p4210, SRC_CAM, 8, 4),
-       MUX(mout_fimc3, "mout_fimc3", group1_p4210, SRC_CAM, 12, 4),
-       MUX(mout_cam0, "mout_cam0", group1_p4210, SRC_CAM, 16, 4),
-       MUX(mout_cam1, "mout_cam1", group1_p4210, SRC_CAM, 20, 4),
-       MUX(mout_csis0, "mout_csis0", group1_p4210, SRC_CAM, 24, 4),
-       MUX(mout_csis1, "mout_csis1", group1_p4210, SRC_CAM, 28, 4),
-       MUX(none, "mout_mfc0", sclk_ampll_p4210, SRC_MFC, 0, 1),
-       MUX_F(mout_g3d0, "mout_g3d0", sclk_ampll_p4210, SRC_G3D, 0, 1,
+       MUX(0, "mout_aclk200", sclk_ampll_p4210, SRC_TOP0, 12, 1),
+       MUX(0, "mout_aclk100", sclk_ampll_p4210, SRC_TOP0, 16, 1),
+       MUX(0, "mout_aclk160", sclk_ampll_p4210, SRC_TOP0, 20, 1),
+       MUX(0, "mout_aclk133", sclk_ampll_p4210, SRC_TOP0, 24, 1),
+       MUX(0, "mout_mixer", mout_mixer_p4210, SRC_TV, 4, 1),
+       MUX(0, "mout_dac", mout_dac_p4210, SRC_TV, 8, 1),
+       MUX(0, "mout_g2d0", sclk_ampll_p4210, E4210_SRC_IMAGE, 0, 1),
+       MUX(0, "mout_g2d1", sclk_evpll_p, E4210_SRC_IMAGE, 4, 1),
+       MUX(0, "mout_g2d", mout_g2d_p, E4210_SRC_IMAGE, 8, 1),
+       MUX(0, "mout_fimd1", group1_p4210, E4210_SRC_LCD1, 0, 4),
+       MUX(0, "mout_mipi1", group1_p4210, E4210_SRC_LCD1, 12, 4),
+       MUX(CLK_SCLK_MPLL, "sclk_mpll", mout_mpll_p, SRC_CPU, 8, 1),
+       MUX(CLK_MOUT_CORE, "mout_core", mout_core_p4210, SRC_CPU, 16, 1),
+       MUX(CLK_SCLK_VPLL, "sclk_vpll", sclk_vpll_p4210, SRC_TOP0, 8, 1),
+       MUX(CLK_MOUT_FIMC0, "mout_fimc0", group1_p4210, SRC_CAM, 0, 4),
+       MUX(CLK_MOUT_FIMC1, "mout_fimc1", group1_p4210, SRC_CAM, 4, 4),
+       MUX(CLK_MOUT_FIMC2, "mout_fimc2", group1_p4210, SRC_CAM, 8, 4),
+       MUX(CLK_MOUT_FIMC3, "mout_fimc3", group1_p4210, SRC_CAM, 12, 4),
+       MUX(CLK_MOUT_CAM0, "mout_cam0", group1_p4210, SRC_CAM, 16, 4),
+       MUX(CLK_MOUT_CAM1, "mout_cam1", group1_p4210, SRC_CAM, 20, 4),
+       MUX(CLK_MOUT_CSIS0, "mout_csis0", group1_p4210, SRC_CAM, 24, 4),
+       MUX(CLK_MOUT_CSIS1, "mout_csis1", group1_p4210, SRC_CAM, 28, 4),
+       MUX(0, "mout_mfc0", sclk_ampll_p4210, SRC_MFC, 0, 1),
+       MUX_F(CLK_MOUT_G3D0, "mout_g3d0", sclk_ampll_p4210, SRC_G3D, 0, 1,
                        CLK_SET_RATE_PARENT, 0),
-       MUX(none, "mout_fimd0", group1_p4210, SRC_LCD0, 0, 4),
-       MUX(none, "mout_mipi0", group1_p4210, SRC_LCD0, 12, 4),
-       MUX(none, "mout_audio0", mout_audio0_p4210, SRC_MAUDIO, 0, 4),
-       MUX(none, "mout_mmc0", group1_p4210, SRC_FSYS, 0, 4),
-       MUX(none, "mout_mmc1", group1_p4210, SRC_FSYS, 4, 4),
-       MUX(none, "mout_mmc2", group1_p4210, SRC_FSYS, 8, 4),
-       MUX(none, "mout_mmc3", group1_p4210, SRC_FSYS, 12, 4),
-       MUX(none, "mout_mmc4", group1_p4210, SRC_FSYS, 16, 4),
-       MUX(none, "mout_sata", sclk_ampll_p4210, SRC_FSYS, 24, 1),
-       MUX(none, "mout_uart0", group1_p4210, SRC_PERIL0, 0, 4),
-       MUX(none, "mout_uart1", group1_p4210, SRC_PERIL0, 4, 4),
-       MUX(none, "mout_uart2", group1_p4210, SRC_PERIL0, 8, 4),
-       MUX(none, "mout_uart3", group1_p4210, SRC_PERIL0, 12, 4),
-       MUX(none, "mout_uart4", group1_p4210, SRC_PERIL0, 16, 4),
-       MUX(none, "mout_audio1", mout_audio1_p4210, SRC_PERIL1, 0, 4),
-       MUX(none, "mout_audio2", mout_audio2_p4210, SRC_PERIL1, 4, 4),
-       MUX(none, "mout_spi0", group1_p4210, SRC_PERIL1, 16, 4),
-       MUX(none, "mout_spi1", group1_p4210, SRC_PERIL1, 20, 4),
-       MUX(none, "mout_spi2", group1_p4210, SRC_PERIL1, 24, 4),
+       MUX(0, "mout_fimd0", group1_p4210, SRC_LCD0, 0, 4),
+       MUX(0, "mout_mipi0", group1_p4210, SRC_LCD0, 12, 4),
+       MUX(0, "mout_audio0", mout_audio0_p4210, SRC_MAUDIO, 0, 4),
+       MUX(0, "mout_mmc0", group1_p4210, SRC_FSYS, 0, 4),
+       MUX(0, "mout_mmc1", group1_p4210, SRC_FSYS, 4, 4),
+       MUX(0, "mout_mmc2", group1_p4210, SRC_FSYS, 8, 4),
+       MUX(0, "mout_mmc3", group1_p4210, SRC_FSYS, 12, 4),
+       MUX(0, "mout_mmc4", group1_p4210, SRC_FSYS, 16, 4),
+       MUX(0, "mout_sata", sclk_ampll_p4210, SRC_FSYS, 24, 1),
+       MUX(0, "mout_uart0", group1_p4210, SRC_PERIL0, 0, 4),
+       MUX(0, "mout_uart1", group1_p4210, SRC_PERIL0, 4, 4),
+       MUX(0, "mout_uart2", group1_p4210, SRC_PERIL0, 8, 4),
+       MUX(0, "mout_uart3", group1_p4210, SRC_PERIL0, 12, 4),
+       MUX(0, "mout_uart4", group1_p4210, SRC_PERIL0, 16, 4),
+       MUX(0, "mout_audio1", mout_audio1_p4210, SRC_PERIL1, 0, 4),
+       MUX(0, "mout_audio2", mout_audio2_p4210, SRC_PERIL1, 4, 4),
+       MUX(0, "mout_spi0", group1_p4210, SRC_PERIL1, 16, 4),
+       MUX(0, "mout_spi1", group1_p4210, SRC_PERIL1, 20, 4),
+       MUX(0, "mout_spi2", group1_p4210, SRC_PERIL1, 24, 4),
  };
  
  /* list of mux clocks supported in exynos4x12 soc */
  static struct samsung_mux_clock exynos4x12_mux_clks[] __initdata = {
-       MUX(mout_mpll_user_c, "mout_mpll_user_c", mout_mpll_user_p4x12,
+       MUX(CLK_MOUT_MPLL_USER_C, "mout_mpll_user_c", mout_mpll_user_p4x12,
                        SRC_CPU, 24, 1),
-       MUX(none, "mout_aclk266_gps", aclk_p4412, SRC_TOP1, 4, 1),
-       MUX(none, "mout_aclk400_mcuisp", aclk_p4412, SRC_TOP1, 8, 1),
-       MUX(mout_mpll_user_t, "mout_mpll_user_t", mout_mpll_user_p4x12,
+       MUX(0, "mout_aclk266_gps", aclk_p4412, SRC_TOP1, 4, 1),
+       MUX(0, "mout_aclk400_mcuisp", aclk_p4412, SRC_TOP1, 8, 1),
+       MUX(CLK_MOUT_MPLL_USER_T, "mout_mpll_user_t", mout_mpll_user_p4x12,
                        SRC_TOP1, 12, 1),
-       MUX(none, "mout_user_aclk266_gps", mout_user_aclk266_gps_p4x12,
+       MUX(0, "mout_user_aclk266_gps", mout_user_aclk266_gps_p4x12,
                        SRC_TOP1, 16, 1),
-       MUX(aclk200, "aclk200", mout_user_aclk200_p4x12, SRC_TOP1, 20, 1),
-       MUX(aclk400_mcuisp, "aclk400_mcuisp", mout_user_aclk400_mcuisp_p4x12,
-                       SRC_TOP1, 24, 1),
-       MUX(none, "mout_aclk200", aclk_p4412, SRC_TOP0, 12, 1),
-       MUX(none, "mout_aclk100", aclk_p4412, SRC_TOP0, 16, 1),
-       MUX(none, "mout_aclk160", aclk_p4412, SRC_TOP0, 20, 1),
-       MUX(none, "mout_aclk133", aclk_p4412, SRC_TOP0, 24, 1),
-       MUX(none, "mout_mdnie0", group1_p4x12, SRC_LCD0, 4, 4),
-       MUX(none, "mout_mdnie_pwm0", group1_p4x12, SRC_LCD0, 8, 4),
-       MUX(none, "mout_sata", sclk_ampll_p4x12, SRC_FSYS, 24, 1),
-       MUX(none, "mout_jpeg0", sclk_ampll_p4x12, E4X12_SRC_CAM1, 0, 1),
-       MUX(none, "mout_jpeg1", sclk_evpll_p, E4X12_SRC_CAM1, 4, 1),
-       MUX(none, "mout_jpeg", mout_jpeg_p, E4X12_SRC_CAM1, 8, 1),
-       MUX(sclk_mpll, "sclk_mpll", mout_mpll_p, SRC_DMC, 12, 1),
-       MUX(sclk_vpll, "sclk_vpll", mout_vpll_p, SRC_TOP0, 8, 1),
-       MUX(mout_core, "mout_core", mout_core_p4x12, SRC_CPU, 16, 1),
-       MUX(mout_fimc0, "mout_fimc0", group1_p4x12, SRC_CAM, 0, 4),
-       MUX(mout_fimc1, "mout_fimc1", group1_p4x12, SRC_CAM, 4, 4),
-       MUX(mout_fimc2, "mout_fimc2", group1_p4x12, SRC_CAM, 8, 4),
-       MUX(mout_fimc3, "mout_fimc3", group1_p4x12, SRC_CAM, 12, 4),
-       MUX(mout_cam0, "mout_cam0", group1_p4x12, SRC_CAM, 16, 4),
-       MUX(mout_cam1, "mout_cam1", group1_p4x12, SRC_CAM, 20, 4),
-       MUX(mout_csis0, "mout_csis0", group1_p4x12, SRC_CAM, 24, 4),
-       MUX(mout_csis1, "mout_csis1", group1_p4x12, SRC_CAM, 28, 4),
-       MUX(none, "mout_mfc0", sclk_ampll_p4x12, SRC_MFC, 0, 1),
-       MUX_F(mout_g3d0, "mout_g3d0", sclk_ampll_p4x12, SRC_G3D, 0, 1,
+       MUX(CLK_ACLK200, "aclk200", mout_user_aclk200_p4x12, SRC_TOP1, 20, 1),
+       MUX(CLK_ACLK400_MCUISP, "aclk400_mcuisp",
+               mout_user_aclk400_mcuisp_p4x12, SRC_TOP1, 24, 1),
+       MUX(0, "mout_aclk200", aclk_p4412, SRC_TOP0, 12, 1),
+       MUX(0, "mout_aclk100", aclk_p4412, SRC_TOP0, 16, 1),
+       MUX(0, "mout_aclk160", aclk_p4412, SRC_TOP0, 20, 1),
+       MUX(0, "mout_aclk133", aclk_p4412, SRC_TOP0, 24, 1),
+       MUX(0, "mout_mdnie0", group1_p4x12, SRC_LCD0, 4, 4),
+       MUX(0, "mout_mdnie_pwm0", group1_p4x12, SRC_LCD0, 8, 4),
+       MUX(0, "mout_sata", sclk_ampll_p4x12, SRC_FSYS, 24, 1),
+       MUX(0, "mout_jpeg0", sclk_ampll_p4x12, E4X12_SRC_CAM1, 0, 1),
+       MUX(0, "mout_jpeg1", sclk_evpll_p, E4X12_SRC_CAM1, 4, 1),
+       MUX(0, "mout_jpeg", mout_jpeg_p, E4X12_SRC_CAM1, 8, 1),
+       MUX(CLK_SCLK_MPLL, "sclk_mpll", mout_mpll_p, SRC_DMC, 12, 1),
+       MUX(CLK_SCLK_VPLL, "sclk_vpll", mout_vpll_p, SRC_TOP0, 8, 1),
+       MUX(CLK_MOUT_CORE, "mout_core", mout_core_p4x12, SRC_CPU, 16, 1),
+       MUX(CLK_MOUT_FIMC0, "mout_fimc0", group1_p4x12, SRC_CAM, 0, 4),
+       MUX(CLK_MOUT_FIMC1, "mout_fimc1", group1_p4x12, SRC_CAM, 4, 4),
+       MUX(CLK_MOUT_FIMC2, "mout_fimc2", group1_p4x12, SRC_CAM, 8, 4),
+       MUX(CLK_MOUT_FIMC3, "mout_fimc3", group1_p4x12, SRC_CAM, 12, 4),
+       MUX(CLK_MOUT_CAM0, "mout_cam0", group1_p4x12, SRC_CAM, 16, 4),
+       MUX(CLK_MOUT_CAM1, "mout_cam1", group1_p4x12, SRC_CAM, 20, 4),
+       MUX(CLK_MOUT_CSIS0, "mout_csis0", group1_p4x12, SRC_CAM, 24, 4),
+       MUX(CLK_MOUT_CSIS1, "mout_csis1", group1_p4x12, SRC_CAM, 28, 4),
+       MUX(0, "mout_mfc0", sclk_ampll_p4x12, SRC_MFC, 0, 1),
+       MUX_F(CLK_MOUT_G3D0, "mout_g3d0", sclk_ampll_p4x12, SRC_G3D, 0, 1,
                        CLK_SET_RATE_PARENT, 0),
-       MUX(none, "mout_fimd0", group1_p4x12, SRC_LCD0, 0, 4),
-       MUX(none, "mout_mipi0", group1_p4x12, SRC_LCD0, 12, 4),
-       MUX(none, "mout_audio0", mout_audio0_p4x12, SRC_MAUDIO, 0, 4),
-       MUX(none, "mout_mmc0", group1_p4x12, SRC_FSYS, 0, 4),
-       MUX(none, "mout_mmc1", group1_p4x12, SRC_FSYS, 4, 4),
-       MUX(none, "mout_mmc2", group1_p4x12, SRC_FSYS, 8, 4),
-       MUX(none, "mout_mmc3", group1_p4x12, SRC_FSYS, 12, 4),
-       MUX(none, "mout_mmc4", group1_p4x12, SRC_FSYS, 16, 4),
-       MUX(none, "mout_mipihsi", aclk_p4412, SRC_FSYS, 24, 1),
-       MUX(none, "mout_uart0", group1_p4x12, SRC_PERIL0, 0, 4),
-       MUX(none, "mout_uart1", group1_p4x12, SRC_PERIL0, 4, 4),
-       MUX(none, "mout_uart2", group1_p4x12, SRC_PERIL0, 8, 4),
-       MUX(none, "mout_uart3", group1_p4x12, SRC_PERIL0, 12, 4),
-       MUX(none, "mout_uart4", group1_p4x12, SRC_PERIL0, 16, 4),
-       MUX(none, "mout_audio1", mout_audio1_p4x12, SRC_PERIL1, 0, 4),
-       MUX(none, "mout_audio2", mout_audio2_p4x12, SRC_PERIL1, 4, 4),
-       MUX(none, "mout_spi0", group1_p4x12, SRC_PERIL1, 16, 4),
-       MUX(none, "mout_spi1", group1_p4x12, SRC_PERIL1, 20, 4),
-       MUX(none, "mout_spi2", group1_p4x12, SRC_PERIL1, 24, 4),
-       MUX(none, "mout_pwm_isp", group1_p4x12, E4X12_SRC_ISP, 0, 4),
-       MUX(none, "mout_spi0_isp", group1_p4x12, E4X12_SRC_ISP, 4, 4),
-       MUX(none, "mout_spi1_isp", group1_p4x12, E4X12_SRC_ISP, 8, 4),
-       MUX(none, "mout_uart_isp", group1_p4x12, E4X12_SRC_ISP, 12, 4),
-       MUX(none, "mout_g2d0", sclk_ampll_p4210, SRC_DMC, 20, 1),
-       MUX(none, "mout_g2d1", sclk_evpll_p, SRC_DMC, 24, 1),
-       MUX(none, "mout_g2d", mout_g2d_p, SRC_DMC, 28, 1),
+       MUX(0, "mout_fimd0", group1_p4x12, SRC_LCD0, 0, 4),
+       MUX(0, "mout_mipi0", group1_p4x12, SRC_LCD0, 12, 4),
+       MUX(0, "mout_audio0", mout_audio0_p4x12, SRC_MAUDIO, 0, 4),
+       MUX(0, "mout_mmc0", group1_p4x12, SRC_FSYS, 0, 4),
+       MUX(0, "mout_mmc1", group1_p4x12, SRC_FSYS, 4, 4),
+       MUX(0, "mout_mmc2", group1_p4x12, SRC_FSYS, 8, 4),
+       MUX(0, "mout_mmc3", group1_p4x12, SRC_FSYS, 12, 4),
+       MUX(0, "mout_mmc4", group1_p4x12, SRC_FSYS, 16, 4),
+       MUX(0, "mout_mipihsi", aclk_p4412, SRC_FSYS, 24, 1),
+       MUX(0, "mout_uart0", group1_p4x12, SRC_PERIL0, 0, 4),
+       MUX(0, "mout_uart1", group1_p4x12, SRC_PERIL0, 4, 4),
+       MUX(0, "mout_uart2", group1_p4x12, SRC_PERIL0, 8, 4),
+       MUX(0, "mout_uart3", group1_p4x12, SRC_PERIL0, 12, 4),
+       MUX(0, "mout_uart4", group1_p4x12, SRC_PERIL0, 16, 4),
+       MUX(0, "mout_audio1", mout_audio1_p4x12, SRC_PERIL1, 0, 4),
+       MUX(0, "mout_audio2", mout_audio2_p4x12, SRC_PERIL1, 4, 4),
+       MUX(0, "mout_spi0", group1_p4x12, SRC_PERIL1, 16, 4),
+       MUX(0, "mout_spi1", group1_p4x12, SRC_PERIL1, 20, 4),
+       MUX(0, "mout_spi2", group1_p4x12, SRC_PERIL1, 24, 4),
+       MUX(0, "mout_pwm_isp", group1_p4x12, E4X12_SRC_ISP, 0, 4),
+       MUX(0, "mout_spi0_isp", group1_p4x12, E4X12_SRC_ISP, 4, 4),
+       MUX(0, "mout_spi1_isp", group1_p4x12, E4X12_SRC_ISP, 8, 4),
+       MUX(0, "mout_uart_isp", group1_p4x12, E4X12_SRC_ISP, 12, 4),
+       MUX(0, "mout_g2d0", sclk_ampll_p4210, SRC_DMC, 20, 1),
+       MUX(0, "mout_g2d1", sclk_evpll_p, SRC_DMC, 24, 1),
+       MUX(0, "mout_g2d", mout_g2d_p, SRC_DMC, 28, 1),
  };
  
  /* list of divider clocks supported in all exynos4 soc's */
  static struct samsung_div_clock exynos4_div_clks[] __initdata = {
-       DIV(none, "div_core", "mout_core", DIV_CPU0, 0, 3),
-       DIV(none, "div_core2", "div_core", DIV_CPU0, 28, 3),
-       DIV(none, "div_fimc0", "mout_fimc0", DIV_CAM, 0, 4),
-       DIV(none, "div_fimc1", "mout_fimc1", DIV_CAM, 4, 4),
-       DIV(none, "div_fimc2", "mout_fimc2", DIV_CAM, 8, 4),
-       DIV(none, "div_fimc3", "mout_fimc3", DIV_CAM, 12, 4),
-       DIV(none, "div_cam0", "mout_cam0", DIV_CAM, 16, 4),
-       DIV(none, "div_cam1", "mout_cam1", DIV_CAM, 20, 4),
-       DIV(none, "div_csis0", "mout_csis0", DIV_CAM, 24, 4),
-       DIV(none, "div_csis1", "mout_csis1", DIV_CAM, 28, 4),
-       DIV(sclk_mfc, "sclk_mfc", "mout_mfc", DIV_MFC, 0, 4),
-       DIV_F(none, "div_g3d", "mout_g3d", DIV_G3D, 0, 4,
+       DIV(0, "div_core", "mout_core", DIV_CPU0, 0, 3),
+       DIV(0, "div_core2", "div_core", DIV_CPU0, 28, 3),
+       DIV(0, "div_fimc0", "mout_fimc0", DIV_CAM, 0, 4),
+       DIV(0, "div_fimc1", "mout_fimc1", DIV_CAM, 4, 4),
+       DIV(0, "div_fimc2", "mout_fimc2", DIV_CAM, 8, 4),
+       DIV(0, "div_fimc3", "mout_fimc3", DIV_CAM, 12, 4),
+       DIV(0, "div_cam0", "mout_cam0", DIV_CAM, 16, 4),
+       DIV(0, "div_cam1", "mout_cam1", DIV_CAM, 20, 4),
+       DIV(0, "div_csis0", "mout_csis0", DIV_CAM, 24, 4),
+       DIV(0, "div_csis1", "mout_csis1", DIV_CAM, 28, 4),
+       DIV(CLK_SCLK_MFC, "sclk_mfc", "mout_mfc", DIV_MFC, 0, 4),
+       DIV_F(0, "div_g3d", "mout_g3d", DIV_G3D, 0, 4,
                        CLK_SET_RATE_PARENT, 0),
-       DIV(none, "div_fimd0", "mout_fimd0", DIV_LCD0, 0, 4),
-       DIV(none, "div_mipi0", "mout_mipi0", DIV_LCD0, 16, 4),
-       DIV(none, "div_audio0", "mout_audio0", DIV_MAUDIO, 0, 4),
-       DIV(sclk_pcm0, "sclk_pcm0", "sclk_audio0", DIV_MAUDIO, 4, 8),
-       DIV(none, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),
-       DIV(none, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),
-       DIV(none, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4),
-       DIV(none, "div_mmc3", "mout_mmc3", DIV_FSYS2, 16, 4),
-       DIV(sclk_pixel, "sclk_pixel", "sclk_vpll", DIV_TV, 0, 4),
-       DIV(aclk100, "aclk100", "mout_aclk100", DIV_TOP, 4, 4),
-       DIV(aclk160, "aclk160", "mout_aclk160", DIV_TOP, 8, 3),
-       DIV(aclk133, "aclk133", "mout_aclk133", DIV_TOP, 12, 3),
-       DIV(none, "div_onenand", "mout_onenand1", DIV_TOP, 16, 3),
-       DIV(sclk_slimbus, "sclk_slimbus", "sclk_epll", DIV_PERIL3, 4, 4),
-       DIV(sclk_pcm1, "sclk_pcm1", "sclk_audio1", DIV_PERIL4, 4, 8),
-       DIV(sclk_pcm2, "sclk_pcm2", "sclk_audio2", DIV_PERIL4, 20, 8),
-       DIV(sclk_i2s1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
-       DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
-       DIV(none, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
-       DIV_F(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
+       DIV(0, "div_fimd0", "mout_fimd0", DIV_LCD0, 0, 4),
+       DIV(0, "div_mipi0", "mout_mipi0", DIV_LCD0, 16, 4),
+       DIV(0, "div_audio0", "mout_audio0", DIV_MAUDIO, 0, 4),
+       DIV(CLK_SCLK_PCM0, "sclk_pcm0", "sclk_audio0", DIV_MAUDIO, 4, 8),
+       DIV(0, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),
+       DIV(0, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),
+       DIV(0, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4),
+       DIV(0, "div_mmc3", "mout_mmc3", DIV_FSYS2, 16, 4),
+       DIV(CLK_SCLK_PIXEL, "sclk_pixel", "sclk_vpll", DIV_TV, 0, 4),
+       DIV(CLK_ACLK100, "aclk100", "mout_aclk100", DIV_TOP, 4, 4),
+       DIV(CLK_ACLK160, "aclk160", "mout_aclk160", DIV_TOP, 8, 3),
+       DIV(CLK_ACLK133, "aclk133", "mout_aclk133", DIV_TOP, 12, 3),
+       DIV(0, "div_onenand", "mout_onenand1", DIV_TOP, 16, 3),
+       DIV(CLK_SCLK_SLIMBUS, "sclk_slimbus", "sclk_epll", DIV_PERIL3, 4, 4),
+       DIV(CLK_SCLK_PCM1, "sclk_pcm1", "sclk_audio1", DIV_PERIL4, 4, 8),
+       DIV(CLK_SCLK_PCM2, "sclk_pcm2", "sclk_audio2", DIV_PERIL4, 20, 8),
+       DIV(CLK_SCLK_I2S1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
+       DIV(CLK_SCLK_I2S2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
+       DIV(0, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
 -      DIV(0, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8),
++      DIV_F(0, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
 +                      CLK_SET_RATE_PARENT, 0),
-       DIV(none, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
-       DIV(none, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
-       DIV(none, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),
-       DIV(none, "div_uart3", "mout_uart3", DIV_PERIL0, 12, 4),
-       DIV(none, "div_uart4", "mout_uart4", DIV_PERIL0, 16, 4),
-       DIV(none, "div_spi0", "mout_spi0", DIV_PERIL1, 0, 4),
-       DIV(none, "div_spi_pre0", "div_spi0", DIV_PERIL1, 8, 8),
-       DIV(none, "div_spi1", "mout_spi1", DIV_PERIL1, 16, 4),
-       DIV(none, "div_spi_pre1", "div_spi1", DIV_PERIL1, 24, 8),
-       DIV(none, "div_spi2", "mout_spi2", DIV_PERIL2, 0, 4),
-       DIV(none, "div_spi_pre2", "div_spi2", DIV_PERIL2, 8, 8),
-       DIV(none, "div_audio1", "mout_audio1", DIV_PERIL4, 0, 4),
-       DIV(none, "div_audio2", "mout_audio2", DIV_PERIL4, 16, 4),
-       DIV(arm_clk, "arm_clk", "div_core2", DIV_CPU0, 28, 3),
-       DIV(sclk_apll, "sclk_apll", "mout_apll", DIV_CPU0, 24, 3),
-       DIV_F(none, "div_mipi_pre0", "div_mipi0", DIV_LCD0, 20, 4,
+       DIV(0, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
+       DIV(0, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
+       DIV(0, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),
+       DIV(0, "div_uart3", "mout_uart3", DIV_PERIL0, 12, 4),
+       DIV(0, "div_uart4", "mout_uart4", DIV_PERIL0, 16, 4),
+       DIV(0, "div_spi0", "mout_spi0", DIV_PERIL1, 0, 4),
+       DIV(0, "div_spi_pre0", "div_spi0", DIV_PERIL1, 8, 8),
+       DIV(0, "div_spi1", "mout_spi1", DIV_PERIL1, 16, 4),
+       DIV(0, "div_spi_pre1", "div_spi1", DIV_PERIL1, 24, 8),
+       DIV(0, "div_spi2", "mout_spi2", DIV_PERIL2, 0, 4),
+       DIV(0, "div_spi_pre2", "div_spi2", DIV_PERIL2, 8, 8),
+       DIV(0, "div_audio1", "mout_audio1", DIV_PERIL4, 0, 4),
+       DIV(0, "div_audio2", "mout_audio2", DIV_PERIL4, 16, 4),
+       DIV(CLK_ARM_CLK, "arm_clk", "div_core2", DIV_CPU0, 28, 3),
+       DIV(CLK_SCLK_APLL, "sclk_apll", "mout_apll", DIV_CPU0, 24, 3),
+       DIV_F(0, "div_mipi_pre0", "div_mipi0", DIV_LCD0, 20, 4,
                        CLK_SET_RATE_PARENT, 0),
-       DIV_F(none, "div_mmc_pre0", "div_mmc0", DIV_FSYS1, 8, 8,
+       DIV_F(0, "div_mmc_pre0", "div_mmc0", DIV_FSYS1, 8, 8,
                        CLK_SET_RATE_PARENT, 0),
-       DIV_F(none, "div_mmc_pre1", "div_mmc1", DIV_FSYS1, 24, 8,
+       DIV_F(0, "div_mmc_pre1", "div_mmc1", DIV_FSYS1, 24, 8,
                        CLK_SET_RATE_PARENT, 0),
-       DIV_F(none, "div_mmc_pre2", "div_mmc2", DIV_FSYS2, 8, 8,
+       DIV_F(0, "div_mmc_pre2", "div_mmc2", DIV_FSYS2, 8, 8,
                        CLK_SET_RATE_PARENT, 0),
-       DIV_F(none, "div_mmc_pre3", "div_mmc3", DIV_FSYS2, 24, 8,
+       DIV_F(0, "div_mmc_pre3", "div_mmc3", DIV_FSYS2, 24, 8,
                        CLK_SET_RATE_PARENT, 0),
  };
  
  /* list of divider clocks supported in exynos4210 soc */
  static struct samsung_div_clock exynos4210_div_clks[] __initdata = {
-       DIV(aclk200, "aclk200", "mout_aclk200", DIV_TOP, 0, 3),
-       DIV(sclk_fimg2d, "sclk_fimg2d", "mout_g2d", DIV_IMAGE, 0, 4),
-       DIV(none, "div_fimd1", "mout_fimd1", E4210_DIV_LCD1, 0, 4),
-       DIV(none, "div_mipi1", "mout_mipi1", E4210_DIV_LCD1, 16, 4),
-       DIV(none, "div_sata", "mout_sata", DIV_FSYS0, 20, 4),
-       DIV_F(none, "div_mipi_pre1", "div_mipi1", E4210_DIV_LCD1, 20, 4,
+       DIV(CLK_ACLK200, "aclk200", "mout_aclk200", DIV_TOP, 0, 3),
+       DIV(CLK_SCLK_FIMG2D, "sclk_fimg2d", "mout_g2d", DIV_IMAGE, 0, 4),
+       DIV(0, "div_fimd1", "mout_fimd1", E4210_DIV_LCD1, 0, 4),
+       DIV(0, "div_mipi1", "mout_mipi1", E4210_DIV_LCD1, 16, 4),
+       DIV(0, "div_sata", "mout_sata", DIV_FSYS0, 20, 4),
+       DIV_F(0, "div_mipi_pre1", "div_mipi1", E4210_DIV_LCD1, 20, 4,
                        CLK_SET_RATE_PARENT, 0),
  };
  
  /* list of divider clocks supported in exynos4x12 soc */
  static struct samsung_div_clock exynos4x12_div_clks[] __initdata = {
-       DIV(none, "div_mdnie0", "mout_mdnie0", DIV_LCD0, 4, 4),
-       DIV(none, "div_mdnie_pwm0", "mout_mdnie_pwm0", DIV_LCD0, 8, 4),
-       DIV(none, "div_mdnie_pwm_pre0", "div_mdnie_pwm0", DIV_LCD0, 12, 4),
-       DIV(none, "div_mipihsi", "mout_mipihsi", DIV_FSYS0, 20, 4),
-       DIV(none, "div_jpeg", "mout_jpeg", E4X12_DIV_CAM1, 0, 4),
-       DIV(div_aclk200, "div_aclk200", "mout_aclk200", DIV_TOP, 0, 3),
-       DIV(none, "div_aclk266_gps", "mout_aclk266_gps", DIV_TOP, 20, 3),
-       DIV(div_aclk400_mcuisp, "div_aclk400_mcuisp", "mout_aclk400_mcuisp",
+       DIV(0, "div_mdnie0", "mout_mdnie0", DIV_LCD0, 4, 4),
+       DIV(0, "div_mdnie_pwm0", "mout_mdnie_pwm0", DIV_LCD0, 8, 4),
+       DIV(0, "div_mdnie_pwm_pre0", "div_mdnie_pwm0", DIV_LCD0, 12, 4),
+       DIV(0, "div_mipihsi", "mout_mipihsi", DIV_FSYS0, 20, 4),
+       DIV(0, "div_jpeg", "mout_jpeg", E4X12_DIV_CAM1, 0, 4),
+       DIV(CLK_DIV_ACLK200, "div_aclk200", "mout_aclk200", DIV_TOP, 0, 3),
+       DIV(0, "div_aclk266_gps", "mout_aclk266_gps", DIV_TOP, 20, 3),
+       DIV(CLK_DIV_ACLK400_MCUISP, "div_aclk400_mcuisp", "mout_aclk400_mcuisp",
                                                DIV_TOP, 24, 3),
-       DIV(none, "div_pwm_isp", "mout_pwm_isp", E4X12_DIV_ISP, 0, 4),
-       DIV(none, "div_spi0_isp", "mout_spi0_isp", E4X12_DIV_ISP, 4, 4),
-       DIV(none, "div_spi0_isp_pre", "div_spi0_isp", E4X12_DIV_ISP, 8, 8),
-       DIV(none, "div_spi1_isp", "mout_spi1_isp", E4X12_DIV_ISP, 16, 4),
-       DIV(none, "div_spi1_isp_pre", "div_spi1_isp", E4X12_DIV_ISP, 20, 8),
-       DIV(none, "div_uart_isp", "mout_uart_isp", E4X12_DIV_ISP, 28, 4),
-       DIV_F(div_isp0, "div_isp0", "aclk200", E4X12_DIV_ISP0, 0, 3,
+       DIV(0, "div_pwm_isp", "mout_pwm_isp", E4X12_DIV_ISP, 0, 4),
+       DIV(0, "div_spi0_isp", "mout_spi0_isp", E4X12_DIV_ISP, 4, 4),
+       DIV(0, "div_spi0_isp_pre", "div_spi0_isp", E4X12_DIV_ISP, 8, 8),
+       DIV(0, "div_spi1_isp", "mout_spi1_isp", E4X12_DIV_ISP, 16, 4),
+       DIV(0, "div_spi1_isp_pre", "div_spi1_isp", E4X12_DIV_ISP, 20, 8),
+       DIV(0, "div_uart_isp", "mout_uart_isp", E4X12_DIV_ISP, 28, 4),
+       DIV_F(CLK_DIV_ISP0, "div_isp0", "aclk200", E4X12_DIV_ISP0, 0, 3,
                                                CLK_GET_RATE_NOCACHE, 0),
-       DIV_F(div_isp1, "div_isp1", "aclk200", E4X12_DIV_ISP0, 4, 3,
+       DIV_F(CLK_DIV_ISP1, "div_isp1", "aclk200", E4X12_DIV_ISP0, 4, 3,
                                                CLK_GET_RATE_NOCACHE, 0),
-       DIV(none, "div_mpwm", "div_isp1", E4X12_DIV_ISP1, 0, 3),
-       DIV_F(div_mcuisp0, "div_mcuisp0", "aclk400_mcuisp", E4X12_DIV_ISP1,
+       DIV(0, "div_mpwm", "div_isp1", E4X12_DIV_ISP1, 0, 3),
+       DIV_F(CLK_DIV_MCUISP0, "div_mcuisp0", "aclk400_mcuisp", E4X12_DIV_ISP1,
                                                4, 3, CLK_GET_RATE_NOCACHE, 0),
-       DIV_F(div_mcuisp1, "div_mcuisp1", "div_mcuisp0", E4X12_DIV_ISP1,
+       DIV_F(CLK_DIV_MCUISP1, "div_mcuisp1", "div_mcuisp0", E4X12_DIV_ISP1,
                                                8, 3, CLK_GET_RATE_NOCACHE, 0),
-       DIV(sclk_fimg2d, "sclk_fimg2d", "mout_g2d", DIV_DMC1, 0, 4),
+       DIV(CLK_SCLK_FIMG2D, "sclk_fimg2d", "mout_g2d", DIV_DMC1, 0, 4),
  };
  
  /* list of gate clocks supported in all exynos4 soc's */
@@@ -606,333 -544,341 +545,341 @@@ static struct samsung_gate_clock exynos
         * the device name and clock alias names specified below for some
         * of the clocks can be removed.
         */
-       GATE(sclk_hdmi, "sclk_hdmi", "mout_hdmi", SRC_MASK_TV, 0, 0, 0),
-       GATE(sclk_spdif, "sclk_spdif", "mout_spdif", SRC_MASK_PERIL1, 8, 0, 0),
-       GATE(jpeg, "jpeg", "aclk160", GATE_IP_CAM, 6, 0, 0),
-       GATE(mie0, "mie0", "aclk160", GATE_IP_LCD0, 1, 0, 0),
-       GATE(dsim0, "dsim0", "aclk160", GATE_IP_LCD0, 3, 0, 0),
-       GATE(fimd1, "fimd1", "aclk160", E4210_GATE_IP_LCD1, 0, 0, 0),
-       GATE(mie1, "mie1", "aclk160", E4210_GATE_IP_LCD1, 1, 0, 0),
-       GATE(dsim1, "dsim1", "aclk160", E4210_GATE_IP_LCD1, 3, 0, 0),
-       GATE(smmu_fimd1, "smmu_fimd1", "aclk160", E4210_GATE_IP_LCD1, 4, 0, 0),
-       GATE(tsi, "tsi", "aclk133", GATE_IP_FSYS, 4, 0, 0),
-       GATE(sromc, "sromc", "aclk133", GATE_IP_FSYS, 11, 0, 0),
-       GATE(sclk_g3d, "sclk_g3d", "div_g3d", GATE_IP_G3D, 0,
+       GATE(CLK_SCLK_HDMI, "sclk_hdmi", "mout_hdmi", SRC_MASK_TV, 0, 0, 0),
+       GATE(CLK_SCLK_SPDIF, "sclk_spdif", "mout_spdif", SRC_MASK_PERIL1, 8, 0,
+               0),
+       GATE(CLK_JPEG, "jpeg", "aclk160", GATE_IP_CAM, 6, 0, 0),
+       GATE(CLK_MIE0, "mie0", "aclk160", GATE_IP_LCD0, 1, 0, 0),
+       GATE(CLK_DSIM0, "dsim0", "aclk160", GATE_IP_LCD0, 3, 0, 0),
+       GATE(CLK_FIMD1, "fimd1", "aclk160", E4210_GATE_IP_LCD1, 0, 0, 0),
+       GATE(CLK_MIE1, "mie1", "aclk160", E4210_GATE_IP_LCD1, 1, 0, 0),
+       GATE(CLK_DSIM1, "dsim1", "aclk160", E4210_GATE_IP_LCD1, 3, 0, 0),
+       GATE(CLK_SMMU_FIMD1, "smmu_fimd1", "aclk160", E4210_GATE_IP_LCD1, 4, 0,
+               0),
+       GATE(CLK_TSI, "tsi", "aclk133", GATE_IP_FSYS, 4, 0, 0),
+       GATE(CLK_SROMC, "sromc", "aclk133", GATE_IP_FSYS, 11, 0, 0),
+       GATE(CLK_SCLK_G3D, "sclk_g3d", "div_g3d", GATE_IP_G3D, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(usb_device, "usb_device", "aclk133", GATE_IP_FSYS, 13, 0, 0),
-       GATE(onenand, "onenand", "aclk133", GATE_IP_FSYS, 15, 0, 0),
-       GATE(nfcon, "nfcon", "aclk133", GATE_IP_FSYS, 16, 0, 0),
-       GATE(gps, "gps", "aclk133", GATE_IP_GPS, 0, 0, 0),
-       GATE(smmu_gps, "smmu_gps", "aclk133", GATE_IP_GPS, 1, 0, 0),
-       GATE(slimbus, "slimbus", "aclk100", GATE_IP_PERIL, 25, 0, 0),
-       GATE(sclk_cam0, "sclk_cam0", "div_cam0", GATE_SCLK_CAM, 4,
+       GATE(CLK_USB_DEVICE, "usb_device", "aclk133", GATE_IP_FSYS, 13, 0, 0),
+       GATE(CLK_ONENAND, "onenand", "aclk133", GATE_IP_FSYS, 15, 0, 0),
+       GATE(CLK_NFCON, "nfcon", "aclk133", GATE_IP_FSYS, 16, 0, 0),
+       GATE(CLK_GPS, "gps", "aclk133", GATE_IP_GPS, 0, 0, 0),
+       GATE(CLK_SMMU_GPS, "smmu_gps", "aclk133", GATE_IP_GPS, 1, 0, 0),
+       GATE(CLK_SLIMBUS, "slimbus", "aclk100", GATE_IP_PERIL, 25, 0, 0),
+       GATE(CLK_SCLK_CAM0, "sclk_cam0", "div_cam0", GATE_SCLK_CAM, 4,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_cam1, "sclk_cam1", "div_cam1", GATE_SCLK_CAM, 5,
+       GATE(CLK_SCLK_CAM1, "sclk_cam1", "div_cam1", GATE_SCLK_CAM, 5,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mipi0, "sclk_mipi0", "div_mipi_pre0",
+       GATE(CLK_SCLK_MIPI0, "sclk_mipi0", "div_mipi_pre0",
                        SRC_MASK_LCD0, 12, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_audio0, "sclk_audio0", "div_audio0", SRC_MASK_MAUDIO, 0,
+       GATE(CLK_SCLK_AUDIO0, "sclk_audio0", "div_audio0", SRC_MASK_MAUDIO, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_audio1, "sclk_audio1", "div_audio1", SRC_MASK_PERIL1, 0,
+       GATE(CLK_SCLK_AUDIO1, "sclk_audio1", "div_audio1", SRC_MASK_PERIL1, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(vp, "vp", "aclk160", GATE_IP_TV, 0, 0, 0),
-       GATE(mixer, "mixer", "aclk160", GATE_IP_TV, 1, 0, 0),
-       GATE(hdmi, "hdmi", "aclk160", GATE_IP_TV, 3, 0, 0),
-       GATE(pwm, "pwm", "aclk100", GATE_IP_PERIL, 24, 0, 0),
-       GATE(sdmmc4, "sdmmc4", "aclk133", GATE_IP_FSYS, 9, 0, 0),
-       GATE(usb_host, "usb_host", "aclk133", GATE_IP_FSYS, 12, 0, 0),
-       GATE(sclk_fimc0, "sclk_fimc0", "div_fimc0", SRC_MASK_CAM, 0,
+       GATE(CLK_VP, "vp", "aclk160", GATE_IP_TV, 0, 0, 0),
+       GATE(CLK_MIXER, "mixer", "aclk160", GATE_IP_TV, 1, 0, 0),
+       GATE(CLK_HDMI, "hdmi", "aclk160", GATE_IP_TV, 3, 0, 0),
+       GATE(CLK_PWM, "pwm", "aclk100", GATE_IP_PERIL, 24, 0, 0),
+       GATE(CLK_SDMMC4, "sdmmc4", "aclk133", GATE_IP_FSYS, 9, 0, 0),
+       GATE(CLK_USB_HOST, "usb_host", "aclk133", GATE_IP_FSYS, 12, 0, 0),
+       GATE(CLK_SCLK_FIMC0, "sclk_fimc0", "div_fimc0", SRC_MASK_CAM, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_fimc1, "sclk_fimc1", "div_fimc1", SRC_MASK_CAM, 4,
+       GATE(CLK_SCLK_FIMC1, "sclk_fimc1", "div_fimc1", SRC_MASK_CAM, 4,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_fimc2, "sclk_fimc2", "div_fimc2", SRC_MASK_CAM, 8,
+       GATE(CLK_SCLK_FIMC2, "sclk_fimc2", "div_fimc2", SRC_MASK_CAM, 8,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_fimc3, "sclk_fimc3", "div_fimc3", SRC_MASK_CAM, 12,
+       GATE(CLK_SCLK_FIMC3, "sclk_fimc3", "div_fimc3", SRC_MASK_CAM, 12,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_csis0, "sclk_csis0", "div_csis0", SRC_MASK_CAM, 24,
+       GATE(CLK_SCLK_CSIS0, "sclk_csis0", "div_csis0", SRC_MASK_CAM, 24,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_csis1, "sclk_csis1", "div_csis1", SRC_MASK_CAM, 28,
+       GATE(CLK_SCLK_CSIS1, "sclk_csis1", "div_csis1", SRC_MASK_CAM, 28,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_fimd0, "sclk_fimd0", "div_fimd0", SRC_MASK_LCD0, 0,
+       GATE(CLK_SCLK_FIMD0, "sclk_fimd0", "div_fimd0", SRC_MASK_LCD0, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc0, "sclk_mmc0", "div_mmc_pre0", SRC_MASK_FSYS, 0,
+       GATE(CLK_SCLK_MMC0, "sclk_mmc0", "div_mmc_pre0", SRC_MASK_FSYS, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc1, "sclk_mmc1", "div_mmc_pre1", SRC_MASK_FSYS, 4,
+       GATE(CLK_SCLK_MMC1, "sclk_mmc1", "div_mmc_pre1", SRC_MASK_FSYS, 4,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc2, "sclk_mmc2", "div_mmc_pre2", SRC_MASK_FSYS, 8,
+       GATE(CLK_SCLK_MMC2, "sclk_mmc2", "div_mmc_pre2", SRC_MASK_FSYS, 8,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc3, "sclk_mmc3", "div_mmc_pre3", SRC_MASK_FSYS, 12,
+       GATE(CLK_SCLK_MMC3, "sclk_mmc3", "div_mmc_pre3", SRC_MASK_FSYS, 12,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mmc4, "sclk_mmc4", "div_mmc_pre4", SRC_MASK_FSYS, 16,
+       GATE(CLK_SCLK_MMC4, "sclk_mmc4", "div_mmc_pre4", SRC_MASK_FSYS, 16,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_uart0, "uclk0", "div_uart0", SRC_MASK_PERIL0, 0,
+       GATE(CLK_SCLK_UART0, "uclk0", "div_uart0", SRC_MASK_PERIL0, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_uart1, "uclk1", "div_uart1", SRC_MASK_PERIL0, 4,
+       GATE(CLK_SCLK_UART1, "uclk1", "div_uart1", SRC_MASK_PERIL0, 4,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_uart2, "uclk2", "div_uart2", SRC_MASK_PERIL0, 8,
+       GATE(CLK_SCLK_UART2, "uclk2", "div_uart2", SRC_MASK_PERIL0, 8,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_uart3, "uclk3", "div_uart3", SRC_MASK_PERIL0, 12,
+       GATE(CLK_SCLK_UART3, "uclk3", "div_uart3", SRC_MASK_PERIL0, 12,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_uart4, "uclk4", "div_uart4", SRC_MASK_PERIL0, 16,
+       GATE(CLK_SCLK_UART4, "uclk4", "div_uart4", SRC_MASK_PERIL0, 16,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_audio2, "sclk_audio2", "div_audio2", SRC_MASK_PERIL1, 4,
+       GATE(CLK_SCLK_AUDIO2, "sclk_audio2", "div_audio2", SRC_MASK_PERIL1, 4,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_spi0, "sclk_spi0", "div_spi_pre0", SRC_MASK_PERIL1, 16,
+       GATE(CLK_SCLK_SPI0, "sclk_spi0", "div_spi_pre0", SRC_MASK_PERIL1, 16,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_spi1, "sclk_spi1", "div_spi_pre1", SRC_MASK_PERIL1, 20,
+       GATE(CLK_SCLK_SPI1, "sclk_spi1", "div_spi_pre1", SRC_MASK_PERIL1, 20,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_spi2, "sclk_spi2", "div_spi_pre2", SRC_MASK_PERIL1, 24,
+       GATE(CLK_SCLK_SPI2, "sclk_spi2", "div_spi_pre2", SRC_MASK_PERIL1, 24,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(fimc0, "fimc0", "aclk160", GATE_IP_CAM, 0,
+       GATE(CLK_FIMC0, "fimc0", "aclk160", GATE_IP_CAM, 0,
                        0, 0),
-       GATE(fimc1, "fimc1", "aclk160", GATE_IP_CAM, 1,
+       GATE(CLK_FIMC1, "fimc1", "aclk160", GATE_IP_CAM, 1,
                        0, 0),
-       GATE(fimc2, "fimc2", "aclk160", GATE_IP_CAM, 2,
+       GATE(CLK_FIMC2, "fimc2", "aclk160", GATE_IP_CAM, 2,
                        0, 0),
-       GATE(fimc3, "fimc3", "aclk160", GATE_IP_CAM, 3,
+       GATE(CLK_FIMC3, "fimc3", "aclk160", GATE_IP_CAM, 3,
                        0, 0),
-       GATE(csis0, "csis0", "aclk160", GATE_IP_CAM, 4,
+       GATE(CLK_CSIS0, "csis0", "aclk160", GATE_IP_CAM, 4,
                        0, 0),
-       GATE(csis1, "csis1", "aclk160", GATE_IP_CAM, 5,
+       GATE(CLK_CSIS1, "csis1", "aclk160", GATE_IP_CAM, 5,
                        0, 0),
-       GATE(smmu_fimc0, "smmu_fimc0", "aclk160", GATE_IP_CAM, 7,
+       GATE(CLK_SMMU_FIMC0, "smmu_fimc0", "aclk160", GATE_IP_CAM, 7,
                        0, 0),
-       GATE(smmu_fimc1, "smmu_fimc1", "aclk160", GATE_IP_CAM, 8,
+       GATE(CLK_SMMU_FIMC1, "smmu_fimc1", "aclk160", GATE_IP_CAM, 8,
                        0, 0),
-       GATE(smmu_fimc2, "smmu_fimc2", "aclk160", GATE_IP_CAM, 9,
+       GATE(CLK_SMMU_FIMC2, "smmu_fimc2", "aclk160", GATE_IP_CAM, 9,
                        0, 0),
-       GATE(smmu_fimc3, "smmu_fimc3", "aclk160", GATE_IP_CAM, 10,
+       GATE(CLK_SMMU_FIMC3, "smmu_fimc3", "aclk160", GATE_IP_CAM, 10,
                        0, 0),
-       GATE(smmu_jpeg, "smmu_jpeg", "aclk160", GATE_IP_CAM, 11,
+       GATE(CLK_SMMU_JPEG, "smmu_jpeg", "aclk160", GATE_IP_CAM, 11,
                        0, 0),
-       GATE(pixelasyncm0, "pxl_async0", "aclk160", GATE_IP_CAM, 17, 0, 0),
-       GATE(pixelasyncm1, "pxl_async1", "aclk160", GATE_IP_CAM, 18, 0, 0),
-       GATE(smmu_tv, "smmu_tv", "aclk160", GATE_IP_TV, 4,
+       GATE(CLK_PIXELASYNCM0, "pxl_async0", "aclk160", GATE_IP_CAM, 17, 0, 0),
+       GATE(CLK_PIXELASYNCM1, "pxl_async1", "aclk160", GATE_IP_CAM, 18, 0, 0),
+       GATE(CLK_SMMU_TV, "smmu_tv", "aclk160", GATE_IP_TV, 4,
                        0, 0),
-       GATE(mfc, "mfc", "aclk100", GATE_IP_MFC, 0, 0, 0),
-       GATE(smmu_mfcl, "smmu_mfcl", "aclk100", GATE_IP_MFC, 1,
+       GATE(CLK_MFC, "mfc", "aclk100", GATE_IP_MFC, 0, 0, 0),
+       GATE(CLK_SMMU_MFCL, "smmu_mfcl", "aclk100", GATE_IP_MFC, 1,
                        0, 0),
-       GATE(smmu_mfcr, "smmu_mfcr", "aclk100", GATE_IP_MFC, 2,
+       GATE(CLK_SMMU_MFCR, "smmu_mfcr", "aclk100", GATE_IP_MFC, 2,
                        0, 0),
-       GATE(fimd0, "fimd0", "aclk160", GATE_IP_LCD0, 0,
+       GATE(CLK_FIMD0, "fimd0", "aclk160", GATE_IP_LCD0, 0,
                        0, 0),
-       GATE(smmu_fimd0, "smmu_fimd0", "aclk160", GATE_IP_LCD0, 4,
+       GATE(CLK_SMMU_FIMD0, "smmu_fimd0", "aclk160", GATE_IP_LCD0, 4,
                        0, 0),
-       GATE(pdma0, "pdma0", "aclk133", GATE_IP_FSYS, 0,
+       GATE(CLK_PDMA0, "pdma0", "aclk133", GATE_IP_FSYS, 0,
                        0, 0),
-       GATE(pdma1, "pdma1", "aclk133", GATE_IP_FSYS, 1,
+       GATE(CLK_PDMA1, "pdma1", "aclk133", GATE_IP_FSYS, 1,
                        0, 0),
-       GATE(sdmmc0, "sdmmc0", "aclk133", GATE_IP_FSYS, 5,
+       GATE(CLK_SDMMC0, "sdmmc0", "aclk133", GATE_IP_FSYS, 5,
                        0, 0),
-       GATE(sdmmc1, "sdmmc1", "aclk133", GATE_IP_FSYS, 6,
+       GATE(CLK_SDMMC1, "sdmmc1", "aclk133", GATE_IP_FSYS, 6,
                        0, 0),
-       GATE(sdmmc2, "sdmmc2", "aclk133", GATE_IP_FSYS, 7,
+       GATE(CLK_SDMMC2, "sdmmc2", "aclk133", GATE_IP_FSYS, 7,
                        0, 0),
-       GATE(sdmmc3, "sdmmc3", "aclk133", GATE_IP_FSYS, 8,
+       GATE(CLK_SDMMC3, "sdmmc3", "aclk133", GATE_IP_FSYS, 8,
                        0, 0),
-       GATE(uart0, "uart0", "aclk100", GATE_IP_PERIL, 0,
+       GATE(CLK_UART0, "uart0", "aclk100", GATE_IP_PERIL, 0,
                        0, 0),
-       GATE(uart1, "uart1", "aclk100", GATE_IP_PERIL, 1,
+       GATE(CLK_UART1, "uart1", "aclk100", GATE_IP_PERIL, 1,
                        0, 0),
-       GATE(uart2, "uart2", "aclk100", GATE_IP_PERIL, 2,
+       GATE(CLK_UART2, "uart2", "aclk100", GATE_IP_PERIL, 2,
                        0, 0),
-       GATE(uart3, "uart3", "aclk100", GATE_IP_PERIL, 3,
+       GATE(CLK_UART3, "uart3", "aclk100", GATE_IP_PERIL, 3,
                        0, 0),
-       GATE(uart4, "uart4", "aclk100", GATE_IP_PERIL, 4,
+       GATE(CLK_UART4, "uart4", "aclk100", GATE_IP_PERIL, 4,
                        0, 0),
-       GATE(i2c0, "i2c0", "aclk100", GATE_IP_PERIL, 6,
+       GATE(CLK_I2C0, "i2c0", "aclk100", GATE_IP_PERIL, 6,
                        0, 0),
-       GATE(i2c1, "i2c1", "aclk100", GATE_IP_PERIL, 7,
+       GATE(CLK_I2C1, "i2c1", "aclk100", GATE_IP_PERIL, 7,
                        0, 0),
-       GATE(i2c2, "i2c2", "aclk100", GATE_IP_PERIL, 8,
+       GATE(CLK_I2C2, "i2c2", "aclk100", GATE_IP_PERIL, 8,
                        0, 0),
-       GATE(i2c3, "i2c3", "aclk100", GATE_IP_PERIL, 9,
+       GATE(CLK_I2C3, "i2c3", "aclk100", GATE_IP_PERIL, 9,
                        0, 0),
-       GATE(i2c4, "i2c4", "aclk100", GATE_IP_PERIL, 10,
+       GATE(CLK_I2C4, "i2c4", "aclk100", GATE_IP_PERIL, 10,
                        0, 0),
-       GATE(i2c5, "i2c5", "aclk100", GATE_IP_PERIL, 11,
+       GATE(CLK_I2C5, "i2c5", "aclk100", GATE_IP_PERIL, 11,
                        0, 0),
-       GATE(i2c6, "i2c6", "aclk100", GATE_IP_PERIL, 12,
+       GATE(CLK_I2C6, "i2c6", "aclk100", GATE_IP_PERIL, 12,
                        0, 0),
-       GATE(i2c7, "i2c7", "aclk100", GATE_IP_PERIL, 13,
+       GATE(CLK_I2C7, "i2c7", "aclk100", GATE_IP_PERIL, 13,
                        0, 0),
-       GATE(i2c_hdmi, "i2c-hdmi", "aclk100", GATE_IP_PERIL, 14,
+       GATE(CLK_I2C_HDMI, "i2c-hdmi", "aclk100", GATE_IP_PERIL, 14,
                        0, 0),
-       GATE(spi0, "spi0", "aclk100", GATE_IP_PERIL, 16,
+       GATE(CLK_SPI0, "spi0", "aclk100", GATE_IP_PERIL, 16,
                        0, 0),
-       GATE(spi1, "spi1", "aclk100", GATE_IP_PERIL, 17,
+       GATE(CLK_SPI1, "spi1", "aclk100", GATE_IP_PERIL, 17,
                        0, 0),
-       GATE(spi2, "spi2", "aclk100", GATE_IP_PERIL, 18,
+       GATE(CLK_SPI2, "spi2", "aclk100", GATE_IP_PERIL, 18,
                        0, 0),
-       GATE(i2s1, "i2s1", "aclk100", GATE_IP_PERIL, 20,
+       GATE(CLK_I2S1, "i2s1", "aclk100", GATE_IP_PERIL, 20,
                        0, 0),
-       GATE(i2s2, "i2s2", "aclk100", GATE_IP_PERIL, 21,
+       GATE(CLK_I2S2, "i2s2", "aclk100", GATE_IP_PERIL, 21,
                        0, 0),
-       GATE(pcm1, "pcm1", "aclk100", GATE_IP_PERIL, 22,
+       GATE(CLK_PCM1, "pcm1", "aclk100", GATE_IP_PERIL, 22,
                        0, 0),
-       GATE(pcm2, "pcm2", "aclk100", GATE_IP_PERIL, 23,
+       GATE(CLK_PCM2, "pcm2", "aclk100", GATE_IP_PERIL, 23,
                        0, 0),
-       GATE(spdif, "spdif", "aclk100", GATE_IP_PERIL, 26,
+       GATE(CLK_SPDIF, "spdif", "aclk100", GATE_IP_PERIL, 26,
                        0, 0),
-       GATE(ac97, "ac97", "aclk100", GATE_IP_PERIL, 27,
+       GATE(CLK_AC97, "ac97", "aclk100", GATE_IP_PERIL, 27,
                        0, 0),
  };
  
  /* list of gate clocks supported in exynos4210 soc */
  static struct samsung_gate_clock exynos4210_gate_clks[] __initdata = {
-       GATE(tvenc, "tvenc", "aclk160", GATE_IP_TV, 2, 0, 0),
-       GATE(g2d, "g2d", "aclk200", E4210_GATE_IP_IMAGE, 0, 0, 0),
-       GATE(rotator, "rotator", "aclk200", E4210_GATE_IP_IMAGE, 1, 0, 0),
-       GATE(mdma, "mdma", "aclk200", E4210_GATE_IP_IMAGE, 2, 0, 0),
-       GATE(smmu_g2d, "smmu_g2d", "aclk200", E4210_GATE_IP_IMAGE, 3, 0, 0),
-       GATE(smmu_mdma, "smmu_mdma", "aclk200", E4210_GATE_IP_IMAGE, 5, 0, 0),
-       GATE(pcie_phy, "pcie_phy", "aclk133", GATE_IP_FSYS, 2, 0, 0),
-       GATE(sata_phy, "sata_phy", "aclk133", GATE_IP_FSYS, 3, 0, 0),
-       GATE(sata, "sata", "aclk133", GATE_IP_FSYS, 10, 0, 0),
-       GATE(pcie, "pcie", "aclk133", GATE_IP_FSYS, 14, 0, 0),
-       GATE(smmu_pcie, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0),
-       GATE(modemif, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0),
-       GATE(chipid, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0),
-       GATE(sysreg, "sysreg", "aclk100", E4210_GATE_IP_PERIR, 0,
+       GATE(CLK_TVENC, "tvenc", "aclk160", GATE_IP_TV, 2, 0, 0),
+       GATE(CLK_G2D, "g2d", "aclk200", E4210_GATE_IP_IMAGE, 0, 0, 0),
+       GATE(CLK_ROTATOR, "rotator", "aclk200", E4210_GATE_IP_IMAGE, 1, 0, 0),
+       GATE(CLK_MDMA, "mdma", "aclk200", E4210_GATE_IP_IMAGE, 2, 0, 0),
+       GATE(CLK_SMMU_G2D, "smmu_g2d", "aclk200", E4210_GATE_IP_IMAGE, 3, 0, 0),
+       GATE(CLK_SMMU_MDMA, "smmu_mdma", "aclk200", E4210_GATE_IP_IMAGE, 5, 0,
+               0),
+       GATE(CLK_PCIE_PHY, "pcie_phy", "aclk133", GATE_IP_FSYS, 2, 0, 0),
+       GATE(CLK_SATA_PHY, "sata_phy", "aclk133", GATE_IP_FSYS, 3, 0, 0),
+       GATE(CLK_SATA, "sata", "aclk133", GATE_IP_FSYS, 10, 0, 0),
+       GATE(CLK_PCIE, "pcie", "aclk133", GATE_IP_FSYS, 14, 0, 0),
+       GATE(CLK_SMMU_PCIE, "smmu_pcie", "aclk133", GATE_IP_FSYS, 18, 0, 0),
+       GATE(CLK_MODEMIF, "modemif", "aclk100", GATE_IP_PERIL, 28, 0, 0),
+       GATE(CLK_CHIPID, "chipid", "aclk100", E4210_GATE_IP_PERIR, 0, 0, 0),
+       GATE(CLK_SYSREG, "sysreg", "aclk100", E4210_GATE_IP_PERIR, 0,
                        CLK_IGNORE_UNUSED, 0),
-       GATE(hdmi_cec, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0, 0),
-       GATE(smmu_rotator, "smmu_rotator", "aclk200",
+       GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4210_GATE_IP_PERIR, 11, 0,
+               0),
+       GATE(CLK_SMMU_ROTATOR, "smmu_rotator", "aclk200",
                        E4210_GATE_IP_IMAGE, 4, 0, 0),
-       GATE(sclk_mipi1, "sclk_mipi1", "div_mipi_pre1",
+       GATE(CLK_SCLK_MIPI1, "sclk_mipi1", "div_mipi_pre1",
                        E4210_SRC_MASK_LCD1, 12, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_sata, "sclk_sata", "div_sata",
+       GATE(CLK_SCLK_SATA, "sclk_sata", "div_sata",
                        SRC_MASK_FSYS, 24, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mixer, "sclk_mixer", "mout_mixer", SRC_MASK_TV, 4, 0, 0),
-       GATE(sclk_dac, "sclk_dac", "mout_dac", SRC_MASK_TV, 8, 0, 0),
-       GATE(tsadc, "tsadc", "aclk100", GATE_IP_PERIL, 15,
+       GATE(CLK_SCLK_MIXER, "sclk_mixer", "mout_mixer", SRC_MASK_TV, 4, 0, 0),
+       GATE(CLK_SCLK_DAC, "sclk_dac", "mout_dac", SRC_MASK_TV, 8, 0, 0),
+       GATE(CLK_TSADC, "tsadc", "aclk100", GATE_IP_PERIL, 15,
                        0, 0),
-       GATE(mct, "mct", "aclk100", E4210_GATE_IP_PERIR, 13,
+       GATE(CLK_MCT, "mct", "aclk100", E4210_GATE_IP_PERIR, 13,
                        0, 0),
-       GATE(wdt, "watchdog", "aclk100", E4210_GATE_IP_PERIR, 14,
+       GATE(CLK_WDT, "watchdog", "aclk100", E4210_GATE_IP_PERIR, 14,
                        0, 0),
-       GATE(rtc, "rtc", "aclk100", E4210_GATE_IP_PERIR, 15,
+       GATE(CLK_RTC, "rtc", "aclk100", E4210_GATE_IP_PERIR, 15,
                        0, 0),
-       GATE(keyif, "keyif", "aclk100", E4210_GATE_IP_PERIR, 16,
+       GATE(CLK_KEYIF, "keyif", "aclk100", E4210_GATE_IP_PERIR, 16,
                        0, 0),
-       GATE(sclk_fimd1, "sclk_fimd1", "div_fimd1", E4210_SRC_MASK_LCD1, 0,
+       GATE(CLK_SCLK_FIMD1, "sclk_fimd1", "div_fimd1", E4210_SRC_MASK_LCD1, 0,
                        CLK_SET_RATE_PARENT, 0),
-       GATE(tmu_apbif, "tmu_apbif", "aclk100", E4210_GATE_IP_PERIR, 17, 0, 0),
+       GATE(CLK_TMU_APBIF, "tmu_apbif", "aclk100", E4210_GATE_IP_PERIR, 17, 0,
+               0),
  };
  
  /* list of gate clocks supported in exynos4x12 soc */
  static struct samsung_gate_clock exynos4x12_gate_clks[] __initdata = {
-       GATE(audss, "audss", "sclk_epll", E4X12_GATE_IP_MAUDIO, 0, 0, 0),
-       GATE(mdnie0, "mdnie0", "aclk160", GATE_IP_LCD0, 2, 0, 0),
-       GATE(rotator, "rotator", "aclk200", E4X12_GATE_IP_IMAGE, 1, 0, 0),
-       GATE(mdma2, "mdma2", "aclk200", E4X12_GATE_IP_IMAGE, 2, 0, 0),
-       GATE(smmu_mdma, "smmu_mdma", "aclk200", E4X12_GATE_IP_IMAGE, 5, 0, 0),
-       GATE(mipi_hsi, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0),
-       GATE(chipid, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0),
-       GATE(sysreg, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1,
+       GATE(CLK_AUDSS, "audss", "sclk_epll", E4X12_GATE_IP_MAUDIO, 0, 0, 0),
+       GATE(CLK_MDNIE0, "mdnie0", "aclk160", GATE_IP_LCD0, 2, 0, 0),
+       GATE(CLK_ROTATOR, "rotator", "aclk200", E4X12_GATE_IP_IMAGE, 1, 0, 0),
+       GATE(CLK_MDMA2, "mdma2", "aclk200", E4X12_GATE_IP_IMAGE, 2, 0, 0),
+       GATE(CLK_SMMU_MDMA, "smmu_mdma", "aclk200", E4X12_GATE_IP_IMAGE, 5, 0,
+               0),
+       GATE(CLK_MIPI_HSI, "mipi_hsi", "aclk133", GATE_IP_FSYS, 10, 0, 0),
+       GATE(CLK_CHIPID, "chipid", "aclk100", E4X12_GATE_IP_PERIR, 0, 0, 0),
+       GATE(CLK_SYSREG, "sysreg", "aclk100", E4X12_GATE_IP_PERIR, 1,
                        CLK_IGNORE_UNUSED, 0),
-       GATE(hdmi_cec, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0, 0),
-       GATE(sclk_mdnie0, "sclk_mdnie0", "div_mdnie0",
+       GATE(CLK_HDMI_CEC, "hdmi_cec", "aclk100", E4X12_GATE_IP_PERIR, 11, 0,
+               0),
+       GATE(CLK_SCLK_MDNIE0, "sclk_mdnie0", "div_mdnie0",
                        SRC_MASK_LCD0, 4, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mdnie_pwm0, "sclk_mdnie_pwm0", "div_mdnie_pwm_pre0",
+       GATE(CLK_SCLK_MDNIE_PWM0, "sclk_mdnie_pwm0", "div_mdnie_pwm_pre0",
                        SRC_MASK_LCD0, 8, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_mipihsi, "sclk_mipihsi", "div_mipihsi",
+       GATE(CLK_SCLK_MIPIHSI, "sclk_mipihsi", "div_mipihsi",
                        SRC_MASK_FSYS, 24, CLK_SET_RATE_PARENT, 0),
-       GATE(smmu_rotator, "smmu_rotator", "aclk200",
+       GATE(CLK_SMMU_ROTATOR, "smmu_rotator", "aclk200",
                        E4X12_GATE_IP_IMAGE, 4, 0, 0),
-       GATE(mct, "mct", "aclk100", E4X12_GATE_IP_PERIR, 13,
+       GATE(CLK_MCT, "mct", "aclk100", E4X12_GATE_IP_PERIR, 13,
                        0, 0),
-       GATE(rtc, "rtc", "aclk100", E4X12_GATE_IP_PERIR, 15,
+       GATE(CLK_RTC, "rtc", "aclk100", E4X12_GATE_IP_PERIR, 15,
                        0, 0),
-       GATE(keyif, "keyif", "aclk100", E4X12_GATE_IP_PERIR, 16, 0, 0),
-       GATE(sclk_pwm_isp, "sclk_pwm_isp", "div_pwm_isp",
+       GATE(CLK_KEYIF, "keyif", "aclk100", E4X12_GATE_IP_PERIR, 16, 0, 0),
+       GATE(CLK_SCLK_PWM_ISP, "sclk_pwm_isp", "div_pwm_isp",
                        E4X12_SRC_MASK_ISP, 0, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_spi0_isp, "sclk_spi0_isp", "div_spi0_isp_pre",
+       GATE(CLK_SCLK_SPI0_ISP, "sclk_spi0_isp", "div_spi0_isp_pre",
                        E4X12_SRC_MASK_ISP, 4, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_spi1_isp, "sclk_spi1_isp", "div_spi1_isp_pre",
+       GATE(CLK_SCLK_SPI1_ISP, "sclk_spi1_isp", "div_spi1_isp_pre",
                        E4X12_SRC_MASK_ISP, 8, CLK_SET_RATE_PARENT, 0),
-       GATE(sclk_uart_isp, "sclk_uart_isp", "div_uart_isp",
+       GATE(CLK_SCLK_UART_ISP, "sclk_uart_isp", "div_uart_isp",
                        E4X12_SRC_MASK_ISP, 12, CLK_SET_RATE_PARENT, 0),
-       GATE(pwm_isp_sclk, "pwm_isp_sclk", "sclk_pwm_isp",
+       GATE(CLK_PWM_ISP_SCLK, "pwm_isp_sclk", "sclk_pwm_isp",
                        E4X12_GATE_IP_ISP, 0, 0, 0),
-       GATE(spi0_isp_sclk, "spi0_isp_sclk", "sclk_spi0_isp",
+       GATE(CLK_SPI0_ISP_SCLK, "spi0_isp_sclk", "sclk_spi0_isp",
                        E4X12_GATE_IP_ISP, 1, 0, 0),
-       GATE(spi1_isp_sclk, "spi1_isp_sclk", "sclk_spi1_isp",
+       GATE(CLK_SPI1_ISP_SCLK, "spi1_isp_sclk", "sclk_spi1_isp",
                        E4X12_GATE_IP_ISP, 2, 0, 0),
-       GATE(uart_isp_sclk, "uart_isp_sclk", "sclk_uart_isp",
+       GATE(CLK_UART_ISP_SCLK, "uart_isp_sclk", "sclk_uart_isp",
                        E4X12_GATE_IP_ISP, 3, 0, 0),
-       GATE(wdt, "watchdog", "aclk100", E4X12_GATE_IP_PERIR, 14, 0, 0),
-       GATE(pcm0, "pcm0", "aclk100", E4X12_GATE_IP_MAUDIO, 2,
+       GATE(CLK_WDT, "watchdog", "aclk100", E4X12_GATE_IP_PERIR, 14, 0, 0),
+       GATE(CLK_PCM0, "pcm0", "aclk100", E4X12_GATE_IP_MAUDIO, 2,
                        0, 0),
-       GATE(i2s0, "i2s0", "aclk100", E4X12_GATE_IP_MAUDIO, 3,
+       GATE(CLK_I2S0, "i2s0", "aclk100", E4X12_GATE_IP_MAUDIO, 3,
                        0, 0),
-       GATE(fimc_isp, "isp", "aclk200", E4X12_GATE_ISP0, 0,
+       GATE(CLK_FIMC_ISP, "isp", "aclk200", E4X12_GATE_ISP0, 0,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(fimc_drc, "drc", "aclk200", E4X12_GATE_ISP0, 1,
+       GATE(CLK_FIMC_DRC, "drc", "aclk200", E4X12_GATE_ISP0, 1,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(fimc_fd, "fd", "aclk200", E4X12_GATE_ISP0, 2,
+       GATE(CLK_FIMC_FD, "fd", "aclk200", E4X12_GATE_ISP0, 2,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(fimc_lite0, "lite0", "aclk200", E4X12_GATE_ISP0, 3,
+       GATE(CLK_FIMC_LITE0, "lite0", "aclk200", E4X12_GATE_ISP0, 3,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(fimc_lite1, "lite1", "aclk200", E4X12_GATE_ISP0, 4,
+       GATE(CLK_FIMC_LITE1, "lite1", "aclk200", E4X12_GATE_ISP0, 4,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(mcuisp, "mcuisp", "aclk200", E4X12_GATE_ISP0, 5,
+       GATE(CLK_MCUISP, "mcuisp", "aclk200", E4X12_GATE_ISP0, 5,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(gicisp, "gicisp", "aclk200", E4X12_GATE_ISP0, 7,
+       GATE(CLK_GICISP, "gicisp", "aclk200", E4X12_GATE_ISP0, 7,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(smmu_isp, "smmu_isp", "aclk200", E4X12_GATE_ISP0, 8,
+       GATE(CLK_SMMU_ISP, "smmu_isp", "aclk200", E4X12_GATE_ISP0, 8,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(smmu_drc, "smmu_drc", "aclk200", E4X12_GATE_ISP0, 9,
+       GATE(CLK_SMMU_DRC, "smmu_drc", "aclk200", E4X12_GATE_ISP0, 9,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(smmu_fd, "smmu_fd", "aclk200", E4X12_GATE_ISP0, 10,
+       GATE(CLK_SMMU_FD, "smmu_fd", "aclk200", E4X12_GATE_ISP0, 10,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(smmu_lite0, "smmu_lite0", "aclk200", E4X12_GATE_ISP0, 11,
+       GATE(CLK_SMMU_LITE0, "smmu_lite0", "aclk200", E4X12_GATE_ISP0, 11,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(smmu_lite1, "smmu_lite1", "aclk200", E4X12_GATE_ISP0, 12,
+       GATE(CLK_SMMU_LITE1, "smmu_lite1", "aclk200", E4X12_GATE_ISP0, 12,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(ppmuispmx, "ppmuispmx", "aclk200", E4X12_GATE_ISP0, 20,
+       GATE(CLK_PPMUISPMX, "ppmuispmx", "aclk200", E4X12_GATE_ISP0, 20,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(ppmuispx, "ppmuispx", "aclk200", E4X12_GATE_ISP0, 21,
+       GATE(CLK_PPMUISPX, "ppmuispx", "aclk200", E4X12_GATE_ISP0, 21,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(mcuctl_isp, "mcuctl_isp", "aclk200", E4X12_GATE_ISP0, 23,
+       GATE(CLK_MCUCTL_ISP, "mcuctl_isp", "aclk200", E4X12_GATE_ISP0, 23,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(mpwm_isp, "mpwm_isp", "aclk200", E4X12_GATE_ISP0, 24,
+       GATE(CLK_MPWM_ISP, "mpwm_isp", "aclk200", E4X12_GATE_ISP0, 24,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(i2c0_isp, "i2c0_isp", "aclk200", E4X12_GATE_ISP0, 25,
+       GATE(CLK_I2C0_ISP, "i2c0_isp", "aclk200", E4X12_GATE_ISP0, 25,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(i2c1_isp, "i2c1_isp", "aclk200", E4X12_GATE_ISP0, 26,
+       GATE(CLK_I2C1_ISP, "i2c1_isp", "aclk200", E4X12_GATE_ISP0, 26,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(mtcadc_isp, "mtcadc_isp", "aclk200", E4X12_GATE_ISP0, 27,
+       GATE(CLK_MTCADC_ISP, "mtcadc_isp", "aclk200", E4X12_GATE_ISP0, 27,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(pwm_isp, "pwm_isp", "aclk200", E4X12_GATE_ISP0, 28,
+       GATE(CLK_PWM_ISP, "pwm_isp", "aclk200", E4X12_GATE_ISP0, 28,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(wdt_isp, "wdt_isp", "aclk200", E4X12_GATE_ISP0, 30,
+       GATE(CLK_WDT_ISP, "wdt_isp", "aclk200", E4X12_GATE_ISP0, 30,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(uart_isp, "uart_isp", "aclk200", E4X12_GATE_ISP0, 31,
+       GATE(CLK_UART_ISP, "uart_isp", "aclk200", E4X12_GATE_ISP0, 31,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(asyncaxim, "asyncaxim", "aclk200", E4X12_GATE_ISP1, 0,
+       GATE(CLK_ASYNCAXIM, "asyncaxim", "aclk200", E4X12_GATE_ISP1, 0,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(smmu_ispcx, "smmu_ispcx", "aclk200", E4X12_GATE_ISP1, 4,
+       GATE(CLK_SMMU_ISPCX, "smmu_ispcx", "aclk200", E4X12_GATE_ISP1, 4,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(spi0_isp, "spi0_isp", "aclk200", E4X12_GATE_ISP1, 12,
+       GATE(CLK_SPI0_ISP, "spi0_isp", "aclk200", E4X12_GATE_ISP1, 12,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(spi1_isp, "spi1_isp", "aclk200", E4X12_GATE_ISP1, 13,
+       GATE(CLK_SPI1_ISP, "spi1_isp", "aclk200", E4X12_GATE_ISP1, 13,
                        CLK_IGNORE_UNUSED | CLK_GET_RATE_NOCACHE, 0),
-       GATE(g2d, "g2d", "aclk200", GATE_IP_DMC, 23, 0, 0),
-       GATE(tmu_apbif, "tmu_apbif", "aclk100", E4X12_GATE_IP_PERIR, 17, 0, 0),
+       GATE(CLK_G2D, "g2d", "aclk200", GATE_IP_DMC, 23, 0, 0),
+       GATE(CLK_TMU_APBIF, "tmu_apbif", "aclk100", E4X12_GATE_IP_PERIR, 17, 0,
+               0),
  };
  
  static struct samsung_clock_alias exynos4_aliases[] __initdata = {
-       ALIAS(mout_core, NULL, "moutcore"),
-       ALIAS(arm_clk, NULL, "armclk"),
-       ALIAS(sclk_apll, NULL, "mout_apll"),
+       ALIAS(CLK_MOUT_CORE, NULL, "moutcore"),
+       ALIAS(CLK_ARM_CLK, NULL, "armclk"),
+       ALIAS(CLK_SCLK_APLL, NULL, "mout_apll"),
  };
  
  static struct samsung_clock_alias exynos4210_aliases[] __initdata = {
-       ALIAS(sclk_mpll, NULL, "mout_mpll"),
+       ALIAS(CLK_SCLK_MPLL, NULL, "mout_mpll"),
  };
  
  static struct samsung_clock_alias exynos4x12_aliases[] __initdata = {
-       ALIAS(mout_mpll_user_c, NULL, "mout_mpll"),
+       ALIAS(CLK_MOUT_MPLL_USER_C, NULL, "mout_mpll"),
  };
  
  /*
@@@ -978,7 -924,7 +925,7 @@@ static void __init exynos4_clk_register
                finpll_f = clk_get_rate(clk);
        }
  
-       fclk.id = fin_pll;
+       fclk.id = CLK_FIN_PLL;
        fclk.name = "fin_pll";
        fclk.parent_name = NULL;
        fclk.flags = CLK_IS_ROOT;
@@@ -1068,24 -1014,24 +1015,24 @@@ static struct samsung_pll_rate_table ex
  };
  
  static struct samsung_pll_clock exynos4210_plls[nr_plls] __initdata = {
-       [apll] = PLL_A(pll_4508, fout_apll, "fout_apll", "fin_pll", APLL_LOCK,
-               APLL_CON0, "fout_apll", NULL),
-       [mpll] = PLL_A(pll_4508, fout_mpll, "fout_mpll", "fin_pll",
+       [apll] = PLL_A(pll_4508, CLK_FOUT_APLL, "fout_apll", "fin_pll",
+               APLL_LOCK, APLL_CON0, "fout_apll", NULL),
+       [mpll] = PLL_A(pll_4508, CLK_FOUT_MPLL, "fout_mpll", "fin_pll",
                E4210_MPLL_LOCK, E4210_MPLL_CON0, "fout_mpll", NULL),
-       [epll] = PLL_A(pll_4600, fout_epll, "fout_epll", "fin_pll", EPLL_LOCK,
-               EPLL_CON0, "fout_epll", NULL),
-       [vpll] = PLL_A(pll_4650c, fout_vpll, "fout_vpll", "mout_vpllsrc",
+       [epll] = PLL_A(pll_4600, CLK_FOUT_EPLL, "fout_epll", "fin_pll",
+               EPLL_LOCK, EPLL_CON0, "fout_epll", NULL),
+       [vpll] = PLL_A(pll_4650c, CLK_FOUT_VPLL, "fout_vpll", "mout_vpllsrc",
                VPLL_LOCK, VPLL_CON0, "fout_vpll", NULL),
  };
  
  static struct samsung_pll_clock exynos4x12_plls[nr_plls] __initdata = {
-       [apll] = PLL(pll_35xx, fout_apll, "fout_apll", "fin_pll",
+       [apll] = PLL(pll_35xx, CLK_FOUT_APLL, "fout_apll", "fin_pll",
                        APLL_LOCK, APLL_CON0, NULL),
-       [mpll] = PLL(pll_35xx, fout_mpll, "fout_mpll", "fin_pll",
+       [mpll] = PLL(pll_35xx, CLK_FOUT_MPLL, "fout_mpll", "fin_pll",
                        E4X12_MPLL_LOCK, E4X12_MPLL_CON0, NULL),
-       [epll] = PLL(pll_36xx, fout_epll, "fout_epll", "fin_pll",
+       [epll] = PLL(pll_36xx, CLK_FOUT_EPLL, "fout_epll", "fin_pll",
                        EPLL_LOCK, EPLL_CON0, NULL),
-       [vpll] = PLL(pll_36xx, fout_vpll, "fout_vpll", "fin_pll",
+       [vpll] = PLL(pll_36xx, CLK_FOUT_VPLL, "fout_vpll", "fin_pll",
                        VPLL_LOCK, VPLL_CON0, NULL),
  };
  
@@@ -1099,11 -1045,11 +1046,11 @@@ static void __init exynos4_clk_init(str
                panic("%s: failed to map registers\n", __func__);
  
        if (exynos4_soc == EXYNOS4210)
-               samsung_clk_init(np, reg_base, nr_clks,
+               samsung_clk_init(np, reg_base, CLK_NR_CLKS,
                        exynos4_clk_regs, ARRAY_SIZE(exynos4_clk_regs),
                        exynos4210_clk_save, ARRAY_SIZE(exynos4210_clk_save));
        else
-               samsung_clk_init(np, reg_base, nr_clks,
+               samsung_clk_init(np, reg_base, CLK_NR_CLKS,
                        exynos4_clk_regs, ARRAY_SIZE(exynos4_clk_regs),
                        exynos4x12_clk_save, ARRAY_SIZE(exynos4x12_clk_save));
  
index c534043c0481e95ffbee7fa9a09e7af0dcee0aa7,679103bda2b0ac11008948319c2ea7ec6d9a3966..356e9b804421ee7a27ba8a9cba960c3263260a10
@@@ -111,6 -111,46 +111,6 @@@ static void clk_periph_disable(struct c
        gate_ops->disable(gate_hw);
  }
  
 -void tegra_periph_reset_deassert(struct clk *c)
 -{
 -      struct clk_hw *hw = __clk_get_hw(c);
 -      struct tegra_clk_periph *periph = to_clk_periph(hw);
 -      struct tegra_clk_periph_gate *gate;
 -
 -      if (periph->magic != TEGRA_CLK_PERIPH_MAGIC) {
 -              gate = to_clk_periph_gate(hw);
 -              if (gate->magic != TEGRA_CLK_PERIPH_GATE_MAGIC) {
 -                      WARN_ON(1);
 -                      return;
 -              }
 -      } else {
 -              gate = &periph->gate;
 -      }
 -
 -      tegra_periph_reset(gate, 0);
 -}
 -EXPORT_SYMBOL(tegra_periph_reset_deassert);
 -
 -void tegra_periph_reset_assert(struct clk *c)
 -{
 -      struct clk_hw *hw = __clk_get_hw(c);
 -      struct tegra_clk_periph *periph = to_clk_periph(hw);
 -      struct tegra_clk_periph_gate *gate;
 -
 -      if (periph->magic != TEGRA_CLK_PERIPH_MAGIC) {
 -              gate = to_clk_periph_gate(hw);
 -              if (gate->magic != TEGRA_CLK_PERIPH_GATE_MAGIC) {
 -                      WARN_ON(1);
 -                      return;
 -              }
 -      } else {
 -              gate = &periph->gate;
 -      }
 -
 -      tegra_periph_reset(gate, 1);
 -}
 -EXPORT_SYMBOL(tegra_periph_reset_assert);
 -
  const struct clk_ops tegra_clk_periph_ops = {
        .get_parent = clk_periph_get_parent,
        .set_parent = clk_periph_set_parent,
        .disable = clk_periph_disable,
  };
  
- const struct clk_ops tegra_clk_periph_nodiv_ops = {
static const struct clk_ops tegra_clk_periph_nodiv_ops = {
        .get_parent = clk_periph_get_parent,
        .set_parent = clk_periph_set_parent,
        .is_enabled = clk_periph_is_enabled,
index 561bce8ffb1b57c87dd1b45bbae6cbf7c2b479c1,59106623e71e7ddbf25c4a5eebf88f5ed530e99e..fdbdeae3900dd0bb92ea10184239d9bd6c004074
@@@ -290,9 -290,11 +290,11 @@@ static int isp_xclk_init(struct isp_dev
        struct clk_init_data init;
        unsigned int i;
  
+       for (i = 0; i < ARRAY_SIZE(isp->xclks); ++i)
+               isp->xclks[i].clk = ERR_PTR(-EINVAL);
        for (i = 0; i < ARRAY_SIZE(isp->xclks); ++i) {
                struct isp_xclk *xclk = &isp->xclks[i];
-               struct clk *clk;
  
                xclk->isp = isp;
                xclk->id = i == 0 ? ISP_XCLK_A : ISP_XCLK_B;
                init.num_parents = 1;
  
                xclk->hw.init = &init;
-               clk = devm_clk_register(isp->dev, &xclk->hw);
-               if (IS_ERR(clk))
-                       return PTR_ERR(clk);
+               /*
+                * The first argument is NULL in order to avoid circular
+                * reference, as this driver takes reference on the
+                * sensor subdevice modules and the sensors would take
+                * reference on this module through clk_get().
+                */
+               xclk->clk = clk_register(NULL, &xclk->hw);
+               if (IS_ERR(xclk->clk))
+                       return PTR_ERR(xclk->clk);
  
                if (pdata->xclks[i].con_id == NULL &&
                    pdata->xclks[i].dev_id == NULL)
  
                xclk->lookup->con_id = pdata->xclks[i].con_id;
                xclk->lookup->dev_id = pdata->xclks[i].dev_id;
-               xclk->lookup->clk = clk;
+               xclk->lookup->clk = xclk->clk;
  
                clkdev_add(xclk->lookup);
        }
@@@ -335,6 -342,9 +342,9 @@@ static void isp_xclk_cleanup(struct isp
        for (i = 0; i < ARRAY_SIZE(isp->xclks); ++i) {
                struct isp_xclk *xclk = &isp->xclks[i];
  
+               if (!IS_ERR(xclk->clk))
+                       clk_unregister(xclk->clk);
                if (xclk->lookup)
                        clkdev_drop(xclk->lookup);
        }
@@@ -1673,7 -1683,7 +1683,7 @@@ void omap3isp_print_status(struct isp_d
   * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in
   * resume(), and the the pipelines are restarted in complete().
   *
 - * TODO: PM dependencies between the ISP and sensors are not modeled explicitly
 + * TODO: PM dependencies between the ISP and sensors are not modelled explicitly
   * yet.
   */
  static int isp_pm_prepare(struct device *dev)