Skip to content

Commit d3396e1

Browse files
torvaldstorvalds
committed
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "A couple of bug fixes have come in for v4.8 so far. Since the first few were originally meant to go into -rc1 (but didn't get sent in time for travel reasons), the branch is unfortunately based on top of a commit in the middle of the merge window rather than -rc1. Content-wise we have: - a fix for the last remaining broken build in kernelci, getting mach-shmobile to build again with SMP disabled - a fix for a realview regression that broke real hardware but not the qemu model that everyone uses in practice (needed for v4.7 as well) - a merge conflict fix for Tegra that also broke v4.7 - two Kconfig fixes for arm64 build regressions - a couple of arm32 build warning fixes (all harmless) - fix the RTC on Exynos7 Espresso (which apparently never worked right)" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: Merge tag 'pxa-fixes-v4.8' of https://github.com/rjarzmik/linux into randconfig-4.8 arm64: Kconfig: select HISILICON_IRQ_MBIGEN only if PCI is selected arm64: Kconfig: select ALPINE_MSI only if PCI is selected ARM: dts: realview: Fix PBX-A9 cache description ARM: tegra: fix erroneous address in dts ARM: dts: add syscon compatible string for AP syscon ARM: dts: add syscon compatible string for CP syscon ARM: oxnas: select reset controller framework ARM: hide mach-*/ include for ARM_SINGLE_ARMV7M ARM: don't include removed directories Revert "ARM: aspeed: adapt defconfigs for new CONFIG_PRINTK_TIME" ARM: shmobile: don't call platform_can_secondary_boot on UP MAINTAINER: alpine: add a mailing list ARM: do away with final ARCH_REQUIRE_GPIOLIB arm64: dts: Fix RTC by providing rtc_src clock
2 parents 6da7e95 + 12beb34 commit d3396e1

File tree

18 files changed

+29
-19
lines changed

18 files changed

+29
-19
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,6 +1004,7 @@ N: meson
10041004
ARM/Annapurna Labs ALPINE ARCHITECTURE
10051005
M: Tsahee Zidenberg <tsahee@annapurnalabs.com>
10061006
M: Antoine Tenart <antoine.tenart@free-electrons.com>
1007+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
10071008
S: Maintained
10081009
F: arch/arm/mach-alpine/
10091010
F: arch/arm/boot/dts/alpine*

‎arch/arm/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,14 @@ machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
260260
platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))
261261

262262
ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)
263+
ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y)
263264
ifeq ($(KBUILD_SRC),)
264265
KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
265266
else
266267
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
267268
endif
268269
endif
270+
endif
269271

270272
export TEXT_OFFSET GZFLAGS MMUEXT
271273

‎arch/arm/boot/dts/arm-realview-pbx-a9.dts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,12 @@
7070
* associativity as these may be erroneously set
7171
* up by boot loader(s).
7272
*/
73-
cache-size = <1048576>; // 1MB
74-
cache-sets = <4096>;
73+
cache-size = <131072>; // 128KB
74+
cache-sets = <512>;
7575
cache-line-size = <32>;
7676
arm,parity-disable;
77-
arm,tag-latency = <1>;
78-
arm,data-latency = <1 1>;
79-
arm,dirty-latency = <1>;
77+
arm,tag-latency = <1 1 1>;
78+
arm,data-latency = <1 1 1>;
8079
};
8180

8281
scu: scu@1f000000 {

‎arch/arm/boot/dts/integratorap.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
};
4343

4444
syscon {
45-
compatible = "arm,integrator-ap-syscon";
45+
compatible = "arm,integrator-ap-syscon", "syscon";
4646
reg = <0x11000000 0x100>;
4747
interrupt-parent = <&pic>;
4848
/* These are the logical module IRQs */

‎arch/arm/boot/dts/integratorcp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
};
9595

9696
syscon {
97-
compatible = "arm,integrator-cp-syscon";
97+
compatible = "arm,integrator-cp-syscon", "syscon";
9898
reg = <0xcb000000 0x100>;
9999
};
100100

‎arch/arm/boot/dts/tegra124-jetson-tk1.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@
13821382
* Pin 41: BR_UART1_TXD
13831383
* Pin 44: BR_UART1_RXD
13841384
*/
1385-
serial@70006000 {
1385+
serial@0,70006000 {
13861386
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
13871387
status = "okay";
13881388
};
@@ -1394,7 +1394,7 @@
13941394
* Pin 71: UART2_CTS_L
13951395
* Pin 74: UART2_RTS_L
13961396
*/
1397-
serial@70006040 {
1397+
serial@0,70006040 {
13981398
compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";
13991399
status = "okay";
14001400
};

‎arch/arm/configs/aspeed_g4_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
5858
# CONFIG_IOMMU_SUPPORT is not set
5959
CONFIG_FIRMWARE_MEMMAP=y
6060
CONFIG_FANOTIFY=y
61-
CONFIG_PRINTK_TIME=1
61+
CONFIG_PRINTK_TIME=y
6262
CONFIG_DYNAMIC_DEBUG=y
6363
CONFIG_STRIP_ASM_SYMS=y
6464
CONFIG_PAGE_POISONING=y

‎arch/arm/configs/aspeed_g5_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
5959
# CONFIG_IOMMU_SUPPORT is not set
6060
CONFIG_FIRMWARE_MEMMAP=y
6161
CONFIG_FANOTIFY=y
62-
CONFIG_PRINTK_TIME=1
62+
CONFIG_PRINTK_TIME=y
6363
CONFIG_DYNAMIC_DEBUG=y
6464
CONFIG_STRIP_ASM_SYMS=y
6565
CONFIG_PAGE_POISONING=y

‎arch/arm/mach-clps711x/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
menuconfig ARCH_CLPS711X
22
bool "Cirrus Logic EP721x/EP731x-based"
33
depends on ARCH_MULTI_V4T
4-
select ARCH_REQUIRE_GPIOLIB
54
select AUTO_ZRELADDR
65
select CLKSRC_OF
76
select CLPS711X_TIMER
87
select COMMON_CLK
98
select CPU_ARM720T
109
select GENERIC_CLOCKEVENTS
10+
select GPIOLIB
1111
select MFD_SYSCON
1212
select OF_IRQ
1313
select USE_OF

‎arch/arm/mach-mvebu/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
2-
-I$(srctree)/arch/arm/plat-orion/include
1+
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include
32

43
AFLAGS_coherency_ll.o := -Wa,-march=armv7-a
54
CFLAGS_pmsu.o := -march=armv7-a

0 commit comments

Comments
 (0)