| Message ID | 1427728632-10846-2-git-send-email-peter.griffin@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote: > Hi Patrice, Maxime, > > On Monday 30 March 2015 08:47 PM, Peter Griffin wrote: > >Now there are generic phy type constants declared in phy.h, migrate over to > >using them rather than defining our own. This change has been done as one > >atomic commit to be bisectable. > > > >Note: The values of the defines are the same, so there is no ABI breakage > >with this patch. > > > >Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > >Acked-by: Rob Herring <robh@kernel.org> > >Acked-by: Lee Jones <lee.jones@linaro.org> > > Are you okay for this patch to go via PHY tree? It modifies arch/arm/boot/dts > /stih416.dtsi. These files need to be changed simultaneously in order to prevent breakage during bisection and the like. I think the best bet moving forward is to pull this into its own branch, tag it and send Maxime a pull-request to the immutable branch. It's the best way to minimise merge conflicts during the v4.1 merge window. > >--- > > 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 -------------- > > 4 files changed, 13 insertions(+), 27 deletions(-) > > delete mode 100644 include/dt-bindings/phy/phy-miphy365x.h > > > >diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt > >index 9802d5d..8772900 100644 > >--- a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt > >+++ b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt > >@@ -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_PCI > > - 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>; > > ... > > }; > >diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi > >index ea28eba..eeb7afe 100644 > >--- a/arch/arm/boot/dts/stih416.dtsi > >+++ b/arch/arm/boot/dts/stih416.dtsi > >@@ -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>; > >diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c > >index 51b459d..019c2d7 100644 > >--- a/drivers/phy/phy-miphy365x.c > >+++ b/drivers/phy/phy-miphy365x.c > >@@ -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); > > } > >diff --git a/include/dt-bindings/phy/phy-miphy365x.h b/include/dt-bindings/phy/phy-miphy365x.h > >deleted file mode 100644 > >index 8ef8aba..0000000 > >--- a/include/dt-bindings/phy/phy-miphy365x.h > >+++ /dev/null > >@@ -1,14 +0,0 @@ > >-/* > >- * This header provides constants for the phy framework > >- * based on the STMicroelectronics MiPHY365x. > >- * > >- * Author: Lee Jones <lee.jones@linaro.org> > >- */ > >-#ifndef _DT_BINDINGS_PHY_MIPHY > >-#define _DT_BINDINGS_PHY_MIPHY > >- > >-#define MIPHY_TYPE_SATA 1 > >-#define MIPHY_TYPE_PCIE 2 > >-#define MIPHY_TYPE_USB 3 > >- > >-#endif /* _DT_BINDINGS_PHY_MIPHY */ > >
Hi Lee, On Tue, 31 Mar 2015, Lee Jones wrote: > On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote: > > > Hi Patrice, Maxime, > > > > On Monday 30 March 2015 08:47 PM, Peter Griffin wrote: > > >Now there are generic phy type constants declared in phy.h, migrate over to > > >using them rather than defining our own. This change has been done as one > > >atomic commit to be bisectable. > > > > > >Note: The values of the defines are the same, so there is no ABI breakage > > >with this patch. > > > > > >Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > > >Acked-by: Rob Herring <robh@kernel.org> > > >Acked-by: Lee Jones <lee.jones@linaro.org> > > > > Are you okay for this patch to go via PHY tree? It modifies arch/arm/boot/dts > > /stih416.dtsi. > > These files need to be changed simultaneously in order to prevent > breakage during bisection and the like. That is why it has been authored as one atomic commit. See commit message above. regards, Peter -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 31 Mar 2015, Peter Griffin wrote: > On Tue, 31 Mar 2015, Lee Jones wrote: > > On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote: > > > > > Hi Patrice, Maxime, > > > > > > On Monday 30 March 2015 08:47 PM, Peter Griffin wrote: > > > >Now there are generic phy type constants declared in phy.h, migrate over to > > > >using them rather than defining our own. This change has been done as one > > > >atomic commit to be bisectable. > > > > > > > >Note: The values of the defines are the same, so there is no ABI breakage > > > >with this patch. > > > > > > > >Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > > > >Acked-by: Rob Herring <robh@kernel.org> > > > >Acked-by: Lee Jones <lee.jones@linaro.org> > > > > > > Are you okay for this patch to go via PHY tree? It modifies arch/arm/boot/dts > > > /stih416.dtsi. > > > > These files need to be changed simultaneously in order to prevent > > breakage during bisection and the like. > > That is why it has been authored as one atomic commit. See commit message above. I already know you know why you did it. The comment was for Kishon.
On Tue, 31 Mar 2015, Maxime Coquelin wrote: > Hi Kishon, > On 03/31/2015 05:30 PM, Kishon Vijay Abraham I wrote: > >Maxime, > > > >On Tuesday 31 March 2015 01:10 PM, Lee Jones wrote: > >>On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote: > >> > >>>Hi Patrice, Maxime, > >>> > >>>On Monday 30 March 2015 08:47 PM, Peter Griffin wrote: > >>>>Now there are generic phy type constants declared in phy.h, > >>>>migrate over to > >>>>using them rather than defining our own. This change has > >>>>been done as one > >>>>atomic commit to be bisectable. > >>>> > >>>>Note: The values of the defines are the same, so there is no > >>>>ABI breakage > >>>>with this patch. > >>>> > >>>>Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > >>>>Acked-by: Rob Herring <robh@kernel.org> > >>>>Acked-by: Lee Jones <lee.jones@linaro.org> > >>> > >>>Are you okay for this patch to go via PHY tree? It modifies > >>>arch/arm/boot/dts > >>>/stih416.dtsi. > >> > >>These files need to be changed simultaneously in order to prevent > >>breakage during bisection and the like. I think the best bet moving > >>forward is to pull this into its own branch, tag it and send Maxime a > >>pull-request to the immutable branch. It's the best way to minimise > >>merge conflicts during the v4.1 merge window. > > > >okay. I still need an Ack from Maxime. > > You have my Ack. > > I haven't sent a pull request for STi DT files for v4.1 now, and it > is too late to send one. > So creating an immutable tag is not even needed in my opinion, you > can just take the DT patch. Kishon, I saw that you took the MAINTAINERS patch, but not this one. If it's because you are still unsure about it, I agree with Maxime, you can just take this patch without fear of conflict.
On Wed, 01 Apr 2015, Kishon Vijay Abraham I wrote: > Hi, > > On Wednesday 01 April 2015 12:45 PM, Lee Jones wrote: > >On Tue, 31 Mar 2015, Maxime Coquelin wrote: > > > >>Hi Kishon, > >>On 03/31/2015 05:30 PM, Kishon Vijay Abraham I wrote: > >>>Maxime, > >>> > >>>On Tuesday 31 March 2015 01:10 PM, Lee Jones wrote: > >>>>On Tue, 31 Mar 2015, Kishon Vijay Abraham I wrote: > >>>> > >>>>>Hi Patrice, Maxime, > >>>>> > >>>>>On Monday 30 March 2015 08:47 PM, Peter Griffin wrote: > >>>>>>Now there are generic phy type constants declared in phy.h, > >>>>>>migrate over to > >>>>>>using them rather than defining our own. This change has > >>>>>>been done as one > >>>>>>atomic commit to be bisectable. > >>>>>> > >>>>>>Note: The values of the defines are the same, so there is no > >>>>>>ABI breakage > >>>>>>with this patch. > >>>>>> > >>>>>>Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > >>>>>>Acked-by: Rob Herring <robh@kernel.org> > >>>>>>Acked-by: Lee Jones <lee.jones@linaro.org> > >>>>> > >>>>>Are you okay for this patch to go via PHY tree? It modifies > >>>>>arch/arm/boot/dts > >>>>>/stih416.dtsi. > >>>> > >>>>These files need to be changed simultaneously in order to prevent > >>>>breakage during bisection and the like. I think the best bet moving > >>>>forward is to pull this into its own branch, tag it and send Maxime a > >>>>pull-request to the immutable branch. It's the best way to minimise > >>>>merge conflicts during the v4.1 merge window. > >>> > >>>okay. I still need an Ack from Maxime. > >> > >>You have my Ack. > >> > >>I haven't sent a pull request for STi DT files for v4.1 now, and it > >>is too late to send one. > >>So creating an immutable tag is not even needed in my opinion, you > >>can just take the DT patch. > > > >Kishon, > > > >I saw that you took the MAINTAINERS patch, but not this one. If it's > >because you are still unsure about it, I agree with Maxime, you can > >just take this patch without fear of conflict. > > I've took this already > https://git.kernel.org/cgit/linux/kernel/git/kishon/linux-phy.git/commit/?h=next&id=76fa6deabab05688a1653c2f66224be4a3c08d6a I missed that. Thanks for pointing it out.
diff --git a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt index 9802d5d..8772900 100644 --- a/Documentation/devicetree/bindings/phy/phy-miphy365x.txt +++ b/Documentation/devicetree/bindings/phy/phy-miphy365x.txt @@ -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_PCI - 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>; ... }; diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi index ea28eba..eeb7afe 100644 --- a/arch/arm/boot/dts/stih416.dtsi +++ b/arch/arm/boot/dts/stih416.dtsi @@ -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>; diff --git a/drivers/phy/phy-miphy365x.c b/drivers/phy/phy-miphy365x.c index 51b459d..019c2d7 100644 --- a/drivers/phy/phy-miphy365x.c +++ b/drivers/phy/phy-miphy365x.c @@ -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); } diff --git a/include/dt-bindings/phy/phy-miphy365x.h b/include/dt-bindings/phy/phy-miphy365x.h deleted file mode 100644 index 8ef8aba..0000000 --- a/include/dt-bindings/phy/phy-miphy365x.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This header provides constants for the phy framework - * based on the STMicroelectronics MiPHY365x. - * - * Author: Lee Jones <lee.jones@linaro.org> - */ -#ifndef _DT_BINDINGS_PHY_MIPHY -#define _DT_BINDINGS_PHY_MIPHY - -#define MIPHY_TYPE_SATA 1 -#define MIPHY_TYPE_PCIE 2 -#define MIPHY_TYPE_USB 3 - -#endif /* _DT_BINDINGS_PHY_MIPHY */