sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "rockchip: rk3399: enable sdhci clk for emmc"

Browse Source 
This reverts commit 462e1413 ("rockchip: rk3399: enable sdhci clk
for emmc")

Enabling this clock in coreboot is no longer needed as it's handled
in the kernel driver now.

BUG=chrome-os-partner:52873
TEST=boot from usb/sdcard and check there is /dev/mmcblk0
BRANCH=none

Change-Id: I92cf51f175fe56a09ab9329b29a27c77ef4328e1
Signed-off-by: Martin Roth <martinroth@chromium.org>
Original-Commit-Id: 5707d1269a253dabf825be120d1f9348ffaab6d0
Original-Change-Id: I8bca870c663d8ce8fac5daaaaf8225489f22ed13
Original-Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/367421
Original-Commit-Ready: Brian Norris <briannorris@chromium.org>
Original-Reviewed-by: Douglas Anderson <dianders@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/16152
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Shunqian Zheng
2016-08-10 04:45:50 +08:00
committed by Martin Roth
parent e4cc4733eb
commit 5fa08f3c0f
4 changed files with 0 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainboard/google/gru/mainboard.c
View File

@@ -22,7 +22,6 @@
#include <soc/bl31_plat_params.h> #include <soc/bl31_plat_params.h>
#include <soc/clock.h> #include <soc/clock.h>
#include <soc/display.h> #include <soc/display.h>
#include <soc/emmc.h>
#include <soc/grf.h> #include <soc/grf.h>
#include <soc/i2c.h> #include <soc/i2c.h>
#include <soc/usb.h> #include <soc/usb.h>
@@ -42,8 +41,6 @@ static void configure_emmc(void)
write32(&rk3399_grf->emmccore_con[11], RK_CLRSETBITS(0xff, 0)); write32(&rk3399_grf->emmccore_con[11], RK_CLRSETBITS(0xff, 0));
rkclk_configure_emmc(); rkclk_configure_emmc();
enable_emmc_clk();
} }
static void register_reset_to_bl31(void) static void register_reset_to_bl31(void)

1
src/soc/rockchip/rk3399/Makefile.inc
View File

@@ -65,7 +65,6 @@ ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c
ramstage-y += clock.c ramstage-y += clock.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c
ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/edp.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/edp.c
ramstage-y += emmc.c
ramstage-y += ../common/gpio.c ramstage-y += ../common/gpio.c
ramstage-y += gpio.c ramstage-y += gpio.c
ramstage-y += ../common/i2c.c ramstage-y += ../common/i2c.c

50
src/soc/rockchip/rk3399/emmc.c
View File

@@ -1,50 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2016 Rockchip Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#include <arch/io.h>
#include <console/console.h>
#include <delay.h>
#include <soc/addressmap.h>
#include <soc/emmc.h>
#define SDHCI_CLOCK_CONTROL 0x2c
#define SDHCI_CLOCK_CARD_EN 0x0004
#define SDHCI_CLOCK_INT_STABLE 0x0002
#define SDHCI_CLOCK_INT_EN 0x0001
/* TODO(crosbug.com/p/52873): We actually don't need to set clk for
* emmc once kernel fix it's bug.
*/
void enable_emmc_clk(void)
{
int timeout, clk;
write32((void *)(EMMC_BASE + SDHCI_CLOCK_CONTROL), SDHCI_CLOCK_INT_EN);
/* Wait max 20 ms */
timeout = 20;
while (!((clk = read32((void *)(EMMC_BASE + SDHCI_CLOCK_CONTROL)))
& SDHCI_CLOCK_INT_STABLE)) {
if (timeout == 0) {
printk(BIOS_ERR, "Internal clock never stabilised.\n");
return;
}
timeout--;
udelay(1000);
}
clk |= SDHCI_CLOCK_CARD_EN;
write32((void *)(EMMC_BASE + SDHCI_CLOCK_CONTROL), clk);
}

16
src/soc/rockchip/rk3399/include/soc/emmc.h
View File

@@ -1,16 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright 2016 Rockchip Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
void enable_emmc_clk(void);