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

[karo-tx-linux.git] / Documentation / devicetree / bindings / net / nfc / st-nci-i2c.txt

diff --git a/Documentation/devicetree/bindings/net/nfc/st-nci-i2c.txt b/Documentation/devicetree/bindings/net/nfc/st-nci-i2c.txt
index d707588ed734969537f4bcf5d64956315704ed47..263732e8879f1ecd249f7427c78583b40a24c913 100644 (file)
--- a/Documentation/devicetree/bindings/net/nfc/st-nci-i2c.txt
+++ b/Documentation/devicetree/bindings/net/nfc/st-nci-i2c.txt
@@ -11,6 +11,10 @@ Required properties:
 Optional SoC Specific Properties:
 - pinctrl-names: Contains only one value - "default".
 - pintctrl-0: Specifies the pin control groups used for this controller.
+- ese-present: Specifies that an ese is physically connected to the nfc
+controller.
+- uicc-present: Specifies that the uicc swp signal can be physically
+connected to the nfc controller.
 
 Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2):
 
@@ -29,5 +33,8 @@ Example (for ARM-based BeagleBoard xM with ST21NFCB on I2C2):
                interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
 
                reset-gpios = <&gpio5 29 GPIO_ACTIVE_HIGH>;
+
+               ese-present;
+               uicc-present;
        };
 };