From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2022 17:43:09 +0000 (-0700)
Subject: Merge tag 'arm-multiplatform-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v6.6.17~7441
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ecf0aa5317b0ad6bb015128a5b763c954fd58708;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'arm-multiplatform-5.19-1' of git://git./linux/kernel/git/soc/soc

Pull ARMv4T/v5 multiplatform support from Arnd Bergmann:
 "This series has been 12 years in the making, it mostly finishes the
  work that was started with the founding of Linaro to clean up platform
  support in the kernel.

  The largest change here is a cleanup of the omap1 platform, which is
  the final ARM machine type to get converted to the common-clk
  subsystem. All the omap1 specific drivers are now made independent of
  the mach/*.h headers to allow the platform to be part of a generic
  ARMv4/v5 multiplatform kernel.

  The last bit that enables this support is still missing here while we
  wait for some last dependencies to make it into the mainline kernel
  through other subsystems.

  The s3c24xx, ixp4xx, iop32x, ep93xx and dove platforms were all almost
  at the point of allowing multiplatform kernels, this work gets
  completed here along with a few additional cleanup. At the same time,
  the s3c24xx and s3c64xx are now deprecated and expected to get removed
  in the future.

  The PXA and OMAP1 bits are in a separate branch because of
  dependencies. Once both branches are merged, only the three Intel
  StrongARM platforms (RiscPC, Footbridge/NetWinder and StrongARM1100)
  need separate kernels, and there are no plans to include these"

* tag 'arm-multiplatform-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (61 commits)
  ARM: ixp4xx: Consolidate Kconfig fixing issue
  ARM: versatile: Add missing of_node_put in dcscb_init
  ARM: config: Refresh IXP4xx config after multiplatform
  ARM: omap1: add back omap_set_dma_priority() stub
  ARM: omap: fix missing declaration warnings
  ARM: omap: fix address space warnings from sparse
  ARM: spear: remove include/mach/ subdirectory
  ARM: davinci: remove include/mach/ subdirectory
  ARM: omap2: remove include/mach/ subdirectory
  integrator: remove empty ap_init_early()
  ARM: s3c: fix include path
  MAINTAINERS: omap1: Add Janusz as an additional maintainer
  ARM: omap1: htc_herald: fix typos in comments
  ARM: OMAP1: fix typos in comments
  ARM: OMAP1: clock: Remove noop code
  ARM: OMAP1: clock: Remove unused code
  ARM: OMAP1: clock: Fix UART rate reporting algorithm
  ARM: OMAP1: clock: Fix early UART rate issues
  ARM: OMAP1: Prepare for conversion of OMAP1 clocks to CCF
  ARM: omap1: fix build with no SoC selected
  ...
---

ecf0aa5317b0ad6bb015128a5b763c954fd58708
diff --cc arch/arm/configs/mini2440_defconfig
index c774128,0a2e97d..3ef48e7
--- a/arch/arm/configs/mini2440_defconfig
+++ b/arch/arm/configs/mini2440_defconfig
@@@ -4,8 -4,11 +4,10 @@@ CONFIG_POSIX_MQUEUE=
  CONFIG_RELAY=y
  CONFIG_BLK_DEV_INITRD=y
  # CONFIG_COMPAT_BRK is not set
+ CONFIG_ARCH_MULTI_V4T=y
+ # CONFIG_ARCH_MULTI_V7 is not set
  CONFIG_ARCH_S3C24XX=y
  CONFIG_S3C_ADC=y
 -CONFIG_S3C24XX_PWM=y
  # CONFIG_CPU_S3C2410 is not set
  CONFIG_CPU_S3C2440=y
  CONFIG_MACH_MINI2440=y
diff --cc arch/arm/mach-sunxi/Kconfig
index abdb99f,93cf70c..e015f24
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@@ -1,10 -1,13 +1,10 @@@
  # SPDX-License-Identifier: GPL-2.0-only
  menuconfig ARCH_SUNXI
  	bool "Allwinner SoCs"
- 	depends on ARCH_MULTI_V5 || ARCH_MULTI_V7
+ 	depends on (CPU_LITTLE_ENDIAN && ARCH_MULTI_V5) || ARCH_MULTI_V7
  	select ARCH_HAS_RESET_CONTROLLER
  	select CLKSRC_MMIO
 -	select GENERIC_IRQ_CHIP
  	select GPIOLIB
 -	select IRQ_DOMAIN_HIERARCHY
 -	select IRQ_FASTEOI_HIERARCHY_HANDLERS
  	select PINCTRL
  	select PM_OPP
  	select SUN4I_TIMER
@@@ -41,10 -40,8 +41,9 @@@ config MACH_SUN7
  	default ARCH_SUNXI
  	select ARM_GIC
  	select ARM_PSCI
- 	select ARCH_SUPPORTS_BIG_ENDIAN
  	select HAVE_ARM_ARCH_TIMER
  	select SUN5I_HSTIMER
 +	select SUNXI_NMI_INTC
  
  config MACH_SUN8I
  	bool "Allwinner sun8i Family SoCs support"
diff --cc drivers/video/fbdev/omap/lcdc.c
index 97d20dc,4c9091b..e7ce783
--- a/drivers/video/fbdev/omap/lcdc.c
+++ b/drivers/video/fbdev/omap/lcdc.c
@@@ -711,9 -713,9 +713,9 @@@ static int omap_lcdc_init(struct omapfb
  		dev_err(fbdev->dev, "failed to adjust LCD rate\n");
  		goto fail1;
  	}
 -	clk_enable(lcdc.lcd_ck);
 +	clk_prepare_enable(lcdc.lcd_ck);
  
- 	r = request_irq(OMAP_LCDC_IRQ, lcdc_irq_handler, 0, MODULE_NAME, fbdev);
+ 	r = request_irq(fbdev->int_irq, lcdc_irq_handler, 0, MODULE_NAME, fbdev);
  	if (r) {
  		dev_err(fbdev->dev, "unable to get IRQ\n");
  		goto fail2;
@@@ -744,9 -746,9 +746,9 @@@ fail5
  fail4:
  	omap_free_lcd_dma();
  fail3:
- 	free_irq(OMAP_LCDC_IRQ, lcdc.fbdev);
+ 	free_irq(fbdev->int_irq, lcdc.fbdev);
  fail2:
 -	clk_disable(lcdc.lcd_ck);
 +	clk_disable_unprepare(lcdc.lcd_ck);
  fail1:
  	clk_put(lcdc.lcd_ck);
  fail0:
@@@ -759,8 -761,8 +761,8 @@@ static void omap_lcdc_cleanup(void
  		free_palette_ram();
  	free_fbmem();
  	omap_free_lcd_dma();
- 	free_irq(OMAP_LCDC_IRQ, lcdc.fbdev);
+ 	free_irq(lcdc.fbdev->int_irq, lcdc.fbdev);
 -	clk_disable(lcdc.lcd_ck);
 +	clk_disable_unprepare(lcdc.lcd_ck);
  	clk_put(lcdc.lcd_ck);
  }