863e79f8d5
The following patches were dropped because they are already applied upstream: 0012-pinctrl-lantiq-fix-up-pinmux.patch 0013-MTD-lantiq-xway-fix-invalid-operator.patch 0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch 0015-MTD-lantiq-xway-remove-endless-loop.patch 0016-MTD-lantiq-xway-add-missing-write_buf-and-read_buf-t.patch 0017-MTD-xway-fix-nand-locking.patch 0044-pinctrl-lantiq-introduce-new-dedicated-devicetree-bi.patch 0045-pinctrl-lantiq-Fix-GPIO-Setup-of-GPIO-Port3.patch 0046-pinctrl-lantiq-2-pins-have-the-wrong-mux-list.patch 0047-irq-fixes.patch 0047-mtd-plat-nand-pass-of-node.patch 0060-usb-dwc2-Add-support-for-Lantiq-ARX-and-XRX-SoCs.patch 0120-MIPS-lantiq-add-support-for-device-tree-file-from-bo.patch 0121-MIPS-lantiq-make-it-possible-to-build-in-no-device-t.patch 122-MIPS-store-the-appended-dtb-address-in-a-variable.patch The PHY driver was reduced to the code adding the LED configuration, the rest is already upstream: 0023-NET-PHY-adds-driver-for-lantiq-PHY11G.patch The SPI driver was replaced with the version pending for upstream inclusion: New driver: 0090-spi-add-transfer_status-callback.patch 0091-spi-lantiq-ssc-add-support-for-Lantiq-SSC-SPI-controller.patch Old driver: 0100-spi-add-support-for-Lantiq-SPI-controller.patch Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
294 lines
10 KiB
Diff
294 lines
10 KiB
Diff
From 0a63ab263725c427051a8bbaa0732b749627da27 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <blogic@openwrt.org>
|
|
Date: Thu, 7 Aug 2014 18:15:36 +0200
|
|
Subject: [PATCH 23/36] NET: PHY: adds driver for lantiq PHY11G
|
|
|
|
Signed-off-by: John Crispin <blogic@openwrt.org>
|
|
---
|
|
drivers/net/phy/Kconfig | 5 +
|
|
drivers/net/phy/Makefile | 1 +
|
|
drivers/net/phy/lantiq.c | 231 ++++++++++++++++++++++++++++++++++++++++++++++
|
|
3 files changed, 237 insertions(+)
|
|
create mode 100644 drivers/net/phy/lantiq.c
|
|
|
|
--- a/drivers/net/phy/intel-xway.c
|
|
+++ b/drivers/net/phy/intel-xway.c
|
|
@@ -152,6 +152,51 @@
|
|
#define PHY_ID_PHY11G_VR9 0xD565A409
|
|
#define PHY_ID_PHY22F_VR9 0xD565A419
|
|
|
|
+#if IS_ENABLED(CONFIG_OF_MDIO)
|
|
+static int vr9_gphy_of_reg_init(struct phy_device *phydev)
|
|
+{
|
|
+ u32 tmp;
|
|
+
|
|
+ /* store the led values if one was passed by the devicetree */
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,ledch", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LEDCH, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,ledcl", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LEDCL, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led0h", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED0H, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led0l", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED0L, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led1h", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED1H, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led1l", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED1L, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led2h", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED3H, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led2l", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED3L, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led3h", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED3H, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ if (!of_property_read_u32(phydev->mdio.dev.of_node, "lantiq,led3l", &tmp))
|
|
+ phy_write_mmd_indirect(phydev, XWAY_MMD_LED3L, MDIO_MMD_VEND2, tmp);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#else
|
|
+static int vr9_gphy_of_reg_init(struct phy_device *phydev)
|
|
+{
|
|
+ return 0;
|
|
+}
|
|
+#endif /* CONFIG_OF_MDIO */
|
|
+
|
|
static int xway_gphy_config_init(struct phy_device *phydev)
|
|
{
|
|
int err;
|
|
@@ -190,6 +235,7 @@ static int xway_gphy_config_init(struct
|
|
phy_write_mmd_indirect(phydev, XWAY_MMD_LED2H, MDIO_MMD_VEND2, ledxh);
|
|
phy_write_mmd_indirect(phydev, XWAY_MMD_LED2L, MDIO_MMD_VEND2, ledxl);
|
|
|
|
+ vr9_gphy_of_reg_init(phydev);
|
|
return 0;
|
|
}
|
|
|
|
--- /dev/null
|
|
+++ b/Documentation/devicetree/bindings/phy/phy-lanitq.txt
|
|
@@ -0,0 +1,216 @@
|
|
+Lanitq PHY binding
|
|
+============================================
|
|
+
|
|
+This devicetree binding controls the lantiq ethernet phys led functionality.
|
|
+
|
|
+Example:
|
|
+ mdio@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ compatible = "lantiq,xrx200-mdio";
|
|
+ phy5: ethernet-phy@5 {
|
|
+ reg = <0x1>;
|
|
+ compatible = "lantiq,phy11g", "ethernet-phy-ieee802.3-c22";
|
|
+ };
|
|
+ phy11: ethernet-phy@11 {
|
|
+ reg = <0x11>;
|
|
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
|
|
+ lantiq,led2h = <0x00>;
|
|
+ lantiq,led2l = <0x03>;
|
|
+ };
|
|
+ phy12: ethernet-phy@12 {
|
|
+ reg = <0x12>;
|
|
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
|
|
+ lantiq,led1h = <0x00>;
|
|
+ lantiq,led1l = <0x03>;
|
|
+ };
|
|
+ phy13: ethernet-phy@13 {
|
|
+ reg = <0x13>;
|
|
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
|
|
+ lantiq,led2h = <0x00>;
|
|
+ lantiq,led2l = <0x03>;
|
|
+ };
|
|
+ phy14: ethernet-phy@14 {
|
|
+ reg = <0x14>;
|
|
+ compatible = "lantiq,phy22f", "ethernet-phy-ieee802.3-c22";
|
|
+ lantiq,led1h = <0x00>;
|
|
+ lantiq,led1l = <0x03>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+Register Description
|
|
+============================================
|
|
+
|
|
+LEDCH:
|
|
+
|
|
+Name Hardware Reset Value
|
|
+LEDCH 0x00C5
|
|
+
|
|
+| 15 | | | | | | | 8 |
|
|
+=========================================
|
|
+| RES |
|
|
+=========================================
|
|
+
|
|
+| 7 | | | | | | | 0 |
|
|
+=========================================
|
|
+| FBF | SBF |RES | NACS |
|
|
+=========================================
|
|
+
|
|
+Field Bits Type Description
|
|
+FBF 7:6 RW Fast Blink Frequency
|
|
+ ---
|
|
+ 0x0 (00b) F02HZ 2 Hz blinking frequency
|
|
+ 0x1 (01b) F04HZ 4 Hz blinking frequency
|
|
+ 0x2 (10b) F08HZ 8 Hz blinking frequency
|
|
+ 0x3 (11b) F16HZ 16 Hz blinking frequency
|
|
+
|
|
+SBF 5:4 RW Slow Blink Frequency
|
|
+ ---
|
|
+ 0x0 (00b) F02HZ 2 Hz blinking frequency
|
|
+ 0x1 (01b) F04HZ 4 Hz blinking frequency
|
|
+ 0x2 (10b) F08HZ 8 Hz blinking frequency
|
|
+ 0x3 (11b) F16HZ 16 Hz blinking frequency
|
|
+
|
|
+NACS 2:0 RW Inverse of Scan Function
|
|
+ ---
|
|
+ 0x0 (000b) NONE No Function
|
|
+ 0x1 (001b) LINK Complex function enabled when link is up
|
|
+ 0x2 (010b) PDOWN Complex function enabled when device is powered-down
|
|
+ 0x3 (011b) EEE Complex function enabled when device is in EEE mode
|
|
+ 0x4 (100b) ANEG Complex function enabled when auto-negotiation is running
|
|
+ 0x5 (101b) ABIST Complex function enabled when analog self-test is running
|
|
+ 0x6 (110b) CDIAG Complex function enabled when cable diagnostics are running
|
|
+ 0x7 (111b) TEST Complex function enabled when test mode is running
|
|
+
|
|
+LEDCL:
|
|
+
|
|
+Name Hardware Reset Value
|
|
+LEDCL 0x0067
|
|
+
|
|
+| 15 | | | | | | | 8 |
|
|
+=========================================
|
|
+| RES |
|
|
+=========================================
|
|
+
|
|
+| 7 | | | | | | | 0 |
|
|
+=========================================
|
|
+|RES | SCAN |RES | CBLINK |
|
|
+=========================================
|
|
+
|
|
+Field Bits Type Description
|
|
+SCAN 6:4 RW Complex Scan Configuration
|
|
+ ---
|
|
+ 000 B NONE No Function
|
|
+ 001 B LINK Complex function enabled when link is up
|
|
+ 010 B PDOWN Complex function enabled when device is powered-down
|
|
+ 011 B EEE Complex function enabled when device is in EEE mode
|
|
+ 100 B ANEG Complex function enabled when auto-negotiation is running
|
|
+ 101 B ABIST Complex function enabled when analog self-test is running
|
|
+ 110 B CDIAG Complex function enabled when cable diagnostics are running
|
|
+ 111 B TEST Complex function enabled when test mode is running
|
|
+
|
|
+CBLINK 2:0 RW Complex Blinking Configuration
|
|
+ ---
|
|
+ 000 B NONE No Function
|
|
+ 001 B LINK Complex function enabled when link is up
|
|
+ 010 B PDOWN Complex function enabled when device is powered-down
|
|
+ 011 B EEE Complex function enabled when device is in EEE mode
|
|
+ 100 B ANEG Complex function enabled when auto-negotiation is running
|
|
+ 101 B ABIST Complex function enabled when analog self-test is running
|
|
+ 110 B CDIAG Complex function enabled when cable diagnostics are running
|
|
+ 111 B TEST Complex function enabled when test mode is running
|
|
+
|
|
+LEDxH:
|
|
+
|
|
+Name Hardware Reset Value
|
|
+LED0H 0x0070
|
|
+LED1H 0x0020
|
|
+LED2H 0x0040
|
|
+LED3H 0x0040
|
|
+
|
|
+| 15 | | | | | | | 8 |
|
|
+=========================================
|
|
+| RES |
|
|
+=========================================
|
|
+
|
|
+| 7 | | | | | | | 0 |
|
|
+=========================================
|
|
+| CON | BLINKF |
|
|
+=========================================
|
|
+
|
|
+Field Bits Type Description
|
|
+CON 7:4 RW Constant On Configuration
|
|
+ ---
|
|
+ 0x0 (0000b) NONE LED does not light up constantly
|
|
+ 0x1 (0001b) LINK10 LED is on when link is 10 Mbit/s
|
|
+ 0x2 (0010b) LINK100 LED is on when link is 100 Mbit/s
|
|
+ 0x3 (0011b) LINK10X LED is on when link is 10/100 Mbit/s
|
|
+ 0x4 (0100b) LINK1000 LED is on when link is 1000 Mbit/s
|
|
+ 0x5 (0101b) LINK10_0 LED is on when link is 10/1000 Mbit/s
|
|
+ 0x6 (0110b) LINK100X LED is on when link is 100/1000 Mbit/s
|
|
+ 0x7 (0111b) LINK10XX LED is on when link is 10/100/1000 Mbit/s
|
|
+ 0x8 (1000b) PDOWN LED is on when device is powered-down
|
|
+ 0x9 (1001b) EEE LED is on when device is in EEE mode
|
|
+ 0xA (1010b) ANEG LED is on when auto-negotiation is running
|
|
+ 0xB (1011b) ABIST LED is on when analog self-test is running
|
|
+ 0xC (1100b) CDIAG LED is on when cable diagnostics are running
|
|
+
|
|
+BLINKF 3:0 RW Fast Blinking Configuration
|
|
+ ---
|
|
+ 0x0 (0000b) NONE No Blinking
|
|
+ 0x1 (0001b) LINK10 Blink when link is 10 Mbit/s
|
|
+ 0x2 (0010b) LINK100 Blink when link is 100 Mbit/s
|
|
+ 0x3 (0011b) LINK10X Blink when link is 10/100 Mbit/s
|
|
+ 0x4 (0100b) LINK1000 Blink when link is 1000 Mbit/s
|
|
+ 0x5 (0101b) LINK10_0 Blink when link is 10/1000 Mbit/s
|
|
+ 0x6 (0110b) LINK100X Blink when link is 100/1000 Mbit/s
|
|
+ 0x7 (0111b) LINK10XX Blink when link is 10/100/1000 Mbit/s
|
|
+ 0x8 (1000b) PDOWN Blink when device is powered-down
|
|
+ 0x9 (1001b) EEE Blink when device is in EEE mode
|
|
+ 0xA (1010b) ANEG Blink when auto-negotiation is running
|
|
+ 0xB (1011b) ABIST Blink when analog self-test is running
|
|
+ 0xC (1100b) CDIAG Blink when cable diagnostics are running
|
|
+
|
|
+LEDxL:
|
|
+
|
|
+Name Hardware Reset Value
|
|
+LED0L 0x0003
|
|
+LED1L 0x0000
|
|
+LED2L 0x0000
|
|
+LED3L 0x0020
|
|
+
|
|
+| 15 | | | | | | | 8 |
|
|
+=========================================
|
|
+| RES |
|
|
+=========================================
|
|
+
|
|
+| 7 | | | | | | | 0 |
|
|
+=========================================
|
|
+| BLINKS | PULSE |
|
|
+=========================================
|
|
+
|
|
+Field Bits Type Description
|
|
+BLINKS 7:4 RW Slow Blinkin Configuration
|
|
+ ---
|
|
+ 0x0 (0000b) NONE No Blinking
|
|
+ 0x1 (0001b) LINK10 Blink when link is 10 Mbit/s
|
|
+ 0x2 (0010b) LINK100 Blink when link is 100 Mbit/s
|
|
+ 0x3 (0011b) LINK10X Blink when link is 10/100 Mbit/s
|
|
+ 0x4 (0100b) LINK1000 Blink when link is 1000 Mbit/s
|
|
+ 0x5 (0101b) LINK10_0 Blink when link is 10/1000 Mbit/s
|
|
+ 0x6 (0110b) LINK100X Blink when link is 100/1000 Mbit/s
|
|
+ 0x7 (0111b) LINK10XX Blink when link is 10/100/1000 Mbit/s
|
|
+ 0x8 (1000b) PDOWN Blink when device is powered-down
|
|
+ 0x9 (1001b) EEE Blink when device is in EEE mode
|
|
+ 0xA (1010b) ANEG Blink when auto-negotiation is running
|
|
+ 0xB (1011b) ABIST Blink when analog self-test is running
|
|
+ 0xC (1100b) CDIAG Blink when cable diagnostics are runningning
|
|
+
|
|
+PULSE 3:0 RW Pulsing Configuration
|
|
+ The pulse field is a mask field by which certain events can be combined
|
|
+ ---
|
|
+ 0x0 (0000b) NONE No pulsing
|
|
+ 0x1 (0001b) TXACT Transmit activity
|
|
+ 0x2 (0010b) RXACT Receive activity
|
|
+ 0x4 (0100b) COL Collision
|
|
+ 0x8 (1000b) RES Reserved
|