Commit e29d4301 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-soc-6.10' of...

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

i.MX SoC changes for 6.10:

- Assign the pmu->dev parent to be the platform device for MMDC driver,
  so that it doesn't appear directly under /sys/devices/.

* tag 'imx-soc-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Assign parents for mmdc event_source devices

Link: https://lore.kernel.org/r/20240428121247.10370-1-shawnguo2@yeah.netSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fec50db7 6eaa8431
...@@ -437,6 +437,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, ...@@ -437,6 +437,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc,
{ {
*pmu_mmdc = (struct mmdc_pmu) { *pmu_mmdc = (struct mmdc_pmu) {
.pmu = (struct pmu) { .pmu = (struct pmu) {
.parent = dev,
.task_ctx_nr = perf_invalid_context, .task_ctx_nr = perf_invalid_context,
.attr_groups = attr_groups, .attr_groups = attr_groups,
.event_init = mmdc_pmu_event_init, .event_init = mmdc_pmu_event_init,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment