Merge remote-tracking branch 'efi/chainsaw' into x86/efi

Resolved Conflicts:
	drivers/firmware/efivars.c
	fs/efivarsfs/file.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index 8e53b25b5508..e83505e4c236 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -90,5 +90,36 @@
                         phy = <&phy3>;
                         phy-mode = "sgmii";
                 };
+
+                mvsdio@d00d4000 {
+                        pinctrl-0 = <&sdio_pins>;
+                        pinctrl-names = "default";
+                        status = "okay";
+                        /* No CD or WP GPIOs */
+                };
+
+                usb@d0050000 {
+                        status = "okay";
+                };
+
+                usb@d0051000 {
+                        status = "okay";
+                };
+
+                usb@d0052000 {
+                        status = "okay";
+                };
+
+                spi0: spi@d0010600 {
+                        status = "okay";
+
+                        spi-flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "m25p64";
+                                reg = <0>; /* Chip select 0 */
+                                spi-max-frequency = <20000000>;
+                        };
+                };
         };
 };