xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: clk: st: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x

Browse Source 
Use a generic name for this kind of PLL

Correction in dts files are already done here:
commit 5eb26c6059 ("ARM: STi: DT: Rename st_pll3200c32_407_c0_x into st_pll3200c32_cx_x")

Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
This commit is contained in:
Gabriel Fernandez
2015-09-16 09:42:59 +02:00
committed by Stephen Boyd
parent 9054a31d60
commit d34e210ed3
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/clk/st/clkgen-fsyn.c
View File

@@ -307,7 +307,7 @@ static const struct clkgen_quadfs_data st_fs660c32_F_416 = {
.get_rate = clk_fs660c32_dig_get_rate, .get_rate = clk_fs660c32_dig_get_rate,
}; };
static const struct clkgen_quadfs_data st_fs660c32_C_407 = { static const struct clkgen_quadfs_data st_fs660c32_C = {
.nrst_present = true, .nrst_present = true,
.nrst = { CLKGEN_FIELD(0x2f0, 0x1, 0), .nrst = { CLKGEN_FIELD(0x2f0, 0x1, 0),
CLKGEN_FIELD(0x2f0, 0x1, 1), CLKGEN_FIELD(0x2f0, 0x1, 1),
@@ -350,7 +350,7 @@ static const struct clkgen_quadfs_data st_fs660c32_C_407 = {
.get_rate = clk_fs660c32_dig_get_rate, .get_rate = clk_fs660c32_dig_get_rate,
}; };
static const struct clkgen_quadfs_data st_fs660c32_D_407 = { static const struct clkgen_quadfs_data st_fs660c32_D = {
.nrst_present = true, .nrst_present = true,
.nrst = { CLKGEN_FIELD(0x2a0, 0x1, 0), .nrst = { CLKGEN_FIELD(0x2a0, 0x1, 0),
CLKGEN_FIELD(0x2a0, 0x1, 1), CLKGEN_FIELD(0x2a0, 0x1, 1),
@@ -1077,11 +1077,11 @@ static const struct of_device_id quadfs_of_match[] = {
}, },
{ {
.compatible = "st,stih407-quadfs660-C", .compatible = "st,stih407-quadfs660-C",
.data = &st_fs660c32_C_407 .data = &st_fs660c32_C
}, },
{ {
.compatible = "st,stih407-quadfs660-D", .compatible = "st,stih407-quadfs660-D",
.data = &st_fs660c32_D_407 .data = &st_fs660c32_D
}, },
{} {}
}; };

12
drivers/clk/st/clkgen-pll.c
View File

@@ -193,7 +193,7 @@ static const struct clkgen_pll_data st_pll3200c32_407_a0 = {
.ops = &stm_pll3200c32_ops, .ops = &stm_pll3200c32_ops,
}; };
static const struct clkgen_pll_data st_pll3200c32_407_c0_0 = { static const struct clkgen_pll_data st_pll3200c32_cx_0 = {
/* 407 C0 PLL0 */ /* 407 C0 PLL0 */
.pdn_status = CLKGEN_FIELD(0x2a0, 0x1, 8), .pdn_status = CLKGEN_FIELD(0x2a0, 0x1, 8),
.locked_status = CLKGEN_FIELD(0x2a0, 0x1, 24), .locked_status = CLKGEN_FIELD(0x2a0, 0x1, 24),
@@ -205,7 +205,7 @@ static const struct clkgen_pll_data st_pll3200c32_407_c0_0 = {
.ops = &stm_pll3200c32_ops, .ops = &stm_pll3200c32_ops,
}; };
static const struct clkgen_pll_data st_pll3200c32_407_c0_1 = { static const struct clkgen_pll_data st_pll3200c32_cx_1 = {
/* 407 C0 PLL1 */ /* 407 C0 PLL1 */
.pdn_status = CLKGEN_FIELD(0x2c8, 0x1, 8), .pdn_status = CLKGEN_FIELD(0x2c8, 0x1, 8),
.locked_status = CLKGEN_FIELD(0x2c8, 0x1, 24), .locked_status = CLKGEN_FIELD(0x2c8, 0x1, 24),
@@ -624,12 +624,12 @@ static const struct of_device_id c32_pll_of_match[] = {
.data = &st_pll3200c32_407_a0, .data = &st_pll3200c32_407_a0,
}, },
{ {
.compatible = "st,stih407-plls-c32-c0_0", .compatible = "st,plls-c32-cx_0",
.data = &st_pll3200c32_407_c0_0, .data = &st_pll3200c32_cx_0,
}, },
{ {
.compatible = "st,stih407-plls-c32-c0_1", .compatible = "st,plls-c32-cx_1",
.data = &st_pll3200c32_407_c0_1, .data = &st_pll3200c32_cx_1,
}, },
{ {
.compatible = "st,stih407-plls-c32-a9", .compatible = "st,stih407-plls-c32-a9",