|
@@ -527,6 +527,11 @@ static struct clk init_clocks_off[] = {
|
|
.name = "fimg2d",
|
|
.name = "fimg2d",
|
|
.enable = exynos4_clk_ip_image_ctrl,
|
|
.enable = exynos4_clk_ip_image_ctrl,
|
|
.ctrlbit = (1 << 0),
|
|
.ctrlbit = (1 << 0),
|
|
|
|
+ }, {
|
|
|
|
+ .name = "mfc",
|
|
|
|
+ .devname = "s5p-mfc",
|
|
|
|
+ .enable = exynos4_clk_ip_mfc_ctrl,
|
|
|
|
+ .ctrlbit = (1 << 0),
|
|
}, {
|
|
}, {
|
|
.name = "i2c",
|
|
.name = "i2c",
|
|
.devname = "s3c2440-i2c.0",
|
|
.devname = "s3c2440-i2c.0",
|
|
@@ -731,6 +736,52 @@ static struct clksrc_sources clkset_mout_g2d = {
|
|
.nr_sources = ARRAY_SIZE(clkset_mout_g2d_list),
|
|
.nr_sources = ARRAY_SIZE(clkset_mout_g2d_list),
|
|
};
|
|
};
|
|
|
|
|
|
|
|
+static struct clk *clkset_mout_mfc0_list[] = {
|
|
|
|
+ [0] = &clk_mout_mpll.clk,
|
|
|
|
+ [1] = &clk_sclk_apll.clk,
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clksrc_sources clkset_mout_mfc0 = {
|
|
|
|
+ .sources = clkset_mout_mfc0_list,
|
|
|
|
+ .nr_sources = ARRAY_SIZE(clkset_mout_mfc0_list),
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clksrc_clk clk_mout_mfc0 = {
|
|
|
|
+ .clk = {
|
|
|
|
+ .name = "mout_mfc0",
|
|
|
|
+ },
|
|
|
|
+ .sources = &clkset_mout_mfc0,
|
|
|
|
+ .reg_src = { .reg = S5P_CLKSRC_MFC, .shift = 0, .size = 1 },
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clk *clkset_mout_mfc1_list[] = {
|
|
|
|
+ [0] = &clk_mout_epll.clk,
|
|
|
|
+ [1] = &clk_sclk_vpll.clk,
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clksrc_sources clkset_mout_mfc1 = {
|
|
|
|
+ .sources = clkset_mout_mfc1_list,
|
|
|
|
+ .nr_sources = ARRAY_SIZE(clkset_mout_mfc1_list),
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clksrc_clk clk_mout_mfc1 = {
|
|
|
|
+ .clk = {
|
|
|
|
+ .name = "mout_mfc1",
|
|
|
|
+ },
|
|
|
|
+ .sources = &clkset_mout_mfc1,
|
|
|
|
+ .reg_src = { .reg = S5P_CLKSRC_MFC, .shift = 4, .size = 1 },
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clk *clkset_mout_mfc_list[] = {
|
|
|
|
+ [0] = &clk_mout_mfc0.clk,
|
|
|
|
+ [1] = &clk_mout_mfc1.clk,
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+static struct clksrc_sources clkset_mout_mfc = {
|
|
|
|
+ .sources = clkset_mout_mfc_list,
|
|
|
|
+ .nr_sources = ARRAY_SIZE(clkset_mout_mfc_list),
|
|
|
|
+};
|
|
|
|
+
|
|
static struct clksrc_clk clk_dout_mmc0 = {
|
|
static struct clksrc_clk clk_dout_mmc0 = {
|
|
.clk = {
|
|
.clk = {
|
|
.name = "dout_mmc0",
|
|
.name = "dout_mmc0",
|
|
@@ -972,6 +1023,14 @@ static struct clksrc_clk clksrcs[] = {
|
|
.sources = &clkset_mout_g2d,
|
|
.sources = &clkset_mout_g2d,
|
|
.reg_src = { .reg = S5P_CLKSRC_IMAGE, .shift = 8, .size = 1 },
|
|
.reg_src = { .reg = S5P_CLKSRC_IMAGE, .shift = 8, .size = 1 },
|
|
.reg_div = { .reg = S5P_CLKDIV_IMAGE, .shift = 0, .size = 4 },
|
|
.reg_div = { .reg = S5P_CLKDIV_IMAGE, .shift = 0, .size = 4 },
|
|
|
|
+ }, {
|
|
|
|
+ .clk = {
|
|
|
|
+ .name = "sclk_mfc",
|
|
|
|
+ .devname = "s5p-mfc",
|
|
|
|
+ },
|
|
|
|
+ .sources = &clkset_mout_mfc,
|
|
|
|
+ .reg_src = { .reg = S5P_CLKSRC_MFC, .shift = 8, .size = 1 },
|
|
|
|
+ .reg_div = { .reg = S5P_CLKDIV_MFC, .shift = 0, .size = 4 },
|
|
}, {
|
|
}, {
|
|
.clk = {
|
|
.clk = {
|
|
.name = "sclk_mmc",
|
|
.name = "sclk_mmc",
|
|
@@ -1049,6 +1108,8 @@ static struct clksrc_clk *sysclks[] = {
|
|
&clk_dout_mmc2,
|
|
&clk_dout_mmc2,
|
|
&clk_dout_mmc3,
|
|
&clk_dout_mmc3,
|
|
&clk_dout_mmc4,
|
|
&clk_dout_mmc4,
|
|
|
|
+ &clk_mout_mfc0,
|
|
|
|
+ &clk_mout_mfc1,
|
|
};
|
|
};
|
|
|
|
|
|
static int xtal_rate;
|
|
static int xtal_rate;
|