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

Commit c3b6144a authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: kirkwood: Give pm.c its own header file. 



The pm code needs to be separated from common.h in order to split DT
and non-DT systems apart. Move the declarations into a header file of
its own and include it where needed.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> (on kirkwood)
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent b92f10be

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <mach/bridge-regs.h>

#include <mach/bridge-regs.h>

#include <plat/common.h>

#include <plat/common.h>

#include "common.h"

#include "common.h"

#include "pm.h"





#define MV643XX_ETH_MAC_ADDR_LOW	0x0414

#define MV643XX_ETH_MAC_ADDR_LOW	0x0414

#define MV643XX_ETH_MAC_ADDR_HIGH	0x0418

#define MV643XX_ETH_MAC_ADDR_HIGH	0x0418

arch/arm/mach-kirkwood/common.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <plat/time.h>

#include <plat/time.h>

#include <linux/platform_data/dma-mv_xor.h>

#include <linux/platform_data/dma-mv_xor.h>

#include "common.h"

#include "common.h"

#include "pm.h"





/* These can go away once Kirkwood uses the mvebu-mbus DT binding */

/* These can go away once Kirkwood uses the mvebu-mbus DT binding */

#define KIRKWOOD_MBUS_NAND_TARGET 0x01

#define KIRKWOOD_MBUS_NAND_TARGET 0x01

arch/arm/mach-kirkwood/common.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -58,12 +58,6 @@ void kirkwood_cpufreq_init(void); 
void kirkwood_restart(enum reboot_mode, const char *);

void kirkwood_restart(enum reboot_mode, const char *);

void kirkwood_clk_init(void);

void kirkwood_clk_init(void);





#ifdef CONFIG_PM

void kirkwood_pm_init(void);

#else

static inline void kirkwood_pm_init(void) {};

#endif



/* board init functions for boards not fully converted to fdt */

/* board init functions for boards not fully converted to fdt */

#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT

#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT

void mv88f6281gtw_ge_init(void);

void mv88f6281gtw_ge_init(void);

arch/arm/mach-kirkwood/pm.h

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

 * Power Management driver for Marvell Kirkwood SoCs

 *

 * Copyright (C) 2013 Ezequiel Garcia <ezequiel@free-electrons.com>

 * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License,

 * version 2 of the License.

 *

 * This program 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.

 */



#ifndef __ARCH_KIRKWOOD_PM_H

#define __ARCH_KIRKWOOD_PM_H



#ifdef CONFIG_PM

void kirkwood_pm_init(void);

#else

static inline void kirkwood_pm_init(void) {};

#endif



#endif