Commit 42cbaeec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-arm-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC updates from Arnd Bergmann:
 "The at91 power management code and the TI AM33 platform each get a few
  updates for robustness, the other changes are just minor cleanups"

* tag 'soc-arm-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: versatile: clock: convert from round_rate() to determine_rate()
  ARM: rockchip: remove REGULATOR conditional to PM
  ARM: at91: pm: Remove 2.5V regulator
  ARM: OMAP2+: clock: convert from round_rate() to determine_rate()
  ARM: OMAP1: clock: convert from round_rate() to determine_rate()
  ARM: mach-hpe: Rework support and directory structure
  arm: omap2: use string choices helper
  ARM: OMAP2+: pm33xx-core: ix device node reference leaks in amx3_idle_init
  ARM: OMAP2+: use IS_ERR_OR_NULL() helper
  ARM: AM33xx: Implement TI advisory 1.0.36 (EMU0/EMU1 pins state on reset)
  ARM: at91: pm: save and restore ACR during PLL disable/enable
  ARM: at91: pm: fix MCKx restore routine
  ARM: at91: pm: fix .uhp_udp_mask specification for current SoCs
  ARM: shmobile: rcar-gen2: Use SZ_256K definition
parents 38057e32 65d2419f

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -2737,7 +2737,6 @@ F: Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml 
F:	Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml

F:	Documentation/hwmon/gxp-fan-ctrl.rst

F:	arch/arm/boot/dts/hpe/

F:	arch/arm/mach-hpe/

F:	drivers/clocksource/timer-gxp.c

F:	drivers/hwmon/gxp-fan-ctrl.c

F:	drivers/i2c/busses/i2c-gxp.c

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -393,8 +393,6 @@ source "arch/arm/mach-highbank/Kconfig" 


source "arch/arm/mach-hisi/Kconfig"



source "arch/arm/mach-hpe/Kconfig"



source "arch/arm/mach-imx/Kconfig"



source "arch/arm/mach-ixp4xx/Kconfig"

arch/arm/Kconfig.platforms

+25 −0
Original line number Diff line number Diff line
@@ -87,6 +87,31 @@ config MACH_ASM9260 
	help

	  Support for Alphascale ASM9260 based platform.



menuconfig ARCH_HPE

	bool "HPE SoC support"

	depends on ARCH_MULTI_V7

	help

	  This enables support for HPE ARM based BMC chips.



if ARCH_HPE



config ARCH_HPE_GXP

	bool "HPE GXP SoC"

	depends on ARCH_MULTI_V7

	select ARM_VIC

	select GENERIC_IRQ_CHIP

	select CLKSRC_MMIO

	help

	  HPE GXP is the name of the HPE Soc. This SoC is used to implement many

	  BMC features at HPE. It supports ARMv7 architecture based on the Cortex

	  A9 core. It is capable of using an AXI bus to which a memory controller

	  is attached. It has multiple SPI interfaces to connect boot flash and

	  BIOS flash. It uses a 10/100/1000 MAC for network connectivity. It

	  has multiple i2c engines to drive connectivity with a host

	  infrastructure.



endif



menuconfig ARCH_MOXART

	bool "MOXA ART SoC"

	depends on ARCH_MULTI_V4

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge 
machine-$(CONFIG_ARCH_GEMINI)		+= gemini

machine-$(CONFIG_ARCH_HIGHBANK)		+= highbank

machine-$(CONFIG_ARCH_HISI)		+= hisi

machine-$(CONFIG_ARCH_HPE)		+= hpe

machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx

machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone

machine-$(CONFIG_ARCH_LPC18XX)		+= lpc18xx

arch/arm/mach-at91/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -1364,7 +1364,7 @@ static const struct pmc_info pmc_infos[] __initconst = { 
		.version = AT91_PMC_V1,

	},

	{

		.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP,

		.uhp_udp_mask = AT91SAM926x_PMC_UHP,

		.mckr = 0x28,

		.version = AT91_PMC_V2,

	},