Skip to contentSkip to conversation

ARM: socfpga: Repair incorrectly applied MCV patch

PATCH New Marek Vasut 2 participants 3 messages Dec 17, 2015 – Dec 18, 2015 Device tree bindings

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 ARM: socfpga: Repair incorrectly applied MCV patch

For whatever reason, this patch was not applied verbatim and had all tabs replaced with spaces. Replace them back by a quick sed.

Signed-off-by Marek Vasut <[email protected]>
Cc Alan Tull <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Olof Johansson <[email protected]>
Cc Steffen Trumtrar <[email protected]>
Cc Thor Thayer <[email protected]>
Cc Vince Bridgers <[email protected]>
---
 arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi   | 18 +++---
 arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 90 +++++++++++++--------------
 2 files changed, 54 insertions(+), 54 deletions(-)
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi +9 -9
index f0e03a2..baecd98 100644
@@ -18,16 +18,16 @@
 #include "socfpga_cyclone5.dtsi"
 
 / {
-       model = "DENX MCV";
-       compatible = "altr,socfpga-cyclone5", "altr,socfpga";
+	model = "DENX MCV";
+	compatible = "altr,socfpga-cyclone5", "altr,socfpga";
 
-       memory {
-               name = "memory";
-               device_type = "memory";
-               reg = <0x0 0x40000000>; /* 1 GiB */
-       };
+	memory {
+		name = "memory";
+		device_type = "memory";
+		reg = <0x0 0x40000000>; /* 1 GiB */
+	};
 };
 
-&mmc0 {        /* On-SoM eMMC */
-       bus-width = <8>;
+&mmc0 {	/* On-SoM eMMC */
+	bus-width = <8>;
 };
arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts +45 -45

122 lines not on this page · raw message

Signature · 1 line
2.6.4
#1 lore raw

PATCH 1/1 ARM: socfpga: Repair incorrectly applied MCV patch

Quoted 3 lines · Marek Vasut

For whatever reason, this patch was not applied verbatim and had all tabs replaced with spaces. Replace them back by a quick sed.

Thanks for catching this. I think what happened was that I had to pull this patch from the mailing list, and whenever I forward a patch from my gmail account, I can't seem to be able to use git am.

Anyways, patch is applied.

Thanks,
Dinh

author
#2 lore raw

PATCH 1/1 ARM: socfpga: Repair incorrectly applied MCV patch

Quoted 9 lines · Dinh Nguyen
Quoted 2 lines · Marek Vasut

For whatever reason, this patch was not applied verbatim and had all tabs replaced with spaces. Replace them back by a quick sed.

Thanks for catching this. I think what happened was that I had to pull this patch from the mailing list, and whenever I forward a patch from my gmail account, I can't seem to be able to use git am.

Anyways, patch is applied.

Thanks :)

Best regards,
Marek Vasut