phy: miphy365x: Convert to devm_kcalloc and fix wrong sizof

PATCH In review Axel Lin 4 participants 8 messages Mar 5, 2015 – Mar 26, 2015

Subsystems (3)

Device tree bindings libata Generic PHY framework

lore

Share & tools

lore

Axel Lin

author

2015-03-05 01:52 UTC #0 lore raw

PATCH 1/2 phy: miphy365x: Convert to devm_kcalloc and fix wrong sizof

Prefer devm_kcalloc over devm_kzalloc with multiply. In additional, use sizeof(phy) is incorrect, fix it.

Signed-off-by Axel Lin <[email protected]>

---
 drivers/phy/phy-miphy365x.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

drivers/phy/phy-miphy365x.c +2 -3

index 61177a6..51b459d 100644
@@ -549,9 +549,8 @@ static int miphy365x_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	miphy_dev->nphys = of_get_child_count(np);
-	miphy_dev->phys = devm_kzalloc(&pdev->dev,
-				       sizeof(phy) * miphy_dev->nphys,
-				       GFP_KERNEL);
+	miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
+				       sizeof(*miphy_dev->phys), GFP_KERNEL);
 	if (!miphy_dev->phys)
 		return -ENOMEM;

Signature · 1 line

1.9.1

Axel Lin

author

2015-03-05 01:57 UTC #1 lore raw

RFC PATCH 2/2 phy: miphy365x: Convert to use phy.h instead of phy-miphy365x.h

The defines in phy-miphy365x.h are all covered in phy.h:

MIPHY_TYPE_SATA == PHY_TYPE_STA
MIPHY_TYPE_PCIE == PHY_TYPE_PCIE
MIPPHY_TYPE_USB == PHY_TYPE_USB2

So covert to use phy.h and then delete phy-miphy365x.h.

Signed-off-by Axel Lin <[email protected]>

---
 Documentation/devicetree/bindings/ata/ahci-st.txt       |  2 +-
 Documentation/devicetree/bindings/phy/phy-miphy365x.txt |  8 ++++----
 arch/arm/boot/dts/stih416.dtsi                          |  4 ++--
 drivers/phy/phy-miphy365x.c                             | 14 +++++++-------
 include/dt-bindings/phy/phy-miphy365x.h                 | 14 --------------
 5 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h

Documentation/devicetree/bindings/ata/ahci-st.txt +1 -1

index 0574a77..070748b 100644
@@ -21,7 +21,7 @@ Example:
 		reg             = <0xfe380000 0x1000>;
 		interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
 		interrupt-names = "hostc";
-		phys	        = <&miphy365x_phy MIPHY_PORT_0 MIPHY_TYPE_SATA>;
+		phys	        = <&miphy365x_phy MIPHY_PORT_0 PHY_TYPE_SATA>;
 		phy-names       = "ahci_phy";
 		resets	        = <&powerdown STIH416_SATA0_POWERDOWN>,
 				  <&softreset STIH416_SATA0_SOFTRESET>;

Documentation/devicetree/bindings/phy/phy-miphy365x.txt +4 -4

index 9802d5d..087294d 100644
@@ -20,8 +20,8 @@ Required nodes	:  A sub-node is required for each channel the controller
 Required properties (port (child) node):
 - #phy-cells 	: Should be 1 (See second example)
 		  Cell after port phandle is device type from:
-			- MIPHY_TYPE_SATA
-			- MIPHY_TYPE_PCI
+			- PHY_TYPE_SATA
+			- PHY_TYPE_PCIE
 - reg        	: Address and length of register sets for each device in
 		  "reg-names"
 - reg-names     : The names of the register addresses corresponding to the

@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node and a device type.
 
 Example:
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 
 	sata0: sata@fe380000 {
 		...
-		phys	  = <&phy_port0 MIPHY_TYPE_SATA>;
+		phys	  = <&phy_port0 PHY_TYPE_SATA>;
 		...
 	};

arch/arm/boot/dts/stih416.dtsi +2 -2

index ea28eba..eeb7afe 100644
@@ -10,7 +10,7 @@
 #include "stih416-clock.dtsi"
 #include "stih416-pinctrl.dtsi"
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/reset-controller/stih416-resets.h>
 / {

@@ -306,7 +306,7 @@
 			reg             = <0xfe380000 0x1000>;
 			interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
 			interrupt-names = "hostc";
-			phys	        = <&phy_port0 MIPHY_TYPE_SATA>;
+			phys	        = <&phy_port0 PHY_TYPE_SATA>;
 			phy-names       = "sata-phy";
 			resets	        = <&powerdown STIH416_SATA0_POWERDOWN>,
 					  <&softreset STIH416_SATA0_SOFTRESET>;

drivers/phy/phy-miphy365x.c +7 -7

index 51b459d..019c2d7 100644
@@ -25,7 +25,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 
 #define HFC_TIMEOUT		100

@@ -177,7 +177,7 @@ static u8 rx_tx_spd[] = {
 static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
 			      struct miphy365x_dev *miphy_dev)
 {
-	bool sata = (miphy_phy->type == MIPHY_TYPE_SATA);
+	bool sata = (miphy_phy->type == PHY_TYPE_SATA);
 
 	return regmap_update_bits(miphy_dev->regmap,
 				  miphy_phy->ctrlreg,

@@ -431,7 +431,7 @@ static int miphy365x_init(struct phy *phy)
 	}
 
 	/* Initialise Miphy for PCIe or SATA */
-	if (miphy_phy->type == MIPHY_TYPE_PCIE)
+	if (miphy_phy->type == PHY_TYPE_PCIE)
 		ret = miphy365x_init_pcie_port(miphy_phy, miphy_dev);
 	else
 		ret = miphy365x_init_sata_port(miphy_phy, miphy_dev);

@@ -455,8 +455,8 @@ int miphy365x_get_addr(struct device *dev, struct miphy365x_phy *miphy_phy,
 		return ret;
 	}
 
-	if (!((!strncmp(name, "sata", 4) && type == MIPHY_TYPE_SATA) ||
-	      (!strncmp(name, "pcie", 4) && type == MIPHY_TYPE_PCIE)))
+	if (!((!strncmp(name, "sata", 4) && type == PHY_TYPE_SATA) ||
+	      (!strncmp(name, "pcie", 4) && type == PHY_TYPE_PCIE)))
 		return 0;
 
 	miphy_phy->base = of_iomap(phynode, index);

@@ -499,8 +499,8 @@ static struct phy *miphy365x_xlate(struct device *dev,
 
 	miphy_phy->type = args->args[0];
 
-	if (!(miphy_phy->type == MIPHY_TYPE_SATA ||
-	      miphy_phy->type == MIPHY_TYPE_PCIE)) {
+	if (!(miphy_phy->type == PHY_TYPE_SATA ||
+	      miphy_phy->type == PHY_TYPE_PCIE)) {
 		dev_err(dev, "Unsupported device type: %d\n", miphy_phy->type);
 		return ERR_PTR(-EINVAL);
 	}

include/dt-bindings/phy/phy-miphy365x.h deleted +0 ~~-14~~

deleted file mode 100644
index 8ef8aba..0000000
@@ -1,14 +0,0 @@
-/*
- * This header provides constants for the phy framework
- * based on the STMicroelectronics MiPHY365x.
- *
- * Author: Lee Jones <[email protected]>
- */
-#ifndef _DT_BINDINGS_PHY_MIPHY
-#define _DT_BINDINGS_PHY_MIPHY
-
-#define MIPHY_TYPE_SATA		1
-#define MIPHY_TYPE_PCIE		2
-#define MIPPHY_TYPE_USB		3
-
-#endif /* _DT_BINDINGS_PHY_MIPHY */

Signature · 1 line

1.9.1

Lee Jones

Acked-by on v1 2/2

2015-03-05 07:54 UTC #2 lore raw

Re: [RFC][PATCH 2/2] phy: miphy365x: Convert to use phy.h instead of phy-miphy365x.h

Quoted 9 lines · Axel Lin

The defines in phy-miphy365x.h are all covered in phy.h:
MIPHY_TYPE_SATA == PHY_TYPE_STA
MIPHY_TYPE_PCIE == PHY_TYPE_PCIE
MIPPHY_TYPE_USB == PHY_TYPE_USB2
So covert to use phy.h and then delete phy-miphy365x.h.
Signed-off-by Axel Lin <[email protected]>

Quoted 8 lines

---
 Documentation/devicetree/bindings/ata/ahci-st.txt       |  2 +-
 Documentation/devicetree/bindings/phy/phy-miphy365x.txt |  8 ++++----
 arch/arm/boot/dts/stih416.dtsi                          |  4 ++--
 drivers/phy/phy-miphy365x.c                             | 14 +++++++-------
 include/dt-bindings/phy/phy-miphy365x.h                 | 14 --------------
 5 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h

Acked-by Lee Jones <[email protected]>

Quoted 136 lines

Documentation/devicetree/bindings/ata/ahci-st.txt +1 -1

index 0574a77..070748b 100644
@@ -21,7 +21,7 @@ Example:
 		reg             = <0xfe380000 0x1000>;
 		interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
 		interrupt-names = "hostc";
-		phys	        = <&miphy365x_phy MIPHY_PORT_0 MIPHY_TYPE_SATA>;
+		phys	        = <&miphy365x_phy MIPHY_PORT_0 PHY_TYPE_SATA>;
 		phy-names       = "ahci_phy";
 		resets	        = <&powerdown STIH416_SATA0_POWERDOWN>,
 				  <&softreset STIH416_SATA0_SOFTRESET>;

Documentation/devicetree/bindings/phy/phy-miphy365x.txt +4 -4

index 9802d5d..087294d 100644
@@ -20,8 +20,8 @@ Required nodes	:  A sub-node is required for each channel the controller
 Required properties (port (child) node):
 - #phy-cells 	: Should be 1 (See second example)
 		  Cell after port phandle is device type from:
-			- MIPHY_TYPE_SATA
-			- MIPHY_TYPE_PCI
+			- PHY_TYPE_SATA
+			- PHY_TYPE_PCIE
 - reg        	: Address and length of register sets for each device in
 		  "reg-names"
 - reg-names     : The names of the register addresses corresponding to the

@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node and a device type.
 
 Example:
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 
 	sata0: sata@fe380000 {
...
-		phys	  = <&phy_port0 MIPHY_TYPE_SATA>;
+		phys	  = <&phy_port0 PHY_TYPE_SATA>;
...
 	};

arch/arm/boot/dts/stih416.dtsi +2 -2

index ea28eba..eeb7afe 100644
@@ -10,7 +10,7 @@
 #include "stih416-clock.dtsi"
 #include "stih416-pinctrl.dtsi"
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/reset-controller/stih416-resets.h>
 / {

@@ -306,7 +306,7 @@
 			reg             = <0xfe380000 0x1000>;
 			interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
 			interrupt-names = "hostc";
-			phys	        = <&phy_port0 MIPHY_TYPE_SATA>;
+			phys	        = <&phy_port0 PHY_TYPE_SATA>;
 			phy-names       = "sata-phy";
 			resets	        = <&powerdown STIH416_SATA0_POWERDOWN>,
 					  <&softreset STIH416_SATA0_SOFTRESET>;

drivers/phy/phy-miphy365x.c +7 -7

index 51b459d..019c2d7 100644
@@ -25,7 +25,7 @@
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 
 #define HFC_TIMEOUT		100

@@ -177,7 +177,7 @@ static u8 rx_tx_spd[] = {
 static int miphy365x_set_path(struct miphy365x_phy *miphy_phy,
 			      struct miphy365x_dev *miphy_dev)
 {
-	bool sata = (miphy_phy->type == MIPHY_TYPE_SATA);
+	bool sata = (miphy_phy->type == PHY_TYPE_SATA);
 
 	return regmap_update_bits(miphy_dev->regmap,
 				  miphy_phy->ctrlreg,

@@ -431,7 +431,7 @@ static int miphy365x_init(struct phy *phy)
 	}
 
 	/* Initialise Miphy for PCIe or SATA */
-	if (miphy_phy->type == MIPHY_TYPE_PCIE)
+	if (miphy_phy->type == PHY_TYPE_PCIE)
 		ret = miphy365x_init_pcie_port(miphy_phy, miphy_dev);
 	else
 		ret = miphy365x_init_sata_port(miphy_phy, miphy_dev);

@@ -455,8 +455,8 @@ int miphy365x_get_addr(struct device *dev, struct miphy365x_phy *miphy_phy,
 		return ret;
 	}
 
-	if (!((!strncmp(name, "sata", 4) && type == MIPHY_TYPE_SATA) ||
-	      (!strncmp(name, "pcie", 4) && type == MIPHY_TYPE_PCIE)))
+	if (!((!strncmp(name, "sata", 4) && type == PHY_TYPE_SATA) ||
+	      (!strncmp(name, "pcie", 4) && type == PHY_TYPE_PCIE)))
 		return 0;
 
 	miphy_phy->base = of_iomap(phynode, index);

@@ -499,8 +499,8 @@ static struct phy *miphy365x_xlate(struct device *dev,
 
 	miphy_phy->type = args->args[0];
 
-	if (!(miphy_phy->type == MIPHY_TYPE_SATA ||
-	      miphy_phy->type == MIPHY_TYPE_PCIE)) {
+	if (!(miphy_phy->type == PHY_TYPE_SATA ||
+	      miphy_phy->type == PHY_TYPE_PCIE)) {
 		dev_err(dev, "Unsupported device type: %d\n", miphy_phy->type);
 		return ERR_PTR(-EINVAL);
 	}

include/dt-bindings/phy/phy-miphy365x.h deleted +0 ~~-14~~

deleted file mode 100644
index 8ef8aba..0000000
@@ -1,14 +0,0 @@
-/*
- * This header provides constants for the phy framework
- * based on the STMicroelectronics MiPHY365x.
- *
- * Author: Lee Jones <[email protected]>
- */
-#ifndef _DT_BINDINGS_PHY_MIPHY
-#define _DT_BINDINGS_PHY_MIPHY
-
-#define MIPHY_TYPE_SATA		1
-#define MIPHY_TYPE_PCIE		2
-#define MIPPHY_TYPE_USB		3
-
-#endif /* _DT_BINDINGS_PHY_MIPHY */

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Kishon Vijay Abraham I

2015-03-09 11:44 UTC #3 lore raw

Re: [RFC][PATCH 2/2] phy: miphy365x: Convert to use phy.h instead of phy-miphy365x.h

In reply to Axel Lin

Hi,

arch/arm/boot/dts/stih416.dtsi

Quoted 63 lines · Axel Lin

The defines in phy-miphy365x.h are all covered in phy.h:

MIPHY_TYPE_SATA == PHY_TYPE_STA
MIPHY_TYPE_PCIE == PHY_TYPE_PCIE
MIPPHY_TYPE_USB == PHY_TYPE_USB2

So covert to use phy.h and then delete phy-miphy365x.h.

Signed-off-by Axel Lin <[email protected]>

---
  Documentation/devicetree/bindings/ata/ahci-st.txt       |  2 +-
  Documentation/devicetree/bindings/phy/phy-miphy365x.txt |  8 ++++----
  arch/arm/boot/dts/stih416.dtsi                          |  4 ++--
  drivers/phy/phy-miphy365x.c                             | 14 +++++++-------
  include/dt-bindings/phy/phy-miphy365x.h                 | 14 --------------
  5 files changed, 14 insertions(+), 28 deletions(-)

delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h

Documentation/devicetree/bindings/ata/ahci-st.txt +1 -1

index 0574a77..070748b 100644
@@ -21,7 +21,7 @@ Example:
  		reg             = <0xfe380000 0x1000>;
  		interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
  		interrupt-names = "hostc";
-		phys	        = <&miphy365x_phy MIPHY_PORT_0 MIPHY_TYPE_SATA>;
+		phys	        = <&miphy365x_phy MIPHY_PORT_0 PHY_TYPE_SATA>;
  		phy-names       = "ahci_phy";
  		resets	        = <&powerdown STIH416_SATA0_POWERDOWN>,
  				  <&softreset STIH416_SATA0_SOFTRESET>;

Documentation/devicetree/bindings/phy/phy-miphy365x.txt +4 -4

index 9802d5d..087294d 100644
@@ -20,8 +20,8 @@ Required nodes	:  A sub-node is required for each channel the controller
  Required properties (port (child) node):
  - #phy-cells 	: Should be 1 (See second example)
  		  Cell after port phandle is device type from:
-			- MIPHY_TYPE_SATA
-			- MIPHY_TYPE_PCI
+			- PHY_TYPE_SATA
+			- PHY_TYPE_PCIE
  - reg        	: Address and length of register sets for each device in
  		  "reg-names"
  - reg-names     : The names of the register addresses corresponding to the

@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node and a device type.
 
  Example:
 
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 
  	sata0: sata@fe380000 {
...
-		phys	  = <&phy_port0 MIPHY_TYPE_SATA>;
+		phys	  = <&phy_port0 PHY_TYPE_SATA>;
...
  	};

arch/arm/boot/dts/stih416.dtsi +0 -0

index ea28eba..eeb7afe 100644

Can you split the patch so that I can queue the PHY part?

Cheers
Kishon

Axel Lin

author

2015-03-09 13:25 UTC #4 lore raw

Re: [RFC][PATCH 2/2] phy: miphy365x: Convert to use phy.h instead of phy-miphy365x.h

2015-03-09 19:44 GMT+08:00 Kishon Vijay Abraham I <[email protected]>:

Quoted 67 lines

Hi,
Quoted 63 lines · Axel Lin
The defines in phy-miphy365x.h are all covered in phy.h:
MIPHY_TYPE_SATA == PHY_TYPE_STA
MIPHY_TYPE_PCIE == PHY_TYPE_PCIE
MIPPHY_TYPE_USB == PHY_TYPE_USB2
So covert to use phy.h and then delete phy-miphy365x.h.
Signed-off-by Axel Lin <[email protected]>
---
  Documentation/devicetree/bindings/ata/ahci-st.txt       |  2 +-
  Documentation/devicetree/bindings/phy/phy-miphy365x.txt |  8 ++++----
  arch/arm/boot/dts/stih416.dtsi                          |  4 ++--
  drivers/phy/phy-miphy365x.c                             | 14
+++++++-------
  include/dt-bindings/phy/phy-miphy365x.h                 | 14
--------------
  5 files changed, 14 insertions(+), 28 deletions(-)
delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h
Documentation/devicetree/bindings/ata/ahci-st.txt +1 -1
index 0574a77..070748b 100644
@@ -21,7 +21,7 @@ Example:
                reg             = <0xfe380000 0x1000>;
                interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
                interrupt-names = "hostc";
-               phys            = <&miphy365x_phy MIPHY_PORT_0
 MIPHY_TYPE_SATA>;
+               phys            = <&miphy365x_phy MIPHY_PORT_0
 PHY_TYPE_SATA>;
                phy-names       = "ahci_phy";
resets = <&powerdown STIH416_SATA0_POWERDOWN>,
<&softreset STIH416_SATA0_SOFTRESET>;
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +0 -0
index 9802d5d..087294d 100644
@@ -20,8 +20,8 @@ Required nodes        :  A sub-node is required for each
channel the controller
Required properties (port (child) node):
- #phy-cells : Should be 1 (See second example) Cell after port phandle is device type from:
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +2 -2
-                       - MIPHY_TYPE_SATA
-                       - MIPHY_TYPE_PCI
+                       - PHY_TYPE_SATA
+                       - PHY_TYPE_PCIE
  - reg         : Address and length of register sets for each device in
                  "reg-names"
  - reg-names     : The names of the register addresses corresponding to
the
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +0 -0
@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node
and a device type.
Example:
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +1 -1
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>

Quoted 14 lines

arch/arm/boot/dts/stih416.dtsi
Quoted 11 lines
        sata0: sata@fe380000 {
                ...
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +1 -1
-               phys      = <&phy_port0 MIPHY_TYPE_SATA>;
+               phys      = <&phy_port0 PHY_TYPE_SATA>;
...
        };
arch/arm/boot/dts/stih416.dtsi +0 -0
index ea28eba..eeb7afe 100644
Can you split the patch so that I can queue the PHY part?

In my opinion, apply the patch as is should be fine and we don't have any build breakage. I think the change in each file is pretty trivial and won't cause problem. otherwise, I will have to send patches for the conversion in each file and then wait until all patches are merged. Then send another patch to delete include/dt-bindings/phy/phy-miphy365x.h.

Regards,
Axel
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Kishon Vijay Abraham I

2015-03-25 23:11 UTC #5 lore raw

Re: [RFC][PATCH 2/2] phy: miphy365x: Convert to use phy.h instead of phy-miphy365x.h

+Maxime, Srinivas, patrice

Quoted 83 lines · Axel Lin

2015-03-09 19:44 GMT+08:00 Kishon Vijay Abraham I <[email protected]>:
Quoted 67 lines
Hi,
Quoted 63 lines · Axel Lin
The defines in phy-miphy365x.h are all covered in phy.h:
MIPHY_TYPE_SATA == PHY_TYPE_STA
MIPHY_TYPE_PCIE == PHY_TYPE_PCIE
MIPPHY_TYPE_USB == PHY_TYPE_USB2
So covert to use phy.h and then delete phy-miphy365x.h.
Signed-off-by Axel Lin <[email protected]>
---
  Documentation/devicetree/bindings/ata/ahci-st.txt       |  2 +-
  Documentation/devicetree/bindings/phy/phy-miphy365x.txt |  8 ++++----
  arch/arm/boot/dts/stih416.dtsi                          |  4 ++--
  drivers/phy/phy-miphy365x.c                             | 14
+++++++-------
  include/dt-bindings/phy/phy-miphy365x.h                 | 14
--------------
  5 files changed, 14 insertions(+), 28 deletions(-)
delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h
Documentation/devicetree/bindings/ata/ahci-st.txt +1 -1
index 0574a77..070748b 100644
@@ -21,7 +21,7 @@ Example:
                reg             = <0xfe380000 0x1000>;
                interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
                interrupt-names = "hostc";
-               phys            = <&miphy365x_phy MIPHY_PORT_0
 MIPHY_TYPE_SATA>;
+               phys            = <&miphy365x_phy MIPHY_PORT_0
 PHY_TYPE_SATA>;
                phy-names       = "ahci_phy";
resets = <&powerdown STIH416_SATA0_POWERDOWN>,
<&softreset STIH416_SATA0_SOFTRESET>;
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +0 -0
index 9802d5d..087294d 100644
@@ -20,8 +20,8 @@ Required nodes        :  A sub-node is required for each
channel the controller
Required properties (port (child) node):
- #phy-cells : Should be 1 (See second example) Cell after port phandle is device type from:
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +2 -2
-                       - MIPHY_TYPE_SATA
-                       - MIPHY_TYPE_PCI
+                       - PHY_TYPE_SATA
+                       - PHY_TYPE_PCIE
  - reg         : Address and length of register sets for each device in
                  "reg-names"
  - reg-names     : The names of the register addresses corresponding to
the
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +0 -0
@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node
and a device type.
Example:
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +1 -1
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
Quoted 14 lines
arch/arm/boot/dts/stih416.dtsi
Quoted 11 lines
        sata0: sata@fe380000 {
                ...
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +1 -1
-               phys      = <&phy_port0 MIPHY_TYPE_SATA>;
+               phys      = <&phy_port0 PHY_TYPE_SATA>;
...
        };
arch/arm/boot/dts/stih416.dtsi +0 -0
index ea28eba..eeb7afe 100644
Can you split the patch so that I can queue the PHY part?

Quoted 5 lines

In my opinion, apply the patch as is should be fine and we don't have any build breakage. I think the change in each file is pretty trivial and won't cause problem. otherwise, I will have to send patches for the conversion in each file and then wait until all patches are merged. Then send another patch to delete include/dt-bindings/phy/phy-miphy365x.h.

Okay. I can queue after getting Ack from arch/arm/boot/dts/sti* maintainers.

Cheers
Kishon
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Patrice Chotard

Acked-by

2015-03-26 08:48 UTC #6 lore raw

Re: [RFC][PATCH 2/2] phy: miphy365x: Convert to use phy.h instead of phy-miphy365x.h

Hi Kishon

Quoted 83 lines · Kishon Vijay Abraham I

+Maxime, Srinivas, patrice
Quoted 80 lines · Axel Lin
2015-03-09 19:44 GMT+08:00 Kishon Vijay Abraham I <[email protected]>:
Quoted 79 lines
Hi,
arch/arm/boot/dts/stih416.dtsi
Quoted 73 lines · Axel Lin
The defines in phy-miphy365x.h are all covered in phy.h:
MIPHY_TYPE_SATA == PHY_TYPE_STA
MIPHY_TYPE_PCIE == PHY_TYPE_PCIE
MIPPHY_TYPE_USB == PHY_TYPE_USB2
So covert to use phy.h and then delete phy-miphy365x.h.
Signed-off-by Axel Lin <[email protected]>
---
   Documentation/devicetree/bindings/ata/ahci-st.txt       |  2 +-
   Documentation/devicetree/bindings/phy/phy-miphy365x.txt |  8 ++++----
   arch/arm/boot/dts/stih416.dtsi                          |  4 ++--
   drivers/phy/phy-miphy365x.c                             | 14
+++++++-------
   include/dt-bindings/phy/phy-miphy365x.h                 | 14
--------------
   5 files changed, 14 insertions(+), 28 deletions(-)
delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h
Documentation/devicetree/bindings/ata/ahci-st.txt +1 -1
index 0574a77..070748b 100644
@@ -21,7 +21,7 @@ Example:
                 reg             = <0xfe380000 0x1000>;
                 interrupts      = <GIC_SPI 157 IRQ_TYPE_NONE>;
                 interrupt-names = "hostc";
-               phys            = <&miphy365x_phy MIPHY_PORT_0
 MIPHY_TYPE_SATA>;
+               phys            = <&miphy365x_phy MIPHY_PORT_0
 PHY_TYPE_SATA>;
                 phy-names       = "ahci_phy";
resets = <&powerdown STIH416_SATA0_POWERDOWN>,
<&softreset STIH416_SATA0_SOFTRESET>;
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +0 -0
index 9802d5d..087294d 100644
@@ -20,8 +20,8 @@ Required nodes        :  A sub-node is required for each
channel the controller
Required properties (port (child) node):
- #phy-cells : Should be 1 (See second example) Cell after port phandle is device type from:
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +2 -2
-                       - MIPHY_TYPE_SATA
-                       - MIPHY_TYPE_PCI
+                       - PHY_TYPE_SATA
+                       - PHY_TYPE_PCIE
   - reg         : Address and length of register sets for each device in
                   "reg-names"
   - reg-names     : The names of the register addresses corresponding to
the
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +0 -0
@@ -68,10 +68,10 @@ property, containing a phandle to the phy port node
and a device type.
Example:
Documentation/devicetree/bindings/phy/phy-miphy365x.txt +2 -2
-#include <dt-bindings/phy/phy-miphy365x.h>
+#include <dt-bindings/phy/phy.h>
 
         sata0: sata@fe380000 {
...
-               phys      = <&phy_port0 MIPHY_TYPE_SATA>;
+               phys      = <&phy_port0 PHY_TYPE_SATA>;
...
         };
arch/arm/boot/dts/stih416.dtsi +0 -0
index ea28eba..eeb7afe 100644
Can you split the patch so that I can queue the PHY part?

Quoted 6 lines

Quoted 5 lines
In my opinion, apply the patch as is should be fine and we don't have any build breakage. I think the change in each file is pretty trivial and won't cause problem. otherwise, I will have to send patches for the conversion in each file and then wait until all patches are merged. Then send another patch to delete include/dt-bindings/phy/phy-miphy365x.h.
Okay. I can queue after getting Ack from arch/arm/boot/dts/sti* maintainers.

Acked-by Patrice Chotard <[email protected]>

Thanks

Patrice

Quoted 3 lines

Cheers
Kishon

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Lee Jones

Acked-by on v1 1/2

2015-03-05 07:53 UTC #7 lore raw

In reply to Axel Lin

Quoted 7 lines · Axel Lin

Prefer devm_kcalloc over devm_kzalloc with multiply. In additional, use sizeof(phy) is incorrect, fix it.
Signed-off-by Axel Lin <[email protected]>
---
 drivers/phy/phy-miphy365x.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Acked-by Lee Jones <[email protected]>

Quoted 16 lines

drivers/phy/phy-miphy365x.c +2 -3

index 61177a6..51b459d 100644
@@ -549,9 +549,8 @@ static int miphy365x_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	miphy_dev->nphys = of_get_child_count(np);
-	miphy_dev->phys = devm_kzalloc(&pdev->dev,
-				       sizeof(phy) * miphy_dev->nphys,
-				       GFP_KERNEL);
+	miphy_dev->phys = devm_kcalloc(&pdev->dev, miphy_dev->nphys,
+				       sizeof(*miphy_dev->phys), GFP_KERNEL);
 	if (!miphy_dev->phys)
 		return -ENOMEM;

Signature · 4 lines

Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog