From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jan 2024 19:42:53 +0000 (-0800)
Subject: Merge tag 'soc-arm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fb249b275c591f064853157bf2b378fcedd6381b;p=linux.git

Merge tag 'soc-arm-6.8' of git://git./linux/kernel/git/soc/soc

Pull ARM SoC code updates from Arnd Bergmann:
 "There are two notable changes this time:

   - add a arch/arm/Kconfig.platforms file to simplify the platforms
     that have no code except their Kconfig file (Andrew Davis)

   - remove support for the ARM11MPCore CPU in the versatile/realview
     platform. Since this is the last remaining one after removing
     ox820, some core code can go as well (Linus Walleij)

  The other changes are minor cleanups and bugfixes"

* tag 'soc-arm-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: davinci: always select CONFIG_CPU_ARM926T
  soc: pxa: ssp: fix casts
  ARM: debug: fix DEBUG_UNCOMPRESS help for !MULTIPLATFORM
  ARM: MAINTAINERS: drop empty entries for removed boards
  ARM: Delete ARM11MPCore perf leftovers
  ARM: mach-nspire: Rework support and directory structure
  ARM: mach-sunplus: Rework support and directory structure
  ARM: mach-airoha: Rework support and directory structure
  ARM: mach-moxart: Move MOXA ART support into Kconfig.platforms
  ARM: mach-uniphier: Move Socionext UniPhier support into Kconfig.platforms
  ARM: mach-rda: Move RDA Micro support into Kconfig.platforms
  ARM: mach-asm9260: Move ASM9260 support into Kconfig.platforms
  ARM: Kconfig: move platform selection into its own Kconfig file
  ARM: Delete ARM11MPCore (ARM11 ARMv6K SMP) support
  MAINTAINERS: add Marvell MBus driver to Marvell EBU SoCs support
  ARM: mxs: Do not search for "fsl,clkctrl"
  ARM: imx: Use device_get_match_data()
  MAINTAINERS: add omap bus drivers to OMAP2+ SUPPORT
  ARM: at91: pm: set soc_pm.data.mode in at91_pm_secure_init()
---

fb249b275c591f064853157bf2b378fcedd6381b
diff --cc arch/arm/kernel/perf_event_v6.c
index 8fc080c9e4fb1,0cbf46233d6b1..d9fd538415918
--- a/arch/arm/kernel/perf_event_v6.c
+++ b/arch/arm/kernel/perf_event_v6.c
@@@ -436,35 -386,9 +373,8 @@@ static void armv6pmu_disable_event(stru
  	val &= ~mask;
  	val |= evt;
  	armv6_pmcr_write(val);
 -	raw_spin_unlock_irqrestore(&events->pmu_lock, flags);
  }
  
- static void armv6mpcore_pmu_disable_event(struct perf_event *event)
- {
- 	unsigned long val, mask, evt = 0;
- 	struct hw_perf_event *hwc = &event->hw;
- 	int idx = hwc->idx;
- 
- 	if (ARMV6_CYCLE_COUNTER == idx) {
- 		mask	= ARMV6_PMCR_CCOUNT_IEN;
- 	} else if (ARMV6_COUNTER0 == idx) {
- 		mask	= ARMV6_PMCR_COUNT0_IEN;
- 	} else if (ARMV6_COUNTER1 == idx) {
- 		mask	= ARMV6_PMCR_COUNT1_IEN;
- 	} else {
- 		WARN_ONCE(1, "invalid counter number (%d)\n", idx);
- 		return;
- 	}
- 
- 	/*
- 	 * Unlike UP ARMv6, we don't have a way of stopping the counters. We
- 	 * simply disable the interrupt reporting.
- 	 */
- 	val = armv6_pmcr_read();
- 	val &= ~mask;
- 	val |= evt;
- 	armv6_pmcr_write(val);
- }
- 
  static int armv6_map_event(struct perf_event *event)
  {
  	return armpmu_map_event(event, &armv6_perf_map,
diff --cc arch/arm/mach-imx/mmdc.c
index df69af9323754,897e6def59ee7..444a7eaa320ca
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@@ -501,13 -500,9 +500,13 @@@ static int imx_mmdc_perf_init(struct pl
  
  	name = devm_kasprintf(&pdev->dev,
  				GFP_KERNEL, "mmdc%d", ret);
 +	if (!name) {
 +		ret = -ENOMEM;
 +		goto pmu_release_id;
 +	}
  
  	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);