spi: spi-adi-v3: convert to use common clk framework
PATCH 1/1 spi: spi-adi-v3: convert to use common clk framework
Use common clk api to get spi clock.
Signed-off-by Scott Jiang <[email protected]>
--- arch/blackfin/mach-bf609/clock.c | 7 +++++++ drivers/spi/spi-adi-v3.c | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)
arch/blackfin/mach-bf609/clock.c +7 -0
@@ -381,6 +381,12 @@ static struct clk ethclk = { .ops = &dummy_clk_ops, }; +static struct clk spiclk = { + .name ="spi" , + .parent = &sclk1, + .ops = &dummy_clk_ops, +}; +static struct clk_lookup bf609_clks[] = {CLK (sys_clkin,NULL ,"SYS_CLKIN" ),CLK (pll_clk,NULL ,"PLLCLK" ),
@@ -393,6 +399,7 @@ static struct clk_lookup bf609_clks[] = {CLK (dclk,NULL ,"DCLK" ),CLK (oclk,NULL ,"OCLK" ),CLK (ethclk,NULL ,"stmmaceth" ), + CLK(spiclk, NULL, "spi"), };int __init clk_init (void )
drivers/spi/spi-adi-v3.c +7 -6
@@ -13,6 +13,7 @@* GNU General Public License for more details. */ +#include <linux/clk.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/dma-mapping.h>
@@ -800,7 +801,7 @@ static int adi_spi_probe(struct platform_device *pdev)struct adi_spi_master *drv_data;struct resource *mem, *res;unsigned int tx_dma, rx_dma; -unsigned long sclk; +struct clk *sclk;int ret;if (!info) {
@@ -808,10 +809,10 @@ static int adi_spi_probe(struct platform_device *pdev)return -ENODEV ; } - sclk =get_sclk1 (); -if (!sclk) { -dev_err (dev,"can not get sclk1\n" ); -return -ENXIO ; + sclk =devm_clk_get (dev,"spi" ); +if (IS_ERR (sclk)) { +dev_err (dev,"can not get spi clock\n" ); +return PTR_ERR (sclk); } res =platform_get_resource (pdev,IORESOURCE_DMA ,0 );
@@ -852,7 +853,7 @@ static int adi_spi_probe(struct platform_device *pdev) drv_data->tx_dma = tx_dma; drv_data->rx_dma = rx_dma; drv_data->pin_req = info->pin_req; - drv_data->sclk = sclk; + drv_data->sclk =clk_get_rate (sclk); mem =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); drv_data->regs =devm_ioremap_resource (dev, mem);
Signature · 7 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 1396668549-20052-1-git-send-email-scott.jiang.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Mark Brown
AppliedQuoted 1 line · Scott Jiang
Use common clk api to get spi clock.
Applied, thanks.