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

Commit 7ab78d02 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu into next/soc 

mvebu soc for 4.20 (part 1)

 - use dt_fixup to provide fallback for enable-method for Armada XP
 - document the marvell,prestera compatible string
 - update Thomas Petazzoni email in MAINTAINERS file

* tag 'mvebu-soc-4.20-1' of git://git.infradead.org/linux-mvebu

:
  dt-bindings: marvell,prestera: Add common compatible string
  MAINTAINERS: replace free-electrons.com by bootlin.com for Thomas Petazzoni
  ARM: mvebu: use dt_fixup to provide fallback for enable-method

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1c15f655 40ad192f

Documentation/devicetree/bindings/net/marvell,prestera.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Marvell Prestera Switch Chip bindings 
-------------------------------------



Required properties:

- compatible: one of the following

- compatible: must be "marvell,prestera" and one of the following

	"marvell,prestera-98dx3236",

	"marvell,prestera-98dx3336",

	"marvell,prestera-98dx4251",
@@ -21,7 +21,7 @@ switch { 
	ranges = <0 MBUS_ID(0x03, 0x00) 0 0x100000>;



	packet-processor@0 {

		compatible = "marvell,prestera-98dx3236";

		compatible = "marvell,prestera-98dx3236", "marvell,prestera";

		reg = <0 0x4000000>;

		interrupts = <33>, <34>, <35>;

		dfx = <&dfx>;

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -8745,7 +8745,7 @@ S: Maintained 
F:	drivers/net/phy/marvell10g.c



MARVELL MVNETA ETHERNET DRIVER

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

M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/marvell/mvneta.*
@@ -11081,7 +11081,7 @@ S: Maintained 
F:	drivers/firmware/pcdp.*



PCI DRIVER FOR AARDVARK (Marvell Armada 3700)

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

M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>

L:	linux-pci@vger.kernel.org

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

S:	Maintained
@@ -11113,7 +11113,7 @@ F: Documentation/devicetree/bindings/pci/versatile.txt 
F:	drivers/pci/controller/pci-versatile.c



PCI DRIVER FOR ARMADA 8K

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

M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained
@@ -11175,7 +11175,7 @@ F: include/linux/switchtec.h 
F:	drivers/ntb/hw/mscc/



PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)

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

M:	Thomas Petazzoni <thomas.petazzoni@bootlin.com>

M:	Jason Cooper <jason@lakedaemon.net>

L:	linux-pci@vger.kernel.org

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

arch/arm/mach-mvebu/board-v7.c

+8 −6
Original line number Diff line number Diff line
@@ -145,6 +145,13 @@ static void __init mvebu_dt_init(void) 
		i2c_quirk();

}



static void __init armada_370_xp_dt_fixup(void)

{

#ifdef CONFIG_SMP

	smp_set_ops(smp_ops(armada_xp_smp_ops));

#endif

}



static const char * const armada_370_xp_dt_compat[] __initconst = {

	"marvell,armada-370-xp",

	NULL,
@@ -153,17 +160,12 @@ static const char * const armada_370_xp_dt_compat[] __initconst = { 
DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")

	.l2c_aux_val	= 0,

	.l2c_aux_mask	= ~0,

/*

 * The following field (.smp) is still needed to ensure backward

 * compatibility with old Device Trees that were not specifying the

 * cpus enable-method property.

 */

	.smp		= smp_ops(armada_xp_smp_ops),

	.init_machine	= mvebu_dt_init,

	.init_irq       = mvebu_init_irq,

	.restart	= mvebu_restart,

	.reserve        = mvebu_memblock_reserve,

	.dt_compat	= armada_370_xp_dt_compat,

	.dt_fixup	= armada_370_xp_dt_fixup,

MACHINE_END



static const char * const armada_375_dt_compat[] __initconst = {