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

Commit 80868a36 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux into late/kirkwood 

* 'kirkwood/boards' of git://git.infradead.org/users/jcooper/linux

:
  ARM: Dove: allow PCI to be disabled
  ARM: dove: SolidRun CuBox DT
  ARM: dove: add device tree descriptors
  ARM: dove: add device tree based machine descriptor
  ARM: dove: add crypto engine
  ARM: dove: add clock gating control
  ARM: dove: unify clock setup
  ARM: initial DTS support for km_kirkwood
  arm: add documentation describing Marvell families of SoC
  ARM: kirkwood: DT descriptor for Seagate FreeAgent Dockstar
  ARM: kirkwood: DT board setup for Seagate FreeAgent Dockstar
  ARM: Kirkwood: Iomega ix2-200 DT support

Context conflicts in arch/arm/Kconfig and arch/arm/mach-dove/common.c.

The new device trees added to arch/arm/mach-kirkwood/Makefile.boot are
kept and dealt with in a separate changeset, since moving them out to
the new Makefile in this merge commit doesn't work well.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b1618547 0f81bd43

Documentation/arm/Marvell/README

0 → 100644
+232 −0
Original line number Diff line number Diff line 
ARM Marvell SoCs

================



This document lists all the ARM Marvell SoCs that are currently

supported in mainline by the Linux kernel. As the Marvell families of

SoCs are large and complex, it is hard to understand where the support

for a particular SoC is available in the Linux kernel. This document

tries to help in understanding where those SoCs are supported, and to

match them with their corresponding public datasheet, when available.



Orion family

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



  Flavors:

        88F5082

        88F5181

        88F5181L

        88F5182

               Datasheet               : http://www.embeddedarm.com/documentation/third-party/MV88F5182-datasheet.pdf

               Programmer's User Guide : http://www.embeddedarm.com/documentation/third-party/MV88F5182-opensource-manual.pdf

               User Manual             : http://www.embeddedarm.com/documentation/third-party/MV88F5182-usermanual.pdf

        88F5281

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

        88F6183

  Core: Feroceon ARMv5 compatible

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

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



Kirkwood family

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



  Flavors:

        88F6282 a.k.a Armada 300

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

        88F6283 a.k.a Armada 310

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

        88F6190

                Product Brief  : http://www.marvell.com/embedded-processors/kirkwood/assets/88F6190-003_WEB.pdf

                Hardware Spec  : http://www.marvell.com/embedded-processors/kirkwood/assets/HW_88F619x_OpenSource.pdf

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

        88F6192

                Product Brief  : http://www.marvell.com/embedded-processors/kirkwood/assets/88F6192-003_ver1.pdf

                Hardware Spec  : http://www.marvell.com/embedded-processors/kirkwood/assets/HW_88F619x_OpenSource.pdf

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

        88F6182

        88F6180

                Product Brief  : http://www.marvell.com/embedded-processors/kirkwood/assets/88F6180-003_ver1.pdf

                Hardware Spec  : http://www.marvell.com/embedded-processors/kirkwood/assets/HW_88F6180_OpenSource.pdf

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

        88F6281

                Product Brief  : http://www.marvell.com/embedded-processors/kirkwood/assets/88F6281-004_ver1.pdf

                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

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

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



Discovery family

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



  Flavors:

        MV78100

                Product Brief  : http://www.marvell.com/embedded-processors/discovery-innovation/assets/MV78100-003_WEB.pdf

                Hardware Spec  : http://www.marvell.com/embedded-processors/discovery-innovation/assets/HW_MV78100_OpenSource.pdf

                Functional Spec: http://www.marvell.com/embedded-processors/discovery-innovation/assets/FS_MV76100_78100_78200_OpenSource.pdf

        MV78200

                Product Brief  : http://www.marvell.com/embedded-processors/discovery-innovation/assets/MV78200-002_WEB.pdf

                Hardware Spec  : http://www.marvell.com/embedded-processors/discovery-innovation/assets/HW_MV78200_OpenSource.pdf

                Functional Spec: http://www.marvell.com/embedded-processors/discovery-innovation/assets/FS_MV76100_78100_78200_OpenSource.pdf

        MV76100

                Not supported by the Linux kernel.



  Core: Feroceon ARMv5 compatible



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

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



EBU Armada family

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



  Armada 370 Flavors:

        88F6710

        88F6707

        88F6W11



  Armada XP Flavors:

        MV78230

        MV78260

        MV78460



  Product Brief: http://www.marvell.com/embedded-processors/armada-xp/assets/Marvell-ArmadaXP-SoC-product%20brief.pdf

  No public datasheet available.



  Core: Sheeva ARMv7 compatible



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

  Linux kernel plat directory: none



Avanta family

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



  Flavors:

       88F6510

       88F6530P

       88F6550

       88F6560

  Homepage     : http://www.marvell.com/broadband/

  Product Brief: http://www.marvell.com/broadband/assets/Marvell_Avanta_88F6510_305_060-001_product_brief.pdf

  No public datasheet available.



  Core: ARMv5 compatible



  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



Dove family (application processor)

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



  Flavors:

        88AP510 a.k.a Armada 510

                Product Brief   : http://www.marvell.com/application-processors/armada-500/assets/Marvell_Armada510_SoC.pdf

                Hardware Spec   : http://www.marvell.com/application-processors/armada-500/assets/Armada-510-Hardware-Spec.pdf

                Functional Spec : http://www.marvell.com/application-processors/armada-500/assets/Armada-510-Functional-Spec.pdf

  Homepage: http://www.marvell.com/application-processors/armada-500/

  Core: ARMv7 compatible

  Directory: arch/arm/mach-dove



PXA 2xx/3xx/93x/95x family

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



  Flavors:

        PXA21x, PXA25x, PXA26x

             Application processor only

             Core: ARMv5 XScale 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

             Developers manual     : http://www.marvell.com/application-processors/pxa-family/assets/pxa_27x_dev_man.pdf

             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

        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

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

             Design guide          : http://www.marvell.com/application-processors/pxa-family/assets/PXA3xx_Design_Guide.pdf

             Developers manual     : http://www.marvell.com/application-processors/pxa-family/assets/PXA3xx_Developers_Manual.zip

             Specifications        : http://www.marvell.com/application-processors/pxa-family/assets/PXA3xx_EMTS.pdf

             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

        PXA930, PXA935

             Application processor with Communication processor

             Core: ARMv5 XScale core

        PXA955

             Application processor with Communication processor

             Core: ARMv7 compatible Sheeva PJ4 core



   Comments:



    * This line of SoCs originates from the XScale family developed by

      Intel and acquired by Marvell in ~2006. The PXA21x, PXA25x,

      PXA26x, PXA27x, PXA3xx and PXA93x were developed by Intel, while

      the later PXA95x were developed by Marvell.



    * Due to their XScale origin, these SoCs have virtually nothing in

      common with the other (Kirkwood, Dove, etc.) families of Marvell

      SoCs, except with the MMP/MMP2 family of SoCs.



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

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



MMP/MMP2 family (communication processor)

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



   Flavors:

        PXA168, a.k.a Armada 168

             Homepage             : http://www.marvell.com/application-processors/armada-100/armada-168.jsp

             Product brief        : http://www.marvell.com/application-processors/armada-100/assets/pxa_168_pb.pdf

             Hardware manual      : http://www.marvell.com/application-processors/armada-100/assets/armada_16x_datasheet.pdf

             Software manual      : http://www.marvell.com/application-processors/armada-100/assets/armada_16x_software_manual.pdf

             Specification update : http://www.marvell.com/application-processors/armada-100/assets/ARMADA16x_Spec_update.pdf

             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

             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

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

             Application processor only

             Core: ARMv7 compatible Sheeva PJ4 core



   Comments:



    * This line of SoCs originates from the XScale family developed by

      Intel and acquired by Marvell in ~2006. All the processors of

      this MMP/MMP2 family were developed by Marvell.



    * Due to their XScale origin, these SoCs have virtually nothing in

      common with the other (Kirkwood, Dove, etc.) families of Marvell

      SoCs, except with the PXA family of SoCs listed above.



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

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



Long-term plans

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



 * Unify the mach-dove/, mach-mv78xx0/, mach-orion5x/ and

   mach-kirkwood/ into the mach-mvebu/ to support all SoCs from the

   Marvell EBU (Engineering Business Unit) in a single mach-<foo>

   directory. The plat-orion/ would therefore disappear.



 * Unify the mach-mmp/ and mach-pxa/ into the same mach-pxa

   directory. The plat-pxa/ would therefore disappear.



Credits

-------



 Maen Suleiman <maen@marvell.com>

 Lior Amsalem <alior@marvell.com>

 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

 Andrew Lunn <andrew@lunn.ch>

 Nicolas Pitre <nico@fluxnic.net>

 Eric Miao <eric.y.miao@gmail.com>

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -537,10 +537,11 @@ config ARCH_IXP4XX 
config ARCH_DOVE

	bool "Marvell Dove"

	select CPU_V7

	select PCI

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select PLAT_ORION

	select USB_ARCH_HAS_EHCI

	help

	  Support for the Marvell Dove SoC 88AP510

arch/arm/boot/dts/dove-cm-a510.dts

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "dove.dtsi"



/ {

	model = "Compulab CM-A510";

	compatible = "compulab,cm-a510", "marvell,dove";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};

};



&uart0 { status = "okay"; };

&uart1 { status = "okay"; };

&sdio0 { status = "okay"; };

&sdio1 { status = "okay"; };

&sata0 { status = "okay"; };



&spi0 {

	status = "okay";



	/* spi0.0: 4M Flash Winbond W25Q32BV */

	spi-flash@0 {

		compatible = "st,w25q32";

		spi-max-frequency = <20000000>;

		reg = <0>;

	};

};



&i2c0 {

	  status = "okay";

};

arch/arm/boot/dts/dove-cubox.dts

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "dove.dtsi"



/ {

	model = "SolidRun CuBox";

	compatible = "solidrun,cubox", "marvell,dove";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	leds {

		compatible = "gpio-leds";

		power {

			label = "Power";

			gpios = <&gpio0 18 1>;

			linux,default-trigger = "default-on";

		};

	};

};



&uart0 { status = "okay"; };

&sdio0 { status = "okay"; };

&sata0 { status = "okay"; };

&i2c0 { status = "okay"; };



&spi0 {

	status = "okay";



	/* spi0.0: 4M Flash Winbond W25Q32BV */

	spi-flash@0 {

		compatible = "st,w25q32";

		spi-max-frequency = <20000000>;

		reg = <0>;

	};

};

arch/arm/boot/dts/dove-dove-db.dts

0 → 100644
+38 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "dove.dtsi"



/ {

	model = "Marvell DB-MV88AP510-BP Development Board";

	compatible = "marvell,dove-db", "marvell,dove";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x40000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};

};



&uart0 { status = "okay"; };

&uart1 { status = "okay"; };

&sdio0 { status = "okay"; };

&sdio1 { status = "okay"; };

&sata0 { status = "okay"; };



&spi0 {

	status = "okay";



	/* spi0.0: 4M Flash ST-M25P32-VMF6P */

	spi-flash@0 {

		compatible = "st,m25p32";

		spi-max-frequency = <20000000>;

		reg = <0>;

	};

};



&i2c0 {

	  status = "okay";

};