* [PATCH v6 0/7] Add Mediatek MMC driver
@ 2015-06-15 11:20 Chaotian Jing
2015-06-15 11:20 ` [PATCH v6 1/7] mmc: dt-bindings: add Mediatek MMC bindings Chaotian Jing
` (7 more replies)
0 siblings, 8 replies; 17+ messages in thread
From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw)
To: linux-arm-kernel
This series enables MMC support on the MT8135/MT8173 platform.
MT8135 has 5 MMC controllers and MT8173 has 4 MMC controllers.
Changes base on Ulf's comments
Make hclk mandatory in the driver code
Change host->hclk to host->src_clk_freq
Add linux/pm.h
Chaotian Jing (3):
mmc: dt-bindings: add Mediatek MMC bindings
mmc: mediatek: Add Mediatek MMC driver
mmc: mediatek: Add PM support for MMC driver
Eddie Huang (2):
arm64: dts: mediatek: Add MT8173 MMC dts
arm64: mediatek: Add Mediatek MMC support in defconfig
Yingjoe Chen (2):
ARM: mediatek: dts: Add emmc support to mt8135
ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7
Documentation/devicetree/bindings/mmc/mtk-sd.txt | 32 +
arch/arm/boot/dts/mt8135-evbp1.dts | 158 +++
arch/arm/boot/dts/mt8135.dtsi | 55 +
arch/arm/configs/multi_v7_defconfig | 1 +
arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +-
arch/arm64/configs/defconfig | 1 +
drivers/mmc/host/Kconfig | 8 +
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/mtk-sd.c | 1461 ++++++++++++++++++++++
include/linux/mmc/core.h | 1 +
11 files changed, 1888 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt
create mode 100644 drivers/mmc/host/mtk-sd.c
--
1.8.1.1.dirty
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH v6 1/7] mmc: dt-bindings: add Mediatek MMC bindings 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 2/7] mmc: mediatek: Add Mediatek MMC driver Chaotian Jing ` (6 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel Document the device-tree binding of Mediatek MMC host Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> --- Documentation/devicetree/bindings/mmc/mtk-sd.txt | 32 ++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt diff --git a/Documentation/devicetree/bindings/mmc/mtk-sd.txt b/Documentation/devicetree/bindings/mmc/mtk-sd.txt new file mode 100644 index 0000000..a1adfa4 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/mtk-sd.txt @@ -0,0 +1,32 @@ +* MTK MMC controller + +The MTK MSDC can act as a MMC controller +to support MMC, SD, and SDIO types of memory cards. + +This file documents differences between the core properties in mmc.txt +and the properties used by the msdc driver. + +Required properties: +- compatible: Should be "mediatek,mt8173-mmc","mediatek,mt8135-mmc" +- interrupts: Should contain MSDC interrupt number +- clocks: MSDC source clock, HCLK +- clock-names: "source", "hclk" +- pinctrl-names: should be "default", "state_uhs" +- pinctrl-0: should contain default/high speed pin ctrl +- pinctrl-1: should contain uhs mode pin ctrl +- vmmc-supply: power to the Core +- vqmmc-supply: power to the IO + +Examples: +mmc0: mmc at 11230000 { + compatible = "mediatek,mt8173-mmc", "mediatek,mt8135-mmc"; + reg = <0 0x11230000 0 0x108>; + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_LOW>; + vmmc-supply = <&mt6397_vemc_3v3_reg>; + vqmmc-supply = <&mt6397_vio18_reg>; + clocks = <&pericfg CLK_PERI_MSDC30_0>, <&topckgen CLK_TOP_MSDC50_0_H_SEL>; + clock-names = "source", "hclk"; + pinctrl-names = "default", "state_uhs"; + pinctrl-0 = <&mmc0_pins_default>; + pinctrl-1 = <&mmc0_pins_uhs>; +}; -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 2/7] mmc: mediatek: Add Mediatek MMC driver 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 1/7] mmc: dt-bindings: add Mediatek MMC bindings Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 3/7] mmc: mediatek: Add PM support for " Chaotian Jing ` (5 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel Add Mediatek MMC driver code Support eMMC/SD/SDIO Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> --- drivers/mmc/host/Kconfig | 8 + drivers/mmc/host/Makefile | 1 + drivers/mmc/host/mtk-sd.c | 1378 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/mmc/core.h | 1 + 4 files changed, 1388 insertions(+) create mode 100644 drivers/mmc/host/mtk-sd.c diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index b1f837e..6c3dbb9 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -775,3 +775,11 @@ config MMC_TOSHIBA_PCI tristate "Toshiba Type A SD/MMC Card Interface Driver" depends on PCI help + +config MMC_MTK + tristate "MediaTek SD/MMC Card Interface support" + help + This selects the MediaTek(R) Secure digital and Multimedia card Interface. + If you have a machine with a integrated SD/MMC card reader, say Y or M here. + This is needed if support for any SD/SDIO/MMC devices is required. + If unsure, say N. diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index e3ab5b9..7473b79 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o obj-$(CONFIG_MMC_SDHCI_SPEAR) += sdhci-spear.o obj-$(CONFIG_MMC_WBSD) += wbsd.o obj-$(CONFIG_MMC_AU1X) += au1xmmc.o +obj-$(CONFIG_MMC_MTK) += mtk-sd.o obj-$(CONFIG_MMC_OMAP) += omap.o obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c new file mode 100644 index 0000000..952be2e --- /dev/null +++ b/drivers/mmc/host/mtk-sd.c @@ -0,0 +1,1378 @@ +/* + * Copyright (c) 2014-2015 MediaTek Inc. + * Author: Chaotian.Jing <chaotian.jing@mediatek.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * 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 <linux/clk.h> +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/ioport.h> +#include <linux/irq.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/of_gpio.h> +#include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/spinlock.h> + +#include <linux/mmc/card.h> +#include <linux/mmc/core.h> +#include <linux/mmc/host.h> +#include <linux/mmc/mmc.h> +#include <linux/mmc/sd.h> +#include <linux/mmc/sdio.h> + +#define MAX_BD_NUM 1024 + +/*--------------------------------------------------------------------------*/ +/* Common Definition */ +/*--------------------------------------------------------------------------*/ +#define MSDC_BUS_1BITS 0x0 +#define MSDC_BUS_4BITS 0x1 +#define MSDC_BUS_8BITS 0x2 + +#define MSDC_BURST_64B 0x6 + +/*--------------------------------------------------------------------------*/ +/* Register Offset */ +/*--------------------------------------------------------------------------*/ +#define MSDC_CFG 0x0 +#define MSDC_IOCON 0x04 +#define MSDC_PS 0x08 +#define MSDC_INT 0x0c +#define MSDC_INTEN 0x10 +#define MSDC_FIFOCS 0x14 +#define SDC_CFG 0x30 +#define SDC_CMD 0x34 +#define SDC_ARG 0x38 +#define SDC_STS 0x3c +#define SDC_RESP0 0x40 +#define SDC_RESP1 0x44 +#define SDC_RESP2 0x48 +#define SDC_RESP3 0x4c +#define SDC_BLK_NUM 0x50 +#define SDC_ACMD_RESP 0x80 +#define MSDC_DMA_SA 0x90 +#define MSDC_DMA_CTRL 0x98 +#define MSDC_DMA_CFG 0x9c +#define MSDC_PATCH_BIT 0xb0 +#define MSDC_PATCH_BIT1 0xb4 +#define MSDC_PAD_TUNE 0xec + +/*--------------------------------------------------------------------------*/ +/* Register Mask */ +/*--------------------------------------------------------------------------*/ + +/* MSDC_CFG mask */ +#define MSDC_CFG_MODE (0x1 << 0) /* RW */ +#define MSDC_CFG_CKPDN (0x1 << 1) /* RW */ +#define MSDC_CFG_RST (0x1 << 2) /* RW */ +#define MSDC_CFG_PIO (0x1 << 3) /* RW */ +#define MSDC_CFG_CKDRVEN (0x1 << 4) /* RW */ +#define MSDC_CFG_BV18SDT (0x1 << 5) /* RW */ +#define MSDC_CFG_BV18PSS (0x1 << 6) /* R */ +#define MSDC_CFG_CKSTB (0x1 << 7) /* R */ +#define MSDC_CFG_CKDIV (0xff << 8) /* RW */ +#define MSDC_CFG_CKMOD (0x3 << 16) /* RW */ + +/* MSDC_IOCON mask */ +#define MSDC_IOCON_SDR104CKS (0x1 << 0) /* RW */ +#define MSDC_IOCON_RSPL (0x1 << 1) /* RW */ +#define MSDC_IOCON_DSPL (0x1 << 2) /* RW */ +#define MSDC_IOCON_DDLSEL (0x1 << 3) /* RW */ +#define MSDC_IOCON_DDR50CKD (0x1 << 4) /* RW */ +#define MSDC_IOCON_DSPLSEL (0x1 << 5) /* RW */ +#define MSDC_IOCON_W_DSPL (0x1 << 8) /* RW */ +#define MSDC_IOCON_D0SPL (0x1 << 16) /* RW */ +#define MSDC_IOCON_D1SPL (0x1 << 17) /* RW */ +#define MSDC_IOCON_D2SPL (0x1 << 18) /* RW */ +#define MSDC_IOCON_D3SPL (0x1 << 19) /* RW */ +#define MSDC_IOCON_D4SPL (0x1 << 20) /* RW */ +#define MSDC_IOCON_D5SPL (0x1 << 21) /* RW */ +#define MSDC_IOCON_D6SPL (0x1 << 22) /* RW */ +#define MSDC_IOCON_D7SPL (0x1 << 23) /* RW */ +#define MSDC_IOCON_RISCSZ (0x3 << 24) /* RW */ + +/* MSDC_PS mask */ +#define MSDC_PS_CDEN (0x1 << 0) /* RW */ +#define MSDC_PS_CDSTS (0x1 << 1) /* R */ +#define MSDC_PS_CDDEBOUNCE (0xf << 12) /* RW */ +#define MSDC_PS_DAT (0xff << 16) /* R */ +#define MSDC_PS_CMD (0x1 << 24) /* R */ +#define MSDC_PS_WP (0x1 << 31) /* R */ + +/* MSDC_INT mask */ +#define MSDC_INT_MMCIRQ (0x1 << 0) /* W1C */ +#define MSDC_INT_CDSC (0x1 << 1) /* W1C */ +#define MSDC_INT_ACMDRDY (0x1 << 3) /* W1C */ +#define MSDC_INT_ACMDTMO (0x1 << 4) /* W1C */ +#define MSDC_INT_ACMDCRCERR (0x1 << 5) /* W1C */ +#define MSDC_INT_DMAQ_EMPTY (0x1 << 6) /* W1C */ +#define MSDC_INT_SDIOIRQ (0x1 << 7) /* W1C */ +#define MSDC_INT_CMDRDY (0x1 << 8) /* W1C */ +#define MSDC_INT_CMDTMO (0x1 << 9) /* W1C */ +#define MSDC_INT_RSPCRCERR (0x1 << 10) /* W1C */ +#define MSDC_INT_CSTA (0x1 << 11) /* R */ +#define MSDC_INT_XFER_COMPL (0x1 << 12) /* W1C */ +#define MSDC_INT_DXFER_DONE (0x1 << 13) /* W1C */ +#define MSDC_INT_DATTMO (0x1 << 14) /* W1C */ +#define MSDC_INT_DATCRCERR (0x1 << 15) /* W1C */ +#define MSDC_INT_ACMD19_DONE (0x1 << 16) /* W1C */ +#define MSDC_INT_DMA_BDCSERR (0x1 << 17) /* W1C */ +#define MSDC_INT_DMA_GPDCSERR (0x1 << 18) /* W1C */ +#define MSDC_INT_DMA_PROTECT (0x1 << 19) /* W1C */ + +/* MSDC_INTEN mask */ +#define MSDC_INTEN_MMCIRQ (0x1 << 0) /* RW */ +#define MSDC_INTEN_CDSC (0x1 << 1) /* RW */ +#define MSDC_INTEN_ACMDRDY (0x1 << 3) /* RW */ +#define MSDC_INTEN_ACMDTMO (0x1 << 4) /* RW */ +#define MSDC_INTEN_ACMDCRCERR (0x1 << 5) /* RW */ +#define MSDC_INTEN_DMAQ_EMPTY (0x1 << 6) /* RW */ +#define MSDC_INTEN_SDIOIRQ (0x1 << 7) /* RW */ +#define MSDC_INTEN_CMDRDY (0x1 << 8) /* RW */ +#define MSDC_INTEN_CMDTMO (0x1 << 9) /* RW */ +#define MSDC_INTEN_RSPCRCERR (0x1 << 10) /* RW */ +#define MSDC_INTEN_CSTA (0x1 << 11) /* RW */ +#define MSDC_INTEN_XFER_COMPL (0x1 << 12) /* RW */ +#define MSDC_INTEN_DXFER_DONE (0x1 << 13) /* RW */ +#define MSDC_INTEN_DATTMO (0x1 << 14) /* RW */ +#define MSDC_INTEN_DATCRCERR (0x1 << 15) /* RW */ +#define MSDC_INTEN_ACMD19_DONE (0x1 << 16) /* RW */ +#define MSDC_INTEN_DMA_BDCSERR (0x1 << 17) /* RW */ +#define MSDC_INTEN_DMA_GPDCSERR (0x1 << 18) /* RW */ +#define MSDC_INTEN_DMA_PROTECT (0x1 << 19) /* RW */ + +/* MSDC_FIFOCS mask */ +#define MSDC_FIFOCS_RXCNT (0xff << 0) /* R */ +#define MSDC_FIFOCS_TXCNT (0xff << 16) /* R */ +#define MSDC_FIFOCS_CLR (0x1 << 31) /* RW */ + +/* SDC_CFG mask */ +#define SDC_CFG_SDIOINTWKUP (0x1 << 0) /* RW */ +#define SDC_CFG_INSWKUP (0x1 << 1) /* RW */ +#define SDC_CFG_BUSWIDTH (0x3 << 16) /* RW */ +#define SDC_CFG_SDIO (0x1 << 19) /* RW */ +#define SDC_CFG_SDIOIDE (0x1 << 20) /* RW */ +#define SDC_CFG_INTATGAP (0x1 << 21) /* RW */ +#define SDC_CFG_DTOC (0xff << 24) /* RW */ + +/* SDC_STS mask */ +#define SDC_STS_SDCBUSY (0x1 << 0) /* RW */ +#define SDC_STS_CMDBUSY (0x1 << 1) /* RW */ +#define SDC_STS_SWR_COMPL (0x1 << 31) /* RW */ + +/* MSDC_DMA_CTRL mask */ +#define MSDC_DMA_CTRL_START (0x1 << 0) /* W */ +#define MSDC_DMA_CTRL_STOP (0x1 << 1) /* W */ +#define MSDC_DMA_CTRL_RESUME (0x1 << 2) /* W */ +#define MSDC_DMA_CTRL_MODE (0x1 << 8) /* RW */ +#define MSDC_DMA_CTRL_LASTBUF (0x1 << 10) /* RW */ +#define MSDC_DMA_CTRL_BRUSTSZ (0x7 << 12) /* RW */ + +/* MSDC_DMA_CFG mask */ +#define MSDC_DMA_CFG_STS (0x1 << 0) /* R */ +#define MSDC_DMA_CFG_DECSEN (0x1 << 1) /* RW */ +#define MSDC_DMA_CFG_AHBHPROT2 (0x2 << 8) /* RW */ +#define MSDC_DMA_CFG_ACTIVEEN (0x2 << 12) /* RW */ +#define MSDC_DMA_CFG_CS12B16B (0x1 << 16) /* RW */ + +/* MSDC_PATCH_BIT mask */ +#define MSDC_PATCH_BIT_ODDSUPP (0x1 << 1) /* RW */ +#define MSDC_INT_DAT_LATCH_CK_SEL (0x7 << 7) +#define MSDC_CKGEN_MSDC_DLY_SEL (0x1f << 10) +#define MSDC_PATCH_BIT_IODSSEL (0x1 << 16) /* RW */ +#define MSDC_PATCH_BIT_IOINTSEL (0x1 << 17) /* RW */ +#define MSDC_PATCH_BIT_BUSYDLY (0xf << 18) /* RW */ +#define MSDC_PATCH_BIT_WDOD (0xf << 22) /* RW */ +#define MSDC_PATCH_BIT_IDRTSEL (0x1 << 26) /* RW */ +#define MSDC_PATCH_BIT_CMDFSEL (0x1 << 27) /* RW */ +#define MSDC_PATCH_BIT_INTDLSEL (0x1 << 28) /* RW */ +#define MSDC_PATCH_BIT_SPCPUSH (0x1 << 29) /* RW */ +#define MSDC_PATCH_BIT_DECRCTMO (0x1 << 30) /* RW */ + +#define REQ_CMD_EIO (0x1 << 0) +#define REQ_CMD_TMO (0x1 << 1) +#define REQ_DAT_ERR (0x1 << 2) +#define REQ_STOP_EIO (0x1 << 3) +#define REQ_STOP_TMO (0x1 << 4) +#define REQ_CMD_BUSY (0x1 << 5) + +#define MSDC_PREPARE_FLAG (0x1 << 0) +#define MSDC_ASYNC_FLAG (0x1 << 1) +#define MSDC_MMAP_FLAG (0x1 << 2) + +#define CMD_TIMEOUT (HZ/10 * 5) /* 100ms x5 */ +#define DAT_TIMEOUT (HZ * 5) /* 1000ms x5 */ + +/*--------------------------------------------------------------------------*/ +/* Descriptor Structure */ +/*--------------------------------------------------------------------------*/ +struct mt_gpdma_desc { + u32 gpd_info; +#define GPDMA_DESC_HWO (0x1 << 0) +#define GPDMA_DESC_BDP (0x1 << 1) +#define GPDMA_DESC_CHECKSUM (0xff << 8) /* bit8 ~ bit15 */ +#define GPDMA_DESC_INT (0x1 << 16) + u32 next; + u32 ptr; + u32 gpd_data_len; +#define GPDMA_DESC_BUFLEN (0xffff) /* bit0 ~ bit15 */ +#define GPDMA_DESC_EXTLEN (0xff << 16) /* bit16 ~ bit23 */ + u32 arg; + u32 blknum; + u32 cmd; +}; + +struct mt_bdma_desc { + u32 bd_info; +#define BDMA_DESC_EOL (0x1 << 0) +#define BDMA_DESC_CHECKSUM (0xff << 8) /* bit8 ~ bit15 */ +#define BDMA_DESC_BLKPAD (0x1 << 17) +#define BDMA_DESC_DWPAD (0x1 << 18) + u32 next; + u32 ptr; + u32 bd_data_len; +#define BDMA_DESC_BUFLEN (0xffff) /* bit0 ~ bit15 */ +}; + +struct msdc_dma { + struct scatterlist *sg; /* I/O scatter list */ + struct mt_gpdma_desc *gpd; /* pointer to gpd array */ + struct mt_bdma_desc *bd; /* pointer to bd array */ + dma_addr_t gpd_addr; /* the physical address of gpd array */ + dma_addr_t bd_addr; /* the physical address of bd array */ +}; + +struct msdc_host { + struct device *dev; + struct mmc_host *mmc; /* mmc structure */ + int cmd_rsp; + + spinlock_t lock; + struct mmc_request *mrq; + struct mmc_command *cmd; + struct mmc_data *data; + int error; + + void __iomem *base; /* host base address */ + + struct msdc_dma dma; /* dma channel */ + u64 dma_mask; + + u32 timeout_ns; /* data timeout ns */ + u32 timeout_clks; /* data timeout clks */ + + struct pinctrl *pinctrl; + struct pinctrl_state *pins_default; + struct pinctrl_state *pins_uhs; + struct delayed_work req_timeout; + int irq; /* host interrupt */ + + struct clk *src_clk; /* msdc source clock */ + struct clk *h_clk; /* msdc h_clk */ + u32 mclk; /* mmc subsystem clock frequency */ + u32 src_clk_freq; /* source clock frequency */ + u32 sclk; /* SD/MS bus clock frequency */ + bool ddr; + bool vqmmc_enabled; +}; + +static void sdr_set_bits(void __iomem *reg, u32 bs) +{ + u32 val = readl(reg); + + val |= bs; + writel(val, reg); +} + +static void sdr_clr_bits(void __iomem *reg, u32 bs) +{ + u32 val = readl(reg); + + val &= ~bs; + writel(val, reg); +} + +static void sdr_set_field(void __iomem *reg, u32 field, u32 val) +{ + unsigned int tv = readl(reg); + + tv &= ~field; + tv |= ((val) << (ffs((unsigned int)field) - 1)); + writel(tv, reg); +} + +static void sdr_get_field(void __iomem *reg, u32 field, u32 *val) +{ + unsigned int tv = readl(reg); + + *val = ((tv & field) >> (ffs((unsigned int)field) - 1)); +} + +static void msdc_reset_hw(struct msdc_host *host) +{ + u32 val; + + sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_RST); + while (readl(host->base + MSDC_CFG) & MSDC_CFG_RST) + cpu_relax(); + + sdr_set_bits(host->base + MSDC_FIFOCS, MSDC_FIFOCS_CLR); + while (readl(host->base + MSDC_FIFOCS) & MSDC_FIFOCS_CLR) + cpu_relax(); + + val = readl(host->base + MSDC_INT); + writel(val, host->base + MSDC_INT); +} + +static void msdc_cmd_next(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_command *cmd); + +static u32 data_ints_mask = MSDC_INTEN_XFER_COMPL | MSDC_INTEN_DATTMO | + MSDC_INTEN_DATCRCERR | MSDC_INTEN_DMA_BDCSERR | + MSDC_INTEN_DMA_GPDCSERR | MSDC_INTEN_DMA_PROTECT; + +static u8 msdc_dma_calcs(u8 *buf, u32 len) +{ + u32 i, sum = 0; + + for (i = 0; i < len; i++) + sum += buf[i]; + return 0xff - (u8) sum; +} + +static inline void msdc_dma_setup(struct msdc_host *host, struct msdc_dma *dma, + struct mmc_data *data) +{ + unsigned int j, dma_len; + dma_addr_t dma_address; + u32 dma_ctrl; + struct scatterlist *sg; + struct mt_gpdma_desc *gpd; + struct mt_bdma_desc *bd; + + sg = data->sg; + + gpd = dma->gpd; + bd = dma->bd; + + /* modify gpd */ + gpd->gpd_info |= GPDMA_DESC_HWO; + gpd->gpd_info |= GPDMA_DESC_BDP; + /* need to clear first. use these bits to calc checksum */ + gpd->gpd_info &= ~GPDMA_DESC_CHECKSUM; + gpd->gpd_info |= msdc_dma_calcs((u8 *) gpd, 16) << 8; + + /* modify bd */ + for_each_sg(data->sg, sg, data->sg_count, j) { + dma_address = sg_dma_address(sg); + dma_len = sg_dma_len(sg); + + /* init bd */ + bd[j].bd_info &= ~BDMA_DESC_BLKPAD; + bd[j].bd_info &= ~BDMA_DESC_DWPAD; + bd[j].ptr = (u32)dma_address; + bd[j].bd_data_len &= ~BDMA_DESC_BUFLEN; + bd[j].bd_data_len |= (dma_len & BDMA_DESC_BUFLEN); + + if (j == data->sg_count - 1) /* the last bd */ + bd[j].bd_info |= BDMA_DESC_EOL; + else + bd[j].bd_info &= ~BDMA_DESC_EOL; + + /* checksume need to clear first */ + bd[j].bd_info &= ~BDMA_DESC_CHECKSUM; + bd[j].bd_info |= msdc_dma_calcs((u8 *)(&bd[j]), 16) << 8; + } + + sdr_set_field(host->base + MSDC_DMA_CFG, MSDC_DMA_CFG_DECSEN, 1); + dma_ctrl = readl_relaxed(host->base + MSDC_DMA_CTRL); + dma_ctrl &= ~(MSDC_DMA_CTRL_BRUSTSZ | MSDC_DMA_CTRL_MODE); + dma_ctrl |= (MSDC_BURST_64B << 12 | 1 << 8); + writel_relaxed(dma_ctrl, host->base + MSDC_DMA_CTRL); + writel((u32)dma->gpd_addr, host->base + MSDC_DMA_SA); +} + +static void msdc_prepare_data(struct msdc_host *host, struct mmc_request *mrq) +{ + struct mmc_data *data = mrq->data; + + if (!(data->host_cookie & MSDC_PREPARE_FLAG)) { + bool read = (data->flags & MMC_DATA_READ) != 0; + + data->host_cookie |= MSDC_PREPARE_FLAG; + data->sg_count = dma_map_sg(host->dev, data->sg, data->sg_len, + read ? DMA_FROM_DEVICE : DMA_TO_DEVICE); + } +} + +static void msdc_unprepare_data(struct msdc_host *host, struct mmc_request *mrq) +{ + struct mmc_data *data = mrq->data; + + if (data->host_cookie & MSDC_ASYNC_FLAG) + return; + + if (data->host_cookie & MSDC_PREPARE_FLAG) { + bool read = (data->flags & MMC_DATA_READ) != 0; + + dma_unmap_sg(host->dev, data->sg, data->sg_len, + read ? DMA_FROM_DEVICE : DMA_TO_DEVICE); + data->host_cookie &= ~MSDC_PREPARE_FLAG; + } +} + +/* clock control primitives */ +static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks) +{ + u32 timeout, clk_ns; + u32 mode = 0; + + host->timeout_ns = ns; + host->timeout_clks = clks; + if (host->sclk == 0) { + timeout = 0; + } else { + clk_ns = 1000000000UL / host->sclk; + timeout = (ns + clk_ns - 1) / clk_ns + clks; + /* in 1048576 sclk cycle unit */ + timeout = (timeout + (0x1 << 20) - 1) >> 20; + sdr_get_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD, &mode); + /*DDR mode will double the clk cycles for data timeout */ + timeout = mode >= 2 ? timeout * 2 : timeout; + timeout = timeout > 1 ? timeout - 1 : 0; + timeout = timeout > 255 ? 255 : timeout; + } + sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, timeout); +} + +static void msdc_gate_clock(struct msdc_host *host) +{ + clk_disable_unprepare(host->src_clk); + clk_disable_unprepare(host->h_clk); +} + +static void msdc_ungate_clock(struct msdc_host *host) +{ + clk_prepare_enable(host->h_clk); + clk_prepare_enable(host->src_clk); + while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB)) + cpu_relax(); +} + +static void msdc_set_mclk(struct msdc_host *host, int ddr, u32 hz) +{ + u32 mode; + u32 flags; + u32 div; + u32 sclk; + + if (!hz) { + dev_dbg(host->dev, "set mclk to 0\n"); + host->mclk = 0; + sdr_clr_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN); + return; + } + + flags = readl(host->base + MSDC_INTEN); + sdr_clr_bits(host->base + MSDC_INTEN, flags); + if (ddr) { /* may need to modify later */ + mode = 0x2; /* ddr mode and use divisor */ + if (hz >= (host->src_clk_freq >> 2)) { + div = 0; /* mean div = 1/4 */ + sclk = host->src_clk_freq >> 2; /* sclk = clk / 4 */ + } else { + div = (host->src_clk_freq + ((hz << 2) - 1)) / (hz << 2); + sclk = (host->src_clk_freq >> 2) / div; + div = (div >> 1); + } + } else if (hz >= host->src_clk_freq) { + mode = 0x1; /* no divisor */ + div = 0; + sclk = host->src_clk_freq; + } else { + mode = 0x0; /* use divisor */ + if (hz >= (host->src_clk_freq >> 1)) { + div = 0; /* mean div = 1/2 */ + sclk = host->src_clk_freq >> 1; /* sclk = clk / 2 */ + } else { + div = (host->src_clk_freq + ((hz << 2) - 1)) / (hz << 2); + sclk = (host->src_clk_freq >> 2) / div; + } + } + sdr_set_field(host->base + MSDC_CFG, MSDC_CFG_CKMOD | MSDC_CFG_CKDIV, + (mode << 8) | (div % 0xff)); + sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN); + while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB)) + cpu_relax(); + host->sclk = sclk; + host->mclk = hz; + host->ddr = ddr; + /* need because clk changed. */ + msdc_set_timeout(host, host->timeout_ns, host->timeout_clks); + sdr_set_bits(host->base + MSDC_INTEN, flags); + + dev_dbg(host->dev, "sclk: %d, ddr: %d\n", host->sclk, ddr); +} + +static inline u32 msdc_cmd_find_resp(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_command *cmd) +{ + u32 resp; + + switch (mmc_resp_type(cmd)) { + /* Actually, R1, R5, R6, R7 are the same */ + case MMC_RSP_R1: + resp = 0x1; + break; + case MMC_RSP_R1B: + resp = 0x7; + break; + case MMC_RSP_R2: + resp = 0x2; + break; + case MMC_RSP_R3: + resp = 0x3; + break; + case MMC_RSP_NONE: + default: + resp = 0x0; + break; + } + + return resp; +} + +static inline u32 msdc_cmd_prepare_raw_cmd(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_command *cmd) +{ + /* rawcmd : + * vol_swt << 30 | auto_cmd << 28 | blklen << 16 | go_irq << 15 | + * stop << 14 | rw << 13 | dtype << 11 | rsptyp << 7 | brk << 6 | opcode + */ + u32 opcode = cmd->opcode; + u32 resp = msdc_cmd_find_resp(host, mrq, cmd); + u32 rawcmd = (opcode & 0x3f) | ((resp & 0x7) << 7); + + host->cmd_rsp = resp; + + if ((opcode == SD_IO_RW_DIRECT && cmd->flags == (unsigned int) -1) || + opcode == MMC_STOP_TRANSMISSION) + rawcmd |= (0x1 << 14); + else if (opcode == SD_SWITCH_VOLTAGE) + rawcmd |= (0x1 << 30); + else if (opcode == SD_APP_SEND_SCR || + opcode == SD_APP_SEND_NUM_WR_BLKS || + (opcode == SD_SWITCH && mmc_cmd_type(cmd) == MMC_CMD_ADTC) || + (opcode == SD_APP_SD_STATUS && mmc_cmd_type(cmd) == MMC_CMD_ADTC) || + (opcode == MMC_SEND_EXT_CSD && mmc_cmd_type(cmd) == MMC_CMD_ADTC)) + rawcmd |= (0x1 << 11); + + if (cmd->data) { + struct mmc_data *data = cmd->data; + + if (mmc_op_multi(opcode)) { + if (mmc_card_mmc(host->mmc->card) && mrq->sbc && + !(mrq->sbc->arg & 0xFFFF0000)) + rawcmd |= 0x2 << 28; /* AutoCMD23 */ + } + + rawcmd |= ((data->blksz & 0xFFF) << 16); + if (data->flags & MMC_DATA_WRITE) + rawcmd |= (0x1 << 13); + if (data->blocks > 1) + rawcmd |= (0x2 << 11); + else + rawcmd |= (0x1 << 11); + /* Always use dma mode */ + sdr_clr_bits(host->base + MSDC_CFG, MSDC_CFG_PIO); + + if (host->timeout_ns != data->timeout_ns || + host->timeout_clks != data->timeout_clks) + msdc_set_timeout(host, data->timeout_ns, + data->timeout_clks); + + writel(data->blocks, host->base + SDC_BLK_NUM); + } + return rawcmd; +} + +static void msdc_start_data(struct msdc_host *host, struct mmc_request *mrq, + struct mmc_command *cmd, struct mmc_data *data) +{ + bool read; + + WARN_ON(host->data); + host->data = data; + read = data->flags & MMC_DATA_READ; + + mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT); + msdc_dma_setup(host, &host->dma, data); + sdr_set_bits(host->base + MSDC_INTEN, data_ints_mask); + sdr_set_field(host->base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_START, 1); + dev_dbg(host->dev, "DMA start\n"); + dev_dbg(host->dev, "%s: cmd=%d DMA data: %d blocks; read=%d\n", + __func__, cmd->opcode, data->blocks, read); +} + +static int msdc_auto_cmd_done(struct msdc_host *host, int events, + struct mmc_command *cmd) +{ + u32 *rsp = cmd->resp; + + rsp[0] = readl(host->base + SDC_ACMD_RESP); + + if (events & MSDC_INT_ACMDRDY) { + cmd->error = 0; + } else { + msdc_reset_hw(host); + if (events & MSDC_INT_ACMDCRCERR) { + cmd->error = -EILSEQ; + host->error |= REQ_STOP_EIO; + } else if (events & MSDC_INT_ACMDTMO) { + cmd->error = -ETIMEDOUT; + host->error |= REQ_STOP_TMO; + } + dev_err(host->dev, + "%s: AUTO_CMD%d arg=%08X; rsp %08X; cmd_error=%d\n", + __func__, cmd->opcode, cmd->arg, rsp[0], cmd->error); + } + return cmd->error; +} + +static void msdc_track_cmd_data(struct msdc_host *host, + struct mmc_command *cmd, struct mmc_data *data) +{ + if (host->error) + dev_dbg(host->dev, "%s: cmd=%d arg=%08X; host->error=0x%08X\n", + __func__, cmd->opcode, cmd->arg, host->error); +} + +static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq) +{ + unsigned long flags; + bool ret; + + ret = cancel_delayed_work(&host->req_timeout); + if (!ret) { + /* delay work already running */ + return; + } + spin_lock_irqsave(&host->lock, flags); + host->mrq = NULL; + spin_unlock_irqrestore(&host->lock, flags); + + msdc_track_cmd_data(host, mrq->cmd, mrq->data); + if (mrq->data) + msdc_unprepare_data(host, mrq); + mmc_request_done(host->mmc, mrq); +} + +/* returns true if command is fully handled; returns false otherwise */ +static bool msdc_cmd_done(struct msdc_host *host, int events, + struct mmc_request *mrq, struct mmc_command *cmd) +{ + bool done = false; + bool sbc_error; + unsigned long flags; + u32 *rsp = cmd->resp; + + if (mrq->sbc && cmd == mrq->cmd && + (events & (MSDC_INT_ACMDRDY | MSDC_INT_ACMDCRCERR + | MSDC_INT_ACMDTMO))) + msdc_auto_cmd_done(host, events, mrq->sbc); + + sbc_error = mrq->sbc && mrq->sbc->error; + + if (!sbc_error && !(events & (MSDC_INT_CMDRDY + | MSDC_INT_RSPCRCERR + | MSDC_INT_CMDTMO))) + return done; + + spin_lock_irqsave(&host->lock, flags); + done = !host->cmd; + host->cmd = NULL; + spin_unlock_irqrestore(&host->lock, flags); + + if (done) + return true; + + sdr_clr_bits(host->base + MSDC_INTEN, MSDC_INTEN_CMDRDY | + MSDC_INTEN_RSPCRCERR | MSDC_INTEN_CMDTMO | + MSDC_INTEN_ACMDRDY | MSDC_INTEN_ACMDCRCERR | + MSDC_INTEN_ACMDTMO); + writel(cmd->arg, host->base + SDC_ARG); + + if (cmd->flags & MMC_RSP_PRESENT) { + if (cmd->flags & MMC_RSP_136) { + rsp[0] = readl(host->base + SDC_RESP3); + rsp[1] = readl(host->base + SDC_RESP2); + rsp[2] = readl(host->base + SDC_RESP1); + rsp[3] = readl(host->base + SDC_RESP0); + } else { + rsp[0] = readl(host->base + SDC_RESP0); + } + } + + if (!sbc_error && !(events & MSDC_INT_CMDRDY)) { + msdc_reset_hw(host); + if (events & MSDC_INT_RSPCRCERR) { + cmd->error = -EILSEQ; + host->error |= REQ_CMD_EIO; + } else if (events & MSDC_INT_CMDTMO) { + cmd->error = -ETIMEDOUT; + host->error |= REQ_CMD_TMO; + } + } + if (cmd->error) + dev_dbg(host->dev, + "%s: cmd=%d arg=%08X; rsp %08X; cmd_error=%d\n", + __func__, cmd->opcode, cmd->arg, rsp[0], + cmd->error); + + msdc_cmd_next(host, mrq, cmd); + return true; +} + +/* It is the core layer's responsibility to ensure card status + * is correct before issue a request. but host design do below + * checks recommended. + */ +static inline bool msdc_cmd_is_ready(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_command *cmd) +{ + /* The max busy time we can endure is 20ms */ + unsigned long tmo = jiffies + msecs_to_jiffies(20); + + while ((readl(host->base + SDC_STS) & SDC_STS_CMDBUSY) && + time_before(jiffies, tmo)) + cpu_relax(); + if (readl(host->base + SDC_STS) & SDC_STS_CMDBUSY) { + dev_err(host->dev, "CMD bus busy detected\n"); + host->error |= REQ_CMD_BUSY; + msdc_cmd_done(host, MSDC_INT_CMDTMO, mrq, cmd); + return false; + } + + if (mmc_resp_type(cmd) == MMC_RSP_R1B || cmd->data) { + tmo = jiffies + msecs_to_jiffies(20); + /* R1B or with data, should check SDCBUSY */ + while ((readl(host->base + SDC_STS) & SDC_STS_SDCBUSY) && + time_before(jiffies, tmo)) + cpu_relax(); + if (readl(host->base + SDC_STS) & SDC_STS_SDCBUSY) { + dev_err(host->dev, "Controller busy detected\n"); + host->error |= REQ_CMD_BUSY; + msdc_cmd_done(host, MSDC_INT_CMDTMO, mrq, cmd); + return false; + } + } + return true; +} + +static void msdc_start_command(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_command *cmd) +{ + u32 rawcmd; + + WARN_ON(host->cmd); + host->cmd = cmd; + + if (!msdc_cmd_is_ready(host, mrq, cmd)) + return; + + if ((readl(host->base + MSDC_FIFOCS) & MSDC_FIFOCS_TXCNT) >> 16 || + readl(host->base + MSDC_FIFOCS) & MSDC_FIFOCS_RXCNT) { + dev_err(host->dev, "TX/RX FIFO non-empty before start of IO. Reset\n"); + msdc_reset_hw(host); + } + + cmd->error = 0; + rawcmd = msdc_cmd_prepare_raw_cmd(host, mrq, cmd); + mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT); + + sdr_set_bits(host->base + MSDC_INTEN, MSDC_INTEN_CMDRDY | + MSDC_INTEN_RSPCRCERR | MSDC_INTEN_CMDTMO | + MSDC_INTEN_ACMDRDY | MSDC_INTEN_ACMDCRCERR | + MSDC_INTEN_ACMDTMO); + writel(cmd->arg, host->base + SDC_ARG); + writel(rawcmd, host->base + SDC_CMD); +} + +static void msdc_cmd_next(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_command *cmd) +{ + if (cmd->error || (mrq->sbc && mrq->sbc->error)) + msdc_request_done(host, mrq); + else if (cmd == mrq->sbc) + msdc_start_command(host, mrq, mrq->cmd); + else if (!cmd->data) + msdc_request_done(host, mrq); + else + msdc_start_data(host, mrq, cmd, cmd->data); +} + +static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) +{ + struct msdc_host *host = mmc_priv(mmc); + + host->error = 0; + WARN_ON(host->mrq); + host->mrq = mrq; + + if (mrq->data) + msdc_prepare_data(host, mrq); + + /* if SBC is required, we have HW option and SW option. + * if HW option is enabled, and SBC does not have "special" flags, + * use HW option, otherwise use SW option + */ + if (mrq->sbc && (!mmc_card_mmc(mmc->card) || + (mrq->sbc->arg & 0xFFFF0000))) + msdc_start_command(host, mrq, mrq->sbc); + else + msdc_start_command(host, mrq, mrq->cmd); +} + +static void msdc_pre_req(struct mmc_host *mmc, struct mmc_request *mrq, + bool is_first_req) +{ + struct msdc_host *host = mmc_priv(mmc); + struct mmc_data *data = mrq->data; + + if (!data) + return; + + msdc_prepare_data(host, mrq); + data->host_cookie |= MSDC_ASYNC_FLAG; +} + +static void msdc_post_req(struct mmc_host *mmc, struct mmc_request *mrq, + int err) +{ + struct msdc_host *host = mmc_priv(mmc); + struct mmc_data *data; + + data = mrq->data; + if (!data) + return; + if (data->host_cookie) { + data->host_cookie &= ~MSDC_ASYNC_FLAG; + msdc_unprepare_data(host, mrq); + } +} + +static void msdc_data_xfer_next(struct msdc_host *host, + struct mmc_request *mrq, struct mmc_data *data) +{ + if (mmc_op_multi(mrq->cmd->opcode) && mrq->stop && !mrq->stop->error && + (!data->bytes_xfered || !mrq->sbc)) + msdc_start_command(host, mrq, mrq->stop); + else + msdc_request_done(host, mrq); +} + +static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, + struct mmc_request *mrq, struct mmc_data *data) +{ + struct mmc_command *stop = data->stop; + unsigned long flags; + bool done; + unsigned int check_data = events & + (MSDC_INT_XFER_COMPL | MSDC_INT_DATCRCERR | MSDC_INT_DATTMO + | MSDC_INT_DMA_BDCSERR | MSDC_INT_DMA_GPDCSERR + | MSDC_INT_DMA_PROTECT); + + spin_lock_irqsave(&host->lock, flags); + done = !host->data; + if (check_data) + host->data = NULL; + spin_unlock_irqrestore(&host->lock, flags); + + if (done) + return true; + + if (check_data || (stop && stop->error)) { + dev_dbg(host->dev, "DMA status: 0x%8X\n", + readl(host->base + MSDC_DMA_CFG)); + sdr_set_field(host->base + MSDC_DMA_CTRL, MSDC_DMA_CTRL_STOP, + 1); + while (readl(host->base + MSDC_DMA_CFG) & MSDC_DMA_CFG_STS) + cpu_relax(); + sdr_clr_bits(host->base + MSDC_INTEN, data_ints_mask); + dev_dbg(host->dev, "DMA stop\n"); + + if ((events & MSDC_INT_XFER_COMPL) && (!stop || !stop->error)) { + data->bytes_xfered = data->blocks * data->blksz; + } else { + dev_err(host->dev, "interrupt events: %x\n", events); + msdc_reset_hw(host); + host->error |= REQ_DAT_ERR; + data->bytes_xfered = 0; + + if (events & MSDC_INT_DATTMO) + data->error = -ETIMEDOUT; + + dev_err(host->dev, "%s: cmd=%d; blocks=%d", + __func__, mrq->cmd->opcode, data->blocks); + dev_err(host->dev, "data_error=%d xfer_size=%d\n", + (int)data->error, data->bytes_xfered); + } + + msdc_data_xfer_next(host, mrq, data); + done = true; + } + return done; +} + +static void msdc_set_buswidth(struct msdc_host *host, u32 width) +{ + u32 val = readl(host->base + SDC_CFG); + + val &= ~SDC_CFG_BUSWIDTH; + + switch (width) { + default: + case MMC_BUS_WIDTH_1: + val |= (MSDC_BUS_1BITS << 16); + break; + case MMC_BUS_WIDTH_4: + val |= (MSDC_BUS_4BITS << 16); + break; + case MMC_BUS_WIDTH_8: + val |= (MSDC_BUS_8BITS << 16); + break; + } + + writel(val, host->base + SDC_CFG); + dev_dbg(host->dev, "Bus Width = %d", width); +} + +static int msdc_ops_switch_volt(struct mmc_host *mmc, struct mmc_ios *ios) +{ + struct msdc_host *host = mmc_priv(mmc); + int min_uv, max_uv; + int ret = 0; + + if (!IS_ERR(mmc->supply.vqmmc)) { + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_330) { + min_uv = 3300000; + max_uv = 3300000; + } else if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) { + min_uv = 1800000; + max_uv = 1800000; + } else { + dev_err(host->dev, "Unsupported signal voltage!\n"); + return -EINVAL; + } + + ret = regulator_set_voltage(mmc->supply.vqmmc, min_uv, max_uv); + if (ret) { + dev_err(host->dev, + "Regulator set error %d: %d - %d\n", + ret, min_uv, max_uv); + } else { + /* Apply different pinctrl settings for different signal voltage */ + if (ios->signal_voltage == MMC_SIGNAL_VOLTAGE_180) + pinctrl_select_state(host->pinctrl, host->pins_uhs); + else + pinctrl_select_state(host->pinctrl, host->pins_default); + } + } + return ret; +} + +static int msdc_card_busy(struct mmc_host *mmc) +{ + struct msdc_host *host = mmc_priv(mmc); + u32 status = readl(host->base + MSDC_PS); + + /* check if any pin between dat[0:3] is low */ + if (((status >> 16) & 0xf) != 0xf) + return 1; + + return 0; +} + +static void msdc_request_timeout(struct work_struct *work) +{ + struct msdc_host *host = container_of(work, struct msdc_host, + req_timeout.work); + + /* simulate HW timeout status */ + dev_err(host->dev, "%s: aborting cmd/data/mrq\n", __func__); + if (host->mrq) { + dev_err(host->dev, "%s: aborting mrq=%p cmd=%d\n", __func__, + host->mrq, host->mrq->cmd->opcode); + if (host->cmd) { + dev_err(host->dev, "%s: aborting cmd=%d\n", + __func__, host->cmd->opcode); + msdc_cmd_done(host, MSDC_INT_CMDTMO, host->mrq, + host->cmd); + } else if (host->data) { + dev_err(host->dev, "%s: abort data: cmd%d; %d blocks\n", + __func__, host->mrq->cmd->opcode, + host->data->blocks); + msdc_data_xfer_done(host, MSDC_INT_DATTMO, host->mrq, + host->data); + } + } +} + +static irqreturn_t msdc_irq(int irq, void *dev_id) +{ + struct msdc_host *host = (struct msdc_host *) dev_id; + + while (true) { + unsigned long flags; + struct mmc_request *mrq; + struct mmc_command *cmd; + struct mmc_data *data; + u32 events, event_mask; + + spin_lock_irqsave(&host->lock, flags); + events = readl(host->base + MSDC_INT); + event_mask = readl(host->base + MSDC_INTEN); + /* clear interrupts */ + writel(events & event_mask, host->base + MSDC_INT); + + mrq = host->mrq; + cmd = host->cmd; + data = host->data; + spin_unlock_irqrestore(&host->lock, flags); + + if (!(events & event_mask)) + break; + + if (!mrq) { + dev_err(host->dev, + "%s: MRQ=NULL; events=%08X; event_mask=%08X\n", + __func__, events, event_mask); + WARN_ON(1); + break; + } + + dev_dbg(host->dev, "%s: events=%08X\n", __func__, events); + + if (cmd) + msdc_cmd_done(host, events, mrq, cmd); + else if (data) + msdc_data_xfer_done(host, events, mrq, data); + } + + return IRQ_HANDLED; +} + +static void msdc_init_hw(struct msdc_host *host) +{ + u32 val; + + /* Configure to MMC/SD mode, clock free running */ + sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_MODE | MSDC_CFG_CKPDN); + + /* Reset */ + msdc_reset_hw(host); + + /* Disable card detection */ + sdr_clr_bits(host->base + MSDC_PS, MSDC_PS_CDEN); + + /* Disable and clear all interrupts */ + writel(0, host->base + MSDC_INTEN); + val = readl(host->base + MSDC_INT); + writel(val, host->base + MSDC_INT); + + writel(0, host->base + MSDC_PAD_TUNE); + writel(0, host->base + MSDC_IOCON); + sdr_set_field(host->base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 1); + writel(0x403c004f, host->base + MSDC_PATCH_BIT); + sdr_set_field(host->base + MSDC_PATCH_BIT, MSDC_CKGEN_MSDC_DLY_SEL, 1); + writel(0xffff0089, host->base + MSDC_PATCH_BIT1); + /* Configure to enable SDIO mode. + * it's must otherwise sdio cmd5 failed + */ + sdr_set_bits(host->base + SDC_CFG, SDC_CFG_SDIO); + + /* disable detect SDIO device interrupt function */ + sdr_clr_bits(host->base + SDC_CFG, SDC_CFG_SDIOIDE); + + /* Configure to default data timeout */ + sdr_set_field(host->base + SDC_CFG, SDC_CFG_DTOC, 3); + + dev_dbg(host->dev, "init hardware done!"); +} + +static void msdc_deinit_hw(struct msdc_host *host) +{ + u32 val; + /* Disable and clear all interrupts */ + writel(0, host->base + MSDC_INTEN); + + val = readl(host->base + MSDC_INT); + writel(val, host->base + MSDC_INT); +} + +/* init gpd and bd list in msdc_drv_probe */ +static void msdc_init_gpd_bd(struct msdc_host *host, struct msdc_dma *dma) +{ + struct mt_gpdma_desc *gpd = dma->gpd; + struct mt_bdma_desc *bd = dma->bd; + int i; + + memset(gpd, 0, sizeof(struct mt_gpdma_desc)); + + gpd->gpd_info = GPDMA_DESC_BDP; /* hwo, cs, bd pointer */ + gpd->ptr = (u32)dma->bd_addr; /* physical address */ + + memset(bd, 0, sizeof(struct mt_bdma_desc) * MAX_BD_NUM); + for (i = 0; i < (MAX_BD_NUM - 1); i++) + bd[i].next = (u32)dma->bd_addr + sizeof(*bd) * (i + 1); +} + +static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) +{ + struct msdc_host *host = mmc_priv(mmc); + int ret; + u32 ddr = 0; + + if (ios->timing == MMC_TIMING_UHS_DDR50 || + ios->timing == MMC_TIMING_MMC_DDR52) + ddr = 1; + + msdc_set_buswidth(host, ios->bus_width); + + /* Suspend/Resume will do power off/on */ + switch (ios->power_mode) { + case MMC_POWER_UP: + if (!IS_ERR(mmc->supply.vmmc)) { + ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, + ios->vdd); + if (ret) { + dev_err(host->dev, "Failed to set vmmc power!\n"); + return; + } + } + break; + case MMC_POWER_ON: + if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { + ret = regulator_enable(mmc->supply.vqmmc); + if (ret) + dev_err(host->dev, "Failed to set vqmmc power!\n"); + else + host->vqmmc_enabled = true; + } + break; + case MMC_POWER_OFF: + if (!IS_ERR(mmc->supply.vmmc)) + mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); + + if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { + regulator_disable(mmc->supply.vqmmc); + host->vqmmc_enabled = false; + } + break; + default: + break; + } + + if (host->mclk != ios->clock || host->ddr != ddr) + msdc_set_mclk(host, ddr, ios->clock); +} + +static struct mmc_host_ops mt_msdc_ops = { + .post_req = msdc_post_req, + .pre_req = msdc_pre_req, + .request = msdc_ops_request, + .set_ios = msdc_ops_set_ios, + .start_signal_voltage_switch = msdc_ops_switch_volt, + .card_busy = msdc_card_busy, +}; + +static int msdc_drv_probe(struct platform_device *pdev) +{ + struct mmc_host *mmc; + struct msdc_host *host; + struct resource *res; + int ret; + + if (!pdev->dev.of_node) { + dev_err(&pdev->dev, "No DT found\n"); + return -EINVAL; + } + /* Allocate MMC host for this device */ + mmc = mmc_alloc_host(sizeof(struct msdc_host), &pdev->dev); + if (!mmc) + return -ENOMEM; + + host = mmc_priv(mmc); + ret = mmc_of_parse(mmc); + if (ret) + goto host_free; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + host->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(host->base)) { + ret = PTR_ERR(host->base); + goto host_free; + } + + ret = mmc_regulator_get_supply(mmc); + if (ret == -EPROBE_DEFER) + goto host_free; + + host->src_clk = devm_clk_get(&pdev->dev, "source"); + if (IS_ERR(host->src_clk)) { + ret = PTR_ERR(host->src_clk); + goto host_free; + } + + host->h_clk = devm_clk_get(&pdev->dev, "hclk"); + if (IS_ERR(host->h_clk)) { + ret = PTR_ERR(host->h_clk); + goto host_free; + } + + host->irq = platform_get_irq(pdev, 0); + if (host->irq < 0) { + ret = -EINVAL; + goto host_free; + } + + host->pinctrl = devm_pinctrl_get(&pdev->dev); + if (IS_ERR(host->pinctrl)) { + ret = PTR_ERR(host->pinctrl); + dev_err(&pdev->dev, "Cannot find pinctrl!\n"); + goto host_free; + } + + host->pins_default = pinctrl_lookup_state(host->pinctrl, "default"); + if (IS_ERR(host->pins_default)) { + ret = PTR_ERR(host->pins_default); + dev_err(&pdev->dev, "Cannot find pinctrl default!\n"); + goto host_free; + } + + host->pins_uhs = pinctrl_lookup_state(host->pinctrl, "state_uhs"); + if (IS_ERR(host->pins_uhs)) { + ret = PTR_ERR(host->pins_uhs); + dev_err(&pdev->dev, "Cannot find pinctrl uhs!\n"); + goto host_free; + } + + host->dev = &pdev->dev; + host->mmc = mmc; + host->src_clk_freq = clk_get_rate(host->src_clk); + /* Set host parameters to mmc */ + mmc->ops = &mt_msdc_ops; + mmc->f_min = host->src_clk_freq / (4 * 255); + + mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23; + /* MMC core transfer sizes tunable parameters */ + mmc->max_segs = MAX_BD_NUM; + mmc->max_seg_size = BDMA_DESC_BUFLEN; + mmc->max_blk_size = 2048; + mmc->max_req_size = 512 * 1024; + mmc->max_blk_count = mmc->max_req_size / 512; + host->dma_mask = DMA_BIT_MASK(32); + mmc_dev(mmc)->dma_mask = &host->dma_mask; + + host->timeout_clks = 3 * 1048576; + host->dma.gpd = dma_alloc_coherent(&pdev->dev, + sizeof(struct mt_gpdma_desc), + &host->dma.gpd_addr, GFP_KERNEL); + host->dma.bd = dma_alloc_coherent(&pdev->dev, + MAX_BD_NUM * sizeof(struct mt_bdma_desc), + &host->dma.bd_addr, GFP_KERNEL); + if (!host->dma.gpd || !host->dma.bd) { + ret = -ENOMEM; + goto release_mem; + } + msdc_init_gpd_bd(host, &host->dma); + INIT_DELAYED_WORK(&host->req_timeout, msdc_request_timeout); + spin_lock_init(&host->lock); + + platform_set_drvdata(pdev, mmc); + msdc_ungate_clock(host); + msdc_init_hw(host); + + ret = devm_request_irq(&pdev->dev, host->irq, msdc_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, pdev->name, host); + if (ret) + goto release; + + ret = mmc_add_host(mmc); + if (ret) + goto release; + + return 0; + +release: + platform_set_drvdata(pdev, NULL); + msdc_deinit_hw(host); + msdc_gate_clock(host); +release_mem: + if (host->dma.gpd) + dma_free_coherent(&pdev->dev, + sizeof(struct mt_gpdma_desc), + host->dma.gpd, host->dma.gpd_addr); + if (host->dma.bd) + dma_free_coherent(&pdev->dev, + MAX_BD_NUM * sizeof(struct mt_bdma_desc), + host->dma.bd, host->dma.bd_addr); +host_free: + mmc_free_host(mmc); + + return ret; +} + +static int msdc_drv_remove(struct platform_device *pdev) +{ + struct mmc_host *mmc; + struct msdc_host *host; + + mmc = platform_get_drvdata(pdev); + host = mmc_priv(mmc); + + platform_set_drvdata(pdev, NULL); + mmc_remove_host(host->mmc); + msdc_deinit_hw(host); + msdc_gate_clock(host); + + dma_free_coherent(&pdev->dev, + sizeof(struct mt_gpdma_desc), + host->dma.gpd, host->dma.gpd_addr); + dma_free_coherent(&pdev->dev, MAX_BD_NUM * sizeof(struct mt_bdma_desc), + host->dma.bd, host->dma.bd_addr); + + mmc_free_host(host->mmc); + + return 0; +} + +static const struct of_device_id msdc_of_ids[] = { + { .compatible = "mediatek,mt8135-mmc", }, + {} +}; + +static struct platform_driver mt_msdc_driver = { + .probe = msdc_drv_probe, + .remove = msdc_drv_remove, + .driver = { + .name = "mtk-msdc", + .of_match_table = msdc_of_ids, + }, +}; + +module_platform_driver(mt_msdc_driver); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("MediaTek SD/MMC Card Driver"); diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index de722d4e..258daf9 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -121,6 +121,7 @@ struct mmc_data { struct mmc_request *mrq; /* associated request */ unsigned int sg_len; /* size of scatter list */ + int sg_count; /* mapped sg entries */ struct scatterlist *sg; /* I/O scatter list */ s32 host_cookie; /* host private data */ }; -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 3/7] mmc: mediatek: Add PM support for MMC driver 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 1/7] mmc: dt-bindings: add Mediatek MMC bindings Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 2/7] mmc: mediatek: Add Mediatek MMC driver Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts Chaotian Jing ` (4 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel Add PM support for Mediatek MMC driver Save/restore registers when PM Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> --- drivers/mmc/host/mtk-sd.c | 89 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 952be2e..7c20f28 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -22,6 +22,8 @@ #include <linux/of_gpio.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> #include <linux/regulator/consumer.h> #include <linux/spinlock.h> @@ -212,6 +214,7 @@ #define MSDC_ASYNC_FLAG (0x1 << 1) #define MSDC_MMAP_FLAG (0x1 << 2) +#define MTK_MMC_AUTOSUSPEND_DELAY 50 #define CMD_TIMEOUT (HZ/10 * 5) /* 100ms x5 */ #define DAT_TIMEOUT (HZ * 5) /* 1000ms x5 */ @@ -254,6 +257,15 @@ struct msdc_dma { dma_addr_t bd_addr; /* the physical address of bd array */ }; +struct msdc_save_para { + u32 msdc_cfg; + u32 iocon; + u32 sdc_cfg; + u32 pad_tune; + u32 patch_bit0; + u32 patch_bit1; +}; + struct msdc_host { struct device *dev; struct mmc_host *mmc; /* mmc structure */ @@ -286,6 +298,7 @@ struct msdc_host { u32 sclk; /* SD/MS bus clock frequency */ bool ddr; bool vqmmc_enabled; + struct msdc_save_para save_para; /* used when gate HCLK */ }; static void sdr_set_bits(void __iomem *reg, u32 bs) @@ -677,6 +690,9 @@ static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq) if (mrq->data) msdc_unprepare_data(host, mrq); mmc_request_done(host->mmc, mrq); + + pm_runtime_mark_last_busy(host->dev); + pm_runtime_put_autosuspend(host->dev); } /* returns true if command is fully handled; returns false otherwise */ @@ -831,6 +847,8 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) WARN_ON(host->mrq); host->mrq = mrq; + pm_runtime_get_sync(host->dev); + if (mrq->data) msdc_prepare_data(host, mrq); @@ -1145,6 +1163,8 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) int ret; u32 ddr = 0; + pm_runtime_get_sync(host->dev); + if (ios->timing == MMC_TIMING_UHS_DDR50 || ios->timing == MMC_TIMING_MMC_DDR52) ddr = 1; @@ -1159,7 +1179,7 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) ios->vdd); if (ret) { dev_err(host->dev, "Failed to set vmmc power!\n"); - return; + goto end; } } break; @@ -1187,6 +1207,10 @@ static void msdc_ops_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) if (host->mclk != ios->clock || host->ddr != ddr) msdc_set_mclk(host, ddr, ios->clock); + +end: + pm_runtime_mark_last_busy(host->dev); + pm_runtime_put_autosuspend(host->dev); } static struct mmc_host_ops mt_msdc_ops = { @@ -1310,12 +1334,18 @@ static int msdc_drv_probe(struct platform_device *pdev) if (ret) goto release; + pm_runtime_set_active(host->dev); + pm_runtime_set_autosuspend_delay(host->dev, MTK_MMC_AUTOSUSPEND_DELAY); + pm_runtime_use_autosuspend(host->dev); + pm_runtime_enable(host->dev); ret = mmc_add_host(mmc); + if (ret) - goto release; + goto end; return 0; - +end: + pm_runtime_disable(host->dev); release: platform_set_drvdata(pdev, NULL); msdc_deinit_hw(host); @@ -1343,11 +1373,15 @@ static int msdc_drv_remove(struct platform_device *pdev) mmc = platform_get_drvdata(pdev); host = mmc_priv(mmc); + pm_runtime_get_sync(host->dev); + platform_set_drvdata(pdev, NULL); mmc_remove_host(host->mmc); msdc_deinit_hw(host); msdc_gate_clock(host); + pm_runtime_disable(host->dev); + pm_runtime_put_noidle(host->dev); dma_free_coherent(&pdev->dev, sizeof(struct mt_gpdma_desc), host->dma.gpd, host->dma.gpd_addr); @@ -1359,6 +1393,54 @@ static int msdc_drv_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM +static void msdc_save_reg(struct msdc_host *host) +{ + host->save_para.msdc_cfg = readl(host->base + MSDC_CFG); + host->save_para.iocon = readl(host->base + MSDC_IOCON); + host->save_para.sdc_cfg = readl(host->base + SDC_CFG); + host->save_para.pad_tune = readl(host->base + MSDC_PAD_TUNE); + host->save_para.patch_bit0 = readl(host->base + MSDC_PATCH_BIT); + host->save_para.patch_bit1 = readl(host->base + MSDC_PATCH_BIT1); +} + +static void msdc_restore_reg(struct msdc_host *host) +{ + writel(host->save_para.msdc_cfg, host->base + MSDC_CFG); + writel(host->save_para.iocon, host->base + MSDC_IOCON); + writel(host->save_para.sdc_cfg, host->base + SDC_CFG); + writel(host->save_para.pad_tune, host->base + MSDC_PAD_TUNE); + writel(host->save_para.patch_bit0, host->base + MSDC_PATCH_BIT); + writel(host->save_para.patch_bit1, host->base + MSDC_PATCH_BIT1); +} + +static int msdc_runtime_suspend(struct device *dev) +{ + struct mmc_host *mmc = dev_get_drvdata(dev); + struct msdc_host *host = mmc_priv(mmc); + + msdc_save_reg(host); + msdc_gate_clock(host); + return 0; +} + +static int msdc_runtime_resume(struct device *dev) +{ + struct mmc_host *mmc = dev_get_drvdata(dev); + struct msdc_host *host = mmc_priv(mmc); + + msdc_ungate_clock(host); + msdc_restore_reg(host); + return 0; +} +#endif + +static const struct dev_pm_ops msdc_dev_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) + SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL) +}; + static const struct of_device_id msdc_of_ids[] = { { .compatible = "mediatek,mt8135-mmc", }, {} @@ -1370,6 +1452,7 @@ static struct platform_driver mt_msdc_driver = { .driver = { .name = "mtk-msdc", .of_match_table = msdc_of_ids, + .pm = &msdc_dev_pm_ops, }, }; -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing ` (2 preceding siblings ...) 2015-06-15 11:20 ` [PATCH v6 3/7] mmc: mediatek: Add PM support for " Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-16 11:39 ` Daniel Kurtz 2015-06-15 11:20 ` [PATCH v6 5/7] ARM: mediatek: dts: Add emmc support to mt8135 Chaotian Jing ` (3 subsequent siblings) 7 siblings, 1 reply; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel From: Eddie Huang <eddie.huang@mediatek.com> Add node mmc0 ~ mmc3 for mt8173.dtsi Add node mmc0, mmc1 for mt8173-evb.dts Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> --- arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- 2 files changed, 170 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts index b1560c9..762ec61 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts @@ -33,6 +33,132 @@ chosen { }; }; +&mmc0 { + pinctrl-names = "default", "state_uhs"; + pinctrl-0 = <&mmc0_pins_default>; + pinctrl-1 = <&mmc0_pins_uhs>; + status = "okay"; + bus-width = <8>; + max-frequency = <50000000>; + cap-mmc-highspeed; + vmmc-supply = <&mt6397_vemc_3v3_reg>; + vqmmc-supply = <&mt6397_vio18_reg>; + non-removable; +}; + +&mmc1 { + pinctrl-names = "default", "state_uhs"; + pinctrl-0 = <&mmc1_pins_default>; + pinctrl-1 = <&mmc1_pins_uhs>; + status = "okay"; + bus-width = <4>; + max-frequency = <50000000>; + cap-sd-highspeed; + sd-uhs-sdr25; + cd-gpios = <&pio 132 0>; + vmmc-supply = <&mt6397_vmch_reg>; + vqmmc-supply = <&mt6397_vmc_reg>; +}; + +&pio { + mmc0_pins_default: mmc0default { + pins_cmd_dat { + pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>, + <MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>, + <MT8173_PIN_59_MSDC0_DAT2__FUNC_MSDC0_DAT2>, + <MT8173_PIN_60_MSDC0_DAT3__FUNC_MSDC0_DAT3>, + <MT8173_PIN_61_MSDC0_DAT4__FUNC_MSDC0_DAT4>, + <MT8173_PIN_62_MSDC0_DAT5__FUNC_MSDC0_DAT5>, + <MT8173_PIN_63_MSDC0_DAT6__FUNC_MSDC0_DAT6>, + <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>, + <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>; + input-enable; + bias-pull-up; + }; + + pins_clk { + pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>; + bias-pull-down; + }; + + pins_rst { + pinmux = <MT8173_PIN_68_MSDC0_RST___FUNC_MSDC0_RSTB>; + bias-pull-up; + }; + }; + + mmc1_pins_default: mmc1default { + pins_cmd_dat { + pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>, + <MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>, + <MT8173_PIN_75_MSDC1_DAT2__FUNC_MSDC1_DAT2>, + <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>, + <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>; + input-enable; + drive-strength = <MTK_DRIVE_4mA>; + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; + }; + + pins_clk { + pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>; + bias-pull-down; + drive-strength = <MTK_DRIVE_4mA>; + }; + + pins_insert { + pinmux = <MT8173_PIN_132_I2S0_DATA1__FUNC_GPIO132>; + bias-pull-up; + }; + }; + + mmc0_pins_uhs: mmc0 at 0{ + pins_cmd_dat { + pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>, + <MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>, + <MT8173_PIN_59_MSDC0_DAT2__FUNC_MSDC0_DAT2>, + <MT8173_PIN_60_MSDC0_DAT3__FUNC_MSDC0_DAT3>, + <MT8173_PIN_61_MSDC0_DAT4__FUNC_MSDC0_DAT4>, + <MT8173_PIN_62_MSDC0_DAT5__FUNC_MSDC0_DAT5>, + <MT8173_PIN_63_MSDC0_DAT6__FUNC_MSDC0_DAT6>, + <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>, + <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>; + input-enable; + drive-strength = <MTK_DRIVE_2mA>; + bias-pull-up = <MTK_PUPD_SET_R1R0_01>; + }; + + pins_clk { + pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>; + drive-strength = <MTK_DRIVE_2mA>; + bias-pull-down = <MTK_PUPD_SET_R1R0_01>; + }; + + pins_rst { + pinmux = <MT8173_PIN_68_MSDC0_RST___FUNC_MSDC0_RSTB>; + bias-pull-up; + }; + }; + + mmc1_pins_uhs: mmc1 at 0 { + pins_cmd_dat { + pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>, + <MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>, + <MT8173_PIN_75_MSDC1_DAT2__FUNC_MSDC1_DAT2>, + <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>, + <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>; + input-enable; + drive-strength = <MTK_DRIVE_4mA>; + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; + }; + + pins_clk { + pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>; + drive-strength = <MTK_DRIVE_4mA>; + bias-pull-down = <MTK_PUPD_SET_R1R0_10>; + }; + }; +}; + &pwrap { pmic: mt6397 { compatible = "mediatek,mt6397"; diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 512e4eb..56ea429 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -288,7 +288,50 @@ reg = <0 0x19000000 0 0x1000>; #clock-cells = <1>; }; - }; + mmc0: mmc at 11230000 { + compatible = "mediatek,mt8173-mmc", + "mediatek,mt8135-mmc"; + reg = <0 0x11230000 0 0x1000>; + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_0>, + <&topckgen CLK_TOP_MSDC50_0_H_SEL>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc1: mmc at 11240000 { + compatible = "mediatek,mt8173-mmc", + "mediatek,mt8135-mmc"; + reg = <0 0x11240000 0 0x1000>; + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_1>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc2: mmc at 11250000 { + compatible = "mediatek,mt8173-mmc", + "mediatek,mt8135-mmc"; + reg = <0 0x11250000 0 0x1000>; + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_2>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc3: mmc at 11260000 { + compatible = "mediatek,mt8173-mmc", + "mediatek,mt8135-mmc"; + reg = <0 0x11260000 0 0x1000>; + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_3>, + <&topckgen CLK_TOP_MSDC50_2_H_SEL>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + }; }; -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-15 11:20 ` [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts Chaotian Jing @ 2015-06-16 11:39 ` Daniel Kurtz 2015-06-16 12:20 ` Daniel Kurtz 0 siblings, 1 reply; 17+ messages in thread From: Daniel Kurtz @ 2015-06-16 11:39 UTC (permalink / raw) To: linux-arm-kernel Hi Chaotian, On Mon, Jun 15, 2015 at 7:20 PM, Chaotian Jing <chaotian.jing@mediatek.com> wrote: > From: Eddie Huang <eddie.huang@mediatek.com> > > Add node mmc0 ~ mmc3 for mt8173.dtsi > Add node mmc0, mmc1 for mt8173-evb.dts > > Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> > Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > --- > arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- > 2 files changed, 170 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > index b1560c9..762ec61 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > @@ -33,6 +33,132 @@ > chosen { }; > }; > > +&mmc0 { > + pinctrl-names = "default", "state_uhs"; > + pinctrl-0 = <&mmc0_pins_default>; > + pinctrl-1 = <&mmc0_pins_uhs>; > + status = "okay"; > + bus-width = <8>; > + max-frequency = <50000000>; > + cap-mmc-highspeed; > + vmmc-supply = <&mt6397_vemc_3v3_reg>; > + vqmmc-supply = <&mt6397_vio18_reg>; > + non-removable; > +}; > + > +&mmc1 { > + pinctrl-names = "default", "state_uhs"; > + pinctrl-0 = <&mmc1_pins_default>; > + pinctrl-1 = <&mmc1_pins_uhs>; > + status = "okay"; > + bus-width = <4>; > + max-frequency = <50000000>; > + cap-sd-highspeed; > + sd-uhs-sdr25; > + cd-gpios = <&pio 132 0>; > + vmmc-supply = <&mt6397_vmch_reg>; > + vqmmc-supply = <&mt6397_vmc_reg>; > +}; > + > +&pio { > + mmc0_pins_default: mmc0default { > + pins_cmd_dat { > + pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>, > + <MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>, > + <MT8173_PIN_59_MSDC0_DAT2__FUNC_MSDC0_DAT2>, > + <MT8173_PIN_60_MSDC0_DAT3__FUNC_MSDC0_DAT3>, > + <MT8173_PIN_61_MSDC0_DAT4__FUNC_MSDC0_DAT4>, > + <MT8173_PIN_62_MSDC0_DAT5__FUNC_MSDC0_DAT5>, > + <MT8173_PIN_63_MSDC0_DAT6__FUNC_MSDC0_DAT6>, > + <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>, > + <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>; > + input-enable; > + bias-pull-up; > + }; > + > + pins_clk { > + pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>; > + bias-pull-down; > + }; > + > + pins_rst { > + pinmux = <MT8173_PIN_68_MSDC0_RST___FUNC_MSDC0_RSTB>; > + bias-pull-up; > + }; > + }; > + > + mmc1_pins_default: mmc1default { > + pins_cmd_dat { > + pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>, > + <MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>, > + <MT8173_PIN_75_MSDC1_DAT2__FUNC_MSDC1_DAT2>, > + <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>, > + <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>; > + input-enable; > + drive-strength = <MTK_DRIVE_4mA>; > + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; > + }; > + > + pins_clk { > + pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>; > + bias-pull-down; > + drive-strength = <MTK_DRIVE_4mA>; > + }; > + > + pins_insert { > + pinmux = <MT8173_PIN_132_I2S0_DATA1__FUNC_GPIO132>; > + bias-pull-up; > + }; > + }; > + > + mmc0_pins_uhs: mmc0 at 0{ > + pins_cmd_dat { > + pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>, > + <MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>, > + <MT8173_PIN_59_MSDC0_DAT2__FUNC_MSDC0_DAT2>, > + <MT8173_PIN_60_MSDC0_DAT3__FUNC_MSDC0_DAT3>, > + <MT8173_PIN_61_MSDC0_DAT4__FUNC_MSDC0_DAT4>, > + <MT8173_PIN_62_MSDC0_DAT5__FUNC_MSDC0_DAT5>, > + <MT8173_PIN_63_MSDC0_DAT6__FUNC_MSDC0_DAT6>, > + <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>, > + <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>; > + input-enable; > + drive-strength = <MTK_DRIVE_2mA>; > + bias-pull-up = <MTK_PUPD_SET_R1R0_01>; > + }; > + > + pins_clk { > + pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>; > + drive-strength = <MTK_DRIVE_2mA>; > + bias-pull-down = <MTK_PUPD_SET_R1R0_01>; > + }; > + > + pins_rst { > + pinmux = <MT8173_PIN_68_MSDC0_RST___FUNC_MSDC0_RSTB>; > + bias-pull-up; > + }; > + }; > + > + mmc1_pins_uhs: mmc1 at 0 { > + pins_cmd_dat { > + pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>, > + <MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>, > + <MT8173_PIN_75_MSDC1_DAT2__FUNC_MSDC1_DAT2>, > + <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>, > + <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>; > + input-enable; > + drive-strength = <MTK_DRIVE_4mA>; > + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; > + }; > + > + pins_clk { > + pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>; > + drive-strength = <MTK_DRIVE_4mA>; > + bias-pull-down = <MTK_PUPD_SET_R1R0_10>; > + }; > + }; > +}; > + > &pwrap { > pmic: mt6397 { > compatible = "mediatek,mt6397"; > diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi > index 512e4eb..56ea429 100644 > --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi > @@ -288,7 +288,50 @@ > reg = <0 0x19000000 0 0x1000>; > #clock-cells = <1>; > }; > - }; > > + mmc0: mmc at 11230000 { > + compatible = "mediatek,mt8173-mmc", > + "mediatek,mt8135-mmc"; > + reg = <0 0x11230000 0 0x1000>; > + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_MSDC30_0>, > + <&topckgen CLK_TOP_MSDC50_0_H_SEL>; > + clock-names = "source", "hclk"; > + status = "disabled"; > + }; > + > + mmc1: mmc at 11240000 { > + compatible = "mediatek,mt8173-mmc", > + "mediatek,mt8135-mmc"; > + reg = <0 0x11240000 0 0x1000>; > + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_MSDC30_1>, > + <&clk_null>; This requires a "clk_null" phandle, but I have not seen a patch adding that on the public list. Did I miss a patch? -Dan > + clock-names = "source", "hclk"; > + status = "disabled"; > + }; > + > + mmc2: mmc at 11250000 { > + compatible = "mediatek,mt8173-mmc", > + "mediatek,mt8135-mmc"; > + reg = <0 0x11250000 0 0x1000>; > + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_MSDC30_2>, > + <&clk_null>; > + clock-names = "source", "hclk"; > + status = "disabled"; > + }; > + > + mmc3: mmc at 11260000 { > + compatible = "mediatek,mt8173-mmc", > + "mediatek,mt8135-mmc"; > + reg = <0 0x11260000 0 0x1000>; > + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_MSDC30_3>, > + <&topckgen CLK_TOP_MSDC50_2_H_SEL>; > + clock-names = "source", "hclk"; > + status = "disabled"; > + }; > + }; > }; > > -- > 1.8.1.1.dirty > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-16 11:39 ` Daniel Kurtz @ 2015-06-16 12:20 ` Daniel Kurtz 2015-06-18 2:04 ` Eddie Huang 0 siblings, 1 reply; 17+ messages in thread From: Daniel Kurtz @ 2015-06-16 12:20 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 16, 2015 at 7:39 PM, Daniel Kurtz <djkurtz@chromium.org> wrote: > Hi Chaotian, > > On Mon, Jun 15, 2015 at 7:20 PM, Chaotian Jing > <chaotian.jing@mediatek.com> wrote: >> From: Eddie Huang <eddie.huang@mediatek.com> >> >> Add node mmc0 ~ mmc3 for mt8173.dtsi >> Add node mmc0, mmc1 for mt8173-evb.dts >> >> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> >> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> >> --- >> arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- >> 2 files changed, 170 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts >> index b1560c9..762ec61 100644 >> --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts >> +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts >> @@ -33,6 +33,132 @@ >> chosen { }; >> }; >> >> +&mmc0 { >> + pinctrl-names = "default", "state_uhs"; >> + pinctrl-0 = <&mmc0_pins_default>; >> + pinctrl-1 = <&mmc0_pins_uhs>; >> + status = "okay"; >> + bus-width = <8>; >> + max-frequency = <50000000>; >> + cap-mmc-highspeed; >> + vmmc-supply = <&mt6397_vemc_3v3_reg>; >> + vqmmc-supply = <&mt6397_vio18_reg>; I also can't find phandles for these regulators. >> + non-removable; >> +}; >> + >> +&mmc1 { >> + pinctrl-names = "default", "state_uhs"; >> + pinctrl-0 = <&mmc1_pins_default>; >> + pinctrl-1 = <&mmc1_pins_uhs>; >> + status = "okay"; >> + bus-width = <4>; >> + max-frequency = <50000000>; >> + cap-sd-highspeed; >> + sd-uhs-sdr25; >> + cd-gpios = <&pio 132 0>; >> + vmmc-supply = <&mt6397_vmch_reg>; >> + vqmmc-supply = <&mt6397_vmc_reg>; nor these regulators. Which kernel branch are you basing your patch set on? Thanks, -Dan >> +}; >> + >> +&pio { >> + mmc0_pins_default: mmc0default { >> + pins_cmd_dat { >> + pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>, >> + <MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>, >> + <MT8173_PIN_59_MSDC0_DAT2__FUNC_MSDC0_DAT2>, >> + <MT8173_PIN_60_MSDC0_DAT3__FUNC_MSDC0_DAT3>, >> + <MT8173_PIN_61_MSDC0_DAT4__FUNC_MSDC0_DAT4>, >> + <MT8173_PIN_62_MSDC0_DAT5__FUNC_MSDC0_DAT5>, >> + <MT8173_PIN_63_MSDC0_DAT6__FUNC_MSDC0_DAT6>, >> + <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>, >> + <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>; >> + input-enable; >> + bias-pull-up; >> + }; >> + >> + pins_clk { >> + pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>; >> + bias-pull-down; >> + }; >> + >> + pins_rst { >> + pinmux = <MT8173_PIN_68_MSDC0_RST___FUNC_MSDC0_RSTB>; >> + bias-pull-up; >> + }; >> + }; >> + >> + mmc1_pins_default: mmc1default { >> + pins_cmd_dat { >> + pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>, >> + <MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>, >> + <MT8173_PIN_75_MSDC1_DAT2__FUNC_MSDC1_DAT2>, >> + <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>, >> + <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>; >> + input-enable; >> + drive-strength = <MTK_DRIVE_4mA>; >> + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; >> + }; >> + >> + pins_clk { >> + pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>; >> + bias-pull-down; >> + drive-strength = <MTK_DRIVE_4mA>; >> + }; >> + >> + pins_insert { >> + pinmux = <MT8173_PIN_132_I2S0_DATA1__FUNC_GPIO132>; >> + bias-pull-up; >> + }; >> + }; >> + >> + mmc0_pins_uhs: mmc0 at 0{ >> + pins_cmd_dat { >> + pinmux = <MT8173_PIN_57_MSDC0_DAT0__FUNC_MSDC0_DAT0>, >> + <MT8173_PIN_58_MSDC0_DAT1__FUNC_MSDC0_DAT1>, >> + <MT8173_PIN_59_MSDC0_DAT2__FUNC_MSDC0_DAT2>, >> + <MT8173_PIN_60_MSDC0_DAT3__FUNC_MSDC0_DAT3>, >> + <MT8173_PIN_61_MSDC0_DAT4__FUNC_MSDC0_DAT4>, >> + <MT8173_PIN_62_MSDC0_DAT5__FUNC_MSDC0_DAT5>, >> + <MT8173_PIN_63_MSDC0_DAT6__FUNC_MSDC0_DAT6>, >> + <MT8173_PIN_64_MSDC0_DAT7__FUNC_MSDC0_DAT7>, >> + <MT8173_PIN_66_MSDC0_CMD__FUNC_MSDC0_CMD>; >> + input-enable; >> + drive-strength = <MTK_DRIVE_2mA>; >> + bias-pull-up = <MTK_PUPD_SET_R1R0_01>; >> + }; >> + >> + pins_clk { >> + pinmux = <MT8173_PIN_65_MSDC0_CLK__FUNC_MSDC0_CLK>; >> + drive-strength = <MTK_DRIVE_2mA>; >> + bias-pull-down = <MTK_PUPD_SET_R1R0_01>; >> + }; >> + >> + pins_rst { >> + pinmux = <MT8173_PIN_68_MSDC0_RST___FUNC_MSDC0_RSTB>; >> + bias-pull-up; >> + }; >> + }; >> + >> + mmc1_pins_uhs: mmc1 at 0 { >> + pins_cmd_dat { >> + pinmux = <MT8173_PIN_73_MSDC1_DAT0__FUNC_MSDC1_DAT0>, >> + <MT8173_PIN_74_MSDC1_DAT1__FUNC_MSDC1_DAT1>, >> + <MT8173_PIN_75_MSDC1_DAT2__FUNC_MSDC1_DAT2>, >> + <MT8173_PIN_76_MSDC1_DAT3__FUNC_MSDC1_DAT3>, >> + <MT8173_PIN_78_MSDC1_CMD__FUNC_MSDC1_CMD>; >> + input-enable; >> + drive-strength = <MTK_DRIVE_4mA>; >> + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; >> + }; >> + >> + pins_clk { >> + pinmux = <MT8173_PIN_77_MSDC1_CLK__FUNC_MSDC1_CLK>; >> + drive-strength = <MTK_DRIVE_4mA>; >> + bias-pull-down = <MTK_PUPD_SET_R1R0_10>; >> + }; >> + }; >> +}; >> + >> &pwrap { >> pmic: mt6397 { >> compatible = "mediatek,mt6397"; >> diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi >> index 512e4eb..56ea429 100644 >> --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi >> +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi >> @@ -288,7 +288,50 @@ >> reg = <0 0x19000000 0 0x1000>; >> #clock-cells = <1>; >> }; >> - }; >> >> + mmc0: mmc at 11230000 { >> + compatible = "mediatek,mt8173-mmc", >> + "mediatek,mt8135-mmc"; >> + reg = <0 0x11230000 0 0x1000>; >> + interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_LOW>; >> + clocks = <&pericfg CLK_PERI_MSDC30_0>, >> + <&topckgen CLK_TOP_MSDC50_0_H_SEL>; >> + clock-names = "source", "hclk"; >> + status = "disabled"; >> + }; >> + >> + mmc1: mmc at 11240000 { >> + compatible = "mediatek,mt8173-mmc", >> + "mediatek,mt8135-mmc"; >> + reg = <0 0x11240000 0 0x1000>; >> + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; >> + clocks = <&pericfg CLK_PERI_MSDC30_1>, >> + <&clk_null>; > > This requires a "clk_null" phandle, but I have not seen a patch adding > that on the public list. > Did I miss a patch? > > -Dan > >> + clock-names = "source", "hclk"; >> + status = "disabled"; >> + }; >> + >> + mmc2: mmc at 11250000 { >> + compatible = "mediatek,mt8173-mmc", >> + "mediatek,mt8135-mmc"; >> + reg = <0 0x11250000 0 0x1000>; >> + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_LOW>; >> + clocks = <&pericfg CLK_PERI_MSDC30_2>, >> + <&clk_null>; >> + clock-names = "source", "hclk"; >> + status = "disabled"; >> + }; >> + >> + mmc3: mmc at 11260000 { >> + compatible = "mediatek,mt8173-mmc", >> + "mediatek,mt8135-mmc"; >> + reg = <0 0x11260000 0 0x1000>; >> + interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_LOW>; >> + clocks = <&pericfg CLK_PERI_MSDC30_3>, >> + <&topckgen CLK_TOP_MSDC50_2_H_SEL>; >> + clock-names = "source", "hclk"; >> + status = "disabled"; >> + }; >> + }; >> }; >> >> -- >> 1.8.1.1.dirty >> >> >> _______________________________________________ >> Linux-mediatek mailing list >> Linux-mediatek at lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-16 12:20 ` Daniel Kurtz @ 2015-06-18 2:04 ` Eddie Huang 2015-06-18 2:28 ` Eddie Huang 0 siblings, 1 reply; 17+ messages in thread From: Eddie Huang @ 2015-06-18 2:04 UTC (permalink / raw) To: linux-arm-kernel Hi Dan, On Tue, 2015-06-16 at 20:20 +0800, Daniel Kurtz wrote: > On Tue, Jun 16, 2015 at 7:39 PM, Daniel Kurtz <djkurtz@chromium.org> wrote: > > On Mon, Jun 15, 2015 at 7:20 PM, Chaotian Jing > > <chaotian.jing@mediatek.com> wrote: > >> From: Eddie Huang <eddie.huang@mediatek.com> > >> > >> Add node mmc0 ~ mmc3 for mt8173.dtsi > >> Add node mmc0, mmc1 for mt8173-evb.dts > >> > >> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> > >> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > >> --- > >> arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ > >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- > >> 2 files changed, 170 insertions(+), 1 deletion(-) > >> > >> diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > >> index b1560c9..762ec61 100644 > >> --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > >> +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > >> @@ -33,6 +33,132 @@ > >> chosen { }; > >> }; > >> > >> +&mmc0 { > >> + pinctrl-names = "default", "state_uhs"; > >> + pinctrl-0 = <&mmc0_pins_default>; > >> + pinctrl-1 = <&mmc0_pins_uhs>; > >> + status = "okay"; > >> + bus-width = <8>; > >> + max-frequency = <50000000>; > >> + cap-mmc-highspeed; > >> + vmmc-supply = <&mt6397_vemc_3v3_reg>; > >> + vqmmc-supply = <&mt6397_vio18_reg>; > > I also can't find phandles for these regulators. > > >> + non-removable; > >> +}; > >> + > >> +&mmc1 { > >> + pinctrl-names = "default", "state_uhs"; > >> + pinctrl-0 = <&mmc1_pins_default>; > >> + pinctrl-1 = <&mmc1_pins_uhs>; > >> + status = "okay"; > >> + bus-width = <4>; > >> + max-frequency = <50000000>; > >> + cap-sd-highspeed; > >> + sd-uhs-sdr25; > >> + cd-gpios = <&pio 132 0>; > >> + vmmc-supply = <&mt6397_vmch_reg>; > >> + vqmmc-supply = <&mt6397_vmc_reg>; > > nor these regulators. > > Which kernel branch are you basing your patch set on? > It is based on 4.1-rc1, and Sascha's regulator dts patch. [3/4] ARM: dts: mt8135-evbp1: Add PMIC support: https://patchwork.kernel.org/patch/6261161/ Eddie Thanks ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-18 2:04 ` Eddie Huang @ 2015-06-18 2:28 ` Eddie Huang 2015-06-29 11:24 ` Daniel Kurtz 0 siblings, 1 reply; 17+ messages in thread From: Eddie Huang @ 2015-06-18 2:28 UTC (permalink / raw) To: linux-arm-kernel Hi Dan, On Thu, 2015-06-18 at 10:04 +0800, Eddie Huang wrote: > Hi Dan, > > On Tue, 2015-06-16 at 20:20 +0800, Daniel Kurtz wrote: > > On Tue, Jun 16, 2015 at 7:39 PM, Daniel Kurtz <djkurtz@chromium.org> wrote: > > > On Mon, Jun 15, 2015 at 7:20 PM, Chaotian Jing > > > <chaotian.jing@mediatek.com> wrote: > > >> From: Eddie Huang <eddie.huang@mediatek.com> > > >> > > >> Add node mmc0 ~ mmc3 for mt8173.dtsi > > >> Add node mmc0, mmc1 for mt8173-evb.dts > > >> > > >> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> > > >> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > > >> --- > > >> arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ > > >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- > > >> 2 files changed, 170 insertions(+), 1 deletion(-) > > >> > > >> diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > >> index b1560c9..762ec61 100644 > > >> --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > >> +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > >> @@ -33,6 +33,132 @@ > > >> chosen { }; > > >> }; > > >> > > >> +&mmc0 { > > >> + pinctrl-names = "default", "state_uhs"; > > >> + pinctrl-0 = <&mmc0_pins_default>; > > >> + pinctrl-1 = <&mmc0_pins_uhs>; > > >> + status = "okay"; > > >> + bus-width = <8>; > > >> + max-frequency = <50000000>; > > >> + cap-mmc-highspeed; > > >> + vmmc-supply = <&mt6397_vemc_3v3_reg>; > > >> + vqmmc-supply = <&mt6397_vio18_reg>; > > > > I also can't find phandles for these regulators. > > > > >> + non-removable; > > >> +}; > > >> + > > >> +&mmc1 { > > >> + pinctrl-names = "default", "state_uhs"; > > >> + pinctrl-0 = <&mmc1_pins_default>; > > >> + pinctrl-1 = <&mmc1_pins_uhs>; > > >> + status = "okay"; > > >> + bus-width = <4>; > > >> + max-frequency = <50000000>; > > >> + cap-sd-highspeed; > > >> + sd-uhs-sdr25; > > >> + cd-gpios = <&pio 132 0>; > > >> + vmmc-supply = <&mt6397_vmch_reg>; > > >> + vqmmc-supply = <&mt6397_vmc_reg>; > > > > nor these regulators. > > > > Which kernel branch are you basing your patch set on? > > > It is based on 4.1-rc1, and Sascha's regulator dts patch. > [3/4] ARM: dts: mt8135-evbp1: Add PMIC support: > https://patchwork.kernel.org/patch/6261161/ > My mistake, we only sent mt8135-evbp1.dts, but this patch need mt8173-evb.dts, we will send this. Eddie Thanks ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-18 2:28 ` Eddie Huang @ 2015-06-29 11:24 ` Daniel Kurtz 2015-06-29 11:47 ` Eddie Huang 0 siblings, 1 reply; 17+ messages in thread From: Daniel Kurtz @ 2015-06-29 11:24 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jun 18, 2015 at 10:28 AM, Eddie Huang <eddie.huang@mediatek.com> wrote: > > Hi Dan, > > On Thu, 2015-06-18 at 10:04 +0800, Eddie Huang wrote: > > Hi Dan, > > > > On Tue, 2015-06-16 at 20:20 +0800, Daniel Kurtz wrote: > > > On Tue, Jun 16, 2015 at 7:39 PM, Daniel Kurtz <djkurtz@chromium.org> wrote: > > > > On Mon, Jun 15, 2015 at 7:20 PM, Chaotian Jing > > > > <chaotian.jing@mediatek.com> wrote: > > > >> From: Eddie Huang <eddie.huang@mediatek.com> > > > >> > > > >> Add node mmc0 ~ mmc3 for mt8173.dtsi > > > >> Add node mmc0, mmc1 for mt8173-evb.dts > > > >> > > > >> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> > > > >> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > > > >> --- > > > >> arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ > > > >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- > > > >> 2 files changed, 170 insertions(+), 1 deletion(-) > > > >> > > > >> diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > > >> index b1560c9..762ec61 100644 > > > >> --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > > >> +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > > >> @@ -33,6 +33,132 @@ > > > >> chosen { }; > > > >> }; > > > >> > > > >> +&mmc0 { > > > >> + pinctrl-names = "default", "state_uhs"; > > > >> + pinctrl-0 = <&mmc0_pins_default>; > > > >> + pinctrl-1 = <&mmc0_pins_uhs>; > > > >> + status = "okay"; > > > >> + bus-width = <8>; > > > >> + max-frequency = <50000000>; > > > >> + cap-mmc-highspeed; > > > >> + vmmc-supply = <&mt6397_vemc_3v3_reg>; > > > >> + vqmmc-supply = <&mt6397_vio18_reg>; > > > > > > I also can't find phandles for these regulators. > > > > > > >> + non-removable; > > > >> +}; > > > >> + > > > >> +&mmc1 { > > > >> + pinctrl-names = "default", "state_uhs"; > > > >> + pinctrl-0 = <&mmc1_pins_default>; > > > >> + pinctrl-1 = <&mmc1_pins_uhs>; > > > >> + status = "okay"; > > > >> + bus-width = <4>; > > > >> + max-frequency = <50000000>; > > > >> + cap-sd-highspeed; > > > >> + sd-uhs-sdr25; > > > >> + cd-gpios = <&pio 132 0>; > > > >> + vmmc-supply = <&mt6397_vmch_reg>; > > > >> + vqmmc-supply = <&mt6397_vmc_reg>; > > > > > > nor these regulators. > > > > > > Which kernel branch are you basing your patch set on? > > > > > It is based on 4.1-rc1, and Sascha's regulator dts patch. > > [3/4] ARM: dts: mt8135-evbp1: Add PMIC support: > > https://patchwork.kernel.org/patch/6261161/ > > > My mistake, we only sent mt8135-evbp1.dts, but this patch need > mt8173-evb.dts, we will send this. Hi Eddie, When do you plan to send an updated mmc patch set? Thanks, -Dan > > > Eddie > Thanks > > > > ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts 2015-06-29 11:24 ` Daniel Kurtz @ 2015-06-29 11:47 ` Eddie Huang 0 siblings, 0 replies; 17+ messages in thread From: Eddie Huang @ 2015-06-29 11:47 UTC (permalink / raw) To: linux-arm-kernel Hi Dan, On Mon, 2015-06-29 at 19:24 +0800, Daniel Kurtz wrote: > On Thu, Jun 18, 2015 at 10:28 AM, Eddie Huang <eddie.huang@mediatek.com> wrote: > >> On Thu, 2015-06-18 at 10:04 +0800, Eddie Huang wrote: > > > On Tue, 2015-06-16 at 20:20 +0800, Daniel Kurtz wrote: > > > > On Tue, Jun 16, 2015 at 7:39 PM, Daniel Kurtz <djkurtz@chromium.org> wrote: > > > > > On Mon, Jun 15, 2015 at 7:20 PM, Chaotian Jing > > > > > <chaotian.jing@mediatek.com> wrote: > > > > >> From: Eddie Huang <eddie.huang@mediatek.com> > > > > >> > > > > >> Add node mmc0 ~ mmc3 for mt8173.dtsi > > > > >> Add node mmc0, mmc1 for mt8173-evb.dts > > > > >> > > > > >> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> > > > > >> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> > > > > >> --- > > > > >> arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++++++++++++++++++++++++++++ > > > > >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +++++++++- > > > > >> 2 files changed, 170 insertions(+), 1 deletion(-) > > > > >> > > > > >> diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > > > >> index b1560c9..762ec61 100644 > > > > >> --- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > > > >> +++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts > > > > >> @@ -33,6 +33,132 @@ > > > > >> chosen { }; > > > > >> }; > > > > >> > > > > >> +&mmc0 { > > > > >> + pinctrl-names = "default", "state_uhs"; > > > > >> + pinctrl-0 = <&mmc0_pins_default>; > > > > >> + pinctrl-1 = <&mmc0_pins_uhs>; > > > > >> + status = "okay"; > > > > >> + bus-width = <8>; > > > > >> + max-frequency = <50000000>; > > > > >> + cap-mmc-highspeed; > > > > >> + vmmc-supply = <&mt6397_vemc_3v3_reg>; > > > > >> + vqmmc-supply = <&mt6397_vio18_reg>; > > > > > > > > I also can't find phandles for these regulators. > > > > > > > > >> + non-removable; > > > > >> +}; > > > > >> + > > > > >> +&mmc1 { > > > > >> + pinctrl-names = "default", "state_uhs"; > > > > >> + pinctrl-0 = <&mmc1_pins_default>; > > > > >> + pinctrl-1 = <&mmc1_pins_uhs>; > > > > >> + status = "okay"; > > > > >> + bus-width = <4>; > > > > >> + max-frequency = <50000000>; > > > > >> + cap-sd-highspeed; > > > > >> + sd-uhs-sdr25; > > > > >> + cd-gpios = <&pio 132 0>; > > > > >> + vmmc-supply = <&mt6397_vmch_reg>; > > > > >> + vqmmc-supply = <&mt6397_vmc_reg>; > > > > > > > > nor these regulators. > > > > > > > > Which kernel branch are you basing your patch set on? > > > > > > > It is based on 4.1-rc1, and Sascha's regulator dts patch. > > > [3/4] ARM: dts: mt8135-evbp1: Add PMIC support: > > > https://patchwork.kernel.org/patch/6261161/ > > > > > My mistake, we only sent mt8135-evbp1.dts, but this patch need > > mt8173-evb.dts, we will send this. > > > Hi Eddie, > > When do you plan to send an updated mmc patch set? > This patch depends on clock_null patch [0] that James still working on it. We will send new patch after [0] clarify. [0]: http://lists.infradead.org/pipermail/linux-arm-kernel/2015-June/351255.html Thanks Eddie ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 5/7] ARM: mediatek: dts: Add emmc support to mt8135 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing ` (3 preceding siblings ...) 2015-06-15 11:20 ` [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 6/7] arm64: mediatek: Add Mediatek MMC support in defconfig Chaotian Jing ` (2 subsequent siblings) 7 siblings, 0 replies; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel From: Yingjoe Chen <yingjoe.chen@mediatek.com> Add emmc node for mt8135.dtsi & mt8135-evbp1.dts Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> --- arch/arm/boot/dts/mt8135-evbp1.dts | 158 +++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/mt8135.dtsi | 55 +++++++++++++ 2 files changed, 213 insertions(+) diff --git a/arch/arm/boot/dts/mt8135-evbp1.dts b/arch/arm/boot/dts/mt8135-evbp1.dts index 357a91f..043d997 100644 --- a/arch/arm/boot/dts/mt8135-evbp1.dts +++ b/arch/arm/boot/dts/mt8135-evbp1.dts @@ -24,6 +24,164 @@ }; }; +&mmc0 { + pinctrl-names = "default", "state_uhs"; + pinctrl-0 = <&mmc0_pins_default>; + pinctrl-1 = <&mmc0_pins_uhs>; + status = "okay"; + bus-width = <8>; + max-frequency = <50000000>; + cap-mmc-highspeed; + vmmc-supply = <&mt6397_vemc_3v3_reg>; + non-removable; +}; + +&mmc1 { + pinctrl-names = "default", "state_uhs"; + pinctrl-0 = <&mmc1_pins_default>; + pinctrl-1 = <&mmc1_pins_uhs>; + status = "okay"; + bus-width = <4>; + max-frequency = <50000000>; + vmmc-supply = <&mt6397_vmch_reg>; + vqmmc-supply = <&mt6397_vmc_reg>; + cd-gpios = <&pio 63 0>; + cap-sd-highspeed; + sd-uhs-sdr25; +}; + +&pio { + mmc0_pins_default: mmc0default { + pins_cmd_dat { + pinmux = <MT8135_PIN_9_MSDC0_DAT0__FUNC_MSDC0_DAT0>, + <MT8135_PIN_8_MSDC0_DAT1__FUNC_MSDC0_DAT1>, + <MT8135_PIN_7_MSDC0_DAT2__FUNC_MSDC0_DAT2>, + <MT8135_PIN_6_MSDC0_DAT3__FUNC_MSDC0_DAT3>, + <MT8135_PIN_3_MSDC0_DAT4__FUNC_MSDC0_DAT4>, + <MT8135_PIN_2_MSDC0_DAT5__FUNC_MSDC0_DAT5>, + <MT8135_PIN_1_MSDC0_DAT6__FUNC_MSDC0_DAT6>, + <MT8135_PIN_0_MSDC0_DAT7__FUNC_MSDC0_DAT7>, + <MT8135_PIN_4_MSDC0_CMD__FUNC_MSDC0_CMD>; + bias-pull-up; + }; + + pins_clk { + pinmux = <MT8135_PIN_5_MSDC0_CLK__FUNC_MSDC0_CLK>; + bias-pull-down; + }; + + pins_rst { + pinmux = <MT8135_PIN_33_MSDC0_RSTB__FUNC_MSDC0_RSTB>; + bias-pull-up; + }; + }; + + mmc1_pins_default: mmc1default { + pins_cmd_dat { + pinmux = <MT8135_PIN_83_MSDC1_DAT0__FUNC_MSDC1_DAT0>, + <MT8135_PIN_84_MSDC1_DAT1__FUNC_MSDC1_DAT1>, + <MT8135_PIN_87_MSDC1_DAT2__FUNC_MSDC1_DAT2>, + <MT8135_PIN_88_MSDC1_DAT3__FUNC_MSDC1_DAT3>, + <MT8135_PIN_85_MSDC1_CMD__FUNC_MSDC1_CMD>; + bias-pull-up; + }; + + pins_clk { + pinmux = <MT8135_PIN_86_MSDC1_CLK__FUNC_MSDC1_CLK>; + bias-pull-down; + }; + + pins_insi { + pinmux = <MT8135_PIN_63_MSDC1_INSI__FUNC_MSDC1_INSI>; + bias-pull-up; + }; + }; + + mmc2_pins_default: mmc2default { + pins_cmd_dat { + pinmux = <MT8135_PIN_82_MSDC2_DAT0__FUNC_MSDC2_DAT0>, + <MT8135_PIN_81_MSDC2_DAT1__FUNC_MSDC2_DAT1>, + <MT8135_PIN_77_MSDC2_DAT2__FUNC_MSDC2_DAT2>, + <MT8135_PIN_78_MSDC2_DAT3__FUNC_MSDC2_DAT3>, + <MT8135_PIN_79_MSDC2_CMD__FUNC_MSDC2_CMD>; + bias-pull-up; + }; + + pins_clk { + pinmux = <MT8135_PIN_80_MSDC2_CLK__FUNC_MSDC2_CLK>; + bias-pull-down; + }; + + pins_insi { + pinmux = <MT8135_PIN_65_MSDC2_INSI__FUNC_MSDC2_INSI>; + bias-pull-up; + }; + }; + + mmc0_pins_uhs: mmc0 at 0 { + pins_cmd_dat { + pinmux = <MT8135_PIN_9_MSDC0_DAT0__FUNC_MSDC0_DAT0>, + <MT8135_PIN_8_MSDC0_DAT1__FUNC_MSDC0_DAT1>, + <MT8135_PIN_7_MSDC0_DAT2__FUNC_MSDC0_DAT2>, + <MT8135_PIN_6_MSDC0_DAT3__FUNC_MSDC0_DAT3>, + <MT8135_PIN_3_MSDC0_DAT4__FUNC_MSDC0_DAT4>, + <MT8135_PIN_2_MSDC0_DAT5__FUNC_MSDC0_DAT5>, + <MT8135_PIN_1_MSDC0_DAT6__FUNC_MSDC0_DAT6>, + <MT8135_PIN_0_MSDC0_DAT7__FUNC_MSDC0_DAT7>, + <MT8135_PIN_4_MSDC0_CMD__FUNC_MSDC0_CMD>; + drive-strength = <MTK_DRIVE_6mA>; + bias-pull-up = <MTK_PUPD_SET_R1R0_01>; + }; + + pins_clk { + pinmux = <MT8135_PIN_5_MSDC0_CLK__FUNC_MSDC0_CLK>; + drive-strength = <MTK_DRIVE_6mA>; + bias-pull-down = <MTK_PUPD_SET_R1R0_01>; + }; + + pins_rst { + pinmux = <MT8135_PIN_33_MSDC0_RSTB__FUNC_MSDC0_RSTB>; + bias-pull-up; + }; + }; + + mmc1_pins_uhs: mmc1 at 0 { + pins_cmd_dat { + pinmux = <MT8135_PIN_83_MSDC1_DAT0__FUNC_MSDC1_DAT0>, + <MT8135_PIN_84_MSDC1_DAT1__FUNC_MSDC1_DAT1>, + <MT8135_PIN_87_MSDC1_DAT2__FUNC_MSDC1_DAT2>, + <MT8135_PIN_88_MSDC1_DAT3__FUNC_MSDC1_DAT3>, + <MT8135_PIN_85_MSDC1_CMD__FUNC_MSDC1_CMD>; + drive-strength = <MTK_DRIVE_8mA>; + bias-pull-up; + }; + + pins_clk { + pinmux = <MT8135_PIN_86_MSDC1_CLK__FUNC_MSDC1_CLK>; + drive-strength = <MTK_DRIVE_8mA>; + bias-pull-down; + }; + }; + + mmc2_pins_uhs: mmc2 at 0 { + pins_cmd_dat { + pinmux = <MT8135_PIN_82_MSDC2_DAT0__FUNC_MSDC2_DAT0>, + <MT8135_PIN_81_MSDC2_DAT1__FUNC_MSDC2_DAT1>, + <MT8135_PIN_77_MSDC2_DAT2__FUNC_MSDC2_DAT2>, + <MT8135_PIN_78_MSDC2_DAT3__FUNC_MSDC2_DAT3>, + <MT8135_PIN_79_MSDC2_CMD__FUNC_MSDC2_CMD>; + drive-strength = <MTK_DRIVE_8mA>; + bias-pull-up = <MTK_PUPD_SET_R1R0_10>; + }; + + pins_clk { + pinmux = <MT8135_PIN_80_MSDC2_CLK__FUNC_MSDC2_CLK>; + drive-strength = <MTK_DRIVE_8mA>; + bias-pull-down = <MTK_PUPD_SET_R1R0_10>; + }; + }; +}; + &pwrap { pmic: mt6397 { compatible = "mediatek,mt6397"; diff --git a/arch/arm/boot/dts/mt8135.dtsi b/arch/arm/boot/dts/mt8135.dtsi index fec0ac5..9cc42f0 100644 --- a/arch/arm/boot/dts/mt8135.dtsi +++ b/arch/arm/boot/dts/mt8135.dtsi @@ -78,6 +78,12 @@ compatible = "simple-bus"; ranges; + clk_null: clk_null { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + system_clk: dummy13m { compatible = "fixed-clock"; clock-frequency = <13000000>; @@ -241,5 +247,54 @@ status = "disabled"; }; + mmc0: mmc at 11230000 { + compatible = "mediatek,mt8135-mmc"; + reg = <0 0x11230000 0 0x1000>; + interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC20_1>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc1: mmc at 11240000 { + compatible = "mediatek,mt8135-mmc"; + reg = <0 0x11240000 0 0x1000>; + interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC20_2>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc2: mmc at 11250000 { + compatible = "mediatek,mt8135-mmc"; + reg = <0 0x11250000 0 0x1000>; + interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_1>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc3: mmc at 11260000 { + compatible = "mediatek,mt8135-mmc"; + reg = <0 0x11260000 0 0x1000>; + interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_2>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; + + mmc4: mmc at 11270000 { + compatible = "mediatek,mt8135-mmc"; + reg = <0 0x11270000 0 0x1000>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_MSDC30_3>, + <&clk_null>; + clock-names = "source", "hclk"; + status = "disabled"; + }; }; }; -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 6/7] arm64: mediatek: Add Mediatek MMC support in defconfig 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing ` (4 preceding siblings ...) 2015-06-15 11:20 ` [PATCH v6 5/7] ARM: mediatek: dts: Add emmc support to mt8135 Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 7/7] ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7 Chaotian Jing 2015-06-16 8:03 ` [PATCH v6 0/7] Add Mediatek MMC driver Ulf Hansson 7 siblings, 0 replies; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel From: Eddie Huang <eddie.huang@mediatek.com> Add CONFIG_MMC_MTK=y in defconfig Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> Signed-off-by: Eddie Huang <eddie.huang@mediatek.com> --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index d3cedb5..78e3234 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -140,6 +140,7 @@ CONFIG_MMC_ARMMMCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SPI=y +CONFIG_MMC_MTK=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_XGENE=y -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 7/7] ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing ` (5 preceding siblings ...) 2015-06-15 11:20 ` [PATCH v6 6/7] arm64: mediatek: Add Mediatek MMC support in defconfig Chaotian Jing @ 2015-06-15 11:20 ` Chaotian Jing 2015-06-16 8:03 ` [PATCH v6 0/7] Add Mediatek MMC driver Ulf Hansson 7 siblings, 0 replies; 17+ messages in thread From: Chaotian Jing @ 2015-06-15 11:20 UTC (permalink / raw) To: linux-arm-kernel From: Yingjoe Chen <yingjoe.chen@mediatek.com> Add CONFIG_MMC_MTK=y in defconfig Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com> Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index bc673e7..35447b2 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -451,6 +451,7 @@ CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SH_MMCIF=y CONFIG_MMC_SUNXI=y +CONFIG_MMC_MTK=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y -- 1.8.1.1.dirty ^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v6 0/7] Add Mediatek MMC driver 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing ` (6 preceding siblings ...) 2015-06-15 11:20 ` [PATCH v6 7/7] ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7 Chaotian Jing @ 2015-06-16 8:03 ` Ulf Hansson 2015-06-17 21:01 ` Paul Gortmaker 7 siblings, 1 reply; 17+ messages in thread From: Ulf Hansson @ 2015-06-16 8:03 UTC (permalink / raw) To: linux-arm-kernel On 15 June 2015 at 13:20, Chaotian Jing <chaotian.jing@mediatek.com> wrote: > This series enables MMC support on the MT8135/MT8173 platform. > MT8135 has 5 MMC controllers and MT8173 has 4 MMC controllers. > > Changes base on Ulf's comments > Make hclk mandatory in the driver code > Change host->hclk to host->src_clk_freq > Add linux/pm.h > > Chaotian Jing (3): > mmc: dt-bindings: add Mediatek MMC bindings > mmc: mediatek: Add Mediatek MMC driver > mmc: mediatek: Add PM support for MMC driver > > Eddie Huang (2): > arm64: dts: mediatek: Add MT8173 MMC dts > arm64: mediatek: Add Mediatek MMC support in defconfig > > Yingjoe Chen (2): > ARM: mediatek: dts: Add emmc support to mt8135 > ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7 > > Documentation/devicetree/bindings/mmc/mtk-sd.txt | 32 + > arch/arm/boot/dts/mt8135-evbp1.dts | 158 +++ > arch/arm/boot/dts/mt8135.dtsi | 55 + > arch/arm/configs/multi_v7_defconfig | 1 + > arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++ > arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +- > arch/arm64/configs/defconfig | 1 + > drivers/mmc/host/Kconfig | 8 + > drivers/mmc/host/Makefile | 1 + > drivers/mmc/host/mtk-sd.c | 1461 ++++++++++++++++++++++ > include/linux/mmc/core.h | 1 + > 11 files changed, 1888 insertions(+), 1 deletion(-) > create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt > create mode 100644 drivers/mmc/host/mtk-sd.c > > -- > 1.8.1.1.dirty > Hi Chaotian, I have applied patch 1->3 for my next branch, which thus includes the mmc driver parts. I could potentially also pick the ARM patches, but then those needs to be acked from the ARM SoC folks. Kind regards Uffe ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 0/7] Add Mediatek MMC driver 2015-06-16 8:03 ` [PATCH v6 0/7] Add Mediatek MMC driver Ulf Hansson @ 2015-06-17 21:01 ` Paul Gortmaker 2015-06-18 7:26 ` Ulf Hansson 0 siblings, 1 reply; 17+ messages in thread From: Paul Gortmaker @ 2015-06-17 21:01 UTC (permalink / raw) To: linux-arm-kernel On Tue, Jun 16, 2015 at 4:03 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 15 June 2015 at 13:20, Chaotian Jing <chaotian.jing@mediatek.com> wrote: >> This series enables MMC support on the MT8135/MT8173 platform. >> MT8135 has 5 MMC controllers and MT8173 has 4 MMC controllers. >> >> Changes base on Ulf's comments >> Make hclk mandatory in the driver code >> Change host->hclk to host->src_clk_freq >> Add linux/pm.h >> >> Chaotian Jing (3): >> mmc: dt-bindings: add Mediatek MMC bindings >> mmc: mediatek: Add Mediatek MMC driver. This commit breaks when merged to linux-next since it gets exposed as an implicit module.h user that does not include that header: drivers/mmc/host/mtk-sd.c:1459:1: note: in expansion of macro 'module_platform_driver' module_platform_driver(mt_msdc_driver); ^ include/linux/device.h:1296:1: error: type defaults to 'int' in declaration of 'module_init' [-Werror=implicit-int] module_init(__driver##_init); \ ^ Since the code doesn't exist in mainline, I can't fix it from within my header cleanup series, so can you please add an appropriate include of module.h to the above? Also, I noticed the Makefile addition from this commit is whitespace mangled; might as well fix that too if rebasing to fix the include problem. Thanks, Paul. -- >> mmc: mediatek: Add PM support for MMC driver >> >> Eddie Huang (2): >> arm64: dts: mediatek: Add MT8173 MMC dts >> arm64: mediatek: Add Mediatek MMC support in defconfig >> >> Yingjoe Chen (2): >> ARM: mediatek: dts: Add emmc support to mt8135 >> ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7 >> >> Documentation/devicetree/bindings/mmc/mtk-sd.txt | 32 + >> arch/arm/boot/dts/mt8135-evbp1.dts | 158 +++ >> arch/arm/boot/dts/mt8135.dtsi | 55 + >> arch/arm/configs/multi_v7_defconfig | 1 + >> arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 126 ++ >> arch/arm64/boot/dts/mediatek/mt8173.dtsi | 45 +- >> arch/arm64/configs/defconfig | 1 + >> drivers/mmc/host/Kconfig | 8 + >> drivers/mmc/host/Makefile | 1 + >> drivers/mmc/host/mtk-sd.c | 1461 ++++++++++++++++++++++ >> include/linux/mmc/core.h | 1 + >> 11 files changed, 1888 insertions(+), 1 deletion(-) >> create mode 100644 Documentation/devicetree/bindings/mmc/mtk-sd.txt >> create mode 100644 drivers/mmc/host/mtk-sd.c >> >> -- >> 1.8.1.1.dirty >> > > Hi Chaotian, > > I have applied patch 1->3 for my next branch, which thus includes the > mmc driver parts. I could potentially also pick the ARM patches, but > then those needs to be acked from the ARM SoC folks. > > Kind regards > Uffe > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v6 0/7] Add Mediatek MMC driver 2015-06-17 21:01 ` Paul Gortmaker @ 2015-06-18 7:26 ` Ulf Hansson 0 siblings, 0 replies; 17+ messages in thread From: Ulf Hansson @ 2015-06-18 7:26 UTC (permalink / raw) To: linux-arm-kernel On 17 June 2015 at 23:01, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > On Tue, Jun 16, 2015 at 4:03 AM, Ulf Hansson <ulf.hansson@linaro.org> wrote: >> On 15 June 2015 at 13:20, Chaotian Jing <chaotian.jing@mediatek.com> wrote: >>> This series enables MMC support on the MT8135/MT8173 platform. >>> MT8135 has 5 MMC controllers and MT8173 has 4 MMC controllers. >>> >>> Changes base on Ulf's comments >>> Make hclk mandatory in the driver code >>> Change host->hclk to host->src_clk_freq >>> Add linux/pm.h >>> >>> Chaotian Jing (3): >>> mmc: dt-bindings: add Mediatek MMC bindings >>> mmc: mediatek: Add Mediatek MMC driver. > > This commit breaks when merged to linux-next since it gets > exposed as an implicit module.h user that does not include > that header: > > drivers/mmc/host/mtk-sd.c:1459:1: note: in expansion of macro > 'module_platform_driver' > module_platform_driver(mt_msdc_driver); > ^ > include/linux/device.h:1296:1: error: type defaults to 'int' in > declaration of 'module_init' [-Werror=implicit-int] > module_init(__driver##_init); \ > ^ > > Since the code doesn't exist in mainline, I can't fix it from > within my header cleanup series, so can you please add > an appropriate include of module.h to the above? > > Also, I noticed the Makefile addition from this commit > is whitespace mangled; might as well fix that too if > rebasing to fix the include problem. > > Thanks, > Paul. Paul, appreciate your feedback! I have re-based my next branch and updated the commit according to your suggestions. Kind regards Uffe ^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2015-06-29 11:47 UTC | newest] Thread overview: 17+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-06-15 11:20 [PATCH v6 0/7] Add Mediatek MMC driver Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 1/7] mmc: dt-bindings: add Mediatek MMC bindings Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 2/7] mmc: mediatek: Add Mediatek MMC driver Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 3/7] mmc: mediatek: Add PM support for " Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 4/7] arm64: dts: mediatek: Add MT8173 MMC dts Chaotian Jing 2015-06-16 11:39 ` Daniel Kurtz 2015-06-16 12:20 ` Daniel Kurtz 2015-06-18 2:04 ` Eddie Huang 2015-06-18 2:28 ` Eddie Huang 2015-06-29 11:24 ` Daniel Kurtz 2015-06-29 11:47 ` Eddie Huang 2015-06-15 11:20 ` [PATCH v6 5/7] ARM: mediatek: dts: Add emmc support to mt8135 Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 6/7] arm64: mediatek: Add Mediatek MMC support in defconfig Chaotian Jing 2015-06-15 11:20 ` [PATCH v6 7/7] ARM: multi_v7_defconfig: Enable Mediatek MMC support multi-v7 Chaotian Jing 2015-06-16 8:03 ` [PATCH v6 0/7] Add Mediatek MMC driver Ulf Hansson 2015-06-17 21:01 ` Paul Gortmaker 2015-06-18 7:26 ` Ulf Hansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).