• L
    Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8d01b66b
    Linus Torvalds 提交于
    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
      ...
    8d01b66b
Kconfig 4.0 KB