From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2014 21:22:23 +0000 (-0400)
Subject: Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v4.14-rc1~6728
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eb785bef684f2b7d03b530efc8e6f199e9777e2f;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'dt-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC DT updates from Arnd Bergmann:
 "As usual, this is the largest branch, though this time a little under
  half of the total changes with 307 individual non-merge changesets.

  The largest changes are the addition of new machines, in particular
  the Tegra based Chromebook, the Renesas r8a7794 SoC, and DT support
  for the old i.MX1 platform.

  Other changes include
   - at91: various sam9 and sama5 updates
   - exynos: much extended Peach Pi/Pit (Chromebook 2) support
   - keystone: new peripherals
   - meson: added DT for meson6 SoC
   - mvebu: new device support for Armada 370/375
   - qcom: improved support for IPQ8064 and MSM8x60
   - rockchip: much improved support for rk3288
   - shmobile: lots of updates all over the place
   - sunxi: dts license change
   - sunxi: more a23 device support
   - vexpress: CLCD DT description"

* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (308 commits)
  ARM: DTS: meson: update DTSI to add watchdog node
  ARM: dts: keystone-k2l: fix mdio io start address
  ARM: dts: keystone-k2e: fix mdio io start address
  ARM: dts: keystone-k2e: update usb1 node for dma properties
  ARM: dts: keystone: fix io range for usb_phy0
  Revert "Merge tag 'hix5hd2-dt-for-3.18' of git://github.com/hisilicon/linux-hisi into next/dt"
  Revert "ARM: dts: hix5hd2: add wdg node"
  ARM: dts: add rk3288 i2s controller
  ARM: vexpress: Add CLCD Device Tree properties
  ARM: bcm2835: add I2S pinctrl to device tree
  ARM: meson: documentation: add bindings documentation
  ARM: meson: dts: add basic Meson/Meson6/Meson6-atv1200 DTSI/DTS
  ARM: dts: mt6589: Change compatible string for GIC
  ARM: dts: mediatek: Add compatible property for aquaris5
  ARM: dts: mt6589-aquaris5: Add boot argument earlyprintk
  ARM: dts: mt6589: Fix typo in GIC unit address
  ARM: dts: Build dtb for Mediatek board
  ARM: dts: keystone: fix bindings for pcie and usb clock nodes
  ARM: dts: keystone: k2l: Fix chip selects for SPI devices
  ARM: dts: keystone: add dsp gpio controllers nodes
  ...
---

eb785bef684f2b7d03b530efc8e6f199e9777e2f
diff --cc arch/arm/mach-at91/board-dt-sama5.c
index 4cc84e8,70b2504c..6a064e5
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@@ -35,30 -35,19 +35,8 @@@ static void __init sama5_dt_timer_init(
  	at91sam926x_pit_init();
  }
  
- static int ksz9021rn_phy_fixup(struct phy_device *phy)
- {
- 	int value;
 -static const struct of_device_id irq_of_match[] __initconst = {
--
- 	/* Set delay values */
- 	value = MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW | 0x8000;
- 	phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);
- 	value = 0xF2F4;
- 	phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);
- 	value = MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW | 0x8000;
- 	phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);
- 	value = 0x2222;
- 	phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);
 -	{ .compatible = "atmel,sama5d3-aic", .data = at91_aic5_of_init },
 -	{ /*sentinel*/ }
 -};
--
- 	return 0;
 -static void __init at91_dt_init_irq(void)
 -{
 -	of_irq_init(irq_of_match);
--}
--
  static void __init sama5_dt_device_init(void)
  {
- 	if (of_machine_is_compatible("atmel,sama5d3xcm") &&
- 	    IS_ENABLED(CONFIG_PHYLIB))
- 		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
- 			ksz9021rn_phy_fixup);
- 
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  
diff --cc arch/arm/mach-omap2/board-generic.c
index 0b311d5,bdb5194..69166ee
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -240,7 -240,9 +240,9 @@@ MACHINE_EN
  #endif
  
  #ifdef CONFIG_SOC_DRA7XX
 -static const char *dra74x_boards_compat[] __initconst = {
 +static const char *const dra74x_boards_compat[] __initconst = {
+ 	"ti,am5728",
+ 	"ti,am5726",
  	"ti,dra742",
  	"ti,dra7",
  	NULL,
@@@ -259,7 -261,9 +261,9 @@@ DT_MACHINE_START(DRA74X_DT, "Generic DR
  	.restart	= omap44xx_restart,
  MACHINE_END
  
 -static const char *dra72x_boards_compat[] __initconst = {
 +static const char *const dra72x_boards_compat[] __initconst = {
+ 	"ti,am5718",
+ 	"ti,am5716",
  	"ti,dra722",
  	NULL,
  };