mfd: intel_quark_i2c_gpio: Refactor and support for IOT2000
v3 cover mfd: intel_quark_i2c_gpio: Refactor and support for IOT2000
Changes in v3:
- added Andy's reviewed tag
Jan
Jan Kiszka (2):
mfd: intel_quark_i2c_gpio: Use dmi_system_id table for retrieving
frequency
mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform
drivers/mfd/intel_quark_i2c_gpio.c | 49 ++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 20 deletions(-)
Signature · 1 line
2.12.3
PATCH v3 1/2 mfd: intel_quark_i2c_gpio: Use dmi_system_id table for retrieving frequency
Avoids reimplementation of DMI matching in intel_quark_i2c_setup.
--- drivers/mfd/intel_quark_i2c_gpio.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
drivers/mfd/intel_quark_i2c_gpio.c +13 -20
@@ -58,19 +58,18 @@ struct intel_quark_mfd {struct clk_lookup *i2c_clk_lookup; }; -struct i2c_mode_info { -const char *name; -unsigned int i2c_scl_freq; -}; - -static const struct i2c_mode_info platform_i2c_mode_info[] = { +static const struct dmi_system_id dmi_platform_info[] = { { - .name ="Galileo" , - .i2c_scl_freq =100000 , + .matches = { +DMI_EXACT_MATCH (DMI_BOARD_NAME ,"Galileo" ), + }, + .driver_data = (void *)100000 , }, { - .name ="GalileoGen2" , - .i2c_scl_freq =400000 , + .matches = { +DMI_EXACT_MATCH (DMI_BOARD_NAME ,"GalileoGen2" ), + }, + .driver_data = (void *)400000 , }, {} };
@@ -160,8 +159,7 @@ static void intel_quark_unregister_i2c_clk(struct device *dev)static int intel_quark_i2c_setup (struct pci_dev *pdev,struct mfd_cell *cell) { -const char *board_name =dmi_get_system_info (DMI_BOARD_NAME ); -const struct i2c_mode_info *info; +const struct dmi_system_id *dmi_id;struct dw_i2c_platform_data *pdata;struct resource *res = (struct resource *)cell->resources;struct device *dev = &pdev->dev;
@@ -181,14 +179,9 @@ static int intel_quark_i2c_setup(struct pci_dev *pdev, struct mfd_cell *cell)/* Normal mode by default */ pdata->i2c_scl_freq =100000 ; -if (board_name) { -for (info = platform_i2c_mode_info; info->name; info++) { -if (!strcmp (board_name, info->name)) { - pdata->i2c_scl_freq = info->i2c_scl_freq; -break ; - } - } - } + dmi_id =dmi_first_match (dmi_platform_info); +if (dmi_id) + pdata->i2c_scl_freq = (uintptr_t )dmi_id->driver_data; cell->platform_data = pdata; cell->pdata_size =sizeof (*pdata);
Signature · 1 line
2.12.3
Lee Jones
AppliedRe: [PATCH v3 1/2] mfd: intel_quark_i2c_gpio: Use dmi_system_id table for retrieving frequency
Quoted 7 lines · Jan Kiszka
Avoids reimplementation of DMI matching in
intel_quark_i2c_setup.Signed-off-by Jan Kiszka <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_quark_i2c_gpio.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-)
Applied, thanks.
Quoted 61 lines
drivers/mfd/intel_quark_i2c_gpio.c +13
-20@@ -58,19 +58,18 @@ struct intel_quark_mfd {struct clk_lookup *i2c_clk_lookup; }; -struct i2c_mode_info { -const char *name; -unsigned int i2c_scl_freq; -}; - -static const struct i2c_mode_info platform_i2c_mode_info[] = { +static const struct dmi_system_id dmi_platform_info[] = { { - .name ="Galileo" , - .i2c_scl_freq =100000 , + .matches = { +DMI_EXACT_MATCH (DMI_BOARD_NAME ,"Galileo" ), + }, + .driver_data = (void *)100000 , }, { - .name ="GalileoGen2" , - .i2c_scl_freq =400000 , + .matches = { +DMI_EXACT_MATCH (DMI_BOARD_NAME ,"GalileoGen2" ), + }, + .driver_data = (void *)400000 , }, {} };@@ -160,8 +159,7 @@ static void intel_quark_unregister_i2c_clk(struct device *dev)static int intel_quark_i2c_setup (struct pci_dev *pdev,struct mfd_cell *cell) { -const char *board_name =dmi_get_system_info (DMI_BOARD_NAME ); -const struct i2c_mode_info *info; +const struct dmi_system_id *dmi_id;struct dw_i2c_platform_data *pdata;struct resource *res = (struct resource *)cell->resources;struct device *dev = &pdev->dev;@@ -181,14 +179,9 @@ static int intel_quark_i2c_setup(struct pci_dev *pdev, struct mfd_cell *cell)/* Normal mode by default */ pdata->i2c_scl_freq =100000 ; -if (board_name) { -for (info = platform_i2c_mode_info; info->name; info++) { -if (!strcmp (board_name, info->name)) { - pdata->i2c_scl_freq = info->i2c_scl_freq; -break ; - } - } - } + dmi_id =dmi_first_match (dmi_platform_info); +if (dmi_id) + pdata->i2c_scl_freq = (uintptr_t )dmi_id->driver_data; cell->platform_data = pdata; cell->pdata_size =sizeof (*pdata);
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v3 2/2 mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform
In reply to Jan KiszkaThe SIMATIC IOT2020 and IOT2040 are derived from the Galileo Gen2 board and share its I2C frequency.
--- drivers/mfd/intel_quark_i2c_gpio.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/mfd/intel_quark_i2c_gpio.c +16 -0
@@ -71,6 +71,22 @@ static const struct dmi_system_id dmi_platform_info[] = { }, .driver_data = (void *)400000, }, + { + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"), + DMI_EXACT_MATCH(DMI_BOARD_ASSET_TAG, + "6ES7647-0AA00-0YA2"), + }, + .driver_data = (void *)400000, + }, + { + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"), + DMI_EXACT_MATCH(DMI_BOARD_ASSET_TAG, + "6ES7647-0AA00-1YA2"), + }, + .driver_data = (void *)400000, + }, {} };
Signature · 1 line
2.12.3
Lee Jones
AppliedRe: [PATCH v3 2/2] mfd: intel_quark_i2c_gpio: Add support for SIMATIC IOT2000 platform
Quoted 9 lines · Jan Kiszka
The SIMATIC IOT2020 and IOT2040 are derived from the Galileo Gen2 board and share its I2C frequency.
Signed-off-by Sascha Weisenberger <[email protected]>Signed-off-by Jan Kiszka <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>--- drivers/mfd/intel_quark_i2c_gpio.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Applied, thanks.
Quoted 27 lines
drivers/mfd/intel_quark_i2c_gpio.c +16
-0@@ -71,6 +71,22 @@ static const struct dmi_system_id dmi_platform_info[] = { }, .driver_data = (void *)400000, }, + { + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"), + DMI_EXACT_MATCH(DMI_BOARD_ASSET_TAG, + "6ES7647-0AA00-0YA2"), + }, + .driver_data = (void *)400000, + }, + { + .matches = { + DMI_EXACT_MATCH(DMI_BOARD_NAME, "SIMATIC IOT2000"), + DMI_EXACT_MATCH(DMI_BOARD_ASSET_TAG, + "6ES7647-0AA00-1YA2"), + }, + .driver_data = (void *)400000, + }, {} };
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog