Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b8ee1ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Olof Johansson:
 "A few fixes for fallout that we didn't catch in time in -next, or
  smaller warning fixes that have been discovered since"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  soc: qcom/spm: shut up uninitialized variable warning
  ARM: realview: fix device tree build
  ARM: debug-ll: fix BCM63xx entry for multiplatform
  ARM: dts: armadillo800eva Correct extal1 frequency to 24 MHz
parents 5430dfe9 53c517a8

arch/arm/Kconfig.debug

+6 −11
Original line number Diff line number Diff line
@@ -153,10 +153,9 @@ choice 
		  mobile SoCs in the Kona family of chips (e.g. bcm28155,

		  bcm11351, etc...)



	config DEBUG_BCM63XX

	config DEBUG_BCM63XX_UART

		bool "Kernel low-level debugging on BCM63XX UART"

		depends on ARCH_BCM_63XX

		select DEBUG_UART_BCM63XX



	config DEBUG_BERLIN_UART

		bool "Marvell Berlin SoC Debug UART"
@@ -1414,7 +1413,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/vf.S" if DEBUG_VF_UART

	default "debug/vt8500.S" if DEBUG_VT8500_UART0

	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1

	default "debug/bcm63xx.S" if DEBUG_UART_BCM63XX

	default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART

	default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0

	default "mach/debug-macro.S"
@@ -1428,10 +1427,6 @@ config DEBUG_UART_8250 
		ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \

		ARCH_RPC



# Compatibility options for BCM63xx

config DEBUG_UART_BCM63XX

	def_bool ARCH_BCM_63XX



config DEBUG_UART_PHYS

	hex "Physical base address of debug UART"

	default 0x00100a00 if DEBUG_NETX_UART
@@ -1529,7 +1524,7 @@ config DEBUG_UART_PHYS 
	default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1

	default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2

	default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3

	default 0xfffe8600 if DEBUG_UART_BCM63XX

	default 0xfffe8600 if DEBUG_BCM63XX_UART

	default 0xfffff700 if ARCH_IOP33X

	depends on ARCH_EP93XX || \

	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
@@ -1542,7 +1537,7 @@ config DEBUG_UART_PHYS 
		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \

		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \

		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \

		DEBUG_AT91_UART
@@ -1588,7 +1583,7 @@ config DEBUG_UART_VIRT 
	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT

	default 0xfc40ab00 if DEBUG_BRCMSTB_UART

	default 0xfc705000 if DEBUG_ZTE_ZX

	default 0xfcfe8600 if DEBUG_UART_BCM63XX

	default 0xfcfe8600 if DEBUG_BCM63XX_UART

	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX

	default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0

	default 0xfd883000 if DEBUG_ALPINE_UART0
@@ -1638,7 +1633,7 @@ config DEBUG_UART_VIRT 
		DEBUG_NETX_UART || \

		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \

		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \

		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \

		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0



config DEBUG_UART_8250_SHIFT

arch/arm/boot/dts/r8a7740-armadillo800eva.dts

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ 
};



&extal1_clk {

	clock-frequency = <25000000>;

	clock-frequency = <24000000>;

};

&extal2_clk {

	clock-frequency = <48000000>;

arch/arm/mach-realview/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ 
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \

	-I$(srctree)/arch/arm/plat-versatile/include





obj-y					:= core.o

obj-$(CONFIG_REALVIEW_DT)		+= realview-dt.o

obj-$(CONFIG_SMP)			+= platsmp-dt.o

obj-y					:= core.o



ifdef CONFIG_ATAGS

obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o

drivers/soc/qcom/spm.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static struct spm_driver_data *spm_get_drv(struct platform_device *pdev, 
	struct spm_driver_data *drv = NULL;

	struct device_node *cpu_node, *saw_node;

	int cpu;

	bool found;

	bool found = 0;



	for_each_possible_cpu(cpu) {

		cpu_node = of_cpu_device_node_get(cpu);