diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-12-08 14:53:59 +0100 |
| commit | 86916569a811a07eb1b5a4044fc4f04aeb75383c (patch) | |
| tree | 18652b7fd46eb31c2887fae90a85fb793ec75569 /drivers | |
| parent | 1e5b933b5d2538ea0ffeb86537c3996348ef9c64 (diff) | |
| parent | d91a9642518806f9320e67f5b2c8be9347602c48 (diff) | |
| download | barebox-86916569a811a07eb1b5a4044fc4f04aeb75383c.tar.gz barebox-86916569a811a07eb1b5a4044fc4f04aeb75383c.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 7 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_mxs.c | 1 | ||||
| -rw-r--r-- | drivers/net/fec_imx.c | 3 | ||||
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v3.c | 2 | ||||
| -rw-r--r-- | drivers/serial/serial_imx.c | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index 487cd41958..239cd375fa 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -474,8 +474,9 @@ static int esdhc_init(struct mci_host *mci, struct device_d *dev) /* Set the initial clock speed */ set_sysctl(mci, 400000); - /* Disable the BRR and BWR bits in IRQSTAT */ - esdhc_clrbits32(regs + SDHCI_INT_ENABLE, IRQSTATEN_BRR | IRQSTATEN_BWR); + writel(IRQSTATEN_CC | IRQSTATEN_TC | IRQSTATEN_CINT | IRQSTATEN_CTOE | + IRQSTATEN_CCE | IRQSTATEN_CEBE | IRQSTATEN_CIE | IRQSTATEN_DTOE | + IRQSTATEN_DCE | IRQSTATEN_DEBE | IRQSTATEN_DINT, regs + SDHCI_INT_ENABLE); /* Put the PROCTL reg back to the default */ esdhc_write32(regs + SDHCI_HOST_CONTROL__POWER_CONTROL__BLOCK_GAP_CONTROL, @@ -606,6 +607,8 @@ static __maybe_unused struct of_device_id fsl_esdhc_compatible[] = { }, { .compatible = "fsl,imx6q-usdhc", }, { + .compatible = "fsl,imx6sl-usdhc", + }, { /* sentinel */ } }; diff --git a/drivers/mtd/nand/nand_mxs.c b/drivers/mtd/nand/nand_mxs.c index 8989de0272..94101a3d98 100644 --- a/drivers/mtd/nand/nand_mxs.c +++ b/drivers/mtd/nand/nand_mxs.c @@ -1266,6 +1266,7 @@ static int mxs_nand_probe(struct device_d *dev) return PTR_ERR(nand_info->clk); if (mxs_nand_is_imx6(nand_info)) { + clk_disable(nand_info->clk); clk_set_rate(nand_info->clk, 96000000); clk_enable(nand_info->clk); nand_info->dma_channel_base = 0; diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 4ed5e8e14c..a2852ed7af 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -772,6 +772,9 @@ static __maybe_unused struct of_device_id imx_fec_dt_ids[] = { }, { .compatible = "fsl,imx6q-fec", .data = FEC_TYPE_IMX6, + }, { + .compatible = "fsl,imx6sx-fec", + .data = FEC_TYPE_IMX6, }, { /* sentinel */ } diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c index 5dfcde6458..62a352ba50 100644 --- a/drivers/pinctrl/imx-iomux-v3.c +++ b/drivers/pinctrl/imx-iomux-v3.c @@ -199,6 +199,8 @@ static __maybe_unused struct of_device_id imx_iomux_v3_dt_ids[] = { }, { .compatible = "fsl,imx6dl-iomuxc", }, { + .compatible = "fsl,imx6sx-iomuxc", + }, { /* sentinel */ } }; diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index e379f29610..21189cbbf8 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -324,7 +324,7 @@ static int imx_serial_probe(struct device_d *dev) cdev = &priv->cdev; dev->priv = priv; - priv->clk = clk_get(dev, NULL); + priv->clk = clk_get(dev, "per"); if (IS_ERR(priv->clk)) { ret = PTR_ERR(priv->clk); goto err_free; |