![Linus Torvalds](/assets/img/avatar_default.png)
Most of this branch consists of updates, additions and general churn of the device tree source files in the kernel (arch/arm/boot/dts). Besides that, there are a few things to point out: - Lots of platform conversion on OMAP2+, with removal of old board files for various platforms. - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as well - Some updates to pinctrl and other subsystems. Most of these are for DT-enablement of the various platforms and acks have been collected. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJSgB6cAAoJEIwa5zzehBx3uuEP/0n8b7qgmx2e0HPtx3qlqPiR 3bit2/5MzJNufb46qnYhhE+DF+bo1yfGlrIQK7nBXuv1fMKKlVMoUZ7Ql3EBbPzd UWrENl2eiapO7D9uN9EZ5WVYu+tKJewU89xkhM70xlCBUHGgQ4k958E8TH9vmELI Qj1s2UcsYftMF9EH6sbQZ7Jkhrg2M9zVgqUcrqqZT/ZF97174SCEJzAt6n9RGGvr M9sPOPOIO2D5/tu1oOz1dCQQmATj2r5NYAMOu/jVlvB0OpsCrsFwrTWGHWfssR4z 3uIxcaVb4XgtxCtY9o+C9nJiLGqoENWQS7ScuAx6GTHjn4dwL9OZBMjb/vGGFKQp dtikMRCaNAkJ8XNl/s8ND+rLzXuPF2KIqkZZz/Nwm02lZq/0OPu0ysBGpdN4C4pk TRiLxnqE0OZg5cnFQFOMAZF4ABh/0x8cM7a1PPBT5MnTvuH1YrLAuvL5daReU5u1 LlxlFd9rSq8SVn8pBLgKk8RlMkqduDm1HusABnFlzBJMJ0Jy2Ol1X3fPK/8wHq6e 4NedNaQbnx1U5pB2mGIPutkBdVkjK7dKvlDXgYi1sunf5Ake+vej3zJ7u4UfWeIJ lHJgjnPHdGtZ74RU4/ckp5ba+JHXJ15XAxFKk9XRiOjf+9ciQ4dLRF/JfiSRG2Yc 9NZi38w8M3wC2P7U3dh4 =nH67 -----END PGP SIGNATURE----- Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC DT updates from Olof Johansson: "Most of this branch consists of updates, additions and general churn of the device tree source files in the kernel (arch/arm/boot/dts). Besides that, there are a few things to point out: - Lots of platform conversion on OMAP2+, with removal of old board files for various platforms. - Final conversion of a bunch of ux500 (ST-Ericsson) platforms as well - Some updates to pinctrl and other subsystems. Most of these are for DT-enablement of the various platforms and acks have been collected" * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (385 commits) ARM: dts: bcm11351: Use GIC/IRQ defines for sdio interrupts ARM: dts: bcm: Add missing UARTs for bcm11351 (bcm281xx) ARM: dts: bcm281xx: Add card detect GPIO ARM: dts: rename ARCH_BCM to ARCH_BCM_MOBILE (dt) ARM: bcm281xx: Add device node for the GPIO controller ARM: mvebu: Add Netgear ReadyNAS 104 board ARM: tegra: fix Tegra114 IOMMU register address ARM: kirkwood: add support for OpenBlocks A7 platform ARM: dts: omap4-panda: add DPI pinmuxing ARM: dts: AM33xx: Add RNG node ARM: dts: AM33XX: Add hwspinlock node ARM: dts: OMAP5: Add hwspinlock node ARM: dts: OMAP4: Add hwspinlock node ARM: dts: use 'status' property for PCIe nodes ARM: dts: sirf: add missed address-cells and size-cells for prima2 I2C ARM: dts: sirf: add missed cell, cs and dma channel for SPI nodes ARM: dts: sirf: add missed graphics2d iobg in atlas6 dts ARM: dts: sirf: add missed chhifbg node in prima2 and atlas6 dts ARM: dts: sirf: add missed memcontrol-monitor node in prima2 and atlas6 dts ARM: mvebu: Add the core-divider clock to Armada 370/XP ...
187 lines
4.7 KiB
C
187 lines
4.7 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_address.h>
|
|
#include <linux/of_net.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/irqchip.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;
|
|
|
|
/*
|
|
* 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);
|
|
clk_prepare_enable(clk);
|
|
|
|
clkspec.args[0] = CGC_BIT_GE1;
|
|
clk = of_clk_get_from_provider(&clkspec);
|
|
clk_prepare_enable(clk);
|
|
}
|
|
|
|
#define MV643XX_ETH_MAC_ADDR_LOW 0x0414
|
|
#define MV643XX_ETH_MAC_ADDR_HIGH 0x0418
|
|
|
|
static void __init kirkwood_dt_eth_fixup(void)
|
|
{
|
|
struct device_node *np;
|
|
|
|
/*
|
|
* The ethernet interfaces forget the MAC address assigned by u-boot
|
|
* if the clocks are turned off. Usually, u-boot on kirkwood boards
|
|
* has no DT support to properly set local-mac-address property.
|
|
* As a workaround, we get the MAC address from mv643xx_eth registers
|
|
* and update the port device node if no valid MAC address is set.
|
|
*/
|
|
for_each_compatible_node(np, NULL, "marvell,kirkwood-eth-port") {
|
|
struct device_node *pnp = of_get_parent(np);
|
|
struct clk *clk;
|
|
struct property *pmac;
|
|
void __iomem *io;
|
|
u8 *macaddr;
|
|
u32 reg;
|
|
|
|
if (!pnp)
|
|
continue;
|
|
|
|
/* skip disabled nodes or nodes with valid MAC address*/
|
|
if (!of_device_is_available(pnp) || of_get_mac_address(np))
|
|
goto eth_fixup_skip;
|
|
|
|
clk = of_clk_get(pnp, 0);
|
|
if (IS_ERR(clk))
|
|
goto eth_fixup_skip;
|
|
|
|
io = of_iomap(pnp, 0);
|
|
if (!io)
|
|
goto eth_fixup_no_map;
|
|
|
|
/* ensure port clock is not gated to not hang CPU */
|
|
clk_prepare_enable(clk);
|
|
|
|
/* store MAC address register contents in local-mac-address */
|
|
pr_err(FW_INFO "%s: local-mac-address is not set\n",
|
|
np->full_name);
|
|
|
|
pmac = kzalloc(sizeof(*pmac) + 6, GFP_KERNEL);
|
|
if (!pmac)
|
|
goto eth_fixup_no_mem;
|
|
|
|
pmac->value = pmac + 1;
|
|
pmac->length = 6;
|
|
pmac->name = kstrdup("local-mac-address", GFP_KERNEL);
|
|
if (!pmac->name) {
|
|
kfree(pmac);
|
|
goto eth_fixup_no_mem;
|
|
}
|
|
|
|
macaddr = pmac->value;
|
|
reg = readl(io + MV643XX_ETH_MAC_ADDR_HIGH);
|
|
macaddr[0] = (reg >> 24) & 0xff;
|
|
macaddr[1] = (reg >> 16) & 0xff;
|
|
macaddr[2] = (reg >> 8) & 0xff;
|
|
macaddr[3] = reg & 0xff;
|
|
|
|
reg = readl(io + MV643XX_ETH_MAC_ADDR_LOW);
|
|
macaddr[4] = (reg >> 8) & 0xff;
|
|
macaddr[5] = reg & 0xff;
|
|
|
|
of_update_property(np, pmac);
|
|
|
|
eth_fixup_no_mem:
|
|
iounmap(io);
|
|
clk_disable_unprepare(clk);
|
|
eth_fixup_no_map:
|
|
clk_put(clk);
|
|
eth_fixup_skip:
|
|
of_node_put(pnp);
|
|
}
|
|
}
|
|
|
|
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);
|
|
|
|
BUG_ON(mvebu_mbus_dt_init());
|
|
|
|
kirkwood_l2_init();
|
|
|
|
kirkwood_cpufreq_init();
|
|
kirkwood_cpuidle_init();
|
|
/* Setup clocks for legacy devices */
|
|
kirkwood_legacy_clk_init();
|
|
|
|
kirkwood_pm_init();
|
|
kirkwood_dt_eth_fixup();
|
|
|
|
#ifdef CONFIG_KEXEC
|
|
kexec_reinit = kirkwood_enable_pcie;
|
|
#endif
|
|
|
|
if (of_machine_is_compatible("marvell,mv88f6281gtw-ge"))
|
|
mv88f6281gtw_ge_init();
|
|
|
|
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
}
|
|
|
|
static const char * const kirkwood_dt_board_compat[] = {
|
|
"marvell,kirkwood",
|
|
NULL
|
|
};
|
|
|
|
DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
|
|
/* Maintainer: Jason Cooper <jason@lakedaemon.net> */
|
|
.map_io = kirkwood_map_io,
|
|
.init_machine = kirkwood_dt_init,
|
|
.restart = kirkwood_restart,
|
|
.dt_compat = kirkwood_dt_board_compat,
|
|
MACHINE_END
|