Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / pxa3xx.dtsi

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index e1e607f53ce637551e30c7c8922c4402e487c686..c237a0e4b12ae6f9b47e6eaa014a4f9811c3eab3 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -70,6 +70,14 @@
 #define MFP_DS10X      < (0x6 << 10) MFP_DSMSK >
 #define MFP_DS13X      < (0x7 << 10) MFP_DSMSK >
 
+/*
+ * MFP bias pull mode for pins.
+ * Example of use: pinctrl-single,bias-pullup = MPF_PULL_UP;
+ */
+#define MPF_PULL_MSK   (0x7 << 13)
+#define MPF_PULL_DOWN  < (0x5 << 13) (0x5 << 13) 0 MPF_PULL_MSK >
+#define MPF_PULL_UP    < (0x6 << 13) (0x6 << 13) 0 MPF_PULL_MSK >
+
 /*
  * MFP low power mode for pins.
  * Example of use: