github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-01 19:13:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX SoC change for 6.8:

Browse Source 
- Update mach-imx MMDC driver to use device_get_match_data().
 - Drop the use of "fsl,clkctrl" from mach-mxs platform code, as it's
   an undocumented compatible.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmV9EWUUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM7ASwgApXPioV/VAb6trV9Njb/3f0nyxfRw
 egErlK1v1hdIgMtOFE+JSWKbqdx+z64kmrWA2NdSEVu6ZB6aCeDdeImw7A9Lg2Lu
 aaynbWDK7D/r67MKdpyH/7m0pyo5JuHXUCZJvIJvTjMuX9Q/7XN7gQyHojkmFglU
 244wFVnzCi8wryqY8rixAceLSI3U3yxFyVc7Xd63bby1LYeWUj2dMos7ONdV/RBs
 kZQztNH9eTcYGZpUohegm8Oj2J47yI958rbcCFl+uwA3KHZluwGSw1jhS9A8SgBh
 fwXQdKnLhZk16cR+iiRjSewdYxLLmi5e1h6VIUnq3DA5tHEKb2Bbf/lPvQ==
 =Anar
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmWFZ0cACgkQYKtH/8kJ
 Uicrbg/5AYYYTA7w7R5tmaM58/kiTlcVVIIKSRLveRr2OeeIYXRF4oj5NVlLrYvj
 Fx1aavSL7O0Zr0VvbPjDam4pnm2G1akVOd60GkkCEZVnpwKFx8tZEUOGuapYhyPd
 F+nZEVJZl2YliSl+RbOhwHbWrH3PHDXobQsYtDekq5A2edLmBU7LeBUvpl34mBLr
 09fBqzGw8aTTtS2AMSmhmpqftpe/NakP7I+09xUp4TFae9J6Csf4g/gyegNPU7wu
 2SDBCXQcHV9SVbU3y91eEoQho6Wl7h0f7OawG6B1eFoes1CeiE0QNfKc+gwDtWBB
 CvZ8oecGqVWs64MKoFO0GwtNNYFH6WsdK+pG8xekqPC9m2DvLhSQjwa8m70eIsEk
 0KYTrm7BYRg9fUDyY4FBGgPuZacE4foMUInlte588FFYDlr4b4eYEXRwoXh899ec
 zl/xRnBt7qzRc9e6uoKGS/3G9oqjNEaUghfWPhgojqP8G1LiTN8Y91Ub1mh45Up0
 qxQ7iF8iDNDUBIAjHNqfqakcZPoNbWXCk1L9dojZki3RJ2452HNXoPuCneyi8V7m
 j7CgiIXMYOCbsXHbocPVVt3lCnfSW7cdNXczxc0+eQJfKwltH/UK75TeAhyHjd0A
 z9L9FZIHO+0CsOg8EJD1vWzAf1627rehEdm9LdWAzfX7CboMALE=
 =ZF2i
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into soc/arm

i.MX SoC change for 6.8:

- Update mach-imx MMDC driver to use device_get_match_data().
- Drop the use of "fsl,clkctrl" from mach-mxs platform code, as it's
  an undocumented compatible.

* tag 'imx-soc-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: mxs: Do not search for "fsl,clkctrl"
  ARM: imx: Use device_get_match_data()

Link: https://lore.kernel.org/r/20231216064605.876196-2-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-12-22 10:39:02 +00:00
commit fe0a6cebe9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/mach-imx/mmdc.c
View File

@ -13,7 +13,8 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/property.h>
#include <linux/perf_event.h>
#include <linux/slab.h>
@ -103,7 +104,7 @@ struct mmdc_pmu {
struct device *dev;
struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];
struct hlist_node node;
struct fsl_mmdc_devtype_data *devtype_data;
const struct fsl_mmdc_devtype_data *devtype_data;
struct clk *mmdc_ipg_clk;
};
@ -474,8 +475,6 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
struct mmdc_pmu *pmu_mmdc;
char *name;
int ret;
const struct of_device_id *of_id =
of_match_device(imx_mmdc_dt_ids, &pdev->dev);
pmu_mmdc = kzalloc(sizeof(*pmu_mmdc), GFP_KERNEL);
if (!pmu_mmdc) {
@ -503,7 +502,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
GFP_KERNEL, "mmdc%d", ret);
pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data;
pmu_mmdc->devtype_data = device_get_match_data(&pdev->dev);
hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC,
HRTIMER_MODE_REL);

4
arch/arm/mach-mxs/mach-mxs.c
View File

@ -356,7 +356,9 @@ static int __init mxs_restart_init(void)
{
struct device_node *np;
np = of_find_compatible_node(NULL, NULL, "fsl,clkctrl");
np = of_find_compatible_node(NULL, NULL, "fsl,imx23-clkctrl");
if (!np)
np = of_find_compatible_node(NULL, NULL, "fsl,imx28-clkctrl");
reset_addr = of_iomap(np, 0);
if (!reset_addr)
return -ENODEV;