Commit 29e8eb0f authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim

ARM: S5PC100: Add clkdev support

Signed-off-by: default avatarThomas Abraham <thomas.ab@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent d8b22d25
...@@ -739,6 +739,7 @@ config ARCH_S5PC100 ...@@ -739,6 +739,7 @@ config ARCH_S5PC100
bool "Samsung S5PC100" bool "Samsung S5PC100"
select GENERIC_GPIO select GENERIC_GPIO
select HAVE_CLK select HAVE_CLK
select CLKDEV_LOOKUP
select CPU_V7 select CPU_V7
select ARM_L1_CACHE_SHIFT_6 select ARM_L1_CACHE_SHIFT_6
select ARCH_USES_GETTIMEOFFSET select ARCH_USES_GETTIMEOFFSET
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
static struct clk s5p_clk_otgphy = { static struct clk s5p_clk_otgphy = {
.name = "otg_phy", .name = "otg_phy",
.id = -1,
}; };
static struct clk *clk_src_mout_href_list[] = { static struct clk *clk_src_mout_href_list[] = {
...@@ -47,7 +46,6 @@ static struct clksrc_sources clk_src_mout_href = { ...@@ -47,7 +46,6 @@ static struct clksrc_sources clk_src_mout_href = {
static struct clksrc_clk clk_mout_href = { static struct clksrc_clk clk_mout_href = {
.clk = { .clk = {
.name = "mout_href", .name = "mout_href",
.id = -1,
}, },
.sources = &clk_src_mout_href, .sources = &clk_src_mout_href,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 20, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 20, .size = 1 },
...@@ -66,7 +64,6 @@ static struct clksrc_sources clk_src_mout_48m = { ...@@ -66,7 +64,6 @@ static struct clksrc_sources clk_src_mout_48m = {
static struct clksrc_clk clk_mout_48m = { static struct clksrc_clk clk_mout_48m = {
.clk = { .clk = {
.name = "mout_48m", .name = "mout_48m",
.id = -1,
}, },
.sources = &clk_src_mout_48m, .sources = &clk_src_mout_48m,
.reg_src = { .reg = S5P_CLK_SRC1, .shift = 24, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC1, .shift = 24, .size = 1 },
...@@ -75,7 +72,6 @@ static struct clksrc_clk clk_mout_48m = { ...@@ -75,7 +72,6 @@ static struct clksrc_clk clk_mout_48m = {
static struct clksrc_clk clk_mout_mpll = { static struct clksrc_clk clk_mout_mpll = {
.clk = { .clk = {
.name = "mout_mpll", .name = "mout_mpll",
.id = -1,
}, },
.sources = &clk_src_mpll, .sources = &clk_src_mpll,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 4, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 4, .size = 1 },
...@@ -85,7 +81,6 @@ static struct clksrc_clk clk_mout_mpll = { ...@@ -85,7 +81,6 @@ static struct clksrc_clk clk_mout_mpll = {
static struct clksrc_clk clk_mout_apll = { static struct clksrc_clk clk_mout_apll = {
.clk = { .clk = {
.name = "mout_apll", .name = "mout_apll",
.id = -1,
}, },
.sources = &clk_src_apll, .sources = &clk_src_apll,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 0, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 0, .size = 1 },
...@@ -94,7 +89,6 @@ static struct clksrc_clk clk_mout_apll = { ...@@ -94,7 +89,6 @@ static struct clksrc_clk clk_mout_apll = {
static struct clksrc_clk clk_mout_epll = { static struct clksrc_clk clk_mout_epll = {
.clk = { .clk = {
.name = "mout_epll", .name = "mout_epll",
.id = -1,
}, },
.sources = &clk_src_epll, .sources = &clk_src_epll,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 8, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 8, .size = 1 },
...@@ -112,7 +106,6 @@ static struct clksrc_sources clk_src_mout_hpll = { ...@@ -112,7 +106,6 @@ static struct clksrc_sources clk_src_mout_hpll = {
static struct clksrc_clk clk_mout_hpll = { static struct clksrc_clk clk_mout_hpll = {
.clk = { .clk = {
.name = "mout_hpll", .name = "mout_hpll",
.id = -1,
}, },
.sources = &clk_src_mout_hpll, .sources = &clk_src_mout_hpll,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 12, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 12, .size = 1 },
...@@ -121,7 +114,6 @@ static struct clksrc_clk clk_mout_hpll = { ...@@ -121,7 +114,6 @@ static struct clksrc_clk clk_mout_hpll = {
static struct clksrc_clk clk_div_apll = { static struct clksrc_clk clk_div_apll = {
.clk = { .clk = {
.name = "div_apll", .name = "div_apll",
.id = -1,
.parent = &clk_mout_apll.clk, .parent = &clk_mout_apll.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 0, .size = 1 }, .reg_div = { .reg = S5P_CLK_DIV0, .shift = 0, .size = 1 },
...@@ -130,7 +122,6 @@ static struct clksrc_clk clk_div_apll = { ...@@ -130,7 +122,6 @@ static struct clksrc_clk clk_div_apll = {
static struct clksrc_clk clk_div_arm = { static struct clksrc_clk clk_div_arm = {
.clk = { .clk = {
.name = "div_arm", .name = "div_arm",
.id = -1,
.parent = &clk_div_apll.clk, .parent = &clk_div_apll.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 4, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV0, .shift = 4, .size = 3 },
...@@ -139,7 +130,6 @@ static struct clksrc_clk clk_div_arm = { ...@@ -139,7 +130,6 @@ static struct clksrc_clk clk_div_arm = {
static struct clksrc_clk clk_div_d0_bus = { static struct clksrc_clk clk_div_d0_bus = {
.clk = { .clk = {
.name = "div_d0_bus", .name = "div_d0_bus",
.id = -1,
.parent = &clk_div_arm.clk, .parent = &clk_div_arm.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 8, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV0, .shift = 8, .size = 3 },
...@@ -148,7 +138,6 @@ static struct clksrc_clk clk_div_d0_bus = { ...@@ -148,7 +138,6 @@ static struct clksrc_clk clk_div_d0_bus = {
static struct clksrc_clk clk_div_pclkd0 = { static struct clksrc_clk clk_div_pclkd0 = {
.clk = { .clk = {
.name = "div_pclkd0", .name = "div_pclkd0",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 12, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV0, .shift = 12, .size = 3 },
...@@ -157,7 +146,6 @@ static struct clksrc_clk clk_div_pclkd0 = { ...@@ -157,7 +146,6 @@ static struct clksrc_clk clk_div_pclkd0 = {
static struct clksrc_clk clk_div_secss = { static struct clksrc_clk clk_div_secss = {
.clk = { .clk = {
.name = "div_secss", .name = "div_secss",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV0, .shift = 16, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV0, .shift = 16, .size = 3 },
...@@ -166,7 +154,6 @@ static struct clksrc_clk clk_div_secss = { ...@@ -166,7 +154,6 @@ static struct clksrc_clk clk_div_secss = {
static struct clksrc_clk clk_div_apll2 = { static struct clksrc_clk clk_div_apll2 = {
.clk = { .clk = {
.name = "div_apll2", .name = "div_apll2",
.id = -1,
.parent = &clk_mout_apll.clk, .parent = &clk_mout_apll.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 0, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 0, .size = 3 },
...@@ -185,7 +172,6 @@ struct clksrc_sources clk_src_mout_am = { ...@@ -185,7 +172,6 @@ struct clksrc_sources clk_src_mout_am = {
static struct clksrc_clk clk_mout_am = { static struct clksrc_clk clk_mout_am = {
.clk = { .clk = {
.name = "mout_am", .name = "mout_am",
.id = -1,
}, },
.sources = &clk_src_mout_am, .sources = &clk_src_mout_am,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 16, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 16, .size = 1 },
...@@ -194,7 +180,6 @@ static struct clksrc_clk clk_mout_am = { ...@@ -194,7 +180,6 @@ static struct clksrc_clk clk_mout_am = {
static struct clksrc_clk clk_div_d1_bus = { static struct clksrc_clk clk_div_d1_bus = {
.clk = { .clk = {
.name = "div_d1_bus", .name = "div_d1_bus",
.id = -1,
.parent = &clk_mout_am.clk, .parent = &clk_mout_am.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 12, .size = 3 },
...@@ -203,7 +188,6 @@ static struct clksrc_clk clk_div_d1_bus = { ...@@ -203,7 +188,6 @@ static struct clksrc_clk clk_div_d1_bus = {
static struct clksrc_clk clk_div_mpll2 = { static struct clksrc_clk clk_div_mpll2 = {
.clk = { .clk = {
.name = "div_mpll2", .name = "div_mpll2",
.id = -1,
.parent = &clk_mout_am.clk, .parent = &clk_mout_am.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 8, .size = 1 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 8, .size = 1 },
...@@ -212,7 +196,6 @@ static struct clksrc_clk clk_div_mpll2 = { ...@@ -212,7 +196,6 @@ static struct clksrc_clk clk_div_mpll2 = {
static struct clksrc_clk clk_div_mpll = { static struct clksrc_clk clk_div_mpll = {
.clk = { .clk = {
.name = "div_mpll", .name = "div_mpll",
.id = -1,
.parent = &clk_mout_am.clk, .parent = &clk_mout_am.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 4, .size = 2 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 4, .size = 2 },
...@@ -231,7 +214,6 @@ struct clksrc_sources clk_src_mout_onenand = { ...@@ -231,7 +214,6 @@ struct clksrc_sources clk_src_mout_onenand = {
static struct clksrc_clk clk_mout_onenand = { static struct clksrc_clk clk_mout_onenand = {
.clk = { .clk = {
.name = "mout_onenand", .name = "mout_onenand",
.id = -1,
}, },
.sources = &clk_src_mout_onenand, .sources = &clk_src_mout_onenand,
.reg_src = { .reg = S5P_CLK_SRC0, .shift = 24, .size = 1 }, .reg_src = { .reg = S5P_CLK_SRC0, .shift = 24, .size = 1 },
...@@ -240,7 +222,6 @@ static struct clksrc_clk clk_mout_onenand = { ...@@ -240,7 +222,6 @@ static struct clksrc_clk clk_mout_onenand = {
static struct clksrc_clk clk_div_onenand = { static struct clksrc_clk clk_div_onenand = {
.clk = { .clk = {
.name = "div_onenand", .name = "div_onenand",
.id = -1,
.parent = &clk_mout_onenand.clk, .parent = &clk_mout_onenand.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 20, .size = 2 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 20, .size = 2 },
...@@ -249,7 +230,6 @@ static struct clksrc_clk clk_div_onenand = { ...@@ -249,7 +230,6 @@ static struct clksrc_clk clk_div_onenand = {
static struct clksrc_clk clk_div_pclkd1 = { static struct clksrc_clk clk_div_pclkd1 = {
.clk = { .clk = {
.name = "div_pclkd1", .name = "div_pclkd1",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 16, .size = 3 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 16, .size = 3 },
...@@ -258,7 +238,6 @@ static struct clksrc_clk clk_div_pclkd1 = { ...@@ -258,7 +238,6 @@ static struct clksrc_clk clk_div_pclkd1 = {
static struct clksrc_clk clk_div_cam = { static struct clksrc_clk clk_div_cam = {
.clk = { .clk = {
.name = "div_cam", .name = "div_cam",
.id = -1,
.parent = &clk_div_mpll2.clk, .parent = &clk_div_mpll2.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV1, .shift = 24, .size = 5 }, .reg_div = { .reg = S5P_CLK_DIV1, .shift = 24, .size = 5 },
...@@ -267,7 +246,6 @@ static struct clksrc_clk clk_div_cam = { ...@@ -267,7 +246,6 @@ static struct clksrc_clk clk_div_cam = {
static struct clksrc_clk clk_div_hdmi = { static struct clksrc_clk clk_div_hdmi = {
.clk = { .clk = {
.name = "div_hdmi", .name = "div_hdmi",
.id = -1,
.parent = &clk_mout_hpll.clk, .parent = &clk_mout_hpll.clk,
}, },
.reg_div = { .reg = S5P_CLK_DIV3, .shift = 28, .size = 4 }, .reg_div = { .reg = S5P_CLK_DIV3, .shift = 28, .size = 4 },
...@@ -399,367 +377,329 @@ static int s5pc100_sclk1_ctrl(struct clk *clk, int enable) ...@@ -399,367 +377,329 @@ static int s5pc100_sclk1_ctrl(struct clk *clk, int enable)
static struct clk init_clocks_off[] = { static struct clk init_clocks_off[] = {
{ {
.name = "cssys", .name = "cssys",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
}, { }, {
.name = "secss", .name = "secss",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
}, { }, {
.name = "g2d", .name = "g2d",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "mdma", .name = "mdma",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "cfcon", .name = "cfcon",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "nfcon", .name = "nfcon",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "onenandc", .name = "onenandc",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "sdm", .name = "sdm",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_2_ctrl, .enable = s5pc100_d0_2_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "seckey", .name = "seckey",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_2_ctrl, .enable = s5pc100_d0_2_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "hsmmc", .name = "hsmmc",
.id = 2, .devname = "s3c-sdhci.2",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 7), .ctrlbit = (1 << 7),
}, { }, {
.name = "hsmmc", .name = "hsmmc",
.id = 1, .devname = "s3c-sdhci.1",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
}, { }, {
.name = "hsmmc", .name = "hsmmc",
.id = 0, .devname = "s3c-sdhci.0",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
}, { }, {
.name = "modemif", .name = "modemif",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "otg", .name = "otg",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "usbhost", .name = "usbhost",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "pdma", .name = "pdma",
.id = 1, .devname = "s3c-pl330.1",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "pdma", .name = "pdma",
.id = 0, .devname = "s3c-pl330.0",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "lcd", .name = "lcd",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "rotator", .name = "rotator",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "fimc", .name = "fimc",
.id = 0, .devname = "s5p-fimc.0",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "fimc", .name = "fimc",
.id = 1, .devname = "s5p-fimc.1",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "fimc", .name = "fimc",
.id = 2, .devname = "s5p-fimc.2",
.parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "jpeg", .name = "jpeg",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
}, { }, {
.name = "mipi-dsim", .name = "mipi-dsim",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
}, { }, {
.name = "mipi-csis", .name = "mipi-csis",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_1_ctrl, .enable = s5pc100_d1_1_ctrl,
.ctrlbit = (1 << 7), .ctrlbit = (1 << 7),
}, { }, {
.name = "g3d", .name = "g3d",
.id = 0,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_0_ctrl, .enable = s5pc100_d1_0_ctrl,
.ctrlbit = (1 << 8), .ctrlbit = (1 << 8),
}, { }, {
.name = "tv", .name = "tv",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_2_ctrl, .enable = s5pc100_d1_2_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "vp", .name = "vp",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_2_ctrl, .enable = s5pc100_d1_2_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "mixer", .name = "mixer",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_2_ctrl, .enable = s5pc100_d1_2_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "hdmi", .name = "hdmi",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_2_ctrl, .enable = s5pc100_d1_2_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "mfc", .name = "mfc",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_2_ctrl, .enable = s5pc100_d1_2_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "apc", .name = "apc",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "iec", .name = "iec",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "systimer", .name = "systimer",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 7), .ctrlbit = (1 << 7),
}, { }, {
.name = "watchdog", .name = "watchdog",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 8), .ctrlbit = (1 << 8),
}, { }, {
.name = "rtc", .name = "rtc",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 9), .ctrlbit = (1 << 9),
}, { }, {
.name = "i2c", .name = "i2c",
.id = 0, .devname = "s3c2440-i2c.0",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "i2c", .name = "i2c",
.id = 1, .devname = "s3c2440-i2c.1",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
}, { }, {
.name = "spi", .name = "spi",
.id = 0, .devname = "s3c64xx-spi.0",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
}, { }, {
.name = "spi", .name = "spi",
.id = 1, .devname = "s3c64xx-spi.1",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 7), .ctrlbit = (1 << 7),
}, { }, {
.name = "spi", .name = "spi",
.id = 2, .devname = "s3c64xx-spi.2",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 8), .ctrlbit = (1 << 8),
}, { }, {
.name = "irda", .name = "irda",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 9), .ctrlbit = (1 << 9),
}, { }, {
.name = "ccan", .name = "ccan",
.id = 0,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 10), .ctrlbit = (1 << 10),
}, { }, {
.name = "ccan", .name = "ccan",
.id = 1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 11), .ctrlbit = (1 << 11),
}, { }, {
.name = "hsitx", .name = "hsitx",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 12), .ctrlbit = (1 << 12),
}, { }, {
.name = "hsirx", .name = "hsirx",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 13), .ctrlbit = (1 << 13),
}, { }, {
.name = "iis", .name = "iis",
.id = 0, .devname = "samsung-i2s.0",
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "iis", .name = "iis",
.id = 1, .devname = "samsung-i2s.1",
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "iis", .name = "iis",
.id = 2, .devname = "samsung-i2s.2",
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "ac97", .name = "ac97",
.id = -1,
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "pcm", .name = "pcm",
.id = 0, .devname = "samsung-pcm.0",
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "pcm", .name = "pcm",
.id = 1, .devname = "samsung-pcm.1",
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
}, { }, {
.name = "spdif", .name = "spdif",
.id = -1,
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
}, { }, {
.name = "adc", .name = "adc",
.id = -1,
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 7), .ctrlbit = (1 << 7),
}, { }, {
.name = "keypad", .name = "keypad",
.id = -1,
.parent = &clk_div_pclkd1.clk, .parent = &clk_div_pclkd1.clk,
.enable = s5pc100_d1_5_ctrl, .enable = s5pc100_d1_5_ctrl,
.ctrlbit = (1 << 8), .ctrlbit = (1 << 8),
}, { }, {
.name = "spi_48m", .name = "spi_48m",
.id = 0, .devname = "s3c64xx-spi.0",
.parent = &clk_mout_48m.clk, .parent = &clk_mout_48m.clk,
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
.ctrlbit = (1 << 7), .ctrlbit = (1 << 7),
}, { }, {
.name = "spi_48m", .name = "spi_48m",
.id = 1, .devname = "s3c64xx-spi.1",
.parent = &clk_mout_48m.clk, .parent = &clk_mout_48m.clk,
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
.ctrlbit = (1 << 8), .ctrlbit = (1 << 8),
}, { }, {
.name = "spi_48m", .name = "spi_48m",
.id = 2, .devname = "s3c64xx-spi.2",
.parent = &clk_mout_48m.clk, .parent = &clk_mout_48m.clk,
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
.ctrlbit = (1 << 9), .ctrlbit = (1 << 9),
}, { }, {
.name = "mmc_48m", .name = "mmc_48m",
.id = 0, .devname = "s3c-sdhci.0",
.parent = &clk_mout_48m.clk, .parent = &clk_mout_48m.clk,
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
.ctrlbit = (1 << 15), .ctrlbit = (1 << 15),
}, { }, {
.name = "mmc_48m", .name = "mmc_48m",
.id = 1, .devname = "s3c-sdhci.1",
.parent = &clk_mout_48m.clk, .parent = &clk_mout_48m.clk,
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
.ctrlbit = (1 << 16), .ctrlbit = (1 << 16),
}, { }, {
.name = "mmc_48m", .name = "mmc_48m",
.id = 2, .devname = "s3c-sdhci.2",
.parent = &clk_mout_48m.clk, .parent = &clk_mout_48m.clk,
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
.ctrlbit = (1 << 17), .ctrlbit = (1 << 17),
...@@ -768,33 +708,27 @@ static struct clk init_clocks_off[] = { ...@@ -768,33 +708,27 @@ static struct clk init_clocks_off[] = {
static struct clk clk_vclk54m = { static struct clk clk_vclk54m = {
.name = "vclk_54m", .name = "vclk_54m",
.id = -1,
.rate = 54000000, .rate = 54000000,
}; };
static struct clk clk_i2scdclk0 = { static struct clk clk_i2scdclk0 = {
.name = "i2s_cdclk0", .name = "i2s_cdclk0",
.id = -1,
}; };
static struct clk clk_i2scdclk1 = { static struct clk clk_i2scdclk1 = {
.name = "i2s_cdclk1", .name = "i2s_cdclk1",
.id = -1,
}; };
static struct clk clk_i2scdclk2 = { static struct clk clk_i2scdclk2 = {
.name = "i2s_cdclk2", .name = "i2s_cdclk2",
.id = -1,
}; };
static struct clk clk_pcmcdclk0 = { static struct clk clk_pcmcdclk0 = {
.name = "pcm_cdclk0", .name = "pcm_cdclk0",
.id = -1,
}; };
static struct clk clk_pcmcdclk1 = { static struct clk clk_pcmcdclk1 = {
.name = "pcm_cdclk1", .name = "pcm_cdclk1",
.id = -1,
}; };
static struct clk *clk_src_group1_list[] = { static struct clk *clk_src_group1_list[] = {
...@@ -836,7 +770,7 @@ struct clksrc_sources clk_src_group3 = { ...@@ -836,7 +770,7 @@ struct clksrc_sources clk_src_group3 = {
static struct clksrc_clk clk_sclk_audio0 = { static struct clksrc_clk clk_sclk_audio0 = {
.clk = { .clk = {
.name = "sclk_audio", .name = "sclk_audio",
.id = 0, .devname = "samsung-pcm.0",
.ctrlbit = (1 << 8), .ctrlbit = (1 << 8),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
}, },
...@@ -862,7 +796,7 @@ struct clksrc_sources clk_src_group4 = { ...@@ -862,7 +796,7 @@ struct clksrc_sources clk_src_group4 = {
static struct clksrc_clk clk_sclk_audio1 = { static struct clksrc_clk clk_sclk_audio1 = {
.clk = { .clk = {
.name = "sclk_audio", .name = "sclk_audio",
.id = 1, .devname = "samsung-pcm.1",
.ctrlbit = (1 << 9), .ctrlbit = (1 << 9),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
}, },
...@@ -887,7 +821,7 @@ struct clksrc_sources clk_src_group5 = { ...@@ -887,7 +821,7 @@ struct clksrc_sources clk_src_group5 = {
static struct clksrc_clk clk_sclk_audio2 = { static struct clksrc_clk clk_sclk_audio2 = {
.clk = { .clk = {
.name = "sclk_audio", .name = "sclk_audio",
.id = 2, .devname = "samsung-pcm.2",
.ctrlbit = (1 << 10), .ctrlbit = (1 << 10),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
}, },
...@@ -1014,7 +948,6 @@ static struct clk_ops s5pc100_sclk_spdif_ops = { ...@@ -1014,7 +948,6 @@ static struct clk_ops s5pc100_sclk_spdif_ops = {
static struct clksrc_clk clk_sclk_spdif = { static struct clksrc_clk clk_sclk_spdif = {
.clk = { .clk = {
.name = "sclk_spdif", .name = "sclk_spdif",
.id = -1,
.ctrlbit = (1 << 11), .ctrlbit = (1 << 11),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
.ops = &s5pc100_sclk_spdif_ops, .ops = &s5pc100_sclk_spdif_ops,
...@@ -1027,7 +960,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1027,7 +960,7 @@ static struct clksrc_clk clksrcs[] = {
{ {
.clk = { .clk = {
.name = "sclk_spi", .name = "sclk_spi",
.id = 0, .devname = "s3c64xx-spi.0",
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1038,7 +971,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1038,7 +971,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_spi", .name = "sclk_spi",
.id = 1, .devname = "s3c64xx-spi.1",
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1049,7 +982,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1049,7 +982,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_spi", .name = "sclk_spi",
.id = 2, .devname = "s3c64xx-spi.2",
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1060,7 +993,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1060,7 +993,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "uclk1", .name = "uclk1",
.id = -1,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1071,7 +1003,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1071,7 +1003,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_mixer", .name = "sclk_mixer",
.id = -1,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1081,7 +1012,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1081,7 +1012,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_lcd", .name = "sclk_lcd",
.id = -1,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1092,7 +1022,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1092,7 +1022,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_fimc", .name = "sclk_fimc",
.id = 0, .devname = "s5p-fimc.0",
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1103,7 +1033,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1103,7 +1033,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_fimc", .name = "sclk_fimc",
.id = 1, .devname = "s5p-fimc.1",
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1114,7 +1044,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1114,7 +1044,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_fimc", .name = "sclk_fimc",
.id = 2, .devname = "s5p-fimc.2",
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1125,7 +1055,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1125,7 +1055,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_mmc", .name = "sclk_mmc",
.id = 0, .devname = "s3c-sdhci.0",
.ctrlbit = (1 << 12), .ctrlbit = (1 << 12),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1136,7 +1066,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1136,7 +1066,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_mmc", .name = "sclk_mmc",
.id = 1, .devname = "s3c-sdhci.1",
.ctrlbit = (1 << 13), .ctrlbit = (1 << 13),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1147,7 +1077,7 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1147,7 +1077,7 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_mmc", .name = "sclk_mmc",
.id = 2, .devname = "s3c-sdhci.2",
.ctrlbit = (1 << 14), .ctrlbit = (1 << 14),
.enable = s5pc100_sclk1_ctrl, .enable = s5pc100_sclk1_ctrl,
...@@ -1158,7 +1088,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1158,7 +1088,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_irda", .name = "sclk_irda",
.id = 2,
.ctrlbit = (1 << 10), .ctrlbit = (1 << 10),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1169,7 +1098,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1169,7 +1098,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_irda", .name = "sclk_irda",
.id = -1,
.ctrlbit = (1 << 10), .ctrlbit = (1 << 10),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1180,7 +1108,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1180,7 +1108,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_pwi", .name = "sclk_pwi",
.id = -1,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1191,7 +1118,6 @@ static struct clksrc_clk clksrcs[] = { ...@@ -1191,7 +1118,6 @@ static struct clksrc_clk clksrcs[] = {
}, { }, {
.clk = { .clk = {
.name = "sclk_uhost", .name = "sclk_uhost",
.id = -1,
.ctrlbit = (1 << 11), .ctrlbit = (1 << 11),
.enable = s5pc100_sclk0_ctrl, .enable = s5pc100_sclk0_ctrl,
...@@ -1291,79 +1217,70 @@ void __init_or_cpufreq s5pc100_setup_clocks(void) ...@@ -1291,79 +1217,70 @@ void __init_or_cpufreq s5pc100_setup_clocks(void)
static struct clk init_clocks[] = { static struct clk init_clocks[] = {
{ {
.name = "tzic", .name = "tzic",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "intc", .name = "intc",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_0_ctrl, .enable = s5pc100_d0_0_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "ebi", .name = "ebi",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 5), .ctrlbit = (1 << 5),
}, { }, {
.name = "intmem", .name = "intmem",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 4), .ctrlbit = (1 << 4),
}, { }, {
.name = "sromc", .name = "sromc",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "dmc", .name = "dmc",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "chipid", .name = "chipid",
.id = -1,
.parent = &clk_div_d0_bus.clk, .parent = &clk_div_d0_bus.clk,
.enable = s5pc100_d0_1_ctrl, .enable = s5pc100_d0_1_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "gpio", .name = "gpio",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "uart", .name = "uart",
.id = 0, .devname = "s3c6400-uart.0",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 0), .ctrlbit = (1 << 0),
}, { }, {
.name = "uart", .name = "uart",
.id = 1, .devname = "s3c6400-uart.1",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 1), .ctrlbit = (1 << 1),
}, { }, {
.name = "uart", .name = "uart",
.id = 2, .devname = "s3c6400-uart.2",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 2), .ctrlbit = (1 << 2),
}, { }, {
.name = "uart", .name = "uart",
.id = 3, .devname = "s3c6400-uart.3",
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_4_ctrl, .enable = s5pc100_d1_4_ctrl,
.ctrlbit = (1 << 3), .ctrlbit = (1 << 3),
}, { }, {
.name = "timers", .name = "timers",
.id = -1,
.parent = &clk_div_d1_bus.clk, .parent = &clk_div_d1_bus.clk,
.enable = s5pc100_d1_3_ctrl, .enable = s5pc100_d1_3_ctrl,
.ctrlbit = (1 << 6), .ctrlbit = (1 << 6),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment