shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: rockchip: Call rockchip_pinctrl_get_soc_data() after regmap Initialization

Browse Source 
In soc_data_init(), need to write GRF registers, so change
the order for rockchip_pinctrl_get_soc_data(), call it after
regmap Initialization.

Change-Id: Ia3a6a821861d853c85870c2be43f33c6ad76c0e9
Signed-off-by: David Wu <david.wu@rock-chips.com>
This commit is contained in:
David Wu
2018-10-29 10:55:46 +08:00
committed by Tao Huang
parent 6121b53e97
commit f82750e615
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/pinctrl/pinctrl-rockchip.c
View File

@@ -4413,13 +4413,6 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
info->dev = dev;
ctrl = rockchip_pinctrl_get_soc_data(info, pdev);
if (!ctrl) {
dev_err(dev, "driver data not available\n");
return -EINVAL;
}
info->ctrl = ctrl;
node = of_parse_phandle(np, "rockchip,grf", 0);
if (node) {
info->regmap_base = syscon_node_to_regmap(node);
@@ -4463,6 +4456,13 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
return PTR_ERR(info->regmap_pmu);
}
ctrl = rockchip_pinctrl_get_soc_data(info, pdev);
if (!ctrl) {
dev_err(dev, "driver data not available\n");
return -EINVAL;
}
info->ctrl = ctrl;
ret = rockchip_gpiolib_register(pdev, info);
if (ret)
return ret;