korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

spi: lpspi: Add i.MX8 boards support for lpspi

Browse Source 
[ Upstream commit f5e5afdb0e ]

Add both ipg and per clock for lpspi to support i.MX8QM/QXP boards.

Signed-off-by: Clark Wang <xiaoning.wang@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Stable-dep-of: 730bbfaf7d ("spi: spi-fsl-lpspi: Fix scldiv calculation")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Clark Wang 2019-03-06 06:30:34 +00:00 committed by Greg Kroah-Hartman
parent 8f8b12339e
commit 0b536d6c52
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/spi/spi-fsl-lpspi.c
View File

@ -80,7 +80,8 @@ struct lpspi_config {
struct fsl_lpspi_data { struct fsl_lpspi_data {
struct device *dev; struct device *dev;
void __iomem *base; void __iomem *base;
struct clk *clk; struct clk *clk_ipg;
struct clk *clk_per;
bool is_slave; bool is_slave;
void *rx_buf; void *rx_buf;
@ -147,8 +148,19 @@ static int lpspi_prepare_xfer_hardware(struct spi_controller *controller)
{ {
struct fsl_lpspi_data *fsl_lpspi = struct fsl_lpspi_data *fsl_lpspi =
spi_controller_get_devdata(controller); spi_controller_get_devdata(controller);
int ret;
return clk_prepare_enable(fsl_lpspi->clk); ret = clk_prepare_enable(fsl_lpspi->clk_ipg);
if (ret)
return ret;
ret = clk_prepare_enable(fsl_lpspi->clk_per);
if (ret) {
clk_disable_unprepare(fsl_lpspi->clk_ipg);
return ret;
}
return 0;
} }
static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller) static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)
@ -156,7 +168,8 @@ static int lpspi_unprepare_xfer_hardware(struct spi_controller *controller)
struct fsl_lpspi_data *fsl_lpspi = struct fsl_lpspi_data *fsl_lpspi =
spi_controller_get_devdata(controller); spi_controller_get_devdata(controller);
clk_disable_unprepare(fsl_lpspi->clk); clk_disable_unprepare(fsl_lpspi->clk_ipg);
clk_disable_unprepare(fsl_lpspi->clk_per);
return 0; return 0;
} }
@ -249,7 +262,7 @@ static int fsl_lpspi_set_bitrate(struct fsl_lpspi_data *fsl_lpspi)
unsigned int perclk_rate, scldiv; unsigned int perclk_rate, scldiv;
u8 prescale; u8 prescale;
perclk_rate = clk_get_rate(fsl_lpspi->clk); perclk_rate = clk_get_rate(fsl_lpspi->clk_per);
for (prescale = 0; prescale < 8; prescale++) { for (prescale = 0; prescale < 8; prescale++) {
scldiv = perclk_rate / scldiv = perclk_rate /
(clkdivs[prescale] * config.speed_hz) - 2; (clkdivs[prescale] * config.speed_hz) - 2;
@ -522,15 +535,30 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
goto out_controller_put; goto out_controller_put;
} }
fsl_lpspi->clk = devm_clk_get(&pdev->dev, "ipg"); fsl_lpspi->clk_per = devm_clk_get(&pdev->dev, "per");
if (IS_ERR(fsl_lpspi->clk)) { if (IS_ERR(fsl_lpspi->clk_per)) {
ret = PTR_ERR(fsl_lpspi->clk); ret = PTR_ERR(fsl_lpspi->clk_per);
goto out_controller_put; goto out_controller_put;
} }
ret = clk_prepare_enable(fsl_lpspi->clk); fsl_lpspi->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
if (IS_ERR(fsl_lpspi->clk_ipg)) {
ret = PTR_ERR(fsl_lpspi->clk_ipg);
goto out_controller_put;
}
ret = clk_prepare_enable(fsl_lpspi->clk_ipg);
if (ret) { if (ret) {
dev_err(&pdev->dev, "can't enable lpspi clock, ret=%d\n", ret); dev_err(&pdev->dev,
"can't enable lpspi ipg clock, ret=%d\n", ret);
goto out_controller_put;
}
ret = clk_prepare_enable(fsl_lpspi->clk_per);
if (ret) {
dev_err(&pdev->dev,
"can't enable lpspi per clock, ret=%d\n", ret);
clk_disable_unprepare(fsl_lpspi->clk_ipg);
goto out_controller_put; goto out_controller_put;
} }
@ -538,7 +566,8 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
fsl_lpspi->txfifosize = 1 << (temp & 0x0f); fsl_lpspi->txfifosize = 1 << (temp & 0x0f);
fsl_lpspi->rxfifosize = 1 << ((temp >> 8) & 0x0f); fsl_lpspi->rxfifosize = 1 << ((temp >> 8) & 0x0f);
clk_disable_unprepare(fsl_lpspi->clk); clk_disable_unprepare(fsl_lpspi->clk_per);
clk_disable_unprepare(fsl_lpspi->clk_ipg);
ret = devm_spi_register_controller(&pdev->dev, controller); ret = devm_spi_register_controller(&pdev->dev, controller);
if (ret < 0) { if (ret < 0) {
@ -560,7 +589,8 @@ static int fsl_lpspi_remove(struct platform_device *pdev)
struct fsl_lpspi_data *fsl_lpspi = struct fsl_lpspi_data *fsl_lpspi =
spi_controller_get_devdata(controller); spi_controller_get_devdata(controller);
clk_disable_unprepare(fsl_lpspi->clk); clk_disable_unprepare(fsl_lpspi->clk_per);
clk_disable_unprepare(fsl_lpspi->clk_ipg);
return 0; return 0;
} }