* [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI
@ 2021-12-22 16:20 Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 2/5] i2c: nvidia-gpu: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Andy Shevchenko @ 2021-12-22 16:20 UTC (permalink / raw)
To: Wolfram Sang, Andy Shevchenko, linux-kernel, linux-i2c
Cc: Jarkko Nikula, Mika Westerberg, Ajay Gupta, Shah, Nehal-bakulchandra
Introduce a common module to provide an API to instantiate UCSI device
for Cypress CCGx Type-C controller. Individual bus drivers need to select
this one on demand.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: rebased on top of current i2c/for-next
drivers/i2c/busses/Kconfig | 7 +++++++
drivers/i2c/busses/Makefile | 3 +++
drivers/i2c/busses/i2c-ccgx-ucsi.c | 27 +++++++++++++++++++++++++++
drivers/i2c/busses/i2c-ccgx-ucsi.h | 11 +++++++++++
4 files changed, 48 insertions(+)
create mode 100644 drivers/i2c/busses/i2c-ccgx-ucsi.c
create mode 100644 drivers/i2c/busses/i2c-ccgx-ucsi.h
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 42da31c1ab70..08e24e396e37 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -9,6 +9,13 @@ menu "I2C Hardware Bus support"
comment "PC SMBus host controller drivers"
depends on PCI
+config I2C_CCGX_UCSI
+ tristate
+ help
+ A common module to provide an API to instantiate UCSI device
+ for Cypress CCGx Type-C controller. Individual bus drivers
+ need to select this one on demand.
+
config I2C_ALI1535
tristate "ALI 1535"
depends on PCI
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 1d00dce77098..79405cb5d600 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -6,6 +6,9 @@
# ACPI drivers
obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o
+# Auxiliary I2C/SMBus modules
+obj-$(CONFIG_I2C_CCGX_UCSI) += i2c-ccgx-ucsi.o
+
# PC SMBus host controller drivers
obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o
obj-$(CONFIG_I2C_ALI1563) += i2c-ali1563.o
diff --git a/drivers/i2c/busses/i2c-ccgx-ucsi.c b/drivers/i2c/busses/i2c-ccgx-ucsi.c
new file mode 100644
index 000000000000..141c3d1ef752
--- /dev/null
+++ b/drivers/i2c/busses/i2c-ccgx-ucsi.c
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Instantiate UCSI device for Cypress CCGx Type-C controller.
+ * Derived from i2c-designware-pcidrv.c and i2c-nvidia-gpu.c.
+ */
+
+#include <linux/i2c.h>
+#include <linux/export.h>
+#include <linux/string.h>
+
+#include "i2c-ccgx-ucsi.h"
+
+struct software_node;
+
+struct i2c_client *i2c_new_ccgx_ucsi(struct i2c_adapter *adapter, int irq,
+ const struct software_node *swnode)
+{
+ struct i2c_board_info info = {};
+
+ strscpy(info.type, "ccgx-ucsi", sizeof(info.type));
+ info.addr = 0x08;
+ info.irq = irq;
+ info.swnode = swnode;
+
+ return i2c_new_client_device(adapter, &info);
+}
+EXPORT_SYMBOL_GPL(i2c_new_ccgx_ucsi);
diff --git a/drivers/i2c/busses/i2c-ccgx-ucsi.h b/drivers/i2c/busses/i2c-ccgx-ucsi.h
new file mode 100644
index 000000000000..739ac7a4b117
--- /dev/null
+++ b/drivers/i2c/busses/i2c-ccgx-ucsi.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef __I2C_CCGX_UCSI_H_
+#define __I2C_CCGX_UCSI_H_
+
+struct i2c_adapter;
+struct i2c_client;
+struct software_node;
+
+struct i2c_client *i2c_new_ccgx_ucsi(struct i2c_adapter *adapter, int irq,
+ const struct software_node *swnode);
+#endif /* __I2C_CCGX_UCSI_H_ */
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/5] i2c: nvidia-gpu: Switch to use i2c_new_ccgx_ucsi()
2021-12-22 16:20 [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
@ 2021-12-22 16:20 ` Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 3/5] i2c: nvidia-gpu: Use temporary variable for struct device Andy Shevchenko
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Andy Shevchenko @ 2021-12-22 16:20 UTC (permalink / raw)
To: Wolfram Sang, Andy Shevchenko, linux-kernel, linux-i2c
Cc: Jarkko Nikula, Mika Westerberg, Ajay Gupta, Shah, Nehal-bakulchandra
Instead of open coded variant switch to use i2c_new_ccgx_ucsi().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: rebased on top of current i2c/for-next
drivers/i2c/busses/Kconfig | 1 +
drivers/i2c/busses/i2c-nvidia-gpu.c | 26 ++++++--------------------
2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 08e24e396e37..0c9b089d1456 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -252,6 +252,7 @@ config I2C_NFORCE2_S4985
config I2C_NVIDIA_GPU
tristate "NVIDIA GPU I2C controller"
depends on PCI
+ select I2C_CCGX_UCSI
help
If you say yes to this option, support will be included for the
NVIDIA GPU I2C controller which is used to communicate with the GPU's
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c
index b5055a3cbd93..8117c3674209 100644
--- a/drivers/i2c/busses/i2c-nvidia-gpu.c
+++ b/drivers/i2c/busses/i2c-nvidia-gpu.c
@@ -17,6 +17,8 @@
#include <asm/unaligned.h>
+#include "i2c-ccgx-ucsi.h"
+
/* I2C definitions */
#define I2C_MST_CNTL 0x00
#define I2C_MST_CNTL_GEN_START BIT(0)
@@ -266,23 +268,6 @@ static const struct software_node ccgx_node = {
.properties = ccgx_props,
};
-static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq)
-{
- i2cd->gpu_ccgx_ucsi = devm_kzalloc(i2cd->dev,
- sizeof(*i2cd->gpu_ccgx_ucsi),
- GFP_KERNEL);
- if (!i2cd->gpu_ccgx_ucsi)
- return -ENOMEM;
-
- strlcpy(i2cd->gpu_ccgx_ucsi->type, "ccgx-ucsi",
- sizeof(i2cd->gpu_ccgx_ucsi->type));
- i2cd->gpu_ccgx_ucsi->addr = 0x8;
- i2cd->gpu_ccgx_ucsi->irq = irq;
- i2cd->gpu_ccgx_ucsi->swnode = &ccgx_node;
- i2cd->ccgx_client = i2c_new_client_device(&i2cd->adapter, i2cd->gpu_ccgx_ucsi);
- return PTR_ERR_OR_ZERO(i2cd->ccgx_client);
-}
-
static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
struct gpu_i2c_dev *i2cd;
@@ -328,9 +313,10 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (status < 0)
goto free_irq_vectors;
- status = gpu_populate_client(i2cd, pdev->irq);
- if (status < 0) {
- dev_err(&pdev->dev, "gpu_populate_client failed %d\n", status);
+ i2cd->ccgx_client = i2c_new_ccgx_ucsi(&i2cd->adapter, pdev->irq, &ccgx_node);
+ if (IS_ERR(i2cd->ccgx_client)) {
+ status = dev_err_probe(&pdev->dev, PTR_ERR(i2cd->ccgx_client),
+ "register UCSI failed\n");
goto del_adapter;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/5] i2c: nvidia-gpu: Use temporary variable for struct device
2021-12-22 16:20 [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 2/5] i2c: nvidia-gpu: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
@ 2021-12-22 16:20 ` Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 4/5] i2c: nvidia-gpu: Convert to use dev_err_probe() Andy Shevchenko
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Andy Shevchenko @ 2021-12-22 16:20 UTC (permalink / raw)
To: Wolfram Sang, Andy Shevchenko, linux-kernel, linux-i2c
Cc: Jarkko Nikula, Mika Westerberg, Ajay Gupta, Shah, Nehal-bakulchandra
Use temporary variable for struct device to make code neater.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: rebased on top of current i2c/for-next
drivers/i2c/busses/i2c-nvidia-gpu.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c
index 8117c3674209..a82be377146e 100644
--- a/drivers/i2c/busses/i2c-nvidia-gpu.c
+++ b/drivers/i2c/busses/i2c-nvidia-gpu.c
@@ -270,19 +270,20 @@ static const struct software_node ccgx_node = {
static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
+ struct device *dev = &pdev->dev;
struct gpu_i2c_dev *i2cd;
int status;
- i2cd = devm_kzalloc(&pdev->dev, sizeof(*i2cd), GFP_KERNEL);
+ i2cd = devm_kzalloc(dev, sizeof(*i2cd), GFP_KERNEL);
if (!i2cd)
return -ENOMEM;
- i2cd->dev = &pdev->dev;
- dev_set_drvdata(&pdev->dev, i2cd);
+ i2cd->dev = dev;
+ dev_set_drvdata(dev, i2cd);
status = pcim_enable_device(pdev);
if (status < 0) {
- dev_err(&pdev->dev, "pcim_enable_device failed %d\n", status);
+ dev_err(dev, "pcim_enable_device failed %d\n", status);
return status;
}
@@ -290,13 +291,13 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
i2cd->regs = pcim_iomap(pdev, 0, 0);
if (!i2cd->regs) {
- dev_err(&pdev->dev, "pcim_iomap failed\n");
+ dev_err(dev, "pcim_iomap failed\n");
return -ENOMEM;
}
status = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSI);
if (status < 0) {
- dev_err(&pdev->dev, "pci_alloc_irq_vectors err %d\n", status);
+ dev_err(dev, "pci_alloc_irq_vectors err %d\n", status);
return status;
}
@@ -308,22 +309,21 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
sizeof(i2cd->adapter.name));
i2cd->adapter.algo = &gpu_i2c_algorithm;
i2cd->adapter.quirks = &gpu_i2c_quirks;
- i2cd->adapter.dev.parent = &pdev->dev;
+ i2cd->adapter.dev.parent = dev;
status = i2c_add_adapter(&i2cd->adapter);
if (status < 0)
goto free_irq_vectors;
i2cd->ccgx_client = i2c_new_ccgx_ucsi(&i2cd->adapter, pdev->irq, &ccgx_node);
if (IS_ERR(i2cd->ccgx_client)) {
- status = dev_err_probe(&pdev->dev, PTR_ERR(i2cd->ccgx_client),
- "register UCSI failed\n");
+ status = dev_err_probe(dev, PTR_ERR(i2cd->ccgx_client), "register UCSI failed\n");
goto del_adapter;
}
- pm_runtime_set_autosuspend_delay(&pdev->dev, 3000);
- pm_runtime_use_autosuspend(&pdev->dev);
- pm_runtime_put_autosuspend(&pdev->dev);
- pm_runtime_allow(&pdev->dev);
+ pm_runtime_set_autosuspend_delay(dev, 3000);
+ pm_runtime_use_autosuspend(dev);
+ pm_runtime_put_autosuspend(dev);
+ pm_runtime_allow(dev);
return 0;
@@ -336,7 +336,7 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void gpu_i2c_remove(struct pci_dev *pdev)
{
- struct gpu_i2c_dev *i2cd = dev_get_drvdata(&pdev->dev);
+ struct gpu_i2c_dev *i2cd = pci_get_drvdata(pdev);
pm_runtime_get_noresume(i2cd->dev);
i2c_del_adapter(&i2cd->adapter);
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 4/5] i2c: nvidia-gpu: Convert to use dev_err_probe()
2021-12-22 16:20 [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 2/5] i2c: nvidia-gpu: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 3/5] i2c: nvidia-gpu: Use temporary variable for struct device Andy Shevchenko
@ 2021-12-22 16:20 ` Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 5/5] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
2021-12-27 6:31 ` [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Shah, Nehal-bakulchandra
4 siblings, 0 replies; 8+ messages in thread
From: Andy Shevchenko @ 2021-12-22 16:20 UTC (permalink / raw)
To: Wolfram Sang, Andy Shevchenko, linux-kernel, linux-i2c
Cc: Jarkko Nikula, Mika Westerberg, Ajay Gupta, Shah, Nehal-bakulchandra
It's fine to call dev_err_probe() in ->probe() when error code is known.
Convert the driver to use dev_err_probe().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: rebased on top of current i2c/for-next
drivers/i2c/busses/i2c-nvidia-gpu.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c
index a82be377146e..6920c1b9a126 100644
--- a/drivers/i2c/busses/i2c-nvidia-gpu.c
+++ b/drivers/i2c/busses/i2c-nvidia-gpu.c
@@ -282,24 +282,18 @@ static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
dev_set_drvdata(dev, i2cd);
status = pcim_enable_device(pdev);
- if (status < 0) {
- dev_err(dev, "pcim_enable_device failed %d\n", status);
- return status;
- }
+ if (status < 0)
+ return dev_err_probe(dev, status, "pcim_enable_device failed\n");
pci_set_master(pdev);
i2cd->regs = pcim_iomap(pdev, 0, 0);
- if (!i2cd->regs) {
- dev_err(dev, "pcim_iomap failed\n");
- return -ENOMEM;
- }
+ if (!i2cd->regs)
+ return dev_err_probe(dev, -ENOMEM, "pcim_iomap failed\n");
status = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSI);
- if (status < 0) {
- dev_err(dev, "pci_alloc_irq_vectors err %d\n", status);
- return status;
- }
+ if (status < 0)
+ return dev_err_probe(dev, status, "pci_alloc_irq_vectors err\n");
gpu_enable_i2c_bus(i2cd);
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 5/5] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi()
2021-12-22 16:20 [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
` (2 preceding siblings ...)
2021-12-22 16:20 ` [PATCH v2 4/5] i2c: nvidia-gpu: Convert to use dev_err_probe() Andy Shevchenko
@ 2021-12-22 16:20 ` Andy Shevchenko
2021-12-23 14:38 ` Jarkko Nikula
2021-12-27 6:31 ` [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Shah, Nehal-bakulchandra
4 siblings, 1 reply; 8+ messages in thread
From: Andy Shevchenko @ 2021-12-22 16:20 UTC (permalink / raw)
To: Wolfram Sang, Andy Shevchenko, linux-kernel, linux-i2c
Cc: Jarkko Nikula, Mika Westerberg, Ajay Gupta, Shah, Nehal-bakulchandra
Instead of open coded variant switch to use i2c_new_ccgx_ucsi().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v2: rebased on top of current i2c/for-next
drivers/i2c/busses/Kconfig | 1 +
drivers/i2c/busses/i2c-designware-pcidrv.c | 30 ++++------------------
2 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 0c9b089d1456..e2e8ae7ed2a7 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -578,6 +578,7 @@ config I2C_DESIGNWARE_PCI
tristate "Synopsys DesignWare PCI"
depends on PCI
select I2C_DESIGNWARE_CORE
+ select I2C_CCGX_UCSI
help
If you say yes to this option, support will be included for the
Synopsys DesignWare I2C adapter. Only master mode is supported.
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index ef4250f8852b..2782dddfb087 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -24,6 +24,7 @@
#include <linux/slab.h>
#include "i2c-designware-core.h"
+#include "i2c-ccgx-ucsi.h"
#define DRIVER_NAME "i2c-designware-pci"
#define AMD_CLK_RATE_HZ 100000
@@ -125,26 +126,6 @@ static int mfld_setup(struct pci_dev *pdev, struct dw_pci_controller *c)
return -ENODEV;
}
- /*
- * TODO find a better way how to deduplicate instantiation
- * of USB PD slave device from nVidia GPU driver.
- */
-static int navi_amd_register_client(struct dw_i2c_dev *dev)
-{
- struct i2c_board_info info;
-
- memset(&info, 0, sizeof(struct i2c_board_info));
- strscpy(info.type, "ccgx-ucsi", I2C_NAME_SIZE);
- info.addr = 0x08;
- info.irq = dev->irq;
-
- dev->slave = i2c_new_client_device(&dev->adapter, &info);
- if (IS_ERR(dev->slave))
- return PTR_ERR(dev->slave);
-
- return 0;
-}
-
static int navi_amd_setup(struct pci_dev *pdev, struct dw_pci_controller *c)
{
struct dw_i2c_dev *dev = dev_get_drvdata(&pdev->dev);
@@ -325,11 +306,10 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
}
if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
- r = navi_amd_register_client(dev);
- if (r) {
- dev_err(dev->dev, "register client failed with %d\n", r);
- return r;
- }
+ dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, NULL);
+ if (IS_ERR(dev->slave))
+ return dev_err_probe(dev->dev, PTR_ERR(dev->slave),
+ "register UCSI failed\n");
}
pm_runtime_set_autosuspend_delay(&pdev->dev, 1000);
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 5/5] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi()
2021-12-22 16:20 ` [PATCH v2 5/5] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
@ 2021-12-23 14:38 ` Jarkko Nikula
0 siblings, 0 replies; 8+ messages in thread
From: Jarkko Nikula @ 2021-12-23 14:38 UTC (permalink / raw)
To: Andy Shevchenko, Wolfram Sang, linux-kernel, linux-i2c
Cc: Mika Westerberg, Ajay Gupta, Shah, Nehal-bakulchandra
On 12/22/21 18:20, Andy Shevchenko wrote:
> Instead of open coded variant switch to use i2c_new_ccgx_ucsi().
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v2: rebased on top of current i2c/for-next
>
> drivers/i2c/busses/Kconfig | 1 +
> drivers/i2c/busses/i2c-designware-pcidrv.c | 30 ++++------------------
> 2 files changed, 6 insertions(+), 25 deletions(-)
>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI
2021-12-22 16:20 [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
` (3 preceding siblings ...)
2021-12-22 16:20 ` [PATCH v2 5/5] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
@ 2021-12-27 6:31 ` Shah, Nehal-bakulchandra
2021-12-27 17:17 ` Andy Shevchenko
4 siblings, 1 reply; 8+ messages in thread
From: Shah, Nehal-bakulchandra @ 2021-12-27 6:31 UTC (permalink / raw)
To: Andy Shevchenko, Wolfram Sang, linux-kernel, linux-i2c
Cc: Jarkko Nikula, Mika Westerberg, Ajay Gupta, sanket.goswami
Hi Andy
Thanks for the this patch series.
On 12/22/2021 9:50 PM, Andy Shevchenko wrote:
> Introduce a common module to provide an API to instantiate UCSI device
> for Cypress CCGx Type-C controller. Individual bus drivers need to select
> this one on demand.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> v2: rebased on top of current i2c/for-next
> drivers/i2c/busses/Kconfig | 7 +++++++
> drivers/i2c/busses/Makefile | 3 +++
> drivers/i2c/busses/i2c-ccgx-ucsi.c | 27 +++++++++++++++++++++++++++
> drivers/i2c/busses/i2c-ccgx-ucsi.h | 11 +++++++++++
> 4 files changed, 48 insertions(+)
> create mode 100644 drivers/i2c/busses/i2c-ccgx-ucsi.c
> create mode 100644 drivers/i2c/busses/i2c-ccgx-ucsi.h
>
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 42da31c1ab70..08e24e396e37 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -9,6 +9,13 @@ menu "I2C Hardware Bus support"
> comment "PC SMBus host controller drivers"
> depends on PCI
>
> +config I2C_CCGX_UCSI
> + tristate
> + help
> + A common module to provide an API to instantiate UCSI device
> + for Cypress CCGx Type-C controller. Individual bus drivers
> + need to select this one on demand.
> +
> config I2C_ALI1535
> tristate "ALI 1535"
> depends on PCI
> diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
> index 1d00dce77098..79405cb5d600 100644
> --- a/drivers/i2c/busses/Makefile
> +++ b/drivers/i2c/busses/Makefile
> @@ -6,6 +6,9 @@
> # ACPI drivers
> obj-$(CONFIG_I2C_SCMI) += i2c-scmi.o
>
> +# Auxiliary I2C/SMBus modules
> +obj-$(CONFIG_I2C_CCGX_UCSI) += i2c-ccgx-ucsi.o
> +
> # PC SMBus host controller drivers
> obj-$(CONFIG_I2C_ALI1535) += i2c-ali1535.o
> obj-$(CONFIG_I2C_ALI1563) += i2c-ali1563.o
> diff --git a/drivers/i2c/busses/i2c-ccgx-ucsi.c b/drivers/i2c/busses/i2c-ccgx-ucsi.c
> new file mode 100644
> index 000000000000..141c3d1ef752
> --- /dev/null
> +++ b/drivers/i2c/busses/i2c-ccgx-ucsi.c
> @@ -0,0 +1,27 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Instantiate UCSI device for Cypress CCGx Type-C controller.
> + * Derived from i2c-designware-pcidrv.c and i2c-nvidia-gpu.c.
> + */
> +
> +#include <linux/i2c.h>
> +#include <linux/export.h>
> +#include <linux/string.h>
> +
> +#include "i2c-ccgx-ucsi.h"
> +
> +struct software_node;
> +
> +struct i2c_client *i2c_new_ccgx_ucsi(struct i2c_adapter *adapter, int irq,
> + const struct software_node *swnode)
> +{
> + struct i2c_board_info info = {};
> +
> + strscpy(info.type, "ccgx-ucsi", sizeof(info.type));
> + info.addr = 0x08;
> + info.irq = irq;
> + info.swnode = swnode;
> +
> + return i2c_new_client_device(adapter, &info);
> +}
> +EXPORT_SYMBOL_GPL(i2c_new_ccgx_ucsi);c
it needs MODULE_LICENSE("GPL"); else if driver is built as module it
fails to probe. However after adding this we validated and it is working
fine.
> diff --git a/drivers/i2c/busses/i2c-ccgx-ucsi.h b/drivers/i2c/busses/i2c-ccgx-ucsi.h
> new file mode 100644
> index 000000000000..739ac7a4b117
> --- /dev/null
> +++ b/drivers/i2c/busses/i2c-ccgx-ucsi.h
> @@ -0,0 +1,11 @@
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> +#ifndef __I2C_CCGX_UCSI_H_
> +#define __I2C_CCGX_UCSI_H_
> +
> +struct i2c_adapter;
> +struct i2c_client;
> +struct software_node;
> +
> +struct i2c_client *i2c_new_ccgx_ucsi(struct i2c_adapter *adapter, int irq,
> + const struct software_node *swnode);
> +#endif /* __I2C_CCGX_UCSI_H_ */
>
Here, One more suggestion if can be incorporated , instead of passing
only irq we should pass irq number and irq type. For example in our next
generation platform , CCGX driver is using IRQF_TRIGGER_FALLING type
where is default hard coded is IRQF_TRIGGER_HIGH. So in CCGX driver in
request_threaded_irq function along with passing irq number , irq type
also can be passed.
Regards
Nehal Shah
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI
2021-12-27 6:31 ` [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Shah, Nehal-bakulchandra
@ 2021-12-27 17:17 ` Andy Shevchenko
0 siblings, 0 replies; 8+ messages in thread
From: Andy Shevchenko @ 2021-12-27 17:17 UTC (permalink / raw)
To: Shah, Nehal-bakulchandra
Cc: Andy Shevchenko, Wolfram Sang, Linux Kernel Mailing List,
linux-i2c, Jarkko Nikula, Mika Westerberg, Ajay Gupta,
sanket.goswami
On Mon, Dec 27, 2021 at 6:45 PM Shah, Nehal-bakulchandra
<nehal-bakulchandra.shah@amd.com> wrote:
> Thanks for the this patch series.
> On 12/22/2021 9:50 PM, Andy Shevchenko wrote:
...
> > +EXPORT_SYMBOL_GPL(i2c_new_ccgx_ucsi);c
> it needs MODULE_LICENSE("GPL"); else if driver is built as module it
> fails to probe. However after adding this we validated and it is working
> fine.
Thanks!
Dunno if i need to resend or Wolfram can add it when applying.
...
> > +struct i2c_client *i2c_new_ccgx_ucsi(struct i2c_adapter *adapter, int irq,
> > + const struct software_node *swnode);
> Here, One more suggestion if can be incorporated , instead of passing
> only irq we should pass irq number and irq type. For example in our next
> generation platform , CCGX driver is using IRQF_TRIGGER_FALLING type
> where is default hard coded is IRQF_TRIGGER_HIGH. So in CCGX driver in
> request_threaded_irq function along with passing irq number , irq type
> also can be passed.
We don't add dead code in the kernel, so when you have patches ready
just create another one as a prerequisite that adds that.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-12-27 17:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-22 16:20 [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 2/5] i2c: nvidia-gpu: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 3/5] i2c: nvidia-gpu: Use temporary variable for struct device Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 4/5] i2c: nvidia-gpu: Convert to use dev_err_probe() Andy Shevchenko
2021-12-22 16:20 ` [PATCH v2 5/5] i2c: designware-pci: Switch to use i2c_new_ccgx_ucsi() Andy Shevchenko
2021-12-23 14:38 ` Jarkko Nikula
2021-12-27 6:31 ` [PATCH v2 1/5] i2c: Introduce common module to instantiate CCGx UCSI Shah, Nehal-bakulchandra
2021-12-27 17:17 ` Andy Shevchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).