[1/4,v1] net: phy: realtek: Support RTL8366RB variant

Message ID 20180714094556.30791-1-linus.walleij@linaro.org
State New
Headers show
Series
  • [1/4,v1] net: phy: realtek: Support RTL8366RB variant
Related show

Commit Message

Linus Walleij July 14, 2018, 9:45 a.m.
The RTL8366RB is an ASIC with five internal PHYs for
LAN0..LAN3 and WAN. The PHYs are spawn off the main
device so they can be handled in a distributed manner
by the Realtek PHY driver. All that is really needed
is the power save feature enablement and letting the
PHY driver core pick up the IRQ from the switch chip.

Cc: Antti Seppälä <a.seppala@gmail.com>
Cc: Roman Yeryomin <roman@advem.lv>
Cc: Colin Leitner <colin.leitner@googlemail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

---
ChangeLog RFCv2->v1
- Correct the PHY power save register from 0x21 to 0x15
  as it should be.
- Drop the comment about the DSA switch.
- Use BIT(12) for power save bit define
- Use phy_set_bits() to simplify code
- Skip assigning genphy_config_aneg() and
  genphy_read_status() as this is default anyway
ChangeLog RFCv1->RFCv2:
- No real changes.
---
 drivers/net/phy/realtek.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

-- 
2.17.1

Comments

Rob Herring July 16, 2018, 8:45 p.m. | #1
On Sat, Jul 14, 2018 at 11:45:54AM +0200, Linus Walleij wrote:
> The Realtek SMI family is a set of DSA chips that provide

> switching in routers. This binding just follows the pattern

> set by other switches but with the introduction of an embedded

> irqchip to demux and handle the interrupts fired by the single

> line from the chip.

> 

> This interrupt construction is similar to how we handle

> interrupt controllers inside PCI bridges etc.

> 

> Cc: Antti Seppälä <a.seppala@gmail.com>

> Cc: Roman Yeryomin <roman@advem.lv>

> Cc: Colin Leitner <colin.leitner@googlemail.com>

> Cc: Gabor Juhos <juhosg@openwrt.org>

> Cc: Florian Fainelli <f.fainelli@gmail.com>

> Cc: devicetree@vger.kernel.org

> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

> ---

> ChangeLog RFCv2->v1:

> - No changes, we agree on these bindings.

> ChangeLog RFCv1->RFCv2:

> - Switch to Andrew's suggestion to have a local MDIO bus

>   definition inside of the DSA device node

> - Add realtek,disabled-leds

> - Correct WAN IRQ to 12 in the example

> ---

>  .../bindings/net/dsa/realtek-smi.txt          | 153 ++++++++++++++++++

>  1 file changed, 153 insertions(+)

>  create mode 100644 Documentation/devicetree/bindings/net/dsa/realtek-smi.txt

> 

> diff --git a/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt b/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt

> new file mode 100644

> index 000000000000..b6ae8541bd55

> --- /dev/null

> +++ b/Documentation/devicetree/bindings/net/dsa/realtek-smi.txt

> @@ -0,0 +1,153 @@

> +Realtek SMI-based Switches

> +==========================

> +

> +The SMI "Simple Management Interface" is a two-wire protocol using


At least for some other Realtek chips, the documentation I find says the 
S stands for Serial. And Wikipedia says SMI is the same thing as MDIO.

Just want to make sure we don't define GPIOs directly when there should 
be a layer of abstraction like mdio-gpio.

> +bit-banged GPIO that while it reuses the MDIO lines MCK and MDIO does

> +not use the MDIO protocol. This binding defines how to specify the

> +SMI-based Realtek devices.

> +

> +Required properties:

> +

> +- compatible: must be exactly one of:

> +      "realtek,rtl8366"

> +      "realtek,rtl8366rb" (4+1 ports)

> +      "realtek,rtl8366s"  (4+1 ports)

> +      "realtek,rtl8367"

> +      "realtek,rtl8367b"

> +      "realtek,rtl8368s"  (8 port)

> +      "realtek,rtl8369"

> +      "realtek,rtl8370"   (8 port)

> +

> +Required properties:

> +- mdc-gpios: GPIO line for the MDC clock line.

> +- mdio-gpios: GPIO line for the MDIO data line.

> +- reset-gpios: GPIO line for the reset signal.

> +

> +Optional properties:

> +- realtek,disable-leds: if the LED drivers are not used in the

> +  hardware design this will disable them so they are not turned on

> +  and wasting power.

> +

> +Required subnodes:

> +

> +- interrupt-controller

> +

> +  This defines an interrupt controller with an IRQ line (typically

> +  a GPIO) that will demultiplex and handle the interrupt from the single

> +  interrupt line coming out of one of the SMI-based chips. It most

> +  importantly provides link up/down interrupts to the PHY blocks inside

> +  the ASIC.

> +

> +Required properties of interrupt-controller:

> +

> +- interrupt: parent interrupt, see interrupt-controller/interrupts.txt

> +- interrupt-controller: see interrupt-controller/interrupts.txt

> +- #address-cells: should be <0>

> +- #interrupt-cells: should be <1>

> +

> +- mdio

> +

> +  This defines the internal MDIO bus of the SMI device, mostly for the

> +  purpose of being able to hook the interrupts to the right PHY and

> +  the right PHY to the corresponding port.

> +

> +Required properties of mdio:

> +

> +- compatible: should be set to "realtek,smi-mdio" for all SMI devices

> +

> +See net/mdio.txt for additional MDIO bus properties.

> +

> +See net/dsa/dsa.txt for a list of additional required and optional properties

> +and subnodes of DSA switches.

> +

> +Examples:

> +

> +switch {

> +	compatible = "realtek,rtl8366rb";

> +	/* 22 = MDIO (has input reads), 21 = MDC (clock, output only) */

> +	mdc-gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;

> +	mdio-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;

> +	reset-gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;

> +

> +	switch_intc: interrupt-controller {

> +		/* GPIO 15 provides the interrupt */

> +		interrupt-parent = <&gpio0>;

> +		interrupts = <15 IRQ_TYPE_LEVEL_LOW>;

> +		interrupt-controller;

> +		#address-cells = <0>;

> +		#interrupt-cells = <1>;

> +	};

> +

> +	ports {

> +		#address-cells = <1>;

> +		#size-cells = <0>;

> +		reg = <0>;

> +		port@0 {

> +			reg = <0>;

> +			label = "lan0";

> +			phy-handle = <&phy0>;

> +		};

> +		port@1 {

> +			reg = <1>;

> +			label = "lan1";

> +			phy-handle = <&phy1>;

> +		};

> +		port@2 {

> +			reg = <2>;

> +			label = "lan2";

> +			phy-handle = <&phy2>;

> +		};

> +		port@3 {

> +			reg = <3>;

> +			label = "lan3";

> +			phy-handle = <&phy3>;

> +		};

> +		port@4 {

> +			reg = <4>;

> +			label = "wan";

> +			phy-handle = <&phy4>;

> +		};

> +		port@5 {

> +			reg = <5>;

> +			label = "cpu";

> +			ethernet = <&gmac0>;

> +			phy-mode = "rgmii";

> +			fixed-link {

> +				speed = <1000>;

> +				full-duplex;

> +			};

> +		};

> +	};

> +

> +	mdio {

> +		compatible = "realtek,smi-mdio", "dsa-mdio";

> +		#address-cells = <1>;

> +		#size-cells = <0>;

> +

> +		phy0: phy@0 {

> +			reg = <0>;

> +			interrupt-parent = <&switch_intc>;

> +			interrupts = <0>;

> +		};

> +		phy1: phy@1 {

> +			reg = <1>;

> +			interrupt-parent = <&switch_intc>;

> +			interrupts = <1>;

> +		};

> +		phy2: phy@2 {

> +			reg = <2>;

> +			interrupt-parent = <&switch_intc>;

> +			interrupts = <2>;

> +		};

> +		phy3: phy@3 {

> +			reg = <3>;

> +			interrupt-parent = <&switch_intc>;

> +			interrupts = <3>;

> +		};

> +		phy4: phy@4 {

> +			reg = <4>;

> +			interrupt-parent = <&switch_intc>;

> +			interrupts = <12>;

> +		};

> +	};

> +};

> -- 

> 2.17.1

> 

> --

> 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

Patch

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 082fb40c656d..d0d07f22df1f 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -37,6 +37,9 @@ 
 #define RTL8201F_ISR				0x1e
 #define RTL8201F_IER				0x13
 
+#define RTL8366RB_POWER_SAVE			0x15
+#define RTL8366RB_POWER_SAVE_ON			BIT(12)
+
 MODULE_DESCRIPTION("Realtek PHY driver");
 MODULE_AUTHOR("Johnson Leung");
 MODULE_LICENSE("GPL");
@@ -159,6 +162,24 @@  static int rtl8211b_resume(struct phy_device *phydev)
 	return genphy_resume(phydev);
 }
 
+static int rtl8366rb_config_init(struct phy_device *phydev)
+{
+	int ret;
+
+	ret = genphy_config_init(phydev);
+	if (ret < 0)
+		return ret;
+
+	ret = phy_set_bits(phydev, RTL8366RB_POWER_SAVE,
+			   RTL8366RB_POWER_SAVE_ON);
+	if (ret) {
+		dev_err(&phydev->mdio.dev,
+			"error enabling power management\n");
+	}
+
+	return ret;
+}
+
 static struct phy_driver realtek_drvs[] = {
 	{
 		.phy_id         = 0x00008201,
@@ -223,6 +244,15 @@  static struct phy_driver realtek_drvs[] = {
 		.resume		= genphy_resume,
 		.read_page	= rtl821x_read_page,
 		.write_page	= rtl821x_write_page,
+	}, {
+		.phy_id		= 0x001cc961,
+		.name		= "RTL8366RB Gigabit Ethernet",
+		.phy_id_mask	= 0x001fffff,
+		.features	= PHY_GBIT_FEATURES,
+		.flags		= PHY_HAS_INTERRUPT,
+		.config_init	= &rtl8366rb_config_init,
+		.suspend	= genphy_suspend,
+		.resume		= genphy_resume,
 	},
 };
 
@@ -234,6 +264,7 @@  static struct mdio_device_id __maybe_unused realtek_tbl[] = {
 	{ 0x001cc914, 0x001fffff },
 	{ 0x001cc915, 0x001fffff },
 	{ 0x001cc916, 0x001fffff },
+	{ 0x001cc961, 0x001fffff },
 	{ }
 };