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

Commit c1c41cda authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

ARM: orion5x: fix d2net gpio initialization 



commit f8ef1233939495c405a9faa4bd1ae7d3f581bae4 upstream.

The DT version of this board has a custom file with the gpio
device. However, it does nothing because the d2net_init()
has no caller or prototype:

arch/arm/mach-orion5x/board-d2net.c:101:13: error: no previous prototype for 'd2net_init'

Call it from the board-dt file as intended.

Fixes: 94b0bd36 ("ARM: orion5x: convert d2net to Device Tree")
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230516153109.514251-10-arnd@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 679c3482

arch/arm/mach-orion5x/board-dt.c

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ static void __init orion5x_dt_init(void) 
	if (of_machine_is_compatible("maxtor,shared-storage-2"))

		mss2_init();



	if (of_machine_is_compatible("lacie,d2-network"))

		d2net_init();



	of_platform_default_populate(NULL, orion5x_auxdata_lookup, NULL);

}

arch/arm/mach-orion5x/common.h

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,12 @@ extern void mss2_init(void); 
static inline void mss2_init(void) {}

#endif



#ifdef CONFIG_MACH_D2NET_DT

void d2net_init(void);

#else

static inline void d2net_init(void) {}

#endif



/*****************************************************************************

 * Helpers to access Orion registers

 ****************************************************************************/