mirror of
https://github.com/torvalds/linux
synced 2024-09-29 16:00:27 +00:00
e89b405809
When creating the DT based boards-ts219.c the none DT ts219-setup.c
was used as a template. This includes a lateinit() call to initialize
the PCIe bus. The code makes use of machine_is_ts219() which is never
true on DT, so a FIXME was added and the code left as is. This was
unproblematic until b73690c8f8: "ARM: Kirkwood: Support basic
hotplug for PCI-E" which changes the way the PCIe bus is
initialized. The non-DT ts219-setup.c now crashes during boot. The
lateinit() call in the DT boards-ts219.c is being called,
machine_is_ts219() is true and so the PCIe is initialized a second
time.
This patch removes the useless, and now clearly dangerous, code from
boards-ts219.c, making ts219-setup.c work again.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: <stable@vger.kernel.org> # v3.9.x
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
44 lines
1.1 KiB
C
44 lines
1.1 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;
|
|
}
|