forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

rk3368: rename pmu_grf or pmu to pmugrf

Browse source 
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
This commit is contained in:
Huang, Tao 2015-02-06 21:43:58 +08:00
commit 4b8a18bfbc
5 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/boot/dts/rk3368-tb_8846.dts
View file

@ -189,7 +189,7 @@
io-domains {
compatible = "rockchip,rk3368-io-voltage-domain";
rockchip,grf = <&grf>;
rockchip,pmu = <&pmu_grf>;
rockchip,pmugrf = <&pmugrf>;
/*GRF_IO_VSEL*/
dvp-supply = <&ldo7_reg>; /*DVPIO_VDD*/

15
arch/arm64/boot/dts/rk3368.dtsi
View file

@ -133,9 +133,14 @@
<0x0 0xffb72000 0 0x1000>;
};
pmu_grf: syscon@ff738000 {
compatible = "rockchip,rk3368-pmu-grf", "rockchip,pmu-grf", "syscon";
reg = <0x0 0xff738000 0x0 0x100>;
pmu: syscon@ff730000 {
compatible = "rockchip,rk3368-pmu", "rockchip,pmu", "syscon";
reg = <0x0 0xff730000 0x0 0x1000>;
};
pmugrf: syscon@ff738000 {
compatible = "rockchip,rk3368-pmugrf", "rockchip,pmugrf", "syscon";
reg = <0x0 0xff738000 0x0 0x1000>;
};
sgrf: syscon@ff740000 {
@ -747,7 +752,7 @@
lcdc: lcdc@ff930000 {
compatible = "rockchip,rk3368-lcdc";
rockchip,grf = <&grf>;
rockchip,pmu = <&pmu_grf>;
rockchip,pmugrf = <&pmugrf>;
rockchip,prop = <PRMRY>;
rockchip,pwr18 = <0>;
rockchip,iommu-enabled = <0>;
@ -1265,7 +1270,7 @@
pinctrl: pinctrl {
compatible = "rockchip,rk3368-pinctrl";
rockchip,grf = <&grf>;
rockchip,pmu = <&pmu_grf>;
rockchip,pmugrf = <&pmugrf>;
#address-cells = <2>;
#size-cells = <2>;
ranges;

4
drivers/pinctrl/pinctrl-rk3368.c
View file

@ -1861,7 +1861,7 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank,
struct device_node *node;
node = of_parse_phandle(bank->of_node->parent,
"rockchip,pmu", 0);
"rockchip,pmugrf", 0);
if (!node) {
if (of_address_to_resource(bank->of_node, 1, &res)) {
dev_err(info->dev, "cannot find IO resource for bank\n");
@ -2039,7 +2039,7 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)
}
/* try to find the optional reference to the pmu syscon */
node = of_parse_phandle(np, "rockchip,pmu", 0);
node = of_parse_phandle(np, "rockchip,pmugrf", 0);
if (node) {
info->regmap_pmu = syscon_node_to_regmap(node);
if (IS_ERR(info->regmap_pmu))

2
drivers/power/avs/rockchip-io-domain.c
View file

@ -416,7 +416,7 @@ static int rockchip_iodomain_probe(struct platform_device *pdev)
}
/* try to find the optional reference to the pmu syscon */
node = of_parse_phandle(np, "rockchip,pmu", 0);
node = of_parse_phandle(np, "rockchip,pmugrf", 0);
if (node) {
iod->pmu = syscon_node_to_regmap(node);
if (IS_ERR(iod->pmu))

2
drivers/video/rockchip/lcdc/rk3368_lcdc.c
View file

@ -4451,7 +4451,7 @@ static int rk3368_lcdc_probe(struct platform_device *pdev)
return PTR_ERR(lcdc_dev->grf_base);
}
lcdc_dev->pmugrf_base =
syscon_regmap_lookup_by_phandle(np, "rockchip,pmu");
syscon_regmap_lookup_by_phandle(np, "rockchip,pmugrf");
if (IS_ERR(lcdc_dev->pmugrf_base)) {
dev_err(&pdev->dev, "can't find lcdc pmu grf property\n");
return PTR_ERR(lcdc_dev->pmugrf_base);