Merge tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 21:43:33 +0000 (14:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Sep 2017 21:43:33 +0000 (14:43 -0700)
Pull DeviceTree updates from Rob Herring:
 "There's a few orphans in the conversion to %pOF printf specifiers
  included here that no one else picked up.

  Summary:

   - Convert more DT code to use of_property_read_* API.

   - Improve DT overlay support when adding multiple overlays

   - Convert printk's to %pOF format specifiers. Most went via subsystem
     trees, but picked up the remaining orphans

   - Correct unittests to use preferred "okay" for "status" property
     value

   - Add a KASLR seed property

   - Vendor prefixes for Mellanox, Theobroma System, Adaptrum, Moxa

   - Fix modalias buffer handling

   - Clean-up of include paths for building dtbs

   - Add bindings for amc6821, isl1208, tsl2x7x, srf02, and srf10
     devices

   - Add nvmem bindings for MediaTek MT7623 and MT7622 SoC

   - Add compatible string for Allwinner H5 Mali-450 GPU

   - Fix links to old OpenFirmware docs with new mirror on
     devicetree.org

   - Remove status property from binding doc examples"

* tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
  devicetree: Adjust status "ok" -> "okay" under drivers/of/
  dt-bindings: Remove "status" from examples
  dt-bindings: pinctrl: sh-pfc: Use generic node name
  dt-bindings: Add vendor Mellanox
  dt-binding: net/phy: fix interrupts description
  virt: Convert to using %pOF instead of full_name
  macintosh: Convert to using %pOF instead of full_name
  ide: pmac: Convert to using %pOF instead of full_name
  microblaze: Convert to using %pOF instead of full_name
  dt-bindings: usb: musb: Grammar s/the/to/, s/is/are/
  of: Use PLATFORM_DEVID_NONE definition
  of/device: Fix of_device_get_modalias() buffer handling
  of/device: Prevent buffer overflow in of_device_modalias()
  dt-bindings: add amc6821, isl1208 trivial bindings
  dt-bindings: add vendor prefix for Theobroma Systems
  of: search scripts/dtc/include-prefixes path for both CPP and DTC
  of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP
  of: remove drivers/of/testcase-data from include search path for CPP
  of: return of_get_cpu_node from of_cpu_device_node_get if CPUs are not registered
  iio: srf08: add device tree binding for srf02 and srf10
  ...

24 files changed:
1  2 
Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt
Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt
Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
Documentation/devicetree/bindings/mfd/da9052-i2c.txt
Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
Documentation/devicetree/bindings/net/brcm,amac.txt
Documentation/devicetree/bindings/net/marvell-pp2.txt
Documentation/devicetree/bindings/net/phy.txt
Documentation/devicetree/bindings/net/rockchip-dwmac.txt
Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt
Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
Documentation/devicetree/bindings/pinctrl/renesas,pfc-pinctrl.txt
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
Documentation/devicetree/bindings/ptp/brcm,ptp-dte.txt
Documentation/devicetree/bindings/sound/renesas,rsnd.txt
Documentation/devicetree/bindings/sound/rockchip,pdm.txt
Documentation/devicetree/bindings/spi/sh-msiof.txt
Documentation/devicetree/bindings/usb/keystone-usb.txt
Documentation/devicetree/bindings/usb/mediatek,mtu3.txt
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/of/device.c
drivers/of/irq.c
drivers/of/of_mdio.c
drivers/of/property.c

index 941bb6a6fb1304609bb3fa8a94520bfbdcca06f7,c08d5ad79b1f3bb89416cacc4f6872ed80b278ed..fbc07d12322f8020bc7a1ab282cd2eaffb587f9f
@@@ -23,5 -24,5 +23,4 @@@ Example
                interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3",
                                  "eip";
                clocks = <&cpm_syscon0 1 26>;
-               status = "disabled";
 -              dma-mask = <0xff 0xffffffff>;
        };
index 7c04e22a5d6af016fe8198d2d6d955011abc2173,16e3389c8118ad59c31f469d364c0e2babafb60e..6b1075ee8a3025f58c0609da564521afbec70ff7
@@@ -13,8 -6,7 +13,7 @@@ Required properties
  
  Example:
  
 -ptp_dte: ptp_dte@180af650 {
 -      compatible = "brcm,ptp-dte";
 +ptp: ptp-dte@180af650 {
 +      compatible = "brcm,iproc-ptp-dte", "brcm,ptp-dte";
        reg = <0x180af650 0x10>;
-       status = "okay";
  };
index 2ad66f649a28fabed59c28e518a3b68f6d7c2973,beb32ca26e5d476661090b1c7574367d312c794c..47f164fbd1d72f80f8caedb7e6d62ad991351897
@@@ -33,10 -34,5 +33,9 @@@ pdm: pdm@ff040000 
                     &pdmm0_sdi1
                     &pdmm0_sdi2
                     &pdmm0_sdi3>;
 -      pinctrl-1 = <&pdmm0_sleep>;
 +      pinctrl-1 = <&pdmm0_clk_sleep
 +                   &pdmm0_sdi0_sleep
 +                   &pdmm0_sdi1_sleep
 +                   &pdmm0_sdi2_sleep
 +                   &pdmm0_sdi3_sleep>;
-       status = "disabled";
  };
Simple merge
Simple merge
Simple merge
index ed9c3827fad2c32d0ebccb34943177f7c0189ec6,9eb45f69db2fe0b68fa952b1c9289f28f28e9510..fbb72116e9d456b8a08672391de9e2cc144ed171
@@@ -943,10 -897,10 +942,10 @@@ of_fwnode_graph_get_next_endpoint(cons
  }
  
  static struct fwnode_handle *
 -of_fwnode_graph_get_remote_endpoint(struct fwnode_handle *fwnode)
 +of_fwnode_graph_get_remote_endpoint(const struct fwnode_handle *fwnode)
  {
-       return of_fwnode_handle(of_parse_phandle(to_of_node(fwnode),
-                                                "remote-endpoint", 0));
+       return of_fwnode_handle(
+               of_graph_get_remote_endpoint(to_of_node(fwnode)));
  }
  
  static struct fwnode_handle *