mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
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>
54 lines
1.3 KiB
C
54 lines
1.3 KiB
C
/*
|
|
*
|
|
* QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
|
|
*
|
|
* Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
|
|
*
|
|
* Based on the board file ts219-setup.c:
|
|
*
|
|
* Copyright (C) 2009 Martin Michlmayr <tbm@cyrius.com>
|
|
* Copyright (C) 2008 Byron Bradley <byron.bbradley@gmail.com>
|
|
*
|
|
* This program 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.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/mv643xx_eth.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <mach/kirkwood.h>
|
|
#include "common.h"
|
|
#include "tsx1x-common.h"
|
|
|
|
static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
|
|
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
|
};
|
|
|
|
void __init qnap_dt_ts219_init(void)
|
|
{
|
|
u32 dev, rev;
|
|
|
|
kirkwood_pcie_id(&dev, &rev);
|
|
if (dev == MV88F6282_DEV_ID)
|
|
qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
|
|
|
|
kirkwood_ge00_init(&qnap_ts219_ge00_data);
|
|
|
|
pm_power_off = qnap_tsx1x_power_off;
|
|
}
|
|
|
|
/* FIXME: Will not work with DT. Maybe use MPP40_GPIO? */
|
|
static int __init ts219_pci_init(void)
|
|
{
|
|
if (machine_is_ts219())
|
|
kirkwood_pcie_init(KW_PCIE0);
|
|
|
|
return 0;
|
|
}
|
|
subsys_initcall(ts219_pci_init);
|