From: Huang, Tao <huangtao@rock-chips.com>
Date: Fri, 6 Feb 2015 13:43:58 +0000 (+0800)
Subject: rk3368: rename pmu_grf or pmu to pmugrf
X-Git-Tag: firefly_0821_release~4158^2~447^2~24
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4b8a18bfbc63bb40cff4c00266dbc07264d070f6;p=firefly-linux-kernel-4.4.55.git

rk3368: rename pmu_grf or pmu to pmugrf

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rk3368-tb_8846.dts b/arch/arm64/boot/dts/rk3368-tb_8846.dts
index b488dbd91f3a..7cb298223d24 100644
--- a/arch/arm64/boot/dts/rk3368-tb_8846.dts
+++ b/arch/arm64/boot/dts/rk3368-tb_8846.dts
@@ -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*/
diff --git a/arch/arm64/boot/dts/rk3368.dtsi b/arch/arm64/boot/dts/rk3368.dtsi
index 2a6dc1291fc9..3761b07b8c80 100755
--- a/arch/arm64/boot/dts/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rk3368.dtsi
@@ -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;
diff --git a/drivers/pinctrl/pinctrl-rk3368.c b/drivers/pinctrl/pinctrl-rk3368.c
index a733dd000521..a2f28cc910b7 100755
--- a/drivers/pinctrl/pinctrl-rk3368.c
+++ b/drivers/pinctrl/pinctrl-rk3368.c
@@ -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))
diff --git a/drivers/power/avs/rockchip-io-domain.c b/drivers/power/avs/rockchip-io-domain.c
index d0964572268b..e4b6d8da727d 100755
--- a/drivers/power/avs/rockchip-io-domain.c
+++ b/drivers/power/avs/rockchip-io-domain.c
@@ -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))
diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
index 82e429879fa6..f6b777171258 100644
--- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c
@@ -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);