Commit 69700db4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC code updates from Arnd Bergmann:
 "This time there are only fairly minor cleanups across the i.MX,
  ixp4xx, ux500 and renesas platforms.

  The only notable update is a change to the keystone2 platform to
  switch switch it over to standard PSCI SMP bringup, which apparently
  was present in the shipped firmware almost from the start"

* tag 'soc-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: ixp4xx: Remove unused debug iomap
  MAINTAINERS: Add DHCOR to the DH electronic i.MX6 board support
  ARM: ixp4xx: Remove unused static map
  MAINTAINERS: adjust ARM/INTEL IXP4XX ARM ARCHITECTURE to ixp4xx clean-up
  ARM: imx3: Remove unneeded #include <linux/pinctrl/machine.h>
  ARM: mxs: Remove unneeded #include <linux/pinctrl/consumer.h>
  riscv: Kconfig.socs: Add ARCH_RENESAS kconfig option
  ARM: ux500: Drop unused register file
  ARM: ux500: do not directly dereference __iomem
  arm/mach-ux500: fix repeated words in comments
  arm64: renesas: Drop selecting GPIOLIB and PINCTRL
  ARM: shmobile: Drop selecting GPIOLIB and PINCTRL
  ARM: keystone: Replace platform SMP with PSCI
  soc: renesas: Kconfig: Explicitly select GPIOLIB and PINCTRL config under SOC_RENESAS
parents 5910b842 8b7f4dd7

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -2282,8 +2282,6 @@ F: drivers/clocksource/timer-ixp4xx.c 
F:	drivers/crypto/ixp4xx_crypto.c

F:	drivers/gpio/gpio-ixp4xx.c

F:	drivers/irqchip/irq-ixp4xx.c

F:	include/linux/irqchip/irq-ixp4xx.h

F:	include/linux/platform_data/timer-ixp4xx.h









ARM/INTEL KEEMBAY ARCHITECTURE









M:	Paul J. Murphy <paul.j.murphy@intel.com>










@@ -6039,11 +6037,12 @@ F:	include/net/devlink.h







F:	include/uapi/linux/devlink.h









F:	net/core/devlink.c

















DH ELECTRONICS IMX6 DHCOM BOARD SUPPORT









DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT









M:	Christoph Niedermaier <cniedermaier@dh-electronics.com>









L:	kernel@dh-electronics.com









S:	Maintained









F:	arch/arm/boot/dts/imx6*-dhcom-*









F:	arch/arm/boot/dts/imx6*-dhcor-*

















DH ELECTRONICS STM32MP1 DHCOM/DHCOR BOARD SUPPORT









M:	Marek Vasut <marex@denx.de>


































arch/arm/mach-imx/mm-imx3.c



+0
−1






























Original line number
Diff line number
Diff line







@@ -12,7 +12,6 @@







#include <linux/err.h>









#include <linux/io.h>









#include <linux/of_address.h>









#include <linux/pinctrl/machine.h>



















#include <asm/system_misc.h>









#include <asm/hardware/cache-l2x0.h>


































arch/arm/mach-ixp4xx/ixp4xx-of.c



+0
−42






























Original line number
Diff line number
Diff line







@@ -2,48 +2,7 @@







/*









 * IXP4xx Device Tree boot support









 */









#include <linux/kernel.h>









#include <linux/init.h>









#include <linux/io.h>



















#include <asm/mach/arch.h>









#include <asm/mach/map.h>



















/*









 * These are the only fixed phys to virt mappings we ever need









 * we put it right after the UART mapping at 0xffc80000-0xffc81fff









 */









#define IXP4XX_EXP_CFG_BASE_PHYS	0xC4000000









#define IXP4XX_EXP_CFG_BASE_VIRT	0xFEC14000



















static struct map_desc ixp4xx_of_io_desc[] __initdata = {









	/*









	 * This is needed for runtime system configuration checks,









	 * such as reading if hardware so-and-so is present. This









	 * could eventually be converted into a syscon once all boards









	 * are converted to device tree.









	 */









	{









		.virtual = IXP4XX_EXP_CFG_BASE_VIRT,









		.pfn = __phys_to_pfn(IXP4XX_EXP_CFG_BASE_PHYS),









		.length = SZ_4K,









		.type = MT_DEVICE,









	},









#ifdef CONFIG_DEBUG_UART_8250









	/* This is needed for LL-debug/earlyprintk/debug-macro.S */









	{









		.virtual = CONFIG_DEBUG_UART_VIRT,









		.pfn = __phys_to_pfn(CONFIG_DEBUG_UART_PHYS),









		.length = SZ_4K,









		.type = MT_DEVICE,









	},









#endif









};



















static void __init ixp4xx_of_map_io(void)









{









	iotable_init(ixp4xx_of_io_desc, ARRAY_SIZE(ixp4xx_of_io_desc));









}



















/*









 * We handle 4 different SoC families. These compatible strings are enough










@@ -59,6 +18,5 @@ static const char *ixp4xx_of_board_compat[] = {







};



















DT_MACHINE_START(IXP4XX_DT, "IXP4xx (Device Tree)")









	.map_io		= ixp4xx_of_map_io,









	.dt_compat	= ixp4xx_of_board_compat,









MACHINE_END
























arch/arm/mach-keystone/Makefile



+1
−3






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









obj-y					:= keystone.o smc.o



















obj-$(CONFIG_SMP)			+= platsmp.o









obj-y					:= keystone.o



















# PM domain driver for Keystone SOCs









obj-$(CONFIG_ARCH_KEYSTONE)		+= pm_domain.o
























arch/arm/mach-keystone/keystone.c



+0
−2






























Original line number
Diff line number
Diff line







@@ -18,7 +18,6 @@







#include <asm/mach/map.h>









#include <asm/mach/arch.h>









#include <asm/mach/time.h>









#include <asm/smp_plat.h>









#include <asm/memory.h>



















#include "memory.h"










@@ -103,7 +102,6 @@ DT_MACHINE_START(KEYSTONE, "Keystone")







#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)









	.dma_zone_size	= SZ_2G,









#endif









	.smp		= smp_ops(keystone_smp_ops),









	.init_machine	= keystone_init,









	.dt_compat	= keystone_match,









	.pv_fixup	= keystone_pv_fixup,