[PATCH v2 1/3] dt-bindings: add SFF vendor prefix

[PATCH v2 1/3] dt-bindings: add SFF vendor prefix

[Baruch Siach]

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2: New patch in this series
---
 Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index daf465bef758..20fdb79a92d4 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -287,6 +287,7 @@ schindler	Schindler
 seagate	Seagate Technology PLC
 semtech	Semtech Corporation
 sensirion	Sensirion AG
+sff	Small Form Factor Committee
 sgx	SGX Sensortech
 sharp	Sharp Corporation
 si-en	Si-En Technology Ltd.
-- 
2.14.1

[PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Baruch Siach]

Add device-tree binding documentation SFP transceivers. Support for SFP
transceivers has been recently introduced (drivers/net/phy/sfp.c).

Signed-off-by: Baruch Siach <baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
---
v2:
  Rename -gpio properties to -gpios
  Rename the rate-select-gpio property to rate-select0-gpios
  Add the rate-select1-gpios property
  Add examples
---
 Documentation/devicetree/bindings/net/sff,sfp.txt | 74 +++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt

diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
new file mode 100644
index 000000000000..1d9c786d6287
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
@@ -0,0 +1,74 @@
+Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)
+Transceiver
+
+Required properties:
+
+- compatible : must be "sff,sfp"
+
+Optional Properties:
+
+- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
+  interface
+
+- moddef0-gpios : phandle of the MOD-DEF0 (AKA Mod_ABS) module presence input
+  gpio signal
+
+- los-gpios : phandle of the Receiver Loss of Signal Indication input gpio
+  signal
+
+- tx-fault-gpios : phandle of the Module Transmitter Fault input gpio signal
+
+- tx-disable-gpios : phandle of the Transmitter Disable output gpio signal
+
+- rate-select0-gpios : phandle of the Rx Signaling Rate Select (AKA RS0) output
+  gpio
+
+- rate-select1-gpios : phandle of the Tx Signaling Rate Select (AKA RS1) output
+  gpio (SFP+ only)
+
+Example #1: Direct serdes to SFP connection
+
+sfp_eth3: sfp-eth3 {
+	compatible = "sff,sfp";
+	i2c-bus = <&sfp_1g_i2c>;
+	los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>;
+	moddef0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>;
+	tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>;
+	tx-fault-gpios = <&cpm_gpio2 19 GPIO_ACTIVE_HIGH>;
+};
+
+&cps_emac3 {
+	phy-mode = "sgmii";
+	phy-names = "comphy";
+	phys = <&cps_comphy 5 COMPHY_SGMII2>;
+	sfp = <&sfp_eth3>;
+};
+
+Example #2: Serdes to PHY to SFP connection
+
+sfp_eth0: sfp-eth0 {
+	compatible = "sff,sfp+";
+	i2c-bus = <&sfpp0_i2c>;
+	los-gpio = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>;
+	moddef0-gpio = <&cps_gpio1 27 GPIO_ACTIVE_LOW>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&cps_sfpp0_pins>;
+	tx-disable-gpio = <&cps_gpio1 29 GPIO_ACTIVE_HIGH>;
+	tx-fault-gpio  = <&cps_gpio1 26 GPIO_ACTIVE_HIGH>;
+};
+
+p0_phy: ethernet-phy@0 {
+	compatible = "ethernet-phy-ieee802.3-c45";
+	pinctrl-names = "default";
+	pinctrl-0 = <&cpm_phy0_pins &cps_phy0_pins>;
+	reg = <0>;
+	interrupt = <&cpm_gpio2 18 IRQ_TYPE_EDGE_FALLING>;
+	sfp = <&sfp_eth0>;
+};
+
+&cpm_eth0 {
+	phy = <&p0_phy>;
+	phy-mode = "10gbase-kr";
+};
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v2 3/3] net: phy: sfp: rename the rate-select property

[Baruch Siach]

Make the Rx rate select control gpio property name match the documented
binding. This would make the addition of 'rate-select1-gpios' for SFP+
support more natural.

Signed-off-by: Baruch Siach <baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
---
v2: New patch in this series
---
 drivers/net/phy/sfp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index fb2cf4342f48..b44c0e296662 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -62,7 +62,7 @@ static const char *gpio_of_names[] = {
 	"los",
 	"tx-fault",
 	"tx-disable",
-	"rate-select",
+	"rate-select0",
 };
 
 static const enum gpiod_flags gpio_flags[] = {
-- 
2.14.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Sergei Shtylyov]

Hello!

On 8/30/2017 12:51 PM, Baruch Siach wrote:

> Add device-tree binding documentation SFP transceivers. Support for SFP
> transceivers has been recently introduced (drivers/net/phy/sfp.c).
> 
> Signed-off-by: Baruch Siach <baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
> ---
> v2:
>    Rename -gpio properties to -gpios
>    Rename the rate-select-gpio property to rate-select0-gpios
>    Add the rate-select1-gpios property
>    Add examples
> ---
>   Documentation/devicetree/bindings/net/sff,sfp.txt | 74 +++++++++++++++++++++++
>   1 file changed, 74 insertions(+)
>   create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt
> 
> diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
> new file mode 100644
> index 000000000000..1d9c786d6287
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
> @@ -0,0 +1,74 @@
> +Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)
> +Transceiver
> +
> +Required properties:
> +
> +- compatible : must be "sff,sfp"
> +
> +Optional Properties:
> +
> +- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
> +  interface
 > +
> +- moddef0-gpios : phandle of the MOD-DEF0 (AKA Mod_ABS) module presence input
> +  gpio signal

    Your example shows there's GPIO phandle *and* specifier.

 > +
> +- los-gpios : phandle of the Receiver Loss of Signal Indication input gpio
> +  signal

    Ditto.

> +
> +- tx-fault-gpios : phandle of the Module Transmitter Fault input gpio signal

    Ditto.

> +
> +- tx-disable-gpios : phandle of the Transmitter Disable output gpio signal

    Ditto.

> +
> +- rate-select0-gpios : phandle of the Rx Signaling Rate Select (AKA RS0) output
> +  gpio
> +
> +- rate-select1-gpios : phandle of the Tx Signaling Rate Select (AKA RS1) output
> +  gpio (SFP+ only)
> +
> +Example #1: Direct serdes to SFP connection
> +
> +sfp_eth3: sfp-eth3 {
> +	compatible = "sff,sfp";
> +	i2c-bus = <&sfp_1g_i2c>;
> +	los-gpios = <&cpm_gpio2 22 GPIO_ACTIVE_HIGH>;
> +	moddef0-gpios = <&cpm_gpio2 21 GPIO_ACTIVE_LOW>;
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&cpm_sfp_1g_pins &cps_sfp_1g_pins>;
> +	tx-disable-gpios = <&cps_gpio1 24 GPIO_ACTIVE_HIGH>;
> +	tx-fault-gpios = <&cpm_gpio2 19 GPIO_ACTIVE_HIGH>;
> +};
[...]
> +Example #2: Serdes to PHY to SFP connection
> +
> +sfp_eth0: sfp-eth0 {
> +	compatible = "sff,sfp+";
> +	i2c-bus = <&sfpp0_i2c>;
> +	los-gpio = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>;

    You describe "los-gpios" above , not "los-gpio" (which is a deprecated form).

> +	moddef0-gpio = <&cps_gpio1 27 GPIO_ACTIVE_LOW>;

    Ditto.

> +	pinctrl-names = "default";
> +	pinctrl-0 = <&cps_sfpp0_pins>;
> +	tx-disable-gpio = <&cps_gpio1 29 GPIO_ACTIVE_HIGH>;

    Ditto.

> +	tx-fault-gpio  = <&cps_gpio1 26 GPIO_ACTIVE_HIGH>;

    Ditto.

[...]

MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Baruch Siach]

Hi Sergei,

Thanks for reviewing.

On Wed, Aug 30, 2017 at 02:04:11PM +0300, Sergei Shtylyov wrote:
> On 8/30/2017 12:51 PM, Baruch Siach wrote:
> 
> > Add device-tree binding documentation SFP transceivers. Support for SFP
> > transceivers has been recently introduced (drivers/net/phy/sfp.c).
> > 
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> > v2:
> >    Rename -gpio properties to -gpios
> >    Rename the rate-select-gpio property to rate-select0-gpios
> >    Add the rate-select1-gpios property
> >    Add examples
> > ---
> >   Documentation/devicetree/bindings/net/sff,sfp.txt | 74 +++++++++++++++++++++++
> >   1 file changed, 74 insertions(+)
> >   create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt
> > 
> > diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
> > new file mode 100644
> > index 000000000000..1d9c786d6287
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
> > @@ -0,0 +1,74 @@
> > +Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)
> > +Transceiver
> > +
> > +Required properties:
> > +
> > +- compatible : must be "sff,sfp"
> > +
> > +Optional Properties:
> > +
> > +- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
> > +  interface
> > +
> > +- moddef0-gpios : phandle of the MOD-DEF0 (AKA Mod_ABS) module presence input
> > +  gpio signal
> 
>    Your example shows there's GPIO phandle *and* specifier.

Would "GPIO specifier" be enough here?

[...]

> > +Example #2: Serdes to PHY to SFP connection
> > +
> > +sfp_eth0: sfp-eth0 {
> > +	compatible = "sff,sfp+";
> > +	i2c-bus = <&sfpp0_i2c>;
> > +	los-gpio = <&cps_gpio1 28 GPIO_ACTIVE_HIGH>;
> 
>    You describe "los-gpios" above , not "los-gpio" (which is a deprecated form).

Will fix.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Sergei Shtylyov]

On 8/30/2017 2:11 PM, Baruch Siach wrote:

> On Wed, Aug 30, 2017 at 02:04:11PM +0300, Sergei Shtylyov wrote:
>> On 8/30/2017 12:51 PM, Baruch Siach wrote:
>>
>>> Add device-tree binding documentation SFP transceivers. Support for SFP
>>> transceivers has been recently introduced (drivers/net/phy/sfp.c).
>>>
>>> Signed-off-by: Baruch Siach <baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
>>> ---
>>> v2:
>>>     Rename -gpio properties to -gpios
>>>     Rename the rate-select-gpio property to rate-select0-gpios
>>>     Add the rate-select1-gpios property
>>>     Add examples
>>> ---
>>>    Documentation/devicetree/bindings/net/sff,sfp.txt | 74 +++++++++++++++++++++++
>>>    1 file changed, 74 insertions(+)
>>>    create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt
>>>
>>> diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
>>> new file mode 100644
>>> index 000000000000..1d9c786d6287
>>> --- /dev/null
>>> +++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
>>> @@ -0,0 +1,74 @@
>>> +Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)
>>> +Transceiver
>>> +
>>> +Required properties:
>>> +
>>> +- compatible : must be "sff,sfp"
>>> +
>>> +Optional Properties:
>>> +
>>> +- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
>>> +  interface
>>> +
>>> +- moddef0-gpios : phandle of the MOD-DEF0 (AKA Mod_ABS) module presence input
>>> +  gpio signal
>>
>>     Your example shows there's GPIO phandle *and* specifier.
> 
> Would "GPIO specifier" be enough here?

    No, specifier is the cells following GPIO (or any other) phandle.

> [...]

MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Baruch Siach]

Hi Sergei,

On Wed, Aug 30, 2017 at 02:15:32PM +0300, Sergei Shtylyov wrote:
> On 8/30/2017 2:11 PM, Baruch Siach wrote:
> 
> > On Wed, Aug 30, 2017 at 02:04:11PM +0300, Sergei Shtylyov wrote:
> > > On 8/30/2017 12:51 PM, Baruch Siach wrote:
> > > 
> > > > Add device-tree binding documentation SFP transceivers. Support for SFP
> > > > transceivers has been recently introduced (drivers/net/phy/sfp.c).
> > > > 
> > > > Signed-off-by: Baruch Siach <baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org>
> > > > ---
> > > > v2:
> > > >     Rename -gpio properties to -gpios
> > > >     Rename the rate-select-gpio property to rate-select0-gpios
> > > >     Add the rate-select1-gpios property
> > > >     Add examples
> > > > ---
> > > >    Documentation/devicetree/bindings/net/sff,sfp.txt | 74 +++++++++++++++++++++++
> > > >    1 file changed, 74 insertions(+)
> > > >    create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt
> > > > 
> > > > diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
> > > > new file mode 100644
> > > > index 000000000000..1d9c786d6287
> > > > --- /dev/null
> > > > +++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
> > > > @@ -0,0 +1,74 @@
> > > > +Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)
> > > > +Transceiver
> > > > +
> > > > +Required properties:
> > > > +
> > > > +- compatible : must be "sff,sfp"
> > > > +
> > > > +Optional Properties:
> > > > +
> > > > +- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
> > > > +  interface
> > > > +
> > > > +- moddef0-gpios : phandle of the MOD-DEF0 (AKA Mod_ABS) module presence input
> > > > +  gpio signal
> > > 
> > >     Your example shows there's GPIO phandle *and* specifier.
> > 
> > Would "GPIO specifier" be enough here?
> 
>    No, specifier is the cells following GPIO (or any other) phandle.

So this should be "GPIO phandle and specifier of ...", is that correct?

I have found very few (< 4) occurrences of this language in (lots of) '-gpios' 
property descriptions under Documentation/devicetree/bindings/. Is this a new 
requirement?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch-NswTu9S1W3P6gbPvEgmw2w@public.gmane.org - tel: +972.52.368.4656, http://www.tkos.co.il -
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Sergei Shtylyov]

On 08/30/2017 02:25 PM, Baruch Siach wrote:

>>>>> Add device-tree binding documentation SFP transceivers. Support for SFP
>>>>> transceivers has been recently introduced (drivers/net/phy/sfp.c).
>>>>>
>>>>> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
>>>>> ---
>>>>> v2:
>>>>>      Rename -gpio properties to -gpios
>>>>>      Rename the rate-select-gpio property to rate-select0-gpios
>>>>>      Add the rate-select1-gpios property
>>>>>      Add examples
>>>>> ---
>>>>>     Documentation/devicetree/bindings/net/sff,sfp.txt | 74 +++++++++++++++++++++++
>>>>>     1 file changed, 74 insertions(+)
>>>>>     create mode 100644 Documentation/devicetree/bindings/net/sff,sfp.txt
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/net/sff,sfp.txt b/Documentation/devicetree/bindings/net/sff,sfp.txt
>>>>> new file mode 100644
>>>>> index 000000000000..1d9c786d6287
>>>>> --- /dev/null
>>>>> +++ b/Documentation/devicetree/bindings/net/sff,sfp.txt
>>>>> @@ -0,0 +1,74 @@
>>>>> +Small Form Factor (SFF) Committee Small Form-factor Pluggable (SFP)
>>>>> +Transceiver
>>>>> +
>>>>> +Required properties:
>>>>> +
>>>>> +- compatible : must be "sff,sfp"
>>>>> +
>>>>> +Optional Properties:
>>>>> +
>>>>> +- i2c-bus : phandle of an I2C bus controller for the SFP two wire serial
>>>>> +  interface
>>>>> +
>>>>> +- moddef0-gpios : phandle of the MOD-DEF0 (AKA Mod_ABS) module presence input
>>>>> +  gpio signal
>>>>
>>>>      Your example shows there's GPIO phandle *and* specifier.
>>>
>>> Would "GPIO specifier" be enough here?
>>
>>     No, specifier is the cells following GPIO (or any other) phandle.
> 
> So this should be "GPIO phandle and specifier of ...", is that correct?

    Exactly. The length of the GPIO specifier is determined by the 
"#gpio-cells" prop of the GPIO node your phandle refers to.

> I have found very few (< 4) occurrences of this language in (lots of) '-gpios'
> property descriptions under Documentation/devicetree/bindings/.

    You better see Documentation/devicetree/bindings/gpio/gpio.txt.

> Is this a new
> requirement?

    Not at all, and it's not limited to GPIOs. Nobody reads the specs. :-)

> baruch

MBR, Sergei

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Andrew Lunn]

> > > >     Your example shows there's GPIO phandle *and* specifier.
> > > 
> > > Would "GPIO specifier" be enough here?
> > 
> >    No, specifier is the cells following GPIO (or any other) phandle.
> 
> So this should be "GPIO phandle and specifier of ...", is that correct?
> 
> I have found very few (< 4) occurrences of this language in (lots of) '-gpios' 
> property descriptions under Documentation/devicetree/bindings/. Is this a new 
> requirement?

Sometimes it is just easier to refer to another document:

GPIO, as defined in Documentation/devicetree/binding/gpio/gpio.txt

      Andrew

Re: [PATCH v2 2/3] dt-binding: net: sfp binding documentation

[Rob Herring]

On Wed, Aug 30, 2017 at 04:58:29PM +0200, Andrew Lunn wrote:
> > > > >     Your example shows there's GPIO phandle *and* specifier.
> > > > 
> > > > Would "GPIO specifier" be enough here?
> > > 
> > >    No, specifier is the cells following GPIO (or any other) phandle.
> > 
> > So this should be "GPIO phandle and specifier of ...", is that correct?
> > 
> > I have found very few (< 4) occurrences of this language in (lots of) '-gpios' 
> > property descriptions under Documentation/devicetree/bindings/. Is this a new 
> > requirement?
> 
> Sometimes it is just easier to refer to another document:
> 
> GPIO, as defined in Documentation/devicetree/binding/gpio/gpio.txt

Yes, and what I care about here is how many GPIOs, direction and active 
state. IOW, worry about the information necessary to validate a specific 
instance is correct. And hopefully someday we'll have a format parseable 
to do that checking, and all the free form text will be gone.

Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 1/3] dt-bindings: add SFF vendor prefix

[Rob Herring]

On Wed, Aug 30, 2017 at 12:51:10PM +0300, Baruch Siach wrote:
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> v2: New patch in this series
> ---
>  Documentation/devicetree/bindings/vendor-prefixes.txt | 1 +
>  1 file changed, 1 insertion(+)

Acked-by: Rob Herring <robh@kernel.org>