armbian-build/patch/kernel/rockchip-default/130_workaround_tinker_board_reboot.patch
Tony fafd26db7e
Rockchip default merge (#1026)
* Initial commit, cleanup of Rockchip default

* clean up patches:
- 100_DTS_Tinker_opp_LED was splitted into 3 patches
	- 100_DTS_opp for opp (adjusted to RKs 3 point description of opp Voltage)
	- 110_DTS_8723bs for the wifi driver
		-rename of 270-dts-tinker-bluetooth.patch -> 111_DTS_disable_AP6212_bluetooth.patch to keep wifi-chip stuff together
	- 120_DTS_led1_heartbeat
- 190_dts_tinker_s_emmc was reworked and splitted
	- gpiomem node was removed and has its own patch (260_DTS_gpiomem_node)
	- i2c1 node was removed and has its own patch 270_DTS_activate_i2c1
	- spi2 part was removed (defined in rk3288.dtsi), default CS will now be CS0 not 1 (no reason to change this)
	- vdd_log regulator is removed (the counterpart is missing anyway, and actually disabled in ASUS and Rockchips branch) --> own patch in case it gets activated
- 120_workaround_tinker_board_reboot -> 130_workaround_tinker_board_reboot to get some free numbers... ;)

* Renamed 190_DTS_tinker_s_emmc and splitted into DTS-Part and driver part (191_driver_mmc_adjustment)

* Boots, Still no hdmi console

* Rockchip Kernel config updates

Thanks to @Ntemis for the config options, they fixed the framebuffer

Still have runtime GPU errors related to power model
2018-06-28 22:11:59 -04:00

45 lines
1.4 KiB
Diff

diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c
index 29e3ae9..7f35aa4 100644
--- a/drivers/mmc/host/dw_mmc-rockchip.c
+++ b/drivers/mmc/host/dw_mmc-rockchip.c
@@ -13,7 +13,9 @@
#include <linux/mmc/host.h>
#include <linux/mmc/dw_mmc.h>
#include <linux/of_address.h>
+#include <linux/regulator/consumer.h>
#include <linux/slab.h>
+#include <linux/delay.h>
#include "dw_mmc.h"
#include "dw_mmc-pltfm.h"
@@ -285,6 +287,21 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev)
return dw_mci_pltfm_register(pdev, drv_data);
}
+static void dw_mci_rockchip_platfm_shutdown(struct platform_device *pdev)
+{
+ struct dw_mci *host = platform_get_drvdata(pdev);
+ struct mmc_host *mmc = host->cur_slot->mmc;
+ int ret;
+
+ mdelay(20);
+
+ if (!IS_ERR(mmc->supply.vmmc))
+ ret = regulator_enable(mmc->supply.vmmc);
+
+ if (!IS_ERR(mmc->supply.vqmmc))
+ regulator_set_voltage(mmc->supply.vqmmc, 3000000, 3300000);
+}
+
#ifdef CONFIG_PM_SLEEP
static int dw_mci_rockchip_suspend(struct device *dev)
{
@@ -308,6 +325,7 @@ static SIMPLE_DEV_PM_OPS(dw_mci_rockchip_pmops,
static struct platform_driver dw_mci_rockchip_pltfm_driver = {
.probe = dw_mci_rockchip_probe,
.remove = dw_mci_pltfm_remove,
+ .shutdown = dw_mci_rockchip_platfm_shutdown,
.driver = {
.name = "dwmmc_rockchip",
.of_match_table = dw_mci_rockchip_match,