Commit 30edd98b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "mvebu dt64 for 4.13 (part 2)" from Gregory CLEMENT:

- use new clock binding for Armada 7K/8K
- add pinctrl on Armada 7K/8K
- add GPIO on Armada 7K/8K
- switch from GIC to ICU on CP110 (Armada 7K/8K)
- enable the mdio node on the mcbin (Armada 8K based board)

* tag 'mvebu-dt64-4.13-2' of git://git.infradead.org/linux-mvebu:
  arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K
  arm64: dts: marvell: add gpio support for Armada 7K/8K
  arm64: dts: marvell: add pinctrl support for Armada 7K/8K
  arm64: dts: marvell: use new binding for the system controller on cp110
  arm64: dts: marvell: remove *-clock-output-names on cp110
  arm64: dts: marvell: use new bindings for xor clocks on ap806
  arm64: dts: marvell: mcbin: enable the mdio node
parents efd8b0dd 6ef84a82

arch/arm64/boot/dts/marvell/armada-7020.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 */



#include "armada-ap806-dual.dtsi"

#include "armada-cp110-master.dtsi"

#include "armada-70x0.dtsi"



/ {

	model = "Marvell Armada 7020";

arch/arm64/boot/dts/marvell/armada-7040.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
 */



#include "armada-ap806-quad.dtsi"

#include "armada-cp110-master.dtsi"

#include "armada-70x0.dtsi"



/ {

	model = "Marvell Armada 7040";

arch/arm64/boot/dts/marvell/armada-70x0.dtsi

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

 * Copyright (C) 2017 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 the Armada 70x0 SoC

 */



#include "armada-cp110-master.dtsi"



/ {

	aliases {

		gpio1 = &cpm_gpio1;

		gpio2 = &cpm_gpio2;

	};

};



&cpm_gpio1 {

	status = "okay";

};



&cpm_gpio2 {

	status = "okay";

};



&cpm_syscon0 {

	cpm_pinctrl: pinctrl {

		compatible = "marvell,armada-7k-pinctrl";

	};

};

arch/arm64/boot/dts/marvell/armada-8020.dtsi

+1 −2
Original line number Diff line number Diff line
@@ -46,8 +46,7 @@ 
 */



#include "armada-ap806-dual.dtsi"

#include "armada-cp110-master.dtsi"

#include "armada-cp110-slave.dtsi"

#include "armada-80x0.dtsi"



/ {

	model = "Marvell Armada 8020";

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

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ 
};



&cpm_mdio {

	status = "okay";



	ge_phy: ethernet-phy@0 {

		reg = <0>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE