ar8216: factor out AR8327/AR8337-specific driver code into ar8327.c

Move all AR8327/AR8337-specific driver code into a separate source file
ar8327.c and adjust patches so that ar8327.c is compiled if
CONFIG_AR8216_PHY is set.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

SVN-Revision: 43845

target/linux/generic/files/drivers/net/phy/ar8216.h

@@ -419,6 +419,76 @@ struct ar8xxx_priv {
 	int monitor_port;
 };
 
+u32
+ar8xxx_read(struct ar8xxx_priv *priv, int reg);
+void
+ar8xxx_write(struct ar8xxx_priv *priv, int reg, u32 val);
+u32
+ar8xxx_rmw(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val);
+
+void
+ar8xxx_phy_dbg_write(struct ar8xxx_priv *priv, int phy_addr,
+		     u16 dbg_addr, u16 dbg_data);
+void
+ar8xxx_phy_mmd_write(struct ar8xxx_priv *priv, int phy_addr, u16 addr, u16 data);
+void
+ar8xxx_phy_init(struct ar8xxx_priv *priv);
+int
+ar8xxx_sw_set_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		   struct switch_val *val);
+int
+ar8xxx_sw_get_vlan(struct switch_dev *dev, const struct switch_attr *attr,
+		   struct switch_val *val);
+int
+ar8xxx_sw_set_reset_mibs(struct switch_dev *dev,
+			 const struct switch_attr *attr,
+			 struct switch_val *val);
+int
+ar8xxx_sw_set_mirror_rx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val);
+int
+ar8xxx_sw_get_mirror_rx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val);
+int
+ar8xxx_sw_set_mirror_tx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val);
+int
+ar8xxx_sw_get_mirror_tx_enable(struct switch_dev *dev,
+			       const struct switch_attr *attr,
+			       struct switch_val *val);
+int
+ar8xxx_sw_set_mirror_monitor_port(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val);
+int
+ar8xxx_sw_get_mirror_monitor_port(struct switch_dev *dev,
+				  const struct switch_attr *attr,
+				  struct switch_val *val);
+int
+ar8xxx_sw_set_mirror_source_port(struct switch_dev *dev,
+				 const struct switch_attr *attr,
+				 struct switch_val *val);
+int
+ar8xxx_sw_get_mirror_source_port(struct switch_dev *dev,
+				 const struct switch_attr *attr,
+				 struct switch_val *val);
+int
+ar8xxx_sw_set_pvid(struct switch_dev *dev, int port, int vlan);
+int
+ar8xxx_sw_get_pvid(struct switch_dev *dev, int port, int *vlan);
+int
+ar8xxx_sw_hw_apply(struct switch_dev *dev);
+int
+ar8xxx_sw_reset_switch(struct switch_dev *dev);
+int
+ar8xxx_sw_get_port_link(struct switch_dev *dev, int port,
+			struct switch_port_link *link);
+int
+ar8216_wait_bit(struct ar8xxx_priv *priv, int reg, u32 mask, u32 val);
+
 static inline struct ar8xxx_priv *
 swdev_to_ar8xxx(struct switch_dev *swdev)
 {
@@ -460,4 +530,10 @@ static inline bool chip_is_ar8337(struct ar8xxx_priv *priv)
 	return priv->chip_ver == AR8XXX_VER_AR8337;
 }
 
+static inline void
+ar8xxx_reg_set(struct ar8xxx_priv *priv, int reg, u32 val)
+{
+	ar8xxx_rmw(priv, reg, 0, val);
+}
+
 #endif

target/linux/generic/patches-3.10/724-phy_ar8216.patch

@@ -18,7 +18,7 @@
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o

target/linux/generic/patches-3.10/725-phy_rtl8306.patch

@@ -16,7 +16,7 @@
 @@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/generic/patches-3.10/726-phy_rtl8366.patch

@@ -35,7 +35,7 @@
 +++ b/drivers/net/phy/Makefile
 @@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 +obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 +obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o

target/linux/generic/patches-3.13/724-phy_ar8216.patch

@@ -18,7 +18,7 @@
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o

target/linux/generic/patches-3.13/725-phy_rtl8306.patch

@@ -16,7 +16,7 @@
 @@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/generic/patches-3.13/726-phy_rtl8366.patch

@@ -35,7 +35,7 @@
 +++ b/drivers/net/phy/Makefile
 @@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 +obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 +obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o

target/linux/generic/patches-3.14/724-phy_ar8216.patch

@@ -18,7 +18,7 @@
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o

target/linux/generic/patches-3.14/725-phy_rtl8306.patch

@@ -16,7 +16,7 @@
 @@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/generic/patches-3.14/726-phy_rtl8366.patch

@@ -35,7 +35,7 @@
 +++ b/drivers/net/phy/Makefile
 @@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 +obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 +obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o

target/linux/generic/patches-3.14/733-phy_mvsw6171.patch

@@ -20,4 +20,4 @@
 +obj-$(CONFIG_MVSW6171_PHY)	+= mvsw6171.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o

target/linux/generic/patches-3.18/724-phy_ar8216.patch

@@ -18,7 +18,7 @@
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o

target/linux/generic/patches-3.18/725-phy_rtl8306.patch

@@ -16,7 +16,7 @@
 @@ -23,6 +23,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/generic/patches-3.18/726-phy_rtl8366.patch

@@ -35,7 +35,7 @@
 +++ b/drivers/net/phy/Makefile
 @@ -24,6 +24,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 +obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 +obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o

target/linux/generic/patches-3.18/733-phy_mvsw6171.patch

@@ -20,4 +20,4 @@
 +obj-$(CONFIG_MVSW6171_PHY)	+= mvsw6171.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o

target/linux/generic/patches-3.3/724-phy_ar8216.patch

@@ -18,7 +18,7 @@
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o

target/linux/generic/patches-3.3/725-phy_rtl8306.patch

@@ -16,7 +16,7 @@
 @@ -21,6 +21,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/generic/patches-3.3/726-phy_rtl8366.patch

@@ -35,7 +35,7 @@
 +++ b/drivers/net/phy/Makefile
 @@ -22,6 +22,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 +obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 +obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o

target/linux/generic/patches-3.8/724-phy_ar8216.patch

@@ -18,7 +18,7 @@
  obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
-+obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
++obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o
  obj-$(CONFIG_MDIO_BITBANG)	+= mdio-bitbang.o

target/linux/generic/patches-3.8/725-phy_rtl8306.patch

@@ -16,7 +16,7 @@
 @@ -22,6 +22,7 @@ obj-$(CONFIG_MVSWITCH_PHY)	+= mvswitch.o
  obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
 +obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
  obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
  obj-$(CONFIG_FIXED_PHY)		+= fixed.o

target/linux/generic/patches-3.8/726-phy_rtl8366.patch

@@ -35,7 +35,7 @@
 +++ b/drivers/net/phy/Makefile
 @@ -23,6 +23,9 @@ obj-$(CONFIG_IP17XX_PHY)	+= ip17xx.o
  obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
- obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o ar8327.o
  obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
 +obj-$(CONFIG_RTL8366_SMI)	+= rtl8366_smi.o
 +obj-$(CONFIG_RTL8366S_PHY)	+= rtl8366s.o