tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 1b8ee1ec 5430dfe9

+9 -15
+6 -11
arch/arm/Kconfig.debug
··· 153 153 mobile SoCs in the Kona family of chips (e.g. bcm28155, 154 154 bcm11351, etc...) 155 155 156 - config DEBUG_BCM63XX 156 + config DEBUG_BCM63XX_UART 157 157 bool "Kernel low-level debugging on BCM63XX UART" 158 158 depends on ARCH_BCM_63XX 159 - select DEBUG_UART_BCM63XX 160 159 161 160 config DEBUG_BERLIN_UART 162 161 bool "Marvell Berlin SoC Debug UART" ··· 1413 1414 default "debug/vf.S" if DEBUG_VF_UART 1414 1415 default "debug/vt8500.S" if DEBUG_VT8500_UART0 1415 1416 default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 1416 - default "debug/bcm63xx.S" if DEBUG_UART_BCM63XX 1417 + default "debug/bcm63xx.S" if DEBUG_BCM63XX_UART 1417 1418 default "debug/digicolor.S" if DEBUG_DIGICOLOR_UA0 1418 1419 default "mach/debug-macro.S" 1419 1420 ··· 1426 1427 def_bool ARCH_EBSA110 || \ 1427 1428 ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \ 1428 1429 ARCH_RPC 1429 - 1430 - # Compatibility options for BCM63xx 1431 - config DEBUG_UART_BCM63XX 1432 - def_bool ARCH_BCM_63XX 1433 1430 1434 1431 config DEBUG_UART_PHYS 1435 1432 hex "Physical base address of debug UART" ··· 1524 1529 default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1 1525 1530 default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2 1526 1531 default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3 1527 - default 0xfffe8600 if DEBUG_UART_BCM63XX 1532 + default 0xfffe8600 if DEBUG_BCM63XX_UART 1528 1533 default 0xfffff700 if ARCH_IOP33X 1529 1534 depends on ARCH_EP93XX || \ 1530 1535 DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ ··· 1537 1542 DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \ 1538 1543 DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \ 1539 1544 DEBUG_S3C64XX_UART || \ 1540 - DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \ 1545 + DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ 1541 1546 DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \ 1542 1547 DEBUG_AT91_UART 1543 1548 ··· 1583 1588 default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT 1584 1589 default 0xfc40ab00 if DEBUG_BRCMSTB_UART 1585 1590 default 0xfc705000 if DEBUG_ZTE_ZX 1586 - default 0xfcfe8600 if DEBUG_UART_BCM63XX 1591 + default 0xfcfe8600 if DEBUG_BCM63XX_UART 1587 1592 default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX 1588 1593 default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0 1589 1594 default 0xfd883000 if DEBUG_ALPINE_UART0 ··· 1633 1638 DEBUG_NETX_UART || \ 1634 1639 DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \ 1635 1640 DEBUG_S3C64XX_UART || \ 1636 - DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \ 1641 + DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \ 1637 1642 DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 1638 1643 1639 1644 config DEBUG_UART_8250_SHIFT
+1 -1
arch/arm/boot/dts/r8a7740-armadillo800eva.dts
··· 180 180 }; 181 181 182 182 &extal1_clk { 183 - clock-frequency = <25000000>; 183 + clock-frequency = <24000000>; 184 184 }; 185 185 &extal2_clk { 186 186 clock-frequency = <48000000>;
+1 -2
arch/arm/mach-realview/Makefile
··· 4 4 ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 5 5 -I$(srctree)/arch/arm/plat-versatile/include 6 6 7 - 7 + obj-y := core.o 8 8 obj-$(CONFIG_REALVIEW_DT) += realview-dt.o 9 9 obj-$(CONFIG_SMP) += platsmp-dt.o 10 - obj-y := core.o 11 10 12 11 ifdef CONFIG_ATAGS 13 12 obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o
+1 -1
drivers/soc/qcom/spm.c
··· 288 288 struct spm_driver_data *drv = NULL; 289 289 struct device_node *cpu_node, *saw_node; 290 290 int cpu; 291 - bool found; 291 + bool found = 0; 292 292 293 293 for_each_possible_cpu(cpu) { 294 294 cpu_node = of_cpu_device_node_get(cpu);