Merge branch 'next/cleanup-samsung' into next/cleanup-samsung-2

[pandora-kernel.git] / arch / arm / mach-exynos / clock-exynos4.c

diff --git a/arch/arm/mach-exynos/clock-exynos4.c b/arch/arm/mach-exynos/clock-exynos4.c
index 68a2a9c..fa8a134 100644 (file)
--- a/arch/arm/mach-exynos/clock-exynos4.c
+++ b/arch/arm/mach-exynos/clock-exynos4.c
@@ -500,6 +500,10 @@ static struct clk exynos4_init_clocks_off[] = {
                .devname        = "exynos4-fimc.3",
                .enable         = exynos4_clk_ip_cam_ctrl,
                .ctrlbit        = (1 << 3),
+       }, {
+               .name           = "tsi",
+               .enable         = exynos4_clk_ip_fsys_ctrl,
+               .ctrlbit        = (1 << 4),
        }, {
                .name           = "hsmmc",
                .devname        = "exynos4-sdhci.0",
@@ -529,6 +533,14 @@ static struct clk exynos4_init_clocks_off[] = {
                .parent         = &exynos4_clk_aclk_133.clk,
                .enable         = exynos4_clk_ip_fsys_ctrl,
                .ctrlbit        = (1 << 9),
+       }, {
+               .name           = "onenand",
+               .enable         = exynos4_clk_ip_fsys_ctrl,
+               .ctrlbit        = (1 << 15),
+       }, {
+               .name           = "nfcon",
+               .enable         = exynos4_clk_ip_fsys_ctrl,
+               .ctrlbit        = (1 << 16),
        }, {
                .name           = "dac",
                .devname        = "s5p-sdo",
@@ -609,6 +621,25 @@ static struct clk exynos4_init_clocks_off[] = {
                .devname        = "samsung-i2s.2",
                .enable         = exynos4_clk_ip_peril_ctrl,
                .ctrlbit        = (1 << 21),
+       }, {
+               .name           = "pcm",
+               .devname        = "samsung-pcm.1",
+               .enable         = exynos4_clk_ip_peril_ctrl,
+               .ctrlbit        = (1 << 22),
+       }, {
+               .name           = "pcm",
+               .devname        = "samsung-pcm.2",
+               .enable         = exynos4_clk_ip_peril_ctrl,
+               .ctrlbit        = (1 << 23),
+       }, {
+               .name           = "slimbus",
+               .enable         = exynos4_clk_ip_peril_ctrl,
+               .ctrlbit        = (1 << 25),
+       }, {
+               .name           = "spdif",
+               .devname        = "samsung-spdif",
+               .enable         = exynos4_clk_ip_peril_ctrl,
+               .ctrlbit        = (1 << 26),
        }, {
                .name           = "ac97",
                .devname        = "samsung-ac97",