tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/msm/edp: convert to msm_clk_get()
We already have, as a result of upstreaming the gpu bindings,
msm_clk_get() which will try to get the clock both without and with a
"_clk" suffix. Use this in eDP code so we can drop the "_clk" suffix
in bindings while maintaing backwards compatibility.
Signed-off-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
+11
-11
+11
-11
drivers/gpu/drm/msm/edp/edp_ctrl.c
+11
-11
drivers/gpu/drm/msm/edp/edp_ctrl.c
···
150
150
151
151
static int edp_clk_init(struct edp_ctrl *ctrl)
152
152
{
153
-
struct device *dev = &ctrl->pdev->dev;
153
+
struct platform_device *pdev = ctrl->pdev;
154
154
int ret;
155
155
156
-
ctrl->aux_clk = devm_clk_get(dev, "core_clk");
156
+
ctrl->aux_clk = msm_clk_get(pdev, "core");
157
157
if (IS_ERR(ctrl->aux_clk)) {
158
158
ret = PTR_ERR(ctrl->aux_clk);
159
-
pr_err("%s: Can't find aux_clk, %d\n", __func__, ret);
159
+
pr_err("%s: Can't find core clock, %d\n", __func__, ret);
160
160
ctrl->aux_clk = NULL;
161
161
return ret;
162
162
}
163
163
164
-
ctrl->pixel_clk = devm_clk_get(dev, "pixel_clk");
164
+
ctrl->pixel_clk = msm_clk_get(pdev, "pixel");
165
165
if (IS_ERR(ctrl->pixel_clk)) {
166
166
ret = PTR_ERR(ctrl->pixel_clk);
167
-
pr_err("%s: Can't find pixel_clk, %d\n", __func__, ret);
167
+
pr_err("%s: Can't find pixel clock, %d\n", __func__, ret);
168
168
ctrl->pixel_clk = NULL;
169
169
return ret;
170
170
}
171
171
172
-
ctrl->ahb_clk = devm_clk_get(dev, "iface_clk");
172
+
ctrl->ahb_clk = msm_clk_get(pdev, "iface");
173
173
if (IS_ERR(ctrl->ahb_clk)) {
174
174
ret = PTR_ERR(ctrl->ahb_clk);
175
-
pr_err("%s: Can't find ahb_clk, %d\n", __func__, ret);
175
+
pr_err("%s: Can't find iface clock, %d\n", __func__, ret);
176
176
ctrl->ahb_clk = NULL;
177
177
return ret;
178
178
}
179
179
180
-
ctrl->link_clk = devm_clk_get(dev, "link_clk");
180
+
ctrl->link_clk = msm_clk_get(pdev, "link");
181
181
if (IS_ERR(ctrl->link_clk)) {
182
182
ret = PTR_ERR(ctrl->link_clk);
183
-
pr_err("%s: Can't find link_clk, %d\n", __func__, ret);
183
+
pr_err("%s: Can't find link clock, %d\n", __func__, ret);
184
184
ctrl->link_clk = NULL;
185
185
return ret;
186
186
}
187
187
188
188
/* need mdp core clock to receive irq */
189
-
ctrl->mdp_core_clk = devm_clk_get(dev, "mdp_core_clk");
189
+
ctrl->mdp_core_clk = msm_clk_get(pdev, "mdp_core");
190
190
if (IS_ERR(ctrl->mdp_core_clk)) {
191
191
ret = PTR_ERR(ctrl->mdp_core_clk);
192
-
pr_err("%s: Can't find mdp_core_clk, %d\n", __func__, ret);
192
+
pr_err("%s: Can't find mdp_core clock, %d\n", __func__, ret);
193
193
ctrl->mdp_core_clk = NULL;
194
194
return ret;
195
195
}