From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Sep 2015 20:29:48 +0000 (-0700)
Subject: Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'armsoc-arm64' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC 64-bit changes from Olof Johansson:
 "Here's our branch of ARM64 contents for this merge window.

  Most of this is DT contents for new SoCs (or those who have seen new
  device support added).  Maybe we should stop separating out the arm64
  contents here to avoid the kind of internal conflicts as we got this
  time around, where 32- and 64-bit contents conflicted.

  Anyhow, on the actual contents:

  New SoCs:

   - Broadcom North Star 2 (ns2)
   - Marvell Berlin4CT
   - Mediatek MT6795
   - Rockchip RK3368

  In addition, there are enhancements for the following platforms:

   - Mediatek MT8173: cpuidle-dt updates, misc other additions
   - ZyncMP: A bunch of devices added to the existing DTSI
   - Qualcomm MSM8916 and APQ8016 updates for USB, etc.

  + a handful of other updates for various platforms"

* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits)
  ARM64: dts: vexpress: Use assigned-clock-parents for sp810
  ARM64: dts: mt6795: enable basic SMP bringup for MT6795
  arm64: Enable Marvell Berlin SoC family in defconfig
  arm64: Enable Marvell Berlin SoC family in Kconfig
  arm64: dts: Add dts files for Marvell Berlin4CT SoC
  ARM64: zynqmp: Move SPI nodes to the right location
  ARM64: zynqmp: Move uart and ttcs to the right location
  ARM64: zynqmp: Enable spi flashes on ep108
  ARM64: zynqmp: Add eeprom memories on i2c bus
  ARM64: zynqmp: Enable sdhci on ep108
  ARM64: zynqmp: Enable watchdog on ep108
  ARM64: zynqmp: Add DWC3 usb support
  ARM64: zynqmp: Add SMMU support
  ARM64: zynqmp: Add CANs node for platform
  ARM64: zynqmp: Use zynqmp specific compatible string for gpio
  devicetree: xilinx: zynqmp: add sata node
  PCI: iproc: Fix BCMA dependency in Kconfig
  arm64: dts: Add Broadcom North Star 2 support
  arm64: Add Broadcom iProc family support
  PCI: iproc: Fix ARM64 dependency in Kconfig
  ...
---

8d01b66b4f23a9fcf5c6787b27f0be5f8cbae98c
diff --cc Documentation/devicetree/bindings/arm/mediatek.txt
index 2daa424a13a4,ce26ff7aa9b0..618a91994a18
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@@ -5,9 -6,9 +6,10 @@@ following property
  Required root node property:
  
  compatible: Must contain one of
 +   "mediatek,mt6580"
     "mediatek,mt6589"
     "mediatek,mt6592"
+    "mediatek,mt6795"
     "mediatek,mt8127"
     "mediatek,mt8135"
     "mediatek,mt8173"
diff --cc Documentation/devicetree/bindings/serial/mtk-uart.txt
index a875997f2062,5991511fa7ee..2d47add34765
--- a/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@@ -5,11 -5,11 +5,12 @@@ Required properties
    * "mediatek,mt8135-uart" for MT8135 compatible UARTS
    * "mediatek,mt8127-uart" for MT8127 compatible UARTS
    * "mediatek,mt8173-uart" for MT8173 compatible UARTS
+   * "mediatek,mt6795-uart" for MT6795 compatible UARTS
    * "mediatek,mt6589-uart" for MT6589 compatible UARTS
    * "mediatek,mt6582-uart" for MT6582 compatible UARTS
 -  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6795, MT6589,
 -	MT6582, MT6577)
 +  * "mediatek,mt6580-uart" for MT6580 compatible UARTS
-   * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6589, MT6582, 
- 	MT6580, MT6577)
++  * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6795,
++        MT6589, MT6582, MT6580, MT6577)
  
  - reg: The base address of the UART register bank.
  
diff --cc drivers/pci/host/Kconfig
index 1272b8002884,48b5b3058d9d..d5e58bae95cf
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -135,8 -135,8 +135,8 @@@ config PCIE_IPROC_PLATFOR
  	  through the generic platform bus interface
  
  config PCIE_IPROC_BCMA
 -	bool "Broadcom iProc PCIe BCMA bus driver"
 +	tristate "Broadcom iProc PCIe BCMA bus driver"
- 	depends on ARCH_BCM_IPROC || (ARM && COMPILE_TEST)
+ 	depends on ARM && (ARCH_BCM_IPROC || COMPILE_TEST)
  	select PCIE_IPROC
  	select BCMA
  	select PCI_DOMAINS