diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 03:34:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-11 03:34:56 -0500 |
commit | f9efbce6334844c7f8b9b9459f6d7a6fbc2928e0 (patch) | |
tree | 4490a75f7058885561ab498b68fa68e32cf5b969 /arch/arm/mach-mxs | |
parent | 53575aa99dc1584484b99c8173042d8370f6ed88 (diff) | |
parent | 07eb663b7ec7fdb9c325e22e83f5975c724b6249 (diff) |
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
...
Diffstat (limited to 'arch/arm/mach-mxs')
-rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index cc511a4890a3..1dc5acd4fc99 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
@@ -330,6 +330,11 @@ static void __init crystalfontz_init(void) | |||
330 | update_fec_mac_prop(OUI_CRYSTALFONTZ); | 330 | update_fec_mac_prop(OUI_CRYSTALFONTZ); |
331 | } | 331 | } |
332 | 332 | ||
333 | static void __init m28cu3_init(void) | ||
334 | { | ||
335 | update_fec_mac_prop(OUI_DENX); | ||
336 | } | ||
337 | |||
333 | static const char __init *mxs_get_soc_id(void) | 338 | static const char __init *mxs_get_soc_id(void) |
334 | { | 339 | { |
335 | struct device_node *np; | 340 | struct device_node *np; |
@@ -457,6 +462,8 @@ static void __init mxs_machine_init(void) | |||
457 | apx4devkit_init(); | 462 | apx4devkit_init(); |
458 | else if (of_machine_is_compatible("crystalfontz,cfa10036")) | 463 | else if (of_machine_is_compatible("crystalfontz,cfa10036")) |
459 | crystalfontz_init(); | 464 | crystalfontz_init(); |
465 | else if (of_machine_is_compatible("msr,m28cu3")) | ||
466 | m28cu3_init(); | ||
460 | 467 | ||
461 | of_platform_populate(NULL, of_default_bus_match_table, | 468 | of_platform_populate(NULL, of_default_bus_match_table, |
462 | NULL, parent); | 469 | NULL, parent); |