aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Brunet <jbrunet@baylibre.com>2017-12-04 08:34:28 -0500
committerJerome Brunet <jbrunet@baylibre.com>2017-12-08 15:37:19 -0500
commited3fb5af69afc802d6e29700fff3401ba99edac1 (patch)
tree42b965f2b756f5749e28e5badee74e9a0183e637
parent75eccf5ed83250c0aeaeeb76f7288254ac0a87b4 (diff)
clk: meson: gxbb: remove IGNORE_UNUSED from mmc clocks
Remove CLK_IGNORE_UNUSED from mmc clocks. This was only needed while the mmc driver incorrectly used the xtal as source instead of the mmc clock. Now, the driver takes the correct clock, CCF is aware that the clock is being used and we can remove this flag. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> Acked-by: Kevin Hilman <khilman@baylibre.com>
-rw-r--r--drivers/clk/meson/gxbb.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c
index 2ac9f3fa9578..74306ac3df23 100644
--- a/drivers/clk/meson/gxbb.c
+++ b/drivers/clk/meson/gxbb.c
@@ -1031,17 +1031,7 @@ static struct clk_gate gxbb_sd_emmc_a_clk0 = {
1031 .ops = &clk_gate_ops, 1031 .ops = &clk_gate_ops,
1032 .parent_names = (const char *[]){ "sd_emmc_a_clk0_div" }, 1032 .parent_names = (const char *[]){ "sd_emmc_a_clk0_div" },
1033 .num_parents = 1, 1033 .num_parents = 1,
1034 1034 .flags = CLK_SET_RATE_PARENT,
1035 /*
1036 * FIXME:
1037 * We need CLK_IGNORE_UNUSED because mmc DT node point to xtal
1038 * instead of this clock. CCF would gate this on boot, killing
1039 * the mmc controller. Please remove this flag once DT properly
1040 * point to this clock instead of xtal
1041 *
1042 * Same goes for emmc B and C clocks
1043 */
1044 .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
1045 }, 1035 },
1046}; 1036};
1047 1037
@@ -1084,7 +1074,7 @@ static struct clk_gate gxbb_sd_emmc_b_clk0 = {
1084 .ops = &clk_gate_ops, 1074 .ops = &clk_gate_ops,
1085 .parent_names = (const char *[]){ "sd_emmc_b_clk0_div" }, 1075 .parent_names = (const char *[]){ "sd_emmc_b_clk0_div" },
1086 .num_parents = 1, 1076 .num_parents = 1,
1087 .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 1077 .flags = CLK_SET_RATE_PARENT,
1088 }, 1078 },
1089}; 1079};
1090 1080
@@ -1127,7 +1117,7 @@ static struct clk_gate gxbb_sd_emmc_c_clk0 = {
1127 .ops = &clk_gate_ops, 1117 .ops = &clk_gate_ops,
1128 .parent_names = (const char *[]){ "sd_emmc_c_clk0_div" }, 1118 .parent_names = (const char *[]){ "sd_emmc_c_clk0_div" },
1129 .num_parents = 1, 1119 .num_parents = 1,
1130 .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED, 1120 .flags = CLK_SET_RATE_PARENT,
1131 }, 1121 },
1132}; 1122};
1133 1123