Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index a520b4c14ea9f5023b11672c17cb438f256f9067..080d5c5169b5aed17eceef5406442025d3843256 100644 (file)
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -9,6 +9,25 @@
 #include "skeleton.dtsi"
 #include "dt-bindings/clock/pxa-clock.h"
 
+#define PMGROUP(pin) #pin
+#define PMMUX(func, pin, af)                   \
+       mux- ## func {                          \
+               groups = PMGROUP(P ## pin);     \
+               function = #af;                 \
+       }
+#define PMMUX_LPM_LOW(func, pin, af)           \
+       mux- ## func {                          \
+               groups = PMGROUP(P ## pin);     \
+               function = #af;                 \
+               low-power-disable;              \
+       }
+#define PMMUX_LPM_HIGH(func, pin, af)          \
+       mux- ## func {                          \
+               groups = PMGROUP(P ## pin);     \
+               function = #af;                 \
+               low-power-enable;               \
+       }
+
 / {
        model = "Marvell PXA2xx family SoC";
        compatible = "marvell,pxa2xx";
@@ -76,7 +95,7 @@
                        };
                };
 
-               ffuart: uart@40100000 {
+               ffuart: serial@40100000 {
                        compatible = "mrvl,pxa-uart";
                        reg = <0x40100000 0x30>;
                        interrupts = <22>;
@@ -84,7 +103,7 @@
                        status = "disabled";
                };
 
-               btuart: uart@40200000 {
+               btuart: serial@40200000 {
                        compatible = "mrvl,pxa-uart";
                        reg = <0x40200000 0x30>;
                        interrupts = <21>;
@@ -92,7 +111,7 @@
                        status = "disabled";
                };
 
-               stuart: uart@40700000 {
+               stuart: serial@40700000 {
                        compatible = "mrvl,pxa-uart";
                        reg = <0x40700000 0x30>;
                        interrupts = <20>;
@@ -100,7 +119,7 @@
                        status = "disabled";
                };
 
-               hwuart: uart@41100000 {
+               hwuart: serial@41100000 {
                        compatible = "mrvl,pxa-uart";
                        reg = <0x41100000 0x30>;
                        interrupts = <7>;