[GIT PULL] phy: for 4.6 -rc

[GIT PULL] phy: for 4.6 -rc

[Kishon Vijay Abraham I]

Hi Greg,

Please find the pull request for 4.6 -rc cycle below. It consists of
couple of fixes to move the rockchip emmc phy and rockchip display phy
as a child device of GRF. Both these PHY drivers were merged in the
recent merge window and requires their dt bindings to be fixed.

Consider merging this in the -rc cycle. Let me know if I have to change
something.

Thanks
Kishon

The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca:

  Linux 4.6-rc1 (2016-03-26 16:03:24 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-4.6-rc

for you to fetch changes up to 5128de85124c728cdbb6b35bd9dc7410f02c0ca1:

  phy: rockchip-emmc: adapt binding to specifiy register offset and length (2016-04-13 18:33:05 +0530)

----------------------------------------------------------------
phy: for 4.6-rc

*) make rockchip-dp and rockchip-emmc PHY child device of
   GRF

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

----------------------------------------------------------------
Heiko Stuebner (3):
      phy: rockchip-dp: should be a child device of the GRF
      phy: rockchip-emmc: should be a child device of the GRF
      phy: rockchip-emmc: adapt binding to specifiy register offset and length

 .../devicetree/bindings/phy/rockchip-dp-phy.txt    |   18 +++++++++-------
 .../devicetree/bindings/phy/rockchip-emmc-phy.txt  |   22 +++++++++++++-------
 drivers/phy/phy-rockchip-dp.c                      |    7 +++++--
 drivers/phy/phy-rockchip-emmc.c                    |    5 ++++-
 4 files changed, 34 insertions(+), 18 deletions(-)

-- 
1.7.9.5

[PATCH 1/3] phy: rockchip-dp: should be a child device of the GRF

[Kishon Vijay Abraham I]

From: Heiko Stuebner <heiko@sntech.de>

The displayport-phy is fully enclosed in the general register files (GRF).
Therefore as seen from the device-tree it shouldn't be a separate platform-
device but instead a sub-device of the GRF - using the simply-mfd mechanism.

The driver entered the kernel in the current merge-window, so we can still
adapt the binding without needing a fallback, as the binding hasn't been
released with a full kernel yet.

While the edp phy is fully part of the GRF, it doesn't have any separate
register set there, so doesn't get any register-area assigned.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Yakir Yang <ykk@rock-chips.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 .../devicetree/bindings/phy/rockchip-dp-phy.txt    |   18 +++++++++++-------
 drivers/phy/phy-rockchip-dp.c                      |    7 +++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
index 50c4f9b..e3b4809 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
@@ -8,15 +8,19 @@ Required properties:
 	of memory mapped region.
 - clock-names: from common clock binding:
 	Required elements: "24m"
-- rockchip,grf: phandle to the syscon managing the "general register files"
 - #phy-cells : from the generic PHY bindings, must be 0;
 
 Example:
 
-edp_phy: edp-phy {
-	compatible = "rockchip,rk3288-dp-phy";
-	rockchip,grf = <&grf>;
-	clocks = <&cru SCLK_EDP_24M>;
-	clock-names = "24m";
-	#phy-cells = <0>;
+grf: syscon@ff770000 {
+	compatible = "rockchip,rk3288-grf", "syscon", "simple-mfd";
+
+...
+
+	edp_phy: edp-phy {
+		compatible = "rockchip,rk3288-dp-phy";
+		clocks = <&cru SCLK_EDP_24M>;
+		clock-names = "24m";
+		#phy-cells = <0>;
+	};
 };
diff --git a/drivers/phy/phy-rockchip-dp.c b/drivers/phy/phy-rockchip-dp.c
index 77e2d02..793ecb6 100644
--- a/drivers/phy/phy-rockchip-dp.c
+++ b/drivers/phy/phy-rockchip-dp.c
@@ -86,6 +86,9 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev)
 	if (!np)
 		return -ENODEV;
 
+	if (!dev->parent || !dev->parent->of_node)
+		return -ENODEV;
+
 	dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL);
 	if (IS_ERR(dp))
 		return -ENOMEM;
@@ -104,9 +107,9 @@ static int rockchip_dp_phy_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	dp->grf = syscon_regmap_lookup_by_phandle(np, "rockchip,grf");
+	dp->grf = syscon_node_to_regmap(dev->parent->of_node);
 	if (IS_ERR(dp->grf)) {
-		dev_err(dev, "rk3288-dp needs rockchip,grf property\n");
+		dev_err(dev, "rk3288-dp needs the General Register Files syscon\n");
 		return PTR_ERR(dp->grf);
 	}
 
-- 
1.7.9.5

[PATCH 2/3] phy: rockchip-emmc: should be a child device of the GRF

[Kishon Vijay Abraham I]

From: Heiko Stuebner <heiko@sntech.de>

The emmc-phy is fully enclosed in the general register files (GRF).
Therefore as seen from the device-tree it shouldn't be a separate platform-
device but instead a sub-device of the GRF - using the simply-mfd mechanism.

The driver entered the kernel in the current merge-window, so we can still
adapt the binding without needing a fallback, as the binding hasn't been
released with a full kernel yet.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 .../devicetree/bindings/phy/rockchip-emmc-phy.txt  |   18 +++++++++++-------
 drivers/phy/phy-rockchip-emmc.c                    |    5 ++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
index 61916f1..461e958 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
@@ -3,17 +3,21 @@ Rockchip EMMC PHY
 
 Required properties:
  - compatible: rockchip,rk3399-emmc-phy
- - rockchip,grf : phandle to the syscon managing the "general
-   register files"
  - #phy-cells: must be 0
  - reg: PHY configure reg address offset in "general
    register files"
 
 Example:
 
-emmcphy: phy {
-	compatible = "rockchip,rk3399-emmc-phy";
-	rockchip,grf = <&grf>;
-	reg = <0xf780>;
-	#phy-cells = <0>;
+
+grf: syscon@ff770000 {
+	compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
+
+...
+
+	emmcphy: phy@f780 {
+		compatible = "rockchip,rk3399-emmc-phy";
+		reg = <0xf780>;
+		#phy-cells = <0>;
+	};
 };
diff --git a/drivers/phy/phy-rockchip-emmc.c b/drivers/phy/phy-rockchip-emmc.c
index 887b4c2..6ebcf3e 100644
--- a/drivers/phy/phy-rockchip-emmc.c
+++ b/drivers/phy/phy-rockchip-emmc.c
@@ -176,7 +176,10 @@ static int rockchip_emmc_phy_probe(struct platform_device *pdev)
 	struct regmap *grf;
 	unsigned int reg_offset;
 
-	grf = syscon_regmap_lookup_by_phandle(dev->of_node, "rockchip,grf");
+	if (!dev->parent || !dev->parent->of_node)
+		return -ENODEV;
+
+	grf = syscon_node_to_regmap(dev->parent->of_node);
 	if (IS_ERR(grf)) {
 		dev_err(dev, "Missing rockchip,grf property\n");
 		return PTR_ERR(grf);
-- 
1.7.9.5

[PATCH 3/3] phy: rockchip-emmc: adapt binding to specifiy register offset and length

[Kishon Vijay Abraham I]

From: Heiko Stuebner <heiko@sntech.de>

The emmc-phy occupies a contiguous set of 8 registers inside the general
register files, so the reg property should specify this.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 .../devicetree/bindings/phy/rockchip-emmc-phy.txt  |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
index 461e958..555cb0f 100644
--- a/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
+++ b/Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
@@ -4,7 +4,7 @@ Rockchip EMMC PHY
 Required properties:
  - compatible: rockchip,rk3399-emmc-phy
  - #phy-cells: must be 0
- - reg: PHY configure reg address offset in "general
+ - reg: PHY register address offset and length in "general
    register files"
 
 Example:
@@ -12,12 +12,14 @@ Example:
 
 grf: syscon@ff770000 {
 	compatible = "rockchip,rk3399-grf", "syscon", "simple-mfd";
+	#address-cells = <1>;
+	#size-cells = <1>;
 
 ...
 
 	emmcphy: phy@f780 {
 		compatible = "rockchip,rk3399-emmc-phy";
-		reg = <0xf780>;
+		reg = <0xf780 0x20>;
 		#phy-cells = <0>;
 	};
 };
-- 
1.7.9.5

Re: [GIT PULL] phy: for 4.6 -rc

[Greg KH]

On Sun, Apr 17, 2016 at 12:27:09PM +0530, Kishon Vijay Abraham I wrote:
> Hi Greg,
> 
> Please find the pull request for 4.6 -rc cycle below. It consists of
> couple of fixes to move the rockchip emmc phy and rockchip display phy
> as a child device of GRF. Both these PHY drivers were merged in the
> recent merge window and requires their dt bindings to be fixed.
> 
> Consider merging this in the -rc cycle. Let me know if I have to change
> something.

Pulled and pushed out, thanks.

greg k-h