Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <marex@denx.de>
Cc: Alan Tull <atull@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Thor Thayer <tthayer@altera.com>
Cc: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>

authored by

Marek Vasut and committed by
Dinh Nguyen
dfd35b77 34a31588

+54 -54
+9 -9
arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi
··· 18 18 #include "socfpga_cyclone5.dtsi" 19 19 20 20 / { 21 - model = "DENX MCV"; 22 - compatible = "altr,socfpga-cyclone5", "altr,socfpga"; 21 + model = "DENX MCV"; 22 + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; 23 23 24 - memory { 25 - name = "memory"; 26 - device_type = "memory"; 27 - reg = <0x0 0x40000000>; /* 1 GiB */ 28 - }; 24 + memory { 25 + name = "memory"; 26 + device_type = "memory"; 27 + reg = <0x0 0x40000000>; /* 1 GiB */ 28 + }; 29 29 }; 30 30 31 - &mmc0 { /* On-SoM eMMC */ 32 - bus-width = <8>; 31 + &mmc0 { /* On-SoM eMMC */ 32 + bus-width = <8>; 33 33 };
+45 -45
arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts
··· 18 18 #include "socfpga_cyclone5_mcv.dtsi" 19 19 20 20 / { 21 - model = "DENX MCV EVK"; 22 - compatible = "altr,socfpga-cyclone5", "altr,socfpga"; 21 + model = "DENX MCV EVK"; 22 + compatible = "altr,socfpga-cyclone5", "altr,socfpga"; 23 23 24 - aliases { 25 - ethernet0 = &gmac0; 26 - stmpe-i2c0 = &stmpe1; 27 - }; 24 + aliases { 25 + ethernet0 = &gmac0; 26 + stmpe-i2c0 = &stmpe1; 27 + }; 28 28 29 - chosen { 30 - stdout-path = "serial0:115200n8"; 31 - }; 29 + chosen { 30 + stdout-path = "serial0:115200n8"; 31 + }; 32 32 }; 33 33 34 34 &can0 { 35 - status = "okay"; 35 + status = "okay"; 36 36 }; 37 37 38 38 &can1 { 39 - status = "okay"; 39 + status = "okay"; 40 40 }; 41 41 42 42 &gmac0 { 43 - phy-mode = "rgmii"; 44 - status = "okay"; 43 + phy-mode = "rgmii"; 44 + status = "okay"; 45 45 }; 46 46 47 - &gpio0 { /* GPIO 0 ... 28 */ 48 - status = "okay"; 47 + &gpio0 { /* GPIO 0 ... 28 */ 48 + status = "okay"; 49 49 }; 50 50 51 - &gpio1 { /* GPIO 29 ... 57 */ 52 - status = "okay"; 51 + &gpio1 { /* GPIO 29 ... 57 */ 52 + status = "okay"; 53 53 }; 54 54 55 - &gpio2 { /* GPIO 58..66 (HLGPI 0..13 at offset 13) */ 56 - status = "okay"; 55 + &gpio2 { /* GPIO 58..66 (HLGPI 0..13 at offset 13) */ 56 + status = "okay"; 57 57 }; 58 58 59 59 &i2c0 { 60 - status = "okay"; 61 - speed-mode = <0>; 60 + status = "okay"; 61 + speed-mode = <0>; 62 62 63 - stmpe1: stmpe811@41 { 64 - compatible = "st,stmpe811"; 65 - #address-cells = <1>; 66 - #size-cells = <0>; 67 - reg = <0x41>; 68 - id = <0>; 69 - blocks = <0x5>; 70 - irq-gpio = <&portb 28 0x4>; /* GPIO 57, trig. level HI */ 63 + stmpe1: stmpe811@41 { 64 + compatible = "st,stmpe811"; 65 + #address-cells = <1>; 66 + #size-cells = <0>; 67 + reg = <0x41>; 68 + id = <0>; 69 + blocks = <0x5>; 70 + irq-gpio = <&portb 28 0x4>; /* GPIO 57, trig. level HI */ 71 71 72 - stmpe_touchscreen { 73 - compatible = "st,stmpe-ts"; 74 - reg = <0>; 75 - ts,sample-time = <4>; 76 - ts,mod-12b = <1>; 77 - ts,ref-sel = <0>; 78 - ts,adc-freq = <1>; 79 - ts,ave-ctrl = <1>; 80 - ts,touch-det-delay = <3>; 81 - ts,settling = <4>; 82 - ts,fraction-z = <7>; 83 - ts,i-drive = <1>; 84 - }; 85 - }; 72 + stmpe_touchscreen { 73 + compatible = "st,stmpe-ts"; 74 + reg = <0>; 75 + ts,sample-time = <4>; 76 + ts,mod-12b = <1>; 77 + ts,ref-sel = <0>; 78 + ts,adc-freq = <1>; 79 + ts,ave-ctrl = <1>; 80 + ts,touch-det-delay = <3>; 81 + ts,settling = <4>; 82 + ts,fraction-z = <7>; 83 + ts,i-drive = <1>; 84 + }; 85 + }; 86 86 }; 87 87 88 88 &uart0 { 89 - status = "okay"; 89 + status = "okay"; 90 90 }; 91 91 92 92 &usb1 { 93 - status = "okay"; 93 + status = "okay"; 94 94 };