mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 01:54:09 +08:00
40e71e7015
These are 18 branches on 9 platforms with board specific changes, mostly for defconfig files, but nothing really exciting in here. Since the shmobile platform still uses board files for some of the newer machines, we get a few changes there as the result of drivers getting enabled for those boards. This causes some conflicts with contents getting added from multiple branches in sh-mobile specific files. Renesas is putting a lot of work into migrating to device-tree based setup, which will make all those files obsolete in the future and avoid both the conflicts and the need to have these files in the first place. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUdLnmmCrR//JCVInAQKNuxAAxXpBslUGRpI8O28KHA3EeL+9HR5wBoKo K6q6fQlAv9dcGJOx7fkyHU4UfE1kV+M6l4R9BM8VcjflQjCnG4GrQo8qgJNY14nf OpQKSIHEtdBHzFpHEIxogByR1i05hL8nrm21TElgi/aYlDwKbXnApY23ubApPif4 oXmES9ppXvnz1D7bCE7PaZf+TIgufpPFkioQYcV93nD0x5tYu1mZn2xSfYDekAyU mUe1p2oX+77U0lohVQCo1H/ZOJBdoAN1U//2QCiL8YKJitQf/vOVs3QtHEUywIiU CyUaDhfM7sX4QKBWzwjxoVOcT6QC/qhaaqaases0gjgjepKaSqUTZMBdLI7oyF3o 2ExYv8BMGilbIyNUYoxeoqz9zA3IQ7wDxaBh3G1JY9k0/BhKmsEwtGYkSJPdOgpt XyX7N/xKzy0lTWf1N4eSWUiccfXdVjLFf3Jp2xA7e/KJfzFAF/RJXdGiV2Kzdr7m mZ7ESYRk+S3ENgpI/QI4C6kQ7EBynQjhn5t2+iK9k4gKNspNZ3TjLCQif0v0xE3H IIsaSqLBuj9IZ1r13fpQJZIyTr+dHsx2s6QQBFXYzeQ/cjfSRGZP4FmYyweGctfR Hh1AAshrOAwNl4ZdXgIT08JKtBocaGFUtt4syvPfAFYoojMN58xg5EG4FYtKpKHp xU6w43o6KnQ= =7bgc -----END PGP SIGNATURE----- Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC board specific changes from Arnd Bergmann: "These are 18 branches on 9 platforms with board specific changes, mostly for defconfig files, but nothing really exciting in here. Since the shmobile platform still uses board files for some of the newer machines, we get a few changes there as the result of drivers getting enabled for those boards. This causes some conflicts with contents getting added from multiple branches in sh-mobile specific files. Renesas is putting a lot of work into migrating to device-tree based setup, which will make all those files obsolete in the future and avoid both the conflicts and the need to have these files in the first place." * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits) arm: multi_v7_defconfig: Enable initrd/initramfs support arm: multi_v7_defconfig: Enable Zynq UART driver ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV ARM: OMAP1: nokia770: enable Tahvo ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN arm: omap: board-overo: reset GPIO for SMSC911x ARM: shmobile: BOCK-W: change Ether device name ARM: ux500: board-mop500: remove unused pin modes ARM: shmobile: bockw: add MMCIF support ARM: shmobile: bockw: add SPI FLASH support ARM: shmobile: bockw: add I2C device support ARM: shmobile: BOCK-W: add Ether support ARM: tegra: defconfig updates ARM: shmobile: bockw defconfig: add MMCIF support ARM: shmobile: bockw defconfig: add M25P80 support ARM: shmobile: bockw defconfig: add RTC RX8581 support ARM: shmobile: marzen: keep local function as static ARM: shmobile: bockw: add SDHI0 support ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC ARM: shmobile: lager: support GPIO switches ...
208 lines
5.3 KiB
C
208 lines
5.3 KiB
C
/*
|
|
* Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
|
|
*
|
|
* arch/arm/mach-kirkwood/board-dt.c
|
|
*
|
|
* Flattened Device Tree board initialization
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/kexec.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <mach/bridge-regs.h>
|
|
#include <linux/platform_data/usb-ehci-orion.h>
|
|
#include <plat/irq.h>
|
|
#include <plat/common.h>
|
|
#include "common.h"
|
|
|
|
/*
|
|
* There are still devices that doesn't know about DT yet. Get clock
|
|
* gates here and add a clock lookup alias, so that old platform
|
|
* devices still work.
|
|
*/
|
|
|
|
static void __init kirkwood_legacy_clk_init(void)
|
|
{
|
|
|
|
struct device_node *np = of_find_compatible_node(
|
|
NULL, NULL, "marvell,kirkwood-gating-clock");
|
|
struct of_phandle_args clkspec;
|
|
struct clk *clk;
|
|
|
|
clkspec.np = np;
|
|
clkspec.args_count = 1;
|
|
|
|
clkspec.args[0] = CGC_BIT_PEX0;
|
|
orion_clkdev_add("0", "pcie",
|
|
of_clk_get_from_provider(&clkspec));
|
|
|
|
clkspec.args[0] = CGC_BIT_PEX1;
|
|
orion_clkdev_add("1", "pcie",
|
|
of_clk_get_from_provider(&clkspec));
|
|
|
|
clkspec.args[0] = CGC_BIT_SDIO;
|
|
orion_clkdev_add(NULL, "mvsdio",
|
|
of_clk_get_from_provider(&clkspec));
|
|
|
|
/*
|
|
* The ethernet interfaces forget the MAC address assigned by
|
|
* u-boot if the clocks are turned off. Until proper DT support
|
|
* is available we always enable them for now.
|
|
*/
|
|
clkspec.args[0] = CGC_BIT_GE0;
|
|
clk = of_clk_get_from_provider(&clkspec);
|
|
orion_clkdev_add(NULL, "mv643xx_eth_port.0", clk);
|
|
clk_prepare_enable(clk);
|
|
|
|
clkspec.args[0] = CGC_BIT_GE1;
|
|
clk = of_clk_get_from_provider(&clkspec);
|
|
orion_clkdev_add(NULL, "mv643xx_eth_port.1", clk);
|
|
clk_prepare_enable(clk);
|
|
}
|
|
|
|
static void __init kirkwood_of_clk_init(void)
|
|
{
|
|
of_clk_init(NULL);
|
|
kirkwood_legacy_clk_init();
|
|
}
|
|
|
|
static void __init kirkwood_dt_init(void)
|
|
{
|
|
pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);
|
|
|
|
/*
|
|
* Disable propagation of mbus errors to the CPU local bus,
|
|
* as this causes mbus errors (which can occur for example
|
|
* for PCI aborts) to throw CPU aborts, which we're not set
|
|
* up to deal with.
|
|
*/
|
|
writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);
|
|
|
|
kirkwood_setup_wins();
|
|
|
|
kirkwood_l2_init();
|
|
|
|
kirkwood_cpufreq_init();
|
|
|
|
/* Setup root of clk tree */
|
|
kirkwood_of_clk_init();
|
|
|
|
kirkwood_cpuidle_init();
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
kexec_reinit = kirkwood_enable_pcie;
|
|
#endif
|
|
|
|
if (of_machine_is_compatible("globalscale,dreamplug"))
|
|
dreamplug_init();
|
|
|
|
if (of_machine_is_compatible("globalscale,guruplug"))
|
|
guruplug_dt_init();
|
|
|
|
if (of_machine_is_compatible("globalscale,sheevaplug"))
|
|
sheevaplug_dt_init();
|
|
|
|
if (of_machine_is_compatible("dlink,dns-kirkwood"))
|
|
dnskw_init();
|
|
|
|
if (of_machine_is_compatible("iom,iconnect"))
|
|
iconnect_init();
|
|
|
|
if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
|
|
ib62x0_init();
|
|
|
|
if (of_machine_is_compatible("qnap,ts219"))
|
|
qnap_dt_ts219_init();
|
|
|
|
if (of_machine_is_compatible("seagate,dockstar"))
|
|
dockstar_dt_init();
|
|
|
|
if (of_machine_is_compatible("seagate,goflexnet"))
|
|
goflexnet_init();
|
|
|
|
if (of_machine_is_compatible("buffalo,lsxl"))
|
|
lsxl_init();
|
|
|
|
if (of_machine_is_compatible("iom,ix2-200"))
|
|
iomega_ix2_200_init();
|
|
|
|
if (of_machine_is_compatible("keymile,km_kirkwood"))
|
|
km_kirkwood_init();
|
|
|
|
if (of_machine_is_compatible("lacie,cloudbox") ||
|
|
of_machine_is_compatible("lacie,inetspace_v2") ||
|
|
of_machine_is_compatible("lacie,netspace_lite_v2") ||
|
|
of_machine_is_compatible("lacie,netspace_max_v2") ||
|
|
of_machine_is_compatible("lacie,netspace_mini_v2") ||
|
|
of_machine_is_compatible("lacie,netspace_v2"))
|
|
ns2_init();
|
|
|
|
if (of_machine_is_compatible("marvell,db-88f6281-bp") ||
|
|
of_machine_is_compatible("marvell,db-88f6282-bp"))
|
|
db88f628x_init();
|
|
|
|
if (of_machine_is_compatible("mpl,cec4"))
|
|
mplcec4_init();
|
|
|
|
if (of_machine_is_compatible("netgear,readynas-duo-v2"))
|
|
netgear_readynas_init();
|
|
|
|
if (of_machine_is_compatible("plathome,openblocks-a6"))
|
|
openblocks_a6_init();
|
|
|
|
if (of_machine_is_compatible("usi,topkick"))
|
|
usi_topkick_init();
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char * const kirkwood_dt_board_compat[] = {
|
|
"globalscale,dreamplug",
|
|
"globalscale,guruplug",
|
|
"globalscale,sheevaplug",
|
|
"dlink,dns-320",
|
|
"dlink,dns-325",
|
|
"iom,iconnect",
|
|
"raidsonic,ib-nas62x0",
|
|
"qnap,ts219",
|
|
"seagate,dockstar",
|
|
"seagate,goflexnet",
|
|
"buffalo,lsxl",
|
|
"iom,ix2-200",
|
|
"keymile,km_kirkwood",
|
|
"lacie,cloudbox",
|
|
"lacie,inetspace_v2",
|
|
"lacie,netspace_lite_v2",
|
|
"lacie,netspace_max_v2",
|
|
"lacie,netspace_mini_v2",
|
|
"lacie,netspace_v2",
|
|
"marvell,db-88f6281-bp",
|
|
"marvell,db-88f6282-bp",
|
|
"mpl,cec4",
|
|
"netgear,readynas-duo-v2",
|
|
"plathome,openblocks-a6",
|
|
"usi,topkick",
|
|
"zyxel,nsa310",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
|
|
/* Maintainer: Jason Cooper <jason@lakedaemon.net> */
|
|
.map_io = kirkwood_map_io,
|
|
.init_early = kirkwood_init_early,
|
|
.init_irq = orion_dt_init_irq,
|
|
.init_time = kirkwood_timer_init,
|
|
.init_machine = kirkwood_dt_init,
|
|
.restart = kirkwood_restart,
|
|
.dt_compat = kirkwood_dt_board_compat,
|
|
MACHINE_END
|