52cfa7e54b
Merge in the cleanups that should have been used as the base of the DT branch instead of letting the conflicts be exposed all the way up to the toplevel merges. All of these are caused by cleanups being done both in the cleanup branch and the dt branch, resulting in remove/remove conflicts of header files. By Andrew Lunn (3) and others via Jason Cooper * orion/cleanup: ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan ARM: Kirkwood: checkpatch cleanups ARM: Kirkwood: Fix sparse warnings. ARM: Kirkwood: Remove unused includes ARM: kirkwood: cleanup lsxl board includes Remove/remove conflicts in: arch/arm/mach-kirkwood/board-dockstar.c arch/arm/mach-kirkwood/board-goflexnet.c arch/arm/mach-kirkwood/board-lsxl.c Signed-off-by: Olof Johansson <olof@lixom.net>
33 lines
840 B
C
33 lines
840 B
C
/*
|
|
* arch/arm/mach-kirkwood/board-dockstar.c
|
|
*
|
|
* Seagate FreeAgent Dockstar Board Init for drivers not converted to
|
|
* flattened device tree yet.
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*
|
|
* Copied and modified for Seagate GoFlex Net support by
|
|
* Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
|
|
* GoFlex kernel patches.
|
|
*
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mv643xx_eth.h>
|
|
#include "common.h"
|
|
|
|
static struct mv643xx_eth_platform_data dockstar_ge00_data = {
|
|
.phy_addr = MV643XX_ETH_PHY_ADDR(0),
|
|
};
|
|
|
|
void __init dockstar_dt_init(void)
|
|
{
|
|
/*
|
|
* Basic setup. Needs to be called early.
|
|
*/
|
|
kirkwood_ge00_init(&dockstar_ge00_data);
|
|
}
|