diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 16:56:04 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 16:56:04 +0200 |
| commit | 85451a740ff31ba411493c7617e2951493c78e10 (patch) | |
| tree | c670edce35c37f91bbe044795f496765be8b88d4 /drivers | |
| parent | cd47eaf8df4c4c20e187afe727da3e6f9f893c6b (diff) | |
| parent | 13a002a9d7b1f7a7c97b8317f5dcd9b0a9b3d80d (diff) | |
| download | barebox-85451a740ff31ba411493c7617e2951493c78e10.tar.gz barebox-85451a740ff31ba411493c7617e2951493c78e10.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/busses/i2c-imx.c | 4 | ||||
| -rw-r--r-- | drivers/mci/imx-esdhc.c | 5 | ||||
| -rw-r--r-- | drivers/pinctrl/imx-iomux-v3.c | 3 | ||||
| -rw-r--r-- | drivers/spi/Kconfig | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 4ff4f5c2aa..67937da73a 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -200,13 +200,13 @@ static void i2c_fsl_dump_reg(struct i2c_adapter *adapter) reg_cr = fsl_i2c_read_reg(i2c_fsl, FSL_I2C_I2CR); reg_sr = fsl_i2c_read_reg(i2c_fsl, FSL_I2C_I2SR); - dev_dbg(adapter->dev, "CONTROL:\t" + dev_dbg(&adapter->dev, "CONTROL:\t" "IEN =%d, IIEN=%d, MSTA=%d, MTX =%d, TXAK=%d, RSTA=%d\n", (reg_cr & I2CR_IEN ? 1 : 0), (reg_cr & I2CR_IIEN ? 1 : 0), (reg_cr & I2CR_MSTA ? 1 : 0), (reg_cr & I2CR_MTX ? 1 : 0), (reg_cr & I2CR_TXAK ? 1 : 0), (reg_cr & I2CR_RSTA ? 1 : 0)); - dev_dbg(adapter->dev, "STATUS:\t" + dev_dbg(&adapter->dev, "STATUS:\t" "ICF =%d, IAAS=%d, IB =%d, IAL =%d, SRW =%d, IIF =%d, RXAK=%d\n", (reg_sr & I2SR_ICF ? 1 : 0), (reg_sr & I2SR_IAAS ? 1 : 0), (reg_sr & I2SR_IBB ? 1 : 0), (reg_sr & I2SR_IAL ? 1 : 0), diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c index c4daa9d121..db96a81397 100644 --- a/drivers/mci/imx-esdhc.c +++ b/drivers/mci/imx-esdhc.c @@ -455,10 +455,13 @@ static void set_sysctl(struct mci_host *mci, u32 clock) wait_on_timeout(10 * MSECOND, esdhc_read32(regs + SDHCI_PRESENT_STATE) & PRSSTAT_SDSTB); - clk = SYSCTL_PEREN | SYSCTL_CKEN; + clk = SYSCTL_PEREN | SYSCTL_CKEN | SYSCTL_INITA; esdhc_setbits32(regs + SDHCI_CLOCK_CONTROL__TIMEOUT_CONTROL__SOFTWARE_RESET, clk); + + wait_on_timeout(1 * MSECOND, + !(esdhc_read32(regs + SDHCI_CLOCK_CONTROL) & SYSCTL_INITA)); } static void esdhc_set_ios(struct mci_host *mci, struct mci_ios *ios) diff --git a/drivers/pinctrl/imx-iomux-v3.c b/drivers/pinctrl/imx-iomux-v3.c index 38451875ea..d176199c52 100644 --- a/drivers/pinctrl/imx-iomux-v3.c +++ b/drivers/pinctrl/imx-iomux-v3.c @@ -117,6 +117,9 @@ static int imx_iomux_v3_set_state(struct pinctrl_device *pdev, struct device_nod if (of_get_property(np, "input-schmitt-enable", NULL)) share_conf_val |= SHARE_CONF_PAD_CTL_HYS; + if (of_get_property(np, "input-enable", NULL)) + share_conf_val |= IMX_PAD_SION; + if (of_get_property(np, "bias-pull-up", NULL)) share_conf_val |= SHARE_CONF_PAD_CTL_PUE; } else { diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 84945744ef..fed628c589 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -38,7 +38,7 @@ config DRIVER_SPI_IMX_0_7 config DRIVER_SPI_IMX_2_3 bool - depends on ARCH_IMX50 || ARCH_IMX51 || ARCH_IMX53 || ARCH_IMX6 || ARCH_IMX7 + depends on ARCH_IMX50 || ARCH_IMX51 || ARCH_IMX53 || ARCH_IMX6 || ARCH_IMX7 || ARCH_IMX8MQ default y config DRIVER_SPI_MXS |