Commit 8c6d4082 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC 64-bit changes from Arnd Bergmann:
 "Here's our branch of ARM64 contents for this merge window, now
  containing all ARM64 changes other than device tree files.

   - Various new platforms get added:
      * Allwinner A64 SoC
      * Annapurna Labs Alpine SoCs
      * Broadcom Vulcan
      * Marvell Armada 3700 SoCs
      * Amlogic S905

   - Various defconfig changes to enable platform specific drivers

  This branch includes the clk git tree to resolve a build-time
  dependency"

* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
  arm64: defconfig: Increase MMC_BLOCK_MINORS to 16
  arm64: defconfig: Add Qualcomm sdhci and restart functionality
  ARM64: Enable Amlogic Meson GXBaby platform
  arm64: defconfig: Enable Samsung MFD and related configs
  arm64: alpine: select the Alpine MSI controller driver
  arm64: defconfig: enable the Alpine family
  arm64: add Alpine SoC family
  arm64: defconfig: Enable exynos thermal config
  arm64: add defconfig options for Allwinner SoCs
  arm64: defconfig: Enable DesignWare APB GPIO controller
  arm64: defconfig: Add Renesas R-Car Gen3 USB 2.0 phy driver support
  arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS
  clk: samsung: Don't build ARMv8 clock drivers on ARMv7
  MAINTAINERS: Add entry for Broadcom Vulcan SoC
  arm64: cputype info for Broadcom Vulcan
  arm64: Broadcom Vulcan support
  arm64: defconfig: Add Broadcom Vulcan to defconfig
  arm64: update ARCH_MVEBU for Marvell Armada 7K/8K support
  Documentation: arm: add Marvell Armada 7K and 8K families
  Documentation: arm: add link to Armada 38x Functional Spec
  ...
parents 33b3d2e8 a86e56cb

Documentation/arm/Marvell/README

+138 −27
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Orion family 
        88F5281

               Datasheet               : http://www.ocmodshop.com/images/reviews/networking/qnap_ts409u/marvel_88f5281_data_sheet.pdf

        88F6183

  Core: Feroceon ARMv5 compatible

  Core: Feroceon 88fr331 (88f51xx) or 88fr531-vd (88f52xx) ARMv5 compatible

  Linux kernel mach directory: arch/arm/mach-orion5x

  Linux kernel plat directory: arch/arm/plat-orion
@@ -52,7 +52,7 @@ Kirkwood family 
                Hardware Spec  : http://www.marvell.com/embedded-processors/kirkwood/assets/HW_88F6281_OpenSource.pdf

                Functional Spec: http://www.marvell.com/embedded-processors/kirkwood/assets/FS_88F6180_9x_6281_OpenSource.pdf

  Homepage: http://www.marvell.com/embedded-processors/kirkwood/

  Core: Feroceon ARMv5 compatible

  Core: Feroceon 88fr131 ARMv5 compatible

  Linux kernel mach directory: arch/arm/mach-mvebu

  Linux kernel plat directory: none
@@ -71,7 +71,7 @@ Discovery family 
        MV76100

                Not supported by the Linux kernel.



  Core: Feroceon ARMv5 compatible

  Core: Feroceon 88fr571-vd ARMv5 compatible



  Linux kernel mach directory: arch/arm/mach-mv78xx0

  Linux kernel plat directory: arch/arm/plat-orion
@@ -86,20 +86,26 @@ EBU Armada family 
    Product Brief:   http://www.marvell.com/embedded-processors/armada-300/assets/Marvell_ARMADA_370_SoC.pdf

    Hardware Spec:   http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-datasheet.pdf

    Functional Spec: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA370-FunctionalSpec-datasheet.pdf

    Core: Sheeva ARMv7 compatible PJ4B



  Armada 375 Flavors:

	88F6720

    Product Brief: http://www.marvell.com/embedded-processors/armada-300/assets/ARMADA_375_SoC-01_product_brief.pdf



  Armada 380/385 Flavors:

	88F6810

	88F6820

	88F6828



  Armada 390/398 Flavors:

	88F6920

	88F6928

    Core: ARM Cortex-A9



  Armada 38x Flavors:

	88F6810	Armada 380

	88F6820 Armada 385

	88F6828 Armada 388

    Product infos:   http://www.marvell.com/embedded-processors/armada-38x/

    Functional Spec: https://marvellcorp.wufoo.com/forms/marvell-armada-38x-functional-specifications/

    Core: ARM Cortex-A9



  Armada 39x Flavors:

	88F6920 Armada 390

	88F6928 Armada 398

    Product infos: http://www.marvell.com/embedded-processors/armada-39x/

    Core: ARM Cortex-A9



  Armada XP Flavors:

        MV78230
@@ -112,12 +118,43 @@ EBU Armada family 
      http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78230_OS.PDF

      http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78260_OS.PDF

      http://www.marvell.com/embedded-processors/armada-xp/assets/HW_MV78460_OS.PDF



  Core: Sheeva ARMv7 compatible

    Core: Sheeva ARMv7 compatible Dual-core or Quad-core PJ4B-MP



  Linux kernel mach directory: arch/arm/mach-mvebu

  Linux kernel plat directory: none



EBU Armada family ARMv8

-----------------------



  Armada 3710/3720 Flavors:

	88F3710

	88F3720

	Core: ARM Cortex A53 (ARMv8)



	Homepage: http://www.marvell.com/embedded-processors/armada-3700/

	Product Brief: http://www.marvell.com/embedded-processors/assets/PB-88F3700-FNL.pdf

	Device tree files: arch/arm64/boot/dts/marvell/armada-37*



  Armada 7K Flavors:

	88F7020 (AP806 Dual + one CP110)

	88F7040 (AP806 Quad + one CP110)

	Core: ARM Cortex A72



	Homepage: http://www.marvell.com/embedded-processors/armada-70xx/

	Product Brief: http://www.marvell.com/embedded-processors/assets/Armada7020PB-Jan2016.pdf

		       http://www.marvell.com/embedded-processors/assets/Armada7040PB-Jan2016.pdf

	Device tree files: arch/arm64/boot/dts/marvell/armada-70*



  Armada 8K Flavors:

	88F8020 (AP806 Dual + two CP110)

	88F8040 (AP806 Quad + two CP110)

	Core: ARM Cortex A72



	Homepage: http://www.marvell.com/embedded-processors/armada-80xx/

	Product Brief: http://www.marvell.com/embedded-processors/assets/Armada8020PB-Jan2016.pdf

		       http://www.marvell.com/embedded-processors/assets/Armada8040PB-Jan2016.pdf

	Device tree files: arch/arm64/boot/dts/marvell/armada-80*



Avanta family

-------------
@@ -135,6 +172,15 @@ Avanta family 
  Linux kernel mach directory: no code in mainline yet, planned for the future

  Linux kernel plat directory: no code in mainline yet, planned for the future



Storage family

--------------



  Armada SP:

	88RC1580

    Product infos: http://www.marvell.com/storage/armada-sp/

    Core: Sheeva ARMv7 comatible Quad-core PJ4C

    (not supported in upstream Linux kernel)



Dove family (application processor)

-----------------------------------
@@ -155,7 +201,7 @@ PXA 2xx/3xx/93x/95x family 
  Flavors:

        PXA21x, PXA25x, PXA26x

             Application processor only

             Core: ARMv5 XScale core

             Core: ARMv5 XScale1 core

        PXA270, PXA271, PXA272

             Product Brief         : http://www.marvell.com/application-processors/pxa-family/assets/pxa_27x_pb.pdf

             Design guide          : http://www.marvell.com/application-processors/pxa-family/assets/pxa_27x_design_guide.pdf
@@ -163,7 +209,7 @@ PXA 2xx/3xx/93x/95x family 
             Specification         : http://www.marvell.com/application-processors/pxa-family/assets/pxa_27x_emts.pdf

             Specification update  : http://www.marvell.com/application-processors/pxa-family/assets/pxa_27x_spec_update.pdf

             Application processor only

             Core: ARMv5 XScale core

             Core: ARMv5 XScale2 core

        PXA300, PXA310, PXA320

             PXA 300 Product Brief : http://www.marvell.com/application-processors/pxa-family/assets/PXA300_PB_R4.pdf

             PXA 310 Product Brief : http://www.marvell.com/application-processors/pxa-family/assets/PXA310_PB_R4.pdf
@@ -174,10 +220,10 @@ PXA 2xx/3xx/93x/95x family 
             Specification Update  : http://www.marvell.com/application-processors/pxa-family/assets/PXA3xx_Spec_Update.zip

             Reference Manual      : http://www.marvell.com/application-processors/pxa-family/assets/PXA3xx_TavorP_BootROM_Ref_Manual.pdf

             Application processor only

             Core: ARMv5 XScale core

             Core: ARMv5 XScale3 core

        PXA930, PXA935

             Application processor with Communication processor

             Core: ARMv5 XScale core

             Core: ARMv5 XScale3 core

        PXA955

             Application processor with Communication processor

             Core: ARMv7 compatible Sheeva PJ4 core
@@ -196,7 +242,7 @@ PXA 2xx/3xx/93x/95x family 
   Linux kernel mach directory: arch/arm/mach-pxa

   Linux kernel plat directory: arch/arm/plat-pxa



MMP/MMP2 family (communication processor)

MMP/MMP2/MMP3 family (communication processor)

-----------------------------------------



   Flavors:
@@ -209,16 +255,32 @@ MMP/MMP2 family (communication processor) 
             Boot ROM manual      : http://www.marvell.com/application-processors/armada-100/assets/armada_16x_ref_manual.pdf

             App node package     : http://www.marvell.com/application-processors/armada-100/assets/armada_16x_app_note_package.pdf

             Application processor only

             Core: ARMv5 compatible Marvell PJ1 (Mohawk)

        PXA910

             Core: ARMv5 compatible Marvell PJ1 88sv331 (Mohawk)

        PXA910/PXA920

             Homepage             : http://www.marvell.com/communication-processors/pxa910/

             Product Brief        : http://www.marvell.com/communication-processors/pxa910/assets/Marvell_PXA910_Platform-001_PB_final.pdf

             Application processor with Communication processor

             Core: ARMv5 compatible Marvell PJ1 (Mohawk)

        MMP2, a.k.a Armada 610

             Core: ARMv5 compatible Marvell PJ1 88sv331 (Mohawk)

        PXA688, a.k.a. MMP2, a.k.a Armada 610

             Product Brief        : http://www.marvell.com/application-processors/armada-600/assets/armada610_pb.pdf

             Application processor only

             Core: ARMv7 compatible Sheeva PJ4 88sv581x core

	PXA2128, a.k.a. MMP3 (OLPC XO4, Linux support not upstream)

	     Product Brief	  : http://www.marvell.com/application-processors/armada/pxa2128/assets/Marvell-ARMADA-PXA2128-SoC-PB.pdf

	     Application processor only

	     Core: Dual-core ARMv7 compatible Sheeva PJ4C core

	PXA960/PXA968/PXA978 (Linux support not upstream)

	     Application processor with Communication Processor

	     Core: ARMv7 compatible Sheeva PJ4 core

	PXA986/PXA988 (Linux support not upstream)

	     Application processor with Communication Processor

	     Core: Dual-core ARMv7 compatible Sheeva PJ4B-MP core

	PXA1088/PXA1920 (Linux support not upstream)

	     Application processor with Communication Processor

	     Core: quad-core ARMv7 Cortex-A7

	PXA1908/PXA1928/PXA1936

	     Application processor with Communication Processor

	     Core: multi-core ARMv8 Cortex-A53



   Comments:
@@ -237,6 +299,10 @@ Berlin family (Multimedia Solutions) 
-------------------------------------



  Flavors:

	88DE3010, Armada 1000 (no Linux support)

		Core:		Marvell PJ1 (ARMv5TE), Dual-core

		Product Brief:	http://www.marvell.com.cn/digital-entertainment/assets/armada_1000_pb.pdf

	88DE3005, Armada 1500-mini

	88DE3005, Armada 1500 Mini

		Design name:	BG2CD

		Core:		ARM Cortex-A9, PL310 L2CC
@@ -247,14 +313,16 @@ Berlin family (Multimedia Solutions) 
                Homepage:       http://www.marvell.com/multimedia-solutions/armada-1500-mini-plus/

	88DE3100, Armada 1500

		Design name:	BG2

		Core:		Marvell PJ4B (ARMv7), Tauros3 L2CC

		Product Brief:	http://www.marvell.com/multimedia-solutions/armada-1500/assets/Marvell-ARMADA-1500-Product-Brief.pdf

		Core:		Marvell PJ4B-MP (ARMv7), Tauros3 L2CC

		Product Brief:	http://www.marvell.com/digital-entertainment/armada-1500/assets/Marvell-ARMADA-1500-Product-Brief.pdf

	88DE3114, Armada 1500 Pro

		Design name:	BG2Q

		Core:		Quad Core ARM Cortex-A9, PL310 L2CC

	88DE????

	88DE3214, Armada 1500 Pro 4K

		Design name:	BG3

		Core:		ARM Cortex-A15, CA15 integrated L2CC

	88DE3218, ARMADA 1500 Ultra

		Core:		ARM Cortex-A53



  Homepage: http://www.marvell.com/multimedia-solutions/

  Directory: arch/arm/mach-berlin
@@ -263,6 +331,49 @@ Berlin family (Multimedia Solutions) 
   * This line of SoCs is based on Marvell Sheeva or ARM Cortex CPUs

     with Synopsys DesignWare (IRQ, GPIO, Timers, ...) and PXA IP (SDHCI, USB, ETH, ...).



CPU Cores

---------



The XScale cores were designed by Intel, and shipped by Marvell in the older

PXA processors. Feroceon is a Marvell designed core that developed in-house,

and that evolved into Sheeva. The XScale and Feroceon cores were phased out

over time and replaced with Sheeva cores in later products, which subsequently

got replaced with licensed ARM Cortex-A cores.



  XScale 1

	CPUID 0x69052xxx

	ARMv5, iWMMXt

  XScale 2

	CPUID 0x69054xxx

	ARMv5, iWMMXt

  XScale 3

	CPUID 0x69056xxx or 0x69056xxx

	ARMv5, iWMMXt

  Feroceon-1850 88fr331 "Mohawk"

	CPUID 0x5615331x or 0x41xx926x

	ARMv5TE, single issue

  Feroceon-2850 88fr531-vd "Jolteon"

	CPUID 0x5605531x or 0x41xx926x

	ARMv5TE, VFP, dual-issue

  Feroceon 88fr571-vd "Jolteon"

	CPUID 0x5615571x

	ARMv5TE, VFP, dual-issue

  Feroceon 88fr131 "Mohawk-D"

	CPUID 0x5625131x

	ARMv5TE, single-issue in-order

  Sheeva PJ1 88sv331 "Mohawk"

	CPUID 0x561584xx

	ARMv5, single-issue iWMMXt v2

  Sheeva PJ4 88sv581x "Flareon"

	CPUID 0x560f581x

	ARMv7, idivt, optional iWMMXt v2

  Sheeva PJ4B 88sv581x

	CPUID 0x561f581x

	ARMv7, idivt, optional iWMMXt v2

  Sheeva PJ4B-MP / PJ4C

	CPUID 0x562f584x

	ARMv7, idivt/idiva, LPAE, optional iWMMXt v2 and/or NEON



Long-term plans

---------------

Documentation/devicetree/bindings/clock/xgene.txt

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ Required properties: 
	"apm,xgene-socpll-clock" - for a X-Gene SoC PLL clock

	"apm,xgene-pcppll-clock" - for a X-Gene PCP PLL clock

	"apm,xgene-device-clock" - for a X-Gene device clock

	"apm,xgene-socpll-v2-clock" - for a X-Gene SoC PLL v2 clock

	"apm,xgene-pcppll-v2-clock" - for a X-Gene PCP PLL v2 clock



Required properties for SoC or PCP PLL clocks:

- reg : shall be the physical PLL register address for the pll clock.

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1307,6 +1307,7 @@ F: arch/arm/mach-mvebu/ 
F:	drivers/rtc/rtc-armada38x.c

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

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

F:	arch/arm64/boot/dts/marvell/armada*





ARM/Marvell Berlin SoC support
@@ -2552,6 +2553,13 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/broadcom/bcmsysport.*



BROADCOM VULCAN ARM64 SOC

M:	Jayachandran C. <jchandra@broadcom.com>

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

L:	bcm-kernel-feedback-list@broadcom.com

S:	Maintained

F:	arch/arm64/boot/dts/broadcom/vulcan*



BROCADE BFA FC SCSI DRIVER

M:	Anil Gurumurthy <anil.gurumurthy@qlogic.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>

arch/arm/configs/exynos_defconfig

+8 −2
Original line number Diff line number Diff line
@@ -26,12 +26,14 @@ CONFIG_ARM_APPENDED_DTB=y 
CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_STAT_DETAILS=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_EXYNOS_CPUIDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y
@@ -193,7 +195,6 @@ CONFIG_LEDS_TRIGGER_HEARTBEAT=y 
CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_MAX8997=y

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_MAX77802=y

CONFIG_RTC_DRV_S5M=y

CONFIG_RTC_DRV_S3C=y

CONFIG_DMADEVICES=y
@@ -238,7 +239,12 @@ CONFIG_DEBUG_RT_MUTEXES=y 
CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_DEV_S5P=y

CONFIG_ARM_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM_NEON=m

CONFIG_CRYPTO_SHA256_ARM=m

CONFIG_CRYPTO_SHA512_ARM=m

CONFIG_CRYPTO_AES_ARM_BS=m

CONFIG_CRC_CCITT=y

CONFIG_FONTS=y

CONFIG_FONT_7x14=y

arch/arm/configs/multi_v7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -665,7 +665,6 @@ CONFIG_RTC_DRV_MAX8907=y 
CONFIG_RTC_DRV_MAX8997=m

CONFIG_RTC_DRV_MAX77686=y

CONFIG_RTC_DRV_RK808=m

CONFIG_RTC_DRV_MAX77802=m

CONFIG_RTC_DRV_RS5C372=m

CONFIG_RTC_DRV_PALMAS=y

CONFIG_RTC_DRV_ST_LPC=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE