Commit 9e259f93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM 32-bit SoC platform updates from Olof Johansson:
 "Most of the SoC updates in this cycle are cleanups and moves to more
  modern infrastructure:

   - Davinci was moved to common clock framework

   - OMAP1-based Amstrad E3 "Superphone" saw a bunch of cleanups to the
     keyboard interface (bitbanged AT keyboard via GPIO).

   - Removal of some stale code for Renesas platforms

   - Power management improvements for i.MX6LL"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (112 commits)
  ARM: uniphier: select RESET_CONTROLLER
  arm64: uniphier: select RESET_CONTROLLER
  ARM: uniphier: remove empty Makefile
  ARM: exynos: Clear global variable on init error path
  ARM: exynos: Remove outdated maintainer information
  ARM: shmobile: Always enable ARCH_TIMER on SoCs with A7 and/or A15
  ARM: shmobile: r8a7779: hide unused r8a7779_platform_cpu_kill
  soc: r9a06g032: don't build SMP files for non-SMP config
  ARM: shmobile: Add the R9A06G032 SMP enabler driver
  ARM: at91: pm: configure wakeup sources for ULP1 mode
  ARM: at91: pm: add PMC fast startup registers defines
  ARM: at91: pm: Add ULP1 mode support
  ARM: at91: pm: Use ULP0 naming instead of slow clock
  ARM: hisi: handle of_iomap and fix missing of_node_put
  ARM: hisi: check of_iomap and fix missing of_node_put
  ARM: hisi: fix error handling and missing of_node_put
  ARM: mx5: Set the DBGEN bit in ARM_GPC register
  ARM: imx51: Configure M4IF to avoid visual artifacts
  ARM: imx: call imx6sx_cpuidle_init() conditionally for 6sll
  ARM: imx: fix i.MX6SLL build
  ...
parents 5563ae9b f0fc40af

MAINTAINERS

+11 −5
Original line number Diff line number Diff line
@@ -1295,11 +1295,6 @@ F: arch/arm/mach-aspeed/ 
F:	arch/arm/boot/dts/aspeed-*

N:	aspeed



ARM/ATMEL AT91 Clock Support

M:	Boris Brezillon <boris.brezillon@bootlin.com>

S:	Maintained

F:	drivers/clk/at91



ARM/CALXEDA HIGHBANK ARCHITECTURE

M:	Rob Herring <robh@kernel.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1481,6 +1476,16 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git 
F:	arch/arm/mach-imx/*vf610*

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



ARM/FREESCALE LAYERSCAPE ARM ARCHITECTURE

M:	Shawn Guo <shawnguo@kernel.org>

M:	Li Yang <leoyang.li@nxp.com>

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

S:	Maintained

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

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

F:	arch/arm64/boot/dts/freescale/fsl-*

F:	arch/arm64/boot/dts/freescale/qoriq-*



ARM/GLOMATION GESBC9312SX MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -10571,6 +10576,7 @@ F: arch/arm/plat-omap/ 
F:	arch/arm/configs/omap1_defconfig

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

F:	include/linux/platform_data/i2c-omap.h

F:	include/linux/platform_data/ams-delta-fiq.h



OMAP2+ SUPPORT

M:	Tony Lindgren <tony@atomide.com>

arch/arm/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -603,13 +603,16 @@ config ARCH_S3C24XX 
config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL

	select CLKDEV_LOOKUP

	select COMMON_CLK

	select CPU_ARM926T

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select GPIOLIB

	select HAVE_IDE

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	select RESET_CONTROLLER

	select USE_OF

	select ZONE_DMA

	help

arch/arm/Kconfig.debug

+12 −2
Original line number Diff line number Diff line
@@ -204,6 +204,14 @@ choice 
		depends on ARCH_BCM_HR2

		select DEBUG_UART_8250



	config DEBUG_BCM_IPROC_UART3

		bool "Kernel low-level debugging on BCM IPROC UART3"

		depends on ARCH_BCM_CYGNUS

		select DEBUG_UART_8250

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the third serial port on these devices.



	config DEBUG_BCM_KONA_UART

		bool "Kernel low-level debugging messages via BCM KONA UART"

		depends on ARCH_BCM_MOBILE
@@ -1562,14 +1570,15 @@ config DEBUG_UART_PHYS 
	default 0x18000400 if DEBUG_BCM_HR2

	default 0x18010000 if DEBUG_SIRFATLAS7_UART0

	default 0x18020000 if DEBUG_SIRFATLAS7_UART1

	default 0x18023000 if DEBUG_BCM_IPROC_UART3

	default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1

	default 0x20001000 if DEBUG_HIP01_UART

	default 0x20060000 if DEBUG_RK29_UART0

	default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0x20201000 if DEBUG_BCM2835

	default 0x3f201000 if DEBUG_BCM2836

	default 0x3e000000 if DEBUG_BCM_KONA_UART

	default 0x3f201000 if DEBUG_BCM2836

	default 0x4000e400 if DEBUG_LL_UART_EFM32

	default 0x40028000 if DEBUG_AT91_SAMV7_USART1

	default 0x40081000 if DEBUG_LPC18XX_UART0
@@ -1682,6 +1691,7 @@ config DEBUG_UART_VIRT 
	default 0xf1002000 if DEBUG_MT8127_UART0

	default 0xf1006000 if DEBUG_MT6589_UART0

	default 0xf1009000 if DEBUG_MT8135_UART3

	default 0xf1023000 if DEBUG_BCM_IPROC_UART3

	default 0xf11f1000 if DEBUG_VERSATILE

	default 0xf1600000 if DEBUG_INTEGRATOR

	default 0xf1c28000 if DEBUG_SUNXI_UART0
@@ -1797,7 +1807,7 @@ config DEBUG_UART_8250_WORD 
		DEBUG_KEYSTONE_UART0 || DEBUG_KEYSTONE_UART1 || \

		DEBUG_ALPINE_UART0 || \

		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \

		DEBUG_DAVINCI_DA8XX_UART2 || \

		DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_BCM_IPROC_UART3 || \

		DEBUG_BCM_KONA_UART || DEBUG_RK32_UART2



config DEBUG_UART_8250_PALMCHIP

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ machine-$(CONFIG_ARCH_TANGO) += tango 
machine-$(CONFIG_ARCH_TEGRA)		+= tegra

machine-$(CONFIG_ARCH_U300)		+= u300

machine-$(CONFIG_ARCH_U8500)		+= ux500

machine-$(CONFIG_ARCH_UNIPHIER)		+= uniphier

machine-$(CONFIG_ARCH_VERSATILE)	+= versatile

machine-$(CONFIG_ARCH_VEXPRESS)		+= vexpress

machine-$(CONFIG_ARCH_VT8500)		+= vt8500

arch/arm/firmware/trusted_foundations.c

+9 −5
Original line number Diff line number Diff line
@@ -31,21 +31,25 @@ 


static unsigned long cpu_boot_addr;



static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2)

static void tf_generic_smc(u32 type, u32 arg1, u32 arg2)

{

	register u32 r0 asm("r0") = type;

	register u32 r1 asm("r1") = arg1;

	register u32 r2 asm("r2") = arg2;



	asm volatile(

		".arch_extension	sec\n\t"

		"stmfd	sp!, {r4 - r11, lr}\n\t"

		"stmfd	sp!, {r4 - r11}\n\t"

		__asmeq("%0", "r0")

		__asmeq("%1", "r1")

		__asmeq("%2", "r2")

		"mov	r3, #0\n\t"

		"mov	r4, #0\n\t"

		"smc	#0\n\t"

		"ldmfd	sp!, {r4 - r11, pc}"

		"ldmfd	sp!, {r4 - r11}\n\t"

		:

		: "r" (type), "r" (arg1), "r" (arg2)

		: "memory");

		: "r" (r0), "r" (r1), "r" (r2)

		: "memory", "r3", "r12", "lr");

}



static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE