On Thu, Jan 17, 2019 at 12:09:52PM +0800, Shawn Guo wrote:
We have converted mmc to driver model on Poplar. So let's clean up board level mmc initialization code.
Signed-off-by: Shawn Guo shawn.guo@linaro.org
Acked-by: Manivannan Sadhasivam manivannan.sadhasivam@linaro.org
Thanks, Mani
arch/arm/include/asm/arch-hi3798cv200/dwmmc.h | 12 ------------ arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h | 1 - board/hisilicon/poplar/poplar.c | 12 ------------ 3 files changed, 25 deletions(-) delete mode 100644 arch/arm/include/asm/arch-hi3798cv200/dwmmc.h
diff --git a/arch/arm/include/asm/arch-hi3798cv200/dwmmc.h b/arch/arm/include/asm/arch-hi3798cv200/dwmmc.h deleted file mode 100644 index d08c20b36d31..000000000000 --- a/arch/arm/include/asm/arch-hi3798cv200/dwmmc.h +++ /dev/null @@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/*
- (C) Copyright 2017 Linaro
- Jorge Ramirez-Ortiz jorge.ramirez-ortiz@linaro.org
- */
-#ifndef _HI3798cv200_DWMMC_H_ -#define _HI3798cv200_DWMMC_H_
-int hi6220_dwmci_add_port(int index, u32 regbase, int bus_width);
-#endif /* _HI3798cv200_DWMMC_H_ */ diff --git a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h index bb221e17e0ed..b98b45cc817b 100644 --- a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h +++ b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h @@ -11,7 +11,6 @@ #define REG_BASE_CRG 0xF8A22000
/* DEVICES */ -#define REG_BASE_MCI 0xF9830000 #define REG_BASE_UART0 0xF8B00000 #define HIOTG_BASE_ADDR 0xF98C0000
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c index 155dfbb401f1..77948445e261 100644 --- a/board/hisilicon/poplar/poplar.c +++ b/board/hisilicon/poplar/poplar.c @@ -9,7 +9,6 @@ #include <asm/io.h> #include <dm/platform_data/serial_pl01x.h> #include <asm/arch/hi3798cv200.h> -#include <asm/arch/dwmmc.h> #include <asm/armv8/mmu.h>
DECLARE_GLOBAL_DATA_PTR; @@ -155,17 +154,6 @@ static void usb2_phy_init(void) udelay(200); }
-int board_mmc_init(bd_t *bis) -{
- int ret;
- ret = hi6220_dwmci_add_port(0, REG_BASE_MCI, 8);
- if (ret)
printf("mmc init error (%d)\n", ret);- return ret;
-}
#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) #include <usb.h>
#include <usb/dwc2_udc.h>
2.18.0