| Message ID | 1466414778-22879-1-git-send-email-tanmay.jagdale@broadcom.com |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Jun 20, 2016 at 02:56:18PM +0530, Tanmay Jagdale wrote: > Added ACPI support for the I2C controller present on Broadcom's > Vulcan ARM64 processor. ACPI ID used by the controller is BRCM9007. > > Changed the xlp9xx_i2c_get_frequency() function to use > device_property_read_u32() API so that the "clock-frequency" value > can be read from _DSD in ACPI mode. > > Signed-off-by: Tanmay Jagdale <tanmay.jagdale@broadcom.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 20, 2016 at 02:56:18PM +0530, Tanmay Jagdale wrote: > Added ACPI support for the I2C controller present on Broadcom's > Vulcan ARM64 processor. ACPI ID used by the controller is BRCM9007. > > Changed the xlp9xx_i2c_get_frequency() function to use > device_property_read_u32() API so that the "clock-frequency" value > can be read from _DSD in ACPI mode. > > Signed-off-by: Tanmay Jagdale <tanmay.jagdale@broadcom.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c index c941418..55a7bef 100644 --- a/drivers/i2c/busses/i2c-xlp9xx.c +++ b/drivers/i2c/busses/i2c-xlp9xx.c @@ -6,6 +6,7 @@ * warranty of any kind, whether express or implied. */ +#include <linux/acpi.h> #include <linux/completion.h> #include <linux/i2c.h> #include <linux/init.h> @@ -341,11 +342,10 @@ static struct i2c_algorithm xlp9xx_i2c_algo = { static int xlp9xx_i2c_get_frequency(struct platform_device *pdev, struct xlp9xx_i2c_dev *priv) { - struct device_node *np = pdev->dev.of_node; u32 freq; int err; - err = of_property_read_u32(np, "clock-frequency", &freq); + err = device_property_read_u32(&pdev->dev, "clock-frequency", &freq); if (err) { freq = XLP9XX_I2C_DEFAULT_FREQ; dev_dbg(&pdev->dev, "using default frequency %u\n", freq); @@ -429,12 +429,21 @@ static const struct of_device_id xlp9xx_i2c_of_match[] = { { /* sentinel */ }, }; +#ifdef CONFIG_ACPI +static const struct acpi_device_id xlp9xx_i2c_acpi_ids[] = { + {"BRCM9007", 0}, + {} +}; +MODULE_DEVICE_TABLE(acpi, xlp9xx_i2c_acpi_ids); +#endif + static struct platform_driver xlp9xx_i2c_driver = { .probe = xlp9xx_i2c_probe, .remove = xlp9xx_i2c_remove, .driver = { .name = "xlp9xx-i2c", .of_match_table = xlp9xx_i2c_of_match, + .acpi_match_table = ACPI_PTR(xlp9xx_i2c_acpi_ids), }, };
Added ACPI support for the I2C controller present on Broadcom's Vulcan ARM64 processor. ACPI ID used by the controller is BRCM9007. Changed the xlp9xx_i2c_get_frequency() function to use device_property_read_u32() API so that the "clock-frequency" value can be read from _DSD in ACPI mode. Signed-off-by: Tanmay Jagdale <tanmay.jagdale@broadcom.com> --- Changes in v3: Sorted header file inclusion. Rename vulcan_i2c_acpi_ids to xlp9xx_i2c_acpi_ids to stay consistent with rest of the driver. Changes in v2: Changed of_property_read_u32() to device_property_read_u32() so that the "clock-frequency" can be read from DTS or ACPI. drivers/i2c/busses/i2c-xlp9xx.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)