forked from coolsnowwolf/lede
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: arm-trusted-firmware-rockchip-vendor: rk3568 atf revert to v1.28 rockchip: add kmod-ata-ahci-platform for Firefly Station P2 kernel: bump 5.19 to 5.19.1 rockchip: disable UHS modes for R66S rockchip: fix NanoPi R4S soft-reboot on some SD card rockchip: set initial signal voltage on power off
- Loading branch information
Showing
8 changed files
with
68 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| LINUX_VERSION-5.19 = | ||
| LINUX_KERNEL_HASH-5.19 = ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 | ||
| LINUX_VERSION-5.19 = .1 | ||
| LINUX_KERNEL_HASH-5.19.1 = f4e27b926ea2c66b808db1f5706254cf92a8899e2108eedb0c3a7d12499aea55 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+328 KB
package/boot/arm-trusted-firmware-rockchip-vendor/src/bin/rk35/rk3568_bl31_v1.28.elf
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...t/linux/rockchip/patches-5.19/0107-mmc-core-set-initial-signal-voltage-on-power-off.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From 0d329112c709d6cfedf0fffb19f0cc6b19043f6b Mon Sep 17 00:00:00 2001 | ||
| From: Jonas Karlman <jonas@kwiboo.se> | ||
| Date: Wed, 20 Feb 2019 07:38:34 +0000 | ||
| Subject: [PATCH] mmc: core: set initial signal voltage on power off | ||
|
|
||
| Some boards have SD card connectors where the power rail cannot be switched | ||
| off by the driver. If the card has not been power cycled, it may still be | ||
| using 1.8V signaling after a warm re-boot. Bootroms expecting 3.3V signaling | ||
| will fail to boot from a UHS card that continue to use 1.8V signaling. | ||
|
|
||
| Set initial signal voltage in mmc_power_off() to allow re-boot to function. | ||
|
|
||
| This fixes re-boot with UHS cards on Asus Tinker Board (Rockchip RK3288), | ||
| same issue have been seen on some Rockchip RK3399 boards. | ||
|
|
||
| I am sending this as a RFC because I have no insights into SD/MMC subsystem, | ||
| this change fix a re-boot issue on my boards and does not break emmc/sdio. | ||
| Is this an acceptable workaround? Any advice is appreciated. | ||
|
|
||
| Signed-off-by: Jonas Karlman <jonas@kwiboo.se> | ||
| --- | ||
| drivers/mmc/core/core.c | 2 ++ | ||
| 1 file changed, 2 insertions(+) | ||
|
|
||
| --- a/drivers/mmc/core/core.c | ||
| +++ b/drivers/mmc/core/core.c | ||
| @@ -1358,6 +1358,8 @@ void mmc_power_off(struct mmc_host *host | ||
|
|
||
| mmc_pwrseq_power_off(host); | ||
|
|
||
| + mmc_set_initial_signal_voltage(host); | ||
| + | ||
| host->ios.clock = 0; | ||
| host->ios.vdd = 0; | ||
|
|
26 changes: 26 additions & 0 deletions
26
target/linux/rockchip/patches-5.19/105-nanopi-r4s-sd-signalling.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| From: David Bauer <mail@david-bauer.net> | ||
| Subject: arm64: dts: rockchip: disable UHS modes for NanoPi R4S | ||
|
|
||
| The NanoPi R4S leaves the SD card in 1.8V signalling when rebooting | ||
| while U-Boot requires the card to be in 3.3V mode. | ||
|
|
||
| Remove UHS support from the SD controller so the card remains in 3.3V | ||
| mode. This reduces transfer speeds but ensures a reboot whether from | ||
| userspace or following a kernel panic is always working. | ||
|
|
||
| Signed-off-by: David Bauer <mail@david-bauer.net> | ||
|
|
||
| --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts | ||
| @@ -137,6 +137,11 @@ | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| +&sdmmc { | ||
| + /delete-property/ sd-uhs-sdr104; | ||
| + cap-sd-highspeed; | ||
| +}; | ||
| + | ||
| &u2phy0_host { | ||
| phy-supply = <&vdd_5v>; | ||
| }; |