net: phy: sfp: enable i2c-bus detection on ACPI based systems
Subsystems (8)
PATCH 1/1 net: phy: sfp: enable i2c-bus detection on ACPI based systems
--- drivers/i2c/i2c-core-acpi.c | 3 ++- drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++-------- include/linux/i2c.h | 6 ++++++ 3 files changed, 33 insertions(+), 9 deletions(-)
drivers/i2c/i2c-core-acpi.c +2 -1
@@ -337,7 +337,7 @@ static int i2c_acpi_find_match_device(struct device *dev, void *data)return ACPI_COMPANION (dev) == data; } -static struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) {struct device *dev;
@@ -345,6 +345,7 @@ static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle) i2c_acpi_find_match_adapter);return dev ?i2c_verify_adapter (dev) :NULL ; } +EXPORT_SYMBOL_GPL (i2c_acpi_find_adapter_by_handle);static struct i2c_client *i2c_acpi_find_client_by_adev (struct acpi_device *adev) {
drivers/net/phy/sfp.c +25 -8
@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/acpi.h> #include <linux/phy.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h>
@@ -1783,6 +1784,7 @@ static int sfp_probe(struct platform_device *pdev) {const struct sff_data *sff;struct sfp *sfp; +struct i2c_adapter *i2c =NULL ;bool poll = false;int irq, err, i;
@@ -1801,7 +1803,6 @@ static int sfp_probe(struct platform_device *pdev)if (pdev->dev.of_node) {struct device_node *node = pdev->dev.of_node;const struct of_device_id *id; -struct i2c_adapter *i2c;struct device_node *np; id =of_match_node (sfp_of_match, node);
@@ -1818,14 +1819,30 @@ static int sfp_probe(struct platform_device *pdev) i2c =of_find_i2c_adapter_by_node (np);of_node_put (np); -if (!i2c) -return -EPROBE_DEFER ; - - err =sfp_i2c_configure (sfp, i2c); -if (err <0 ) { -i2c_put_adapter (i2c); -return err; + }else if (ACPI_COMPANION (&pdev->dev)) { +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +struct fwnode_handle *fw =acpi_fwnode_handle (adev); +struct fwnode_reference_args args; +struct acpi_handle *acpi_handle; +int ret; + + ret =acpi_node_get_property_reference (fw,"i2c-bus" ,0 , &args); +if (ACPI_FAILURE (ret) || !is_acpi_device_node (args.fwnode)) { +dev_err (&pdev->dev,"missing 'i2c-bus' property\n" ); +return -ENODEV ; } + + acpi_handle =ACPI_HANDLE_FWNODE (args.fwnode); + i2c =i2c_acpi_find_adapter_by_handle (acpi_handle); + } + +if (!i2c) +return -EPROBE_DEFER ; + + err =sfp_i2c_configure (sfp, i2c); +if (err <0 ) { +i2c_put_adapter (i2c); +return err; }for (i =0 ; i <GPIO_MAX ; i++)
include/linux/i2c.h +6 -0
@@ -33,6 +33,7 @@#include <linux/rtmutex.h> #include <linux/irqdomain.h> /* for Host Notify IRQ */ #include <linux/of.h> /* for struct device_node */ +#include <linux/acpi.h> /* for acpi_handle */ #include <linux/swab.h> /* for swab16 */ #include <uapi/linux/i2c.h>
@@ -977,6 +978,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,u32 i2c_acpi_find_bus_speed (struct device *dev);struct i2c_client *i2c_acpi_new_device (struct device *dev,int index,struct i2c_board_info *info); +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle);#else static inline bool i2c_acpi_get_i2c_resource (struct acpi_resource *ares,struct acpi_resource_i2c_serialbus **i2c)
@@ -992,6 +994,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, {return NULL ; } +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +{ +return NULL ; +}#endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */
Signature · 1 line
2.17.1
Heiner Kallweit
maintainerQuoted 8 lines · Ruslan Babayev
Signed-off-by Ruslan Babayev <[email protected]>--- drivers/i2c/i2c-core-acpi.c | 3 ++- drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++-------- include/linux/i2c.h | 6 ++++++ 3 files changed, 33 insertions(+), 9 deletions(-)
Regarding the formal part:
- It should be [PATCH net-next]
- Commit description is missing (scripts/checkpatch.pl should have complained)
And maybe it would be better to split exporting i2c_acpi_find_adapter_by_handle and extending sfp.c to two patches. If Wolfram acks the i2c patch, then I think the series could go through the netdev tree. Eventually up to David.
PATCH 1/2 i2c: acpi: export i2c_acpi_find_adapter_by_handle
In reply to Ruslan BabayevThis allows drivers to lookup i2c adapters on ACPI based systems similar to of_get_i2c_adapter_by_node() with DT based systems.
--- drivers/i2c/i2c-core-acpi.c | 3 ++- include/linux/i2c.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/i2c/i2c-core-acpi.c +2 -1
@@ -337,7 +337,7 @@ static int i2c_acpi_find_match_device(struct device *dev, void *data)return ACPI_COMPANION (dev) == data; } -static struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) {struct device *dev;
@@ -345,6 +345,7 @@ static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle) i2c_acpi_find_match_adapter);return dev ?i2c_verify_adapter (dev) :NULL ; } +EXPORT_SYMBOL_GPL (i2c_acpi_find_adapter_by_handle);static struct i2c_client *i2c_acpi_find_client_by_adev (struct acpi_device *adev) {
include/linux/i2c.h +6 -0
@@ -33,6 +33,7 @@#include <linux/rtmutex.h> #include <linux/irqdomain.h> /* for Host Notify IRQ */ #include <linux/of.h> /* for struct device_node */ +#include <linux/acpi.h> /* for acpi_handle */ #include <linux/swab.h> /* for swab16 */ #include <uapi/linux/i2c.h>
@@ -977,6 +978,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,u32 i2c_acpi_find_bus_speed (struct device *dev);struct i2c_client *i2c_acpi_new_device (struct device *dev,int index,struct i2c_board_info *info); +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle);#else static inline bool i2c_acpi_get_i2c_resource (struct acpi_resource *ares,struct acpi_resource_i2c_serialbus **i2c)
@@ -992,6 +994,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, {return NULL ; } +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +{ +return NULL ; +}#endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */
Signature · 1 line
2.17.1
PATCH 2/2 net: phy: sfp: enable i2c-bus detection on ACPI based systems
In reply to Ruslan BabayevLookup I2C adapter using the "i2c-bus" device property on ACPI based systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
Device (SFP0)
{
Name (_HID, "PRP0001")
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () { "compatible", "sff,sfp" },
Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 },
},
})
}--- drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-)
drivers/net/phy/sfp.c +25 -8
@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/acpi.h> #include <linux/phy.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h>
@@ -1783,6 +1784,7 @@ static int sfp_probe(struct platform_device *pdev) {const struct sff_data *sff;struct sfp *sfp; +struct i2c_adapter *i2c =NULL ;bool poll = false;int irq, err, i;
@@ -1801,7 +1803,6 @@ static int sfp_probe(struct platform_device *pdev)if (pdev->dev.of_node) {struct device_node *node = pdev->dev.of_node;const struct of_device_id *id; -struct i2c_adapter *i2c;struct device_node *np; id =of_match_node (sfp_of_match, node);
@@ -1818,14 +1819,30 @@ static int sfp_probe(struct platform_device *pdev) i2c =of_find_i2c_adapter_by_node (np);of_node_put (np); -if (!i2c) -return -EPROBE_DEFER ; - - err =sfp_i2c_configure (sfp, i2c); -if (err <0 ) { -i2c_put_adapter (i2c); -return err; + }else if (ACPI_COMPANION (&pdev->dev)) { +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +struct fwnode_handle *fw =acpi_fwnode_handle (adev); +struct fwnode_reference_args args; +struct acpi_handle *acpi_handle; +int ret; + + ret =acpi_node_get_property_reference (fw,"i2c-bus" ,0 , &args); +if (ACPI_FAILURE (ret) || !is_acpi_device_node (args.fwnode)) { +dev_err (&pdev->dev,"missing 'i2c-bus' property\n" ); +return -ENODEV ; } + + acpi_handle =ACPI_HANDLE_FWNODE (args.fwnode); + i2c =i2c_acpi_find_adapter_by_handle (acpi_handle); + } + +if (!i2c) +return -EPROBE_DEFER ; + + err =sfp_i2c_configure (sfp, i2c); +if (err <0 ) { +i2c_put_adapter (i2c); +return err; }for (i =0 ; i <GPIO_MAX ; i++)
Signature · 1 line
2.17.1
Heiner Kallweit
maintainerQuoted 18 lines · Ruslan Babayev
Lookup I2C adapter using the "i2c-bus" device property on ACPI based systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
Device (SFP0)
{ Name (_HID, "PRP0001") Name (_DSD, Package () { ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "compatible", "sff,sfp" }, Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 }, }, }) }
Quoted 6 lines
Signed-off-by Ruslan Babayev <[email protected]>--- drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-)
If we have a patch series touching more than one sub-system a typical approach is:
- Send series to all persons / lists being responsible for the affected subsystems
- Maintainers will agree through which tree the series will go
- Maintainers of the other subsystems will ACK their respective patches of the series
I just received patch 2/2. The complete series (cover letter + two patches) should have gone to i2c and phylib maintainers + lists.
As an additional hint regarding the commit message:
I suppose you added this code to support a specific device. Wouldn't hurt if you mention which device it is.
PATCH v2 1/2 i2c: acpi: export i2c_acpi_find_adapter_by_handle
In reply to Ruslan BabayevThis allows drivers to lookup i2c adapters on ACPI based systems similar to of_get_i2c_adapter_by_node() with DT based systems.
--- drivers/i2c/i2c-core-acpi.c | 3 ++- include/linux/i2c.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/i2c/i2c-core-acpi.c +2 -1
@@ -337,7 +337,7 @@ static int i2c_acpi_find_match_device(struct device *dev, void *data)return ACPI_COMPANION (dev) == data; } -static struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) {struct device *dev;
@@ -345,6 +345,7 @@ static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle) i2c_acpi_find_match_adapter);return dev ?i2c_verify_adapter (dev) :NULL ; } +EXPORT_SYMBOL_GPL (i2c_acpi_find_adapter_by_handle);static struct i2c_client *i2c_acpi_find_client_by_adev (struct acpi_device *adev) {
include/linux/i2c.h +6 -0
@@ -21,6 +21,7 @@#include <linux/rtmutex.h> #include <linux/irqdomain.h> /* for Host Notify IRQ */ #include <linux/of.h> /* for struct device_node */ +#include <linux/acpi.h> /* for acpi_handle */ #include <linux/swab.h> /* for swab16 */ #include <uapi/linux/i2c.h>
@@ -981,6 +982,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,u32 i2c_acpi_find_bus_speed (struct device *dev);struct i2c_client *i2c_acpi_new_device (struct device *dev,int index,struct i2c_board_info *info); +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle);#else static inline bool i2c_acpi_get_i2c_resource (struct acpi_resource *ares,struct acpi_resource_i2c_serialbus **i2c)
@@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, {return NULL ; } +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +{ +return NULL ; +}#endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */
Signature · 1 line
2.17.1
Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
include/linux/i2c.h static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, · line 1001
Quoted 9 lines · Ruslan Babayev
include/linux/i2c.h +2
-0+struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle);#else static inline bool i2c_acpi_get_i2c_resource (struct acpi_resource *ares,struct acpi_resource_i2c_serialbus **i2c)@@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, {return NULL ; } +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle)
This should be static inline, I think.
Quoted 8 lines
include/linux/i2c.h +3
-0+{ +return NULL ; +}#endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */ Signature · 1 line
2.17.1
Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
Quoted 13 lines · Mika Westerberg
include/linux/i2c.h static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, · line 1001
Quoted 9 lines · Ruslan Babayev
include/linux/i2c.h +2
-0+struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle);#else static inline bool i2c_acpi_get_i2c_resource (struct acpi_resource *ares,struct acpi_resource_i2c_serialbus **i2c)@@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, {return NULL ; } +struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle)This should be static inline, I think.
Quoted 8 lines
Quoted 8 lines
include/linux/i2c.h +3
-0+{ +return NULL ; +}#endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */ Signature · 1 line
2.17.1
Thanks Mika, will make the change and repost the patches.
Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
In reply to Ruslan BabayevQuoted 5 lines · Ruslan Babayev
This allows drivers to lookup i2c adapters on ACPI based systems similar to
of_get_i2c_adapter_by_node()with DT based systems.Signed-off-by Ruslan Babayev <[email protected]>
Please have a look how your patches look in my inbox:
May 05 Ruslan Babayev ( 129) [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems May 05 Ruslan Babayev ( 65) ├─>[PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 24 Ruslan Babayev ( 65) └─>[PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 05 Ruslan Babayev ( 65) [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 06 Ruslan Babayev ( 3) ├─>[PATCH RFC v2 net-next] Enable SFP support on ACPI May 06 Ruslan Babayev ( 65) ├─>[PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 06 Ruslan Babayev ( 120) └─>[PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems May 07 Ruslan Babayev ( 154) └─&─> May 07 Ruslan Babayev ( 10) └─> May 22 Ruslan Babayev ( 29) └─> May 05 Ruslan Babayev ( 93) [PATCH net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems May 06 Ruslan Babayev ( 25) ├─&─> May 06 Ruslan Babayev ( 99) └─&─>
This is highly confusing, and super hard to find out which patches belong together. v2 2/2 seems even missing. Please resend this as a new series without any in-reply-to, and a fresh cover-letter, so I know which one to apply to my tree.
Thanks,
Wolfram
Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
Quoted 23 lines · Wolfram Sang
Quoted 5 lines · Ruslan Babayev
This allows drivers to lookup i2c adapters on ACPI based systems similar to
of_get_i2c_adapter_by_node()with DT based systems.Signed-off-by Ruslan Babayev <[email protected]>Please have a look how your patches look in my inbox:
May 05 Ruslan Babayev ( 129) [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems May 05 Ruslan Babayev ( 65) ├─>[PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 24 Ruslan Babayev ( 65) └─>[PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 05 Ruslan Babayev ( 65) [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 06 Ruslan Babayev ( 3) ├─>[PATCH RFC v2 net-next] Enable SFP support on ACPI May 06 Ruslan Babayev ( 65) ├─>[PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle May 06 Ruslan Babayev ( 120) └─>[PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems May 07 Ruslan Babayev ( 154) └─&─> May 07 Ruslan Babayev ( 10) └─> May 22 Ruslan Babayev ( 29) └─> May 05 Ruslan Babayev ( 93) [PATCH net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems May 06 Ruslan Babayev ( 25) ├─&─> May 06 Ruslan Babayev ( 99) └─&─>
Quoted 8 lines
This is highly confusing, and super hard to find out which patches belong together. v2 2/2 seems even missing. Please resend this as a new series without any in-reply-to, and a fresh cover-letter, so I know which one to apply to my tree.
Thanks,
Wolfram
Will do, sorry about that.
PATCH v2 2/2 net: phy: sfp: enable i2c-bus detection on ACPI based systems
In reply to Ruslan BabayevLookup I2C adapter using the "i2c-bus" device property on ACPI based systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
Device (SFP0)
{
Name (_HID, "PRP0001")
Name (_CRS, ResourceTemplate()
{
GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionNone,
"\\_SB.PCI0.RP01.GPIO", 0, ResourceConsumer)
{ 0, 1, 2, 3, 4 }
})
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () { "compatible", "sff,sfp" },
Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 },
Package () { "maximum-power-milliwatt", 1000 },
Package () { "tx-disable-gpios", Package () { ^SFP0, 0, 0, 1} },
Package () { "reset-gpio", Package () { ^SFP0, 0, 1, 1} },
Package () { "mod-def0-gpios", Package () { ^SFP0, 0, 2, 1} },
Package () { "tx-fault-gpios", Package () { ^SFP0, 0, 3, 0} },
Package () { "los-gpios", Package () { ^SFP0, 0, 4, 1} },
},
})
}Device (PHY0)
{
Name (_HID, "PRP0001")
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () { "compatible", "ethernet-phy-ieee802.3-c45" },
Package () { "sfp", \_SB.PCI0.RP01.SFP0 },
Package () { "managed", "in-band-status" },
Package () { "phy-mode", "sgmii" },
},
})
}--- drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-)
drivers/net/phy/sfp.c +25 -8
@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> +#include <linux/acpi.h> #include <linux/phy.h> #include <linux/platform_device.h> #include <linux/rtnetlink.h>
@@ -1783,6 +1784,7 @@ static int sfp_probe(struct platform_device *pdev) {const struct sff_data *sff;struct sfp *sfp; +struct i2c_adapter *i2c =NULL ;bool poll = false;int irq, err, i;
@@ -1801,7 +1803,6 @@ static int sfp_probe(struct platform_device *pdev)if (pdev->dev.of_node) {struct device_node *node = pdev->dev.of_node;const struct of_device_id *id; -struct i2c_adapter *i2c;struct device_node *np; id =of_match_node (sfp_of_match, node);
@@ -1818,14 +1819,30 @@ static int sfp_probe(struct platform_device *pdev) i2c =of_find_i2c_adapter_by_node (np);of_node_put (np); -if (!i2c) -return -EPROBE_DEFER ; - - err =sfp_i2c_configure (sfp, i2c); -if (err <0 ) { -i2c_put_adapter (i2c); -return err; + }else if (ACPI_COMPANION (&pdev->dev)) { +struct acpi_device *adev =ACPI_COMPANION (&pdev->dev); +struct fwnode_handle *fw =acpi_fwnode_handle (adev); +struct fwnode_reference_args args; +struct acpi_handle *acpi_handle; +int ret; + + ret =acpi_node_get_property_reference (fw,"i2c-bus" ,0 , &args); +if (ACPI_FAILURE (ret) || !is_acpi_device_node (args.fwnode)) { +dev_err (&pdev->dev,"missing 'i2c-bus' property\n" ); +return -ENODEV ; } + + acpi_handle =ACPI_HANDLE_FWNODE (args.fwnode); + i2c =i2c_acpi_find_adapter_by_handle (acpi_handle); + } + +if (!i2c) +return -EPROBE_DEFER ; + + err =sfp_i2c_configure (sfp, i2c); +if (err <0 ) { +i2c_put_adapter (i2c); +return err; }for (i =0 ; i <GPIO_MAX ; i++)
Signature · 1 line
2.17.1
Quoted 45 lines · Ruslan Babayev
Lookup I2C adapter using the "i2c-bus" device property on ACPI based systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
Device (SFP0)
{ Name (_HID, "PRP0001") Name (_CRS, ResourceTemplate() { GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionNone, "\\_SB.PCI0.RP01.GPIO", 0, ResourceConsumer) { 0, 1, 2, 3, 4 } }) Name (_DSD, Package () { ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "compatible", "sff,sfp" }, Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 }, Package () { "maximum-power-milliwatt", 1000 }, Package () { "tx-disable-gpios", Package () { ^SFP0, 0, 0, 1} }, Package () { "reset-gpio", Package () { ^SFP0, 0, 1, 1} }, Package () { "mod-def0-gpios", Package () { ^SFP0, 0, 2, 1} }, Package () { "tx-fault-gpios", Package () { ^SFP0, 0, 3, 0} }, Package () { "los-gpios", Package () { ^SFP0, 0, 4, 1} }, }, }) }Device (PHY0)
{ Name (_HID, "PRP0001") Name (_DSD, Package () { ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), Package () { Package () { "compatible", "ethernet-phy-ieee802.3-c45" }, Package () { "sfp", \_SB.PCI0.RP01.SFP0 }, Package () { "managed", "in-band-status" }, Package () { "phy-mode", "sgmii" }, }, }) }
Quoted 2 lines
Signed-off-by Ruslan Babayev <[email protected]>
Andrew
David Miller
maintainerFrom: Ruslan Babayev <[email protected]>
Date: Fri, 24 May 2019 17:53:02 -0700
Quoted 4 lines
Lookup I2C adapter using the "i2c-bus" device property on ACPI based systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
I don't see patch #1.
Please repost with both patches and your cover letter CC:'d to netdev.