diff mbox series

[net-next,v4,3/8] net: txgbe: Register I2C platform device

Message ID 20230422045621.360918-4-jiawenwu@trustnetic.com
State New
Headers show
Series TXGBE PHYLINK support | expand

Commit Message

Jiawen Wu April 22, 2023, 4:56 a.m. UTC 
Register the platform device to use Designware I2C bus master driver.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/ethernet/wangxun/Kconfig          |  1 +
 .../net/ethernet/wangxun/txgbe/txgbe_phy.c    | 48 +++++++++++++++++++
 .../net/ethernet/wangxun/txgbe/txgbe_type.h   |  4 ++
 3 files changed, 53 insertions(+)

Comments

Andi Shyti April 25, 2023, 3:06 p.m. UTC | #1 
Hi Jiawen,

[...]

> +	ret = txgbe_i2c_register(txgbe);
> +	if (ret) {
> +		wx_err(txgbe->wx, "failed to init i2c interface: %d\n", ret);
> +		goto err_unregister_swnode;
> +	}
> +
>  	return 0;
> +
> +err_unregister_swnode:
> +	software_node_unregister_node_group(txgbe->nodes.group);
> +
> +	return ret;

no need for the goto here... in my opinion it's easier if you put
software_node_unregister_node_group() under the if and return
ret.

Andi
Andi Shyti April 25, 2023, 3:16 p.m. UTC | #2 
On Tue, Apr 25, 2023 at 05:06:19PM +0200, Andi Shyti wrote:
> Hi Jiawen,
> 
> [...]
> 
> > +	ret = txgbe_i2c_register(txgbe);
> > +	if (ret) {
> > +		wx_err(txgbe->wx, "failed to init i2c interface: %d\n", ret);
> > +		goto err_unregister_swnode;
> > +	}
> > +
> >  	return 0;
> > +
> > +err_unregister_swnode:
> > +	software_node_unregister_node_group(txgbe->nodes.group);
> > +
> > +	return ret;
> 
> no need for the goto here... in my opinion it's easier if you put
> software_node_unregister_node_group() under the if and return
> ret.

please... ignore, I see that there are more goto's added in the
next patches.

Andi
diff mbox series

Patch

diff --git a/drivers/net/ethernet/wangxun/Kconfig b/drivers/net/ethernet/wangxun/Kconfig
index c9d88673d306..8acd6a0d84dc 100644
--- a/drivers/net/ethernet/wangxun/Kconfig
+++ b/drivers/net/ethernet/wangxun/Kconfig
@@ -40,6 +40,7 @@  config NGBE
 config TXGBE
 	tristate "Wangxun(R) 10GbE PCI Express adapters support"
 	depends on PCI
+	select I2C_DESIGNWARE_PLATFORM
 	select LIBWX
 	help
 	  This driver supports Wangxun(R) 10GbE PCI Express family of
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
index 39762c7fc851..d573f77007db 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
@@ -1,6 +1,8 @@ 
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright (c) 2015 - 2023 Beijing WangXun Technology Co., Ltd. */
 
+#include <linux/platform_data/i2c-dw.h>
+#include <linux/platform_device.h>
 #include <linux/gpio/property.h>
 #include <linux/i2c.h>
 #include <linux/pci.h>
@@ -69,6 +71,40 @@  static int txgbe_swnodes_register(struct txgbe *txgbe)
 	return software_node_register_node_group(nodes->group);
 }
 
+static int txgbe_i2c_register(struct txgbe *txgbe)
+{
+	struct pci_dev *pdev = txgbe->wx->pdev;
+	struct dw_i2c_platform_data pdata = {};
+	struct platform_device_info info = {};
+	struct platform_device *i2c_dev;
+	struct resource res = {};
+
+	pdata.base = txgbe->wx->hw_addr + TXGBE_I2C_BASE;
+	pdata.flags = BIT(11); /* MODEL_WANGXUN_SP */
+	pdata.ss_hcnt = 600;
+	pdata.ss_lcnt = 600;
+
+	info.parent = &pdev->dev;
+	info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]);
+	info.name = "i2c_designware";
+	info.id = (pdev->bus->number << 8) | pdev->devfn;
+	info.data = &pdata;
+	info.size_data = sizeof(pdata);
+
+	res.start = pdev->irq;
+	res.end = pdev->irq;
+	res.flags = IORESOURCE_IRQ;
+	info.res = &res;
+	info.num_res = 1;
+	i2c_dev = platform_device_register_full(&info);
+	if (IS_ERR(i2c_dev))
+		return PTR_ERR(i2c_dev);
+
+	txgbe->i2c_dev = i2c_dev;
+
+	return 0;
+}
+
 int txgbe_init_phy(struct txgbe *txgbe)
 {
 	int ret;
@@ -79,10 +115,22 @@  int txgbe_init_phy(struct txgbe *txgbe)
 		return ret;
 	}
 
+	ret = txgbe_i2c_register(txgbe);
+	if (ret) {
+		wx_err(txgbe->wx, "failed to init i2c interface: %d\n", ret);
+		goto err_unregister_swnode;
+	}
+
 	return 0;
+
+err_unregister_swnode:
+	software_node_unregister_node_group(txgbe->nodes.group);
+
+	return ret;
 }
 
 void txgbe_remove_phy(struct txgbe *txgbe)
 {
+	platform_device_unregister(txgbe->i2c_dev);
 	software_node_unregister_node_group(txgbe->nodes.group);
 }
diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
index 51bbecb28433..771aefbc7c80 100644
--- a/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
+++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_type.h
@@ -55,6 +55,9 @@ 
 #define TXGBE_TS_CTL                            0x10300
 #define TXGBE_TS_CTL_EVAL_MD                    BIT(31)
 
+/* I2C registers */
+#define TXGBE_I2C_BASE                          0x14900
+
 /* Part Number String Length */
 #define TXGBE_PBANUM_LENGTH                     32
 
@@ -146,6 +149,7 @@  struct txgbe_nodes {
 struct txgbe {
 	struct wx *wx;
 	struct txgbe_nodes nodes;
+	struct platform_device *i2c_dev;
 };
 
 #endif /* _TXGBE_TYPE_H_ */