Merge remote-tracking branch 'devicetree/for-next'

diff --git a/Documentation/devicetree/bindings/mfd/max77693.txt b/Documentation/devicetree/bindings/mfd/max77693.txt
index d3425846aa5bf1ae865fbd143975459c08bf578c..6a1ae3a2b77f978d33515cb2bf5c08cecd44cc4d 100644 (file)
--- a/Documentation/devicetree/bindings/mfd/max77693.txt
+++ b/Documentation/devicetree/bindings/mfd/max77693.txt
@@ -17,28 +17,28 @@ Required properties:
 - interrupt-parent :  The parent interrupt controller.
 
 Optional properties:
-- regulators : The regulators of max77693 have to be instantiated under subnod
+- regulators : The regulators of max77693 have to be instantiated under subnode
   named "regulators" using the following format.
 
        regulators {
-               regualtor-compatible = ESAFEOUT1/ESAFEOUT2/CHARGER
-               standard regulator constratints[*].
+               regulator-compatible = ESAFEOUT1/ESAFEOUT2/CHARGER
+               standard regulator constraints[*].
        };
 
        [*] refer Documentation/devicetree/bindings/regulator/regulator.txt
 
 - haptic : The MAX77693 haptic device utilises a PWM controlled motor to provide
   users with tactile feedback. PWM period and duty-cycle are varied in
-  order to provide the approprite level of feedback.
+  order to provide the appropriate level of feedback.
 
  Required properties:
-       - compatible : Must be "maxim,max77693-hpatic"
+       - compatible : Must be "maxim,max77693-haptic"
        - haptic-supply : power supply for the haptic motor
        [*] refer Documentation/devicetree/bindings/regulator/regulator.txt
        - pwms : phandle to the physical PWM(Pulse Width Modulation) device.
         PWM properties should be named "pwms". And number of cell is different
         for each pwm device.
-        To get more informations, please refer to documentaion.
+        To get more information, please refer to documentation.
        [*] refer Documentation/devicetree/bindings/pwm/pwm.txt
 
 - charger : Node configuring the charger driver.

diff --git a/Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt b/Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt
new file mode 100644 (file)
index 0000000..19331bb
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/wireless/esp,esp8089.txt
@@ -0,0 +1,31 @@
+Espressif ESP8089 wireless SDIO devices
+
+This node provides properties for controlling the ESP8089 wireless device.
+The node is expected to be specified as a child node to the SDIO controller
+that connects the device to the system.
+
+Required properties:
+
+ - compatible : Should be "esp,esp8089".
+
+Optional properties:
+ - esp,crystal-26M-en: Integer value for the crystal_26M_en firmware parameter
+
+Example:
+
+&mmc1 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       vmmc-supply = <&reg_dldo1>;
+       mmc-pwrseq = <&wifi_pwrseq>;
+       bus-width = <4>;
+       non-removable;
+       status = "okay";
+
+       esp8089: sdio_wifi@1 {
+               compatible = "esp,esp8089";
+               reg = <1>;
+               esp,crystal-26M-en = <2>;
+       };
+};

diff --git a/Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt b/Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt
index 337fc97d18c96111b94e3ca3c75376ac8d6f45ac..3259798a1192b051520b3cad2412a6f59fb6dfa5 100644 (file)
--- a/Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt
+++ b/Documentation/devicetree/bindings/pci/xilinx-nwl-pcie.txt
@@ -55,9 +55,10 @@ nwl_pcie: pcie@fd0e0000 {
        msi-parent = <&nwl_pcie>;
        reg = <0x0 0xfd0e0000 0x0 0x1000>,
              <0x0 0xfd480000 0x0 0x1000>,
-             <0x0 0xe0000000 0x0 0x1000000>;
+             <0x80 0x00000000 0x0 0x1000000>;
        reg-names = "breg", "pcireg", "cfg";
-       ranges = <0x02000000 0x00000000 0xe1000000 0x00000000 0xe1000000 0 0x0f000000>;
+       ranges = <0x02000000 0x00000000 0xe0000000 0x00000000 0xe0000000 0x00000000 0x10000000  /* non-prefetchable memory */
+                 0x43000000 0x00000006 0x00000000 0x00000006 0x00000000 0x00000002 0x00000000>;/* prefetchable memory */
 
        pcie_intc: legacy-interrupt-controller {
                interrupt-controller;

diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
index 17822860cb98c34da30cf6822f708171b9987acc..4b1d6e74c744fe966afd4ff43646f819ffd84676 100644 (file)
--- a/Documentation/devicetree/bindings/spi/spi-bus.txt
+++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
@@ -31,7 +31,7 @@ with max(cs-gpios > hw cs).
 So if for example the controller has 2 CS lines, and the cs-gpios
 property looks like this:
 
-cs-gpios = <&gpio1 0 0> <0> <&gpio1 1 0> <&gpio1 2 0>;
+cs-gpios = <&gpio1 0 0>, <0>, <&gpio1 1 0>, <&gpio1 2 0>;
 
 Then it should be configured so that num_chipselect = 4 with the
 following mapping:

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index cc15e9911dc8f182ab8b941a1397e4b89737119b..147e3ebe314072c26960feb014df72d00650eb16 100644 (file)
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -3,8 +3,8 @@ Device tree binding vendor prefix registry.  Keep list in alphabetical order.
 This isn't an exhaustive list, but you should add new prefixes to it before
 using them to avoid name-space collisions.
 
-abilis Abilis Systems
 abcn   Abracon Corporation
+abilis Abilis Systems
 active-semi    Active-Semi International Inc
 ad     Avionic Design GmbH
 adapteva       Adapteva, Inc.
@@ -102,8 +102,8 @@ friendlyarm Guangzhou FriendlyARM Computer Tech Co., Ltd
 fsl    Freescale Semiconductor
 ge     General Electric Company
 geekbuying     GeekBuying
-GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 gef    GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+GEFanuc        GE Fanuc Intelligent Platforms Embedded Systems, Inc.
 geniatech      Geniatech, Inc.
 giantplus      Giantplus Technology Co., Ltd.
 globalscale    Globalscale Technologies, Inc.
@@ -127,7 +127,6 @@ i2se        I2SE GmbH
 ibm    International Business Machines (IBM)
 idt    Integrated Device Technologies, Inc.
 ifi    Ingenieurburo Fur Ic-Technologie (I/F/I)
-iom    Iomega Corporation
 img    Imagination Technologies Ltd.
 infineon Infineon Technologies
 inforce        Inforce Computing
@@ -137,9 +136,11 @@ intel      Intel Corporation
 intercontrol   Inter Control Group
 invensense     InvenSense Inc.
 inversepath    Inverse Path
+iom    Iomega Corporation
 isee   ISEE 2007 S.L.
 isil   Intersil
 issi   Integrated Silicon Solutions Inc.
+jdi    Japan Display Inc.
 jedec  JEDEC Solid State Technology Association
 karo   Ka-Ro electronics GmbH
 keymile        Keymile GmbH
@@ -151,8 +152,8 @@ lantiq      Lantiq Semiconductor
 lenovo Lenovo Group Ltd.
 lg     LG Corporation
 linux  Linux-specific binding
-lsi    LSI Corp. (LSI Logic)
 lltc   Linear Technology Corporation
+lsi    LSI Corp. (LSI Logic)
 marvell        Marvell Technology Group Ltd.
 maxim  Maxim Integrated Products
 meas   Measurement Specialties
@@ -192,20 +193,20 @@ onnn      ON Semiconductor Corp.
 ontat  On Tat Industrial Company
 opencores      OpenCores.org
 option Option NV
+ORCL   Oracle Corporation
 ortustech      Ortus Technology Co., Ltd.
 ovti   OmniVision Technologies
-ORCL   Oracle Corporation
 oxsemi Oxford Semiconductor, Ltd.
 panasonic      Panasonic Corporation
 parade Parade Technologies Inc.
 pericom        Pericom Technology Inc.
 phytec PHYTEC Messtechnik GmbH
 picochip       Picochip Ltd
+pixcir  PIXCIR MICROELECTRONICS Co., Ltd
 plathome       Plat'Home Co., Ltd.
 plda   PLDA
-pixcir  PIXCIR MICROELECTRONICS Co., Ltd
-pulsedlight    PulsedLight, Inc
 powervr        PowerVR (deprecated, use img)
+pulsedlight    PulsedLight, Inc
 qca    Qualcomm Atheros, Inc.
 qcom   Qualcomm Technologies, Inc
 qemu   QEMU, a generic and open source machine emulator and virtualizer
@@ -233,12 +234,12 @@ sgx       SGX Sensortech
 sharp  Sharp Corporation
 si-en  Si-En Technology Ltd.
 sigma  Sigma Designs, Inc.
+sii    Seiko Instruments, Inc.
 sil    Silicon Image
 silabs Silicon Laboratories
+silergy        Silergy Corp.
 siliconmitus   Silicon Mitus, Inc.
 simtek
-sii    Seiko Instruments, Inc.
-silergy        Silergy Corp.
 sirf   SiRF Technology, Inc.
 sis    Silicon Integrated Systems Corp.
 sitronix       Sitronix Technology Corporation
@@ -256,9 +257,11 @@ starry     Starry Electronic Technology (ShenZhen) Co., LTD
 startek        Startek
 ste    ST-Ericsson
 stericsson     ST-Ericsson
+sunchip        Shenzhen Sunchip Technology Co., Ltd
+SUNW   Sun Microsystems, Inc
+swir   Sierra Wireless
 syna   Synaptics Inc.
 synology       Synology, Inc.
-SUNW   Sun Microsystems, Inc
 tbs    TBS Technologies
 tcg    Trusted Computing Group
 tcl    Toby Churchill Ltd.
@@ -270,14 +273,14 @@ tlm       Trusted Logic Mobility
 toradex        Toradex AG
 toshiba        Toshiba Corporation
 toumaz Toumaz
-tplink TP-LINK Technologies Co., Ltd.
 tpk    TPK U.S.A. LLC
+tplink TP-LINK Technologies Co., Ltd.
 tronfy Tronfy
 tronsmart      Tronsmart
 truly  Truly Semiconductors Limited
 tyan   Tyan Computer Corporation
-upisemi        uPI Semiconductor Corp.
 uniwest        United Western Technologies Corp (UniWest)
+upisemi        uPI Semiconductor Corp.
 urt    United Radiant Technology Corporation
 usi    Universal Scientific Industrial Co., Ltd.
 v3     V3 Semiconductor
@@ -295,7 +298,7 @@ x-powers    X-Powers
 xes    Extreme Engineering Solutions (X-ES)
 xillybus       Xillybus Ltd.
 xlnx   Xilinx
-zyxel  ZyXEL Communications Corp.
 zarlink        Zarlink Semiconductor
 zii    Zodiac Inflight Innovations
 zte    ZTE Corp.
+zyxel  ZyXEL Communications Corp.

diff --git a/Documentation/devicetree/changesets.txt b/Documentation/devicetree/changesets.txt
index 935ba5acc34e6c41b1ba630dd252f9e98c11559c..cb488eeb635372e09ecb2db906c0cdafc1551158 100644 (file)
--- a/Documentation/devicetree/changesets.txt
+++ b/Documentation/devicetree/changesets.txt
@@ -21,20 +21,11 @@ a set of changes. No changes to the active tree are made at this point.
 All the change operations are recorded in the of_changeset 'entries'
 list.
 
-3. mutex_lock(of_mutex) - starts a changeset; The global of_mutex
-ensures there can only be one editor at a time.
-
-4. of_changeset_apply() - Apply the changes to the tree. Either the
+3. of_changeset_apply() - Apply the changes to the tree. Either the
 entire changeset will get applied, or if there is an error the tree will
-be restored to the previous state
-
-5. mutex_unlock(of_mutex) - All operations complete, release the mutex
+be restored to the previous state. The core ensures proper serialization
+through locking. An unlocked version __of_changeset_apply is available,
+if needed.
 
 If a successfully applied changeset needs to be removed, it can be done
-with the following sequence.
-
-1. mutex_lock(of_mutex)
-
-2. of_changeset_revert()
-
-3. mutex_unlock(of_mutex)
+with of_changeset_revert().