From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Aug 2019 19:35:22 +0000 (+0200)
Subject: Merge branch 'lpc32xx/multiplatform' into arm/soc
X-Git-Tag: v5.4-rc1~187^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d64a1fd852abc4e5905ddd5b5d8ccbe3360868bd;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'lpc32xx/multiplatform' into arm/soc

I revisited some older patches here, getting two of the remaining
ARM platforms to build with ARCH_MULTIPLATFORM like most others do.

In case of lpc32xx, I created a new set of patches, which seemed
easier than digging out what I did for an older release many
years ago.

* lpc32xx/multiplatform:
  ARM: lpc32xx: allow multiplatform build
  ARM: lpc32xx: clean up header files
  serial: lpc32xx: allow compile testing
  net: lpc-enet: allow compile testing
  net: lpc-enet: fix printk format strings
  net: lpc-enet: fix badzero.cocci warnings
  net: lpc-enet: move phy setup into platform code
  net: lpc-enet: factor out iram access
  gpio: lpc32xx: allow building on non-lpc32xx targets
  serial: lpc32xx_hs: allow compile-testing
  watchdog: pnx4008_wdt: allow compile-testing
  usb: udc: lpc32xx: allow compile-testing
  usb: ohci-nxp: enable compile-testing

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

d64a1fd852abc4e5905ddd5b5d8ccbe3360868bd
diff --cc arch/arm/Kconfig
index 8c4382e,65808e1..1086a0e
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -424,21 -451,33 +424,6 @@@ config ARCH_DOV
  	help
  	  Support for the Marvell Dove SoC 88AP510
  
- config ARCH_LPC32XX
- 	bool "NXP LPC32XX"
- 	select ARM_AMBA
 -config ARCH_KS8695
 -	bool "Micrel/Kendin KS8695"
 -	select CLKSRC_MMIO
 -	select CPU_ARM922T
 -	select GENERIC_CLOCKEVENTS
 -	select GPIOLIB
 -	select NEED_MACH_MEMORY_H
 -	help
 -	  Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
 -	  System-on-Chip devices.
 -
 -config ARCH_W90X900
 -	bool "Nuvoton W90X900 CPU"
--	select CLKDEV_LOOKUP
- 	select CLKSRC_LPC32XX
- 	select COMMON_CLK
 -	select CLKSRC_MMIO
--	select CPU_ARM926T
--	select GENERIC_CLOCKEVENTS
- 	select GENERIC_IRQ_MULTI_HANDLER
--	select GPIOLIB
- 	select SPARSE_IRQ
- 	select USE_OF
--	help
- 	  Support for the NXP LPC32XX family of processors
 -	  Support for Nuvoton (Winbond logic dept.) ARM9 processor,
 -	  At present, the w90x900 has been renamed nuc900, regarding
 -	  the ARM series product line, you can login the following
 -	  link address to know more.
 -
 -	  <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
 -		ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>
--
  config ARCH_PXA
  	bool "PXA2xx/PXA3xx-based"
  	depends on MMU
@@@ -686,6 -729,10 +671,8 @@@ source "arch/arm/mach-ixp4xx/Kconfig
  
  source "arch/arm/mach-keystone/Kconfig"
  
 -source "arch/arm/mach-ks8695/Kconfig"
 -
+ source "arch/arm/mach-lpc32xx/Kconfig"
+ 
  source "arch/arm/mach-mediatek/Kconfig"
  
  source "arch/arm/mach-meson/Kconfig"