From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 8 Apr 2021 20:16:36 +0000 (+0200)
Subject: Merge branch 'arm/apple-m1' into for-next
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d5fe4b31785b732b71e764b55cda5c8d6e3bbbf;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'arm/apple-m1' into for-next

* arm/apple-m1: (79 commits)
  arm64: apple: Add initial Apple Mac mini (M1, 2020) devicetree
  dt-bindings: display: Add apple,simple-framebuffer
  arm64: Kconfig: Introduce CONFIG_ARCH_APPLE
  irqchip/apple-aic: Add support for the Apple Interrupt Controller
  dt-bindings: interrupt-controller: Add DT bindings for apple-aic
  arm64: Move ICH_ sysreg bits from arm-gic-v3.h to sysreg.h
  of/address: Add infrastructure to declare MMIO as non-posted
  asm-generic/io.h: implement pci_remap_cfgspace using ioremap_np
  arm64: Implement ioremap_np() to map MMIO as nGnRnE
  docs: driver-api: device-io: Document ioremap() variants & access funcs
  docs: driver-api: device-io: Document I/O access functions
  asm-generic/io.h:  Add a non-posted variant of ioremap()
  arm64: arch_timer: Implement support for interrupt-names
  dt-bindings: timer: arm,arch_timer: Add interrupt-names support
  arm64: cputype: Add CPU implementor & types for the Apple M1 cores
  dt-bindings: arm: cpus: Add apple,firestorm & icestorm compatibles
  dt-bindings: arm: apple: Add bindings for Apple ARM platforms
  dt-bindings: vendor-prefixes: Add apple prefix
  arm64: irq: allow FIQs to be handled
  arm64: Always keep DAIF.[IF] in sync
  ...
---

0d5fe4b31785b732b71e764b55cda5c8d6e3bbbf
diff --cc arch/arm64/configs/defconfig
index 19ed6dd1bf08c,54fb257e55f75..f7b48805f457c
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -29,9 -29,9 +29,10 @@@ CONFIG_KALLSYMS_ALL=
  CONFIG_PROFILING=y
  CONFIG_ARCH_ACTIONS=y
  CONFIG_ARCH_AGILEX=y
 +CONFIG_ARCH_N5X=y
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_ALPINE=y
+ CONFIG_ARCH_APPLE=y
  CONFIG_ARCH_BCM2835=y
  CONFIG_ARCH_BCM4908=y
  CONFIG_ARCH_BCM_IPROC=y