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

Commit bb414fc1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt64-4.11-2' of git://git.infradead.org/linux-mvebu into next/dt64 

mvebu dt64 for 4.11 (part 2)

- Add a new Armada 8K based board: MACCHIATOBin
- Enable AHCI on the Armada 7K/8K SoCs

* tag 'mvebu-dt64-4.11-2' of git://git.infradead.org/linux-mvebu

:
  arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci
  arm64: dts: marvell: Add DT for MACCHIATOBin board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4c8cb9c4 7292ff67

arch/arm64/boot/dts/marvell/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-db.dtb 
dtb-$(CONFIG_ARCH_MVEBU) += armada-3720-espressobin.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-7040-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts

0 → 100644
+138 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 Marvell Technology Group Ltd.

 *

 * This file is dual-licensed: you can use it either under the terms

 * of the GPLv2 or the X11 license, at your option. Note that this dual

 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

 *

 * Or, alternatively,

 *

 *  b) Permission is hereby granted, free of charge, to any person

 *     obtaining a copy of this software and associated documentation

 *     files (the "Software"), to deal in the Software without

 *     restriction, including without limitation the rights to use,

 *     copy, modify, merge, publish, distribute, sublicense, and/or

 *     sell copies of the Software, and to permit persons to whom the

 *     Software is furnished to do so, subject to the following

 *     conditions:

 *

 *     The above copyright notice and this permission notice shall be

 *     included in all copies or substantial portions of the Software.

 *

 *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES

 *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

 *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

 *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

 *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 *     OTHER DEALINGS IN THE SOFTWARE.

 */



/*

 * Device Tree file for MACCHIATOBin Armada 8040 community board platform

 */



#include "armada-8040.dtsi"



/ {

	model = "Marvell 8040 MACHIATOBin";

	compatible = "marvell,armada8040-mcbin", "marvell,armada8040",

			"marvell,armada-ap806-quad", "marvell,armada-ap806";



	memory@00000000 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;

	};



	/* Regulator labels correspond with schematics */

	v_3_3: regulator-3-3v {

		compatible = "regulator-fixed";

		regulator-name = "v_3_3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		status = "okay";

	};



	v_vddo_h: regulator-1-8v {

		compatible = "regulator-fixed";

		regulator-name = "v_vddo_h";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		status = "okay";

	};



	v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 {

		compatible = "regulator-fixed";

		regulator-name = "v_5v0_usb3_hst_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		/* actually GPIO controlled, but 8k has no GPIO support yet */

		regulator-always-on;

		status = "okay";

	};



	usb3h0_phy: usb3_phy0 {

		compatible = "usb-nop-xceiv";

		vcc-supply = <&v_5v0_usb3_hst_vbus>;

	};

};



&uart0 {

	status = "okay";

};



&cpm_i2c0 {

	clock-frequency = <100000>;

	status = "okay";

};



&cpm_sata0 {

	/* CPM Lane 0 - U29 */

	status = "okay";

};



&cpm_usb3_0 {

	/* J38? - USB2.0 only */

	status = "okay";

};



&cpm_usb3_1 {

	/* J38? - USB2.0 only */

	status = "okay";

};



&cps_sata0 {

	/* CPS Lane 1 - U32 */

	/* CPS Lane 3 - U31 */

	status = "okay";

};



&cps_spi1 {

	status = "okay";



	spi-flash@0 {

		compatible = "st,w25q32";

		spi-max-frequency = <50000000>;

		reg = <0>;

	};

};



&cps_usb3_0 {

	/* CPS Lane 2 - CON7 */

	usb-phy = <&usb3h0_phy>;

	status = "okay";

};

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ 
			};



			cpm_sata0: sata@540000 {

				compatible = "marvell,armada-8k-ahci";

				compatible = "marvell,armada-8k-ahci",

					     "generic-ahci";

				reg = <0x540000 0x30000>;

				interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cpm_syscon0 1 15>;

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ 
			};



			cps_sata0: sata@540000 {

				compatible = "marvell,armada-8k-ahci";

				compatible = "marvell,armada-8k-ahci",

					     "generic-ahci";

				reg = <0x540000 0x30000>;

				interrupts = <GIC_SPI 287 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cps_syscon0 1 15>;