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

Commit d3396e1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6da7e953 12beb346

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,7 @@ N: meson 
ARM/Annapurna Labs ALPINE ARCHITECTURE

M:	Tsahee Zidenberg <tsahee@annapurnalabs.com>

M:	Antoine Tenart <antoine.tenart@free-electrons.com>

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

S:	Maintained

F:	arch/arm/mach-alpine/

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

arch/arm/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -260,12 +260,14 @@ machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) 
platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))



ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)

ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y)

ifeq ($(KBUILD_SRC),)

KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))

else

KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))

endif

endif

endif



export	TEXT_OFFSET GZFLAGS MMUEXT

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

+4 −5
Original line number Diff line number Diff line
@@ -70,13 +70,12 @@ 
		 * associativity as these may be erroneously set

		 * up by boot loader(s).

		 */

		cache-size = <1048576>; // 1MB

		cache-sets = <4096>;

		cache-size = <131072>; // 128KB

		cache-sets = <512>;

		cache-line-size = <32>;

		arm,parity-disable;

		arm,tag-latency = <1>;

		arm,data-latency = <1 1>;

		arm,dirty-latency = <1>;

		arm,tag-latency = <1 1 1>;

		arm,data-latency = <1 1 1>;

	};



	scu: scu@1f000000 {

arch/arm/boot/dts/integratorap.dts

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



	syscon {

		compatible = "arm,integrator-ap-syscon";

		compatible = "arm,integrator-ap-syscon", "syscon";

		reg = <0x11000000 0x100>;

		interrupt-parent = <&pic>;

		/* These are the logical module IRQs */

arch/arm/boot/dts/integratorcp.dts

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



	syscon {

		compatible = "arm,integrator-cp-syscon";

		compatible = "arm,integrator-cp-syscon", "syscon";

		reg = <0xcb000000 0x100>;

	};