69d323f231
This is a backport of the patches accepted to the Linux mainline related to mvebu SoC (Armada XP and Armada 370) between Linux v3.10, and Linux v3.11. This work mainly covers: * Enabling USB storage, and PCI to mvebu_defconfig. * Add support for NOR flash. * Some PCI device tree related updates, and bus parsing. * Adding Armada XP & 370 PCI driver, and update some clock gating specifics. * Introduce Marvell EBU Device Bus driver. * Enaling USB in the armada*.dts. * Enabling, and updating the mvebu-mbus. * Some SATA and Ethernet related fixes. Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com> CC: Luka Perkov <luka@openwrt.org> SVN-Revision: 39564
133 lines
3.5 KiB
Diff
133 lines
3.5 KiB
Diff
From cf6eb4599d60cb9fa81465aa018c71d11e19ea6a Mon Sep 17 00:00:00 2001
|
|
From: Simon Baatz <gmbnomis@gmail.com>
|
|
Date: Mon, 13 May 2013 23:18:58 +0200
|
|
Subject: [PATCH 002/203] ARM: mvebu: Use standard MMC binding for all users of
|
|
mvsdio
|
|
|
|
In order to prepare the switch to the standard MMC device tree parser
|
|
for mvsdio, adapt all current uses of mvsdio in the dts files to the
|
|
standard format.
|
|
|
|
Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
|
|
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
|
|
---
|
|
arch/arm/boot/dts/armada-370-db.dts | 1 +
|
|
arch/arm/boot/dts/armada-370-mirabox.dts | 1 +
|
|
arch/arm/boot/dts/armada-370-rd.dts | 1 +
|
|
arch/arm/boot/dts/armada-370-xp.dtsi | 4 ++++
|
|
arch/arm/boot/dts/armada-xp-db.dts | 1 +
|
|
arch/arm/boot/dts/kirkwood-dreamplug.dts | 1 +
|
|
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 2 ++
|
|
arch/arm/boot/dts/kirkwood-mplcec4.dts | 2 +-
|
|
arch/arm/boot/dts/kirkwood-topkick.dts | 1 +
|
|
arch/arm/boot/dts/kirkwood.dtsi | 4 ++++
|
|
10 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/armada-370-db.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-db.dts
|
|
@@ -74,6 +74,7 @@
|
|
*/
|
|
status = "disabled";
|
|
/* No CD or WP GPIOs */
|
|
+ broken-cd;
|
|
};
|
|
|
|
usb@50000 {
|
|
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
|
|
@@ -99,6 +99,7 @@
|
|
* No CD or WP GPIOs: SDIO interface used for
|
|
* Wifi/Bluetooth chip
|
|
*/
|
|
+ broken-cd;
|
|
};
|
|
|
|
usb@50000 {
|
|
--- a/arch/arm/boot/dts/armada-370-rd.dts
|
|
+++ b/arch/arm/boot/dts/armada-370-rd.dts
|
|
@@ -64,6 +64,7 @@
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
/* No CD or WP GPIOs */
|
|
+ broken-cd;
|
|
};
|
|
|
|
usb@50000 {
|
|
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
|
|
@@ -143,6 +143,10 @@
|
|
reg = <0xd4000 0x200>;
|
|
interrupts = <54>;
|
|
clocks = <&gateclk 17>;
|
|
+ bus-width = <4>;
|
|
+ cap-sdio-irq;
|
|
+ cap-sd-highspeed;
|
|
+ cap-mmc-highspeed;
|
|
status = "disabled";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/armada-xp-db.dts
|
|
+++ b/arch/arm/boot/dts/armada-xp-db.dts
|
|
@@ -97,6 +97,7 @@
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
/* No CD or WP GPIOs */
|
|
+ broken-cd;
|
|
};
|
|
|
|
usb@50000 {
|
|
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
|
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
|
|
@@ -79,6 +79,7 @@
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
/* No CD or WP GPIOs */
|
|
+ broken-cd;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
|
|
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
|
|
@@ -72,6 +72,8 @@
|
|
|
|
mvsdio@90000 {
|
|
status = "okay";
|
|
+ /* No CD or WP GPIOs */
|
|
+ broken-cd;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
|
|
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
|
|
@@ -136,7 +136,7 @@
|
|
pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
- cd-gpios = <&gpio1 15 0>;
|
|
+ cd-gpios = <&gpio1 15 1>;
|
|
/* No WP GPIO */
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
|
|
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
|
|
@@ -154,6 +154,7 @@
|
|
pinctrl-names = "default";
|
|
status = "okay";
|
|
/* No CD or WP GPIOs */
|
|
+ broken-cd;
|
|
};
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/kirkwood.dtsi
|
|
+++ b/arch/arm/boot/dts/kirkwood.dtsi
|
|
@@ -200,6 +200,10 @@
|
|
reg = <0x90000 0x200>;
|
|
interrupts = <28>;
|
|
clocks = <&gate_clk 4>;
|
|
+ bus-width = <4>;
|
|
+ cap-sdio-irq;
|
|
+ cap-sd-highspeed;
|
|
+ cap-mmc-highspeed;
|
|
status = "disabled";
|
|
};
|
|
};
|