diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-12-22 11:14:54 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-12-22 11:14:55 +0000 |
| commit | e85c036c990671c231e9d86b7fedca6cf2cb4e38 (patch) | |
| tree | d95a40dbeeac09e108cb6f5de07818f736a235d3 /drivers/bus | |
| parent | 827601c40c6ded52a02660f090e4ba82bfa1c26e (diff) | |
| parent | fcefbb49ebb7ad9f06ecee33ae87e4d7075728ff (diff) | |
| download | linux-e85c036c990671c231e9d86b7fedca6cf2cb4e38.tar.gz | |
Merge tag 'imx-drivers-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/drivers
i.MX drivers change for 6.8:
- Change imx-weim bus driver to use device_get_match_data()
* tag 'imx-drivers-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
bus: imx-weim: Use device_get_match_data()
Link: https://lore.kernel.org/r/20231216064605.876196-1-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/imx-weim.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 42c9386a7b423..6b5da73c85417 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c @@ -11,7 +11,10 @@ #include <linux/clk.h> #include <linux/io.h> #include <linux/of_address.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/property.h> #include <linux/mfd/syscon.h> #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> #include <linux/regmap.h> @@ -202,9 +205,7 @@ static int weim_timing_setup(struct device *dev, struct device_node *np, static int weim_parse_dt(struct platform_device *pdev) { - const struct of_device_id *of_id = of_match_device(weim_id_table, - &pdev->dev); - const struct imx_weim_devtype *devtype = of_id->data; + const struct imx_weim_devtype *devtype = device_get_match_data(&pdev->dev); int ret = 0, have_child = 0; struct device_node *child; struct weim_priv *priv; |