Commit a4e86630 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mmp-soc-for-v5.5-2' of... 

Merge tag 'mmp-soc-for-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp into arm/soc

ARM: Marvell MMP SoC patches for v5.5

This tag includes initial support for the Marvell MMP3 processor.
MMP3 is used in OLPC XO-4 laptops, Panasonic Toughpad FZ-A1 tablet
and Dell Wyse 3020/Tx0D thin clients.

* tag 'mmp-soc-for-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp:
  MAINTAINERS: mmp: add Git repository
  ARM: mmp: remove MMP3 USB PHY registers from regs-usb.h
  ARM: mmp: move cputype.h to include/linux/soc/
  ARM: mmp: add SMP support
  ARM: mmp: add support for MMP3 SoC
  ARM: mmp: define MMP_CHIPID by the means of CIU_REG()
  ARM: mmp: DT: convert timer driver to use TIMER_OF_DECLARE
  ARM: mmp: map the PGU as well
  ARM: mmp: don't select CACHE_TAUROS2 on all ARCH_MMP
  ARM: l2c: add definition for FWA in PL310 aux register

Link: https://lore.kernel.org/r/3a035bed90f9d8acc49b2d11d20089b546062aea.camel@v3.sk


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents da0c9ea1 759c2837

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -10909,9 +10909,11 @@ F: drivers/media/radio/radio-miropcm20* 
MMP SUPPORT

R:	Lubomir Rintel <lkundrak@v3.sk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lkundrak/linux-mmp.git

S:	Odd Fixes

F:	arch/arm/boot/dts/mmp*

F:	arch/arm/mach-mmp/

F:	linux/soc/mmp/















MMU GATHER AND TLB INVALIDATION















M:	Will Deacon <will@kernel.org>

































arch/arm/include/asm/hardware/cache-l2x0.h



+2
−0






























Original line number
Diff line number
Diff line








@@ -118,6 +118,8 @@













#define L310_AUX_CTRL_STORE_LIMITATION		BIT(11)	/* R2P0+ */















#define L310_AUX_CTRL_EXCLUSIVE_CACHE		BIT(12)















#define L310_AUX_CTRL_ASSOCIATIVITY_16		BIT(16)













#define L310_AUX_CTRL_FWA_SHIFT			23













#define L310_AUX_CTRL_FWA_MASK			(3 << 23)















#define L310_AUX_CTRL_CACHE_REPLACE_RR		BIT(25)	/* R2P0+ */















#define L310_AUX_CTRL_NS_LOCKDOWN		BIT(26)















#define L310_AUX_CTRL_NS_INT_CTRL		BIT(27)

































arch/arm/mach-mmp/Kconfig



+20
−2






























Original line number
Diff line number
Diff line















# SPDX-License-Identifier: GPL-2.0-only















menuconfig ARCH_MMP













	bool "Marvell PXA168/910/MMP2"













	bool "Marvell PXA168/910/MMP2/MMP3"















	depends on ARCH_MULTI_V5 || ARCH_MULTI_V7















	select GPIO_PXA















	select GPIOLIB















	select PINCTRL















	select PLAT_PXA















	help













	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.













	  Support for Marvell's PXA168/PXA910(MMP), MMP2, and MMP3 processor lines.































if ARCH_MMP


























@@ -129,6 +129,24 @@ config MACH_MMP2_DT













	  Include support for Marvell MMP2 based platforms using















	  the device tree.





























config MACH_MMP3_DT













	bool "Support MMP3 (ARMv7) platforms"













	depends on ARCH_MULTI_V7













	select ARM_GIC













	select HAVE_ARM_SCU if SMP













	select HAVE_ARM_TWD if SMP













	select CACHE_L2X0













	select PINCTRL













	select PINCTRL_SINGLE













	select ARCH_HAS_RESET_CONTROLLER













	select CPU_PJ4B













	select PM_GENERIC_DOMAINS if PM













	select PM_GENERIC_DOMAINS_OF if PM && OF













	help













	  Say 'Y' here if you want to include support for platforms













	  with Marvell MMP3 processor, also known as PXA2128 or













	  Armada 620.





























endmenu































config CPU_PXA168

































arch/arm/mach-mmp/Makefile



+4
−0






























Original line number
Diff line number
Diff line








@@ -22,6 +22,9 @@ ifeq ($(CONFIG_PM),y)













obj-$(CONFIG_CPU_PXA910)	+= pm-pxa910.o















obj-$(CONFIG_CPU_MMP2)		+= pm-mmp2.o















endif













ifeq ($(CONFIG_SMP),y)













obj-$(CONFIG_MACH_MMP3_DT)	+= platsmp.o













endif































# board support















obj-$(CONFIG_MACH_ASPENITE)	+= aspenite.o









@@ -34,5 +37,6 @@ obj-$(CONFIG_MACH_FLINT)	+= flint.o













obj-$(CONFIG_MACH_MARVELL_JASPER) += jasper.o















obj-$(CONFIG_MACH_MMP_DT)	+= mmp-dt.o















obj-$(CONFIG_MACH_MMP2_DT)	+= mmp2-dt.o













obj-$(CONFIG_MACH_MMP3_DT)	+= mmp3.o















obj-$(CONFIG_MACH_TETON_BGA)	+= teton_bga.o















obj-$(CONFIG_MACH_GPLUGD)	+= gplugd.o
























arch/arm/mach-mmp/addr-map.h



+7
−0






























Original line number
Diff line number
Diff line








@@ -20,6 +20,10 @@













#define AXI_VIRT_BASE		IOMEM(0xfe200000)















#define AXI_PHYS_SIZE		0x00200000





























#define PGU_PHYS_BASE		0xe0000000













#define PGU_VIRT_BASE		IOMEM(0xfe400000)













#define PGU_PHYS_SIZE		0x00100000





























/* Static Memory Controller - Chip Select 0 and 1 */















#define SMC_CS0_PHYS_BASE	0x80000000















#define SMC_CS0_PHYS_SIZE	0x10000000









@@ -38,4 +42,7 @@













#define CIU_VIRT_BASE		(AXI_VIRT_BASE + 0x82c00)















#define CIU_REG(x)		(CIU_VIRT_BASE + (x))





























#define SCU_VIRT_BASE		(PGU_VIRT_BASE)













#define SCU_REG(x)		(SCU_VIRT_BASE + (x))





























#endif /* __ASM_MACH_ADDR_MAP_H */
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE