Merge pull request #4374 from islipfd19/Slice_Patch-01

New version of linux causes build to fail with older patch. This one …
This commit is contained in:
CvH 2020-05-09 17:51:02 +02:00 committed by GitHub
commit cf26681c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 30 deletions

View File

@ -1,20 +1,13 @@
--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi 2017-11-18 04:56:28.149405247 +0000 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi 2020-04-29 05:31:07.000000000 -0400
+++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi 2017-11-18 05:35:40.265159491 +0000 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi 2020-05-08 09:07:16.487587235 -0400
@@ -21,7 +21,7 @@ @@ -16,8 +16,8 @@
gpio = &gpio; uart1 = &uart1;
uart0 = &uart0;
sdhost = &sdhost; sdhost = &sdhost;
- mmc0 = &sdhost;
+ mmc1 = &sdhost;
i2s = &i2s;
spi0 = &spi0;
i2c0 = &i2c0;
@@ -29,7 +29,7 @@
spi1 = &spi1;
spi2 = &spi2;
mmc = &mmc; mmc = &mmc;
- mmc1 = &mmc; - mmc1 = &mmc;
- mmc0 = &sdhost;
+ mmc1 = &sdhost;
+ mmc0 = &mmc; + mmc0 = &mmc;
i2s = &i2s;
i2c0 = &i2c0;
i2c1 = &i2c1; i2c1 = &i2c1;
i2c2 = &i2c2;
usb = &usb;

View File

@ -1,20 +1,13 @@
--- a/arch/arm/boot/dts/bcm2708-rpi.dtsi 2017-11-18 04:56:28.149405247 +0000 --- a/arch/arm/boot/dts/bcm270x-rpi.dtsi 2020-04-29 05:31:07.000000000 -0400
+++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi 2017-11-18 05:35:40.265159491 +0000 +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi 2020-05-08 09:07:16.487587235 -0400
@@ -21,7 +21,7 @@ @@ -16,8 +16,8 @@
gpio = &gpio; uart1 = &uart1;
uart0 = &uart0;
sdhost = &sdhost; sdhost = &sdhost;
- mmc0 = &sdhost;
+ mmc1 = &sdhost;
i2s = &i2s;
spi0 = &spi0;
i2c0 = &i2c0;
@@ -29,7 +29,7 @@
spi1 = &spi1;
spi2 = &spi2;
mmc = &mmc; mmc = &mmc;
- mmc1 = &mmc; - mmc1 = &mmc;
- mmc0 = &sdhost;
+ mmc1 = &sdhost;
+ mmc0 = &mmc; + mmc0 = &mmc;
i2s = &i2s;
i2c0 = &i2c0;
i2c1 = &i2c1; i2c1 = &i2c1;
i2c2 = &i2c2;
usb = &usb;