mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
spi: meson-spifc: switch to use modern name
Change legacy name master/slave to modern name host/target or controller. No functional changed. Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Link: https://lore.kernel.org/r/20230823033003.3407403-5-yangyingliang@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
68bf3288c7
commit
55591ac481
1 changed files with 33 additions and 33 deletions
|
@ -67,13 +67,13 @@
|
|||
|
||||
/**
|
||||
* struct meson_spifc
|
||||
* @master: the SPI master
|
||||
* @host: the SPI host
|
||||
* @regmap: regmap for device registers
|
||||
* @clk: input clock of the built-in baud rate generator
|
||||
* @dev: the device structure
|
||||
*/
|
||||
struct meson_spifc {
|
||||
struct spi_master *master;
|
||||
struct spi_controller *host;
|
||||
struct regmap *regmap;
|
||||
struct clk *clk;
|
||||
struct device *dev;
|
||||
|
@ -237,16 +237,16 @@ static int meson_spifc_txrx(struct meson_spifc *spifc,
|
|||
|
||||
/**
|
||||
* meson_spifc_transfer_one() - perform a single transfer
|
||||
* @master: the SPI master
|
||||
* @host: the SPI host
|
||||
* @spi: the SPI device
|
||||
* @xfer: the current SPI transfer
|
||||
* Return: 0 on success, a negative value on error
|
||||
*/
|
||||
static int meson_spifc_transfer_one(struct spi_master *master,
|
||||
static int meson_spifc_transfer_one(struct spi_controller *host,
|
||||
struct spi_device *spi,
|
||||
struct spi_transfer *xfer)
|
||||
{
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
struct meson_spifc *spifc = spi_controller_get_devdata(host);
|
||||
int len, done = 0, ret = 0;
|
||||
|
||||
meson_spifc_setup_speed(spifc, xfer->speed_hz);
|
||||
|
@ -256,7 +256,7 @@ static int meson_spifc_transfer_one(struct spi_master *master,
|
|||
while (done < xfer->len && !ret) {
|
||||
len = min_t(int, xfer->len - done, SPIFC_BUFFER_SIZE);
|
||||
ret = meson_spifc_txrx(spifc, xfer, done, len,
|
||||
spi_transfer_is_last(master, xfer),
|
||||
spi_transfer_is_last(host, xfer),
|
||||
done + len >= xfer->len);
|
||||
done += len;
|
||||
}
|
||||
|
@ -284,19 +284,19 @@ static void meson_spifc_hw_init(struct meson_spifc *spifc)
|
|||
|
||||
static int meson_spifc_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master;
|
||||
struct spi_controller *host;
|
||||
struct meson_spifc *spifc;
|
||||
void __iomem *base;
|
||||
unsigned int rate;
|
||||
int ret = 0;
|
||||
|
||||
master = spi_alloc_master(&pdev->dev, sizeof(struct meson_spifc));
|
||||
if (!master)
|
||||
host = spi_alloc_host(&pdev->dev, sizeof(struct meson_spifc));
|
||||
if (!host)
|
||||
return -ENOMEM;
|
||||
|
||||
platform_set_drvdata(pdev, master);
|
||||
platform_set_drvdata(pdev, host);
|
||||
|
||||
spifc = spi_master_get_devdata(master);
|
||||
spifc = spi_controller_get_devdata(host);
|
||||
spifc->dev = &pdev->dev;
|
||||
|
||||
base = devm_platform_ioremap_resource(pdev, 0);
|
||||
|
@ -327,22 +327,22 @@ static int meson_spifc_probe(struct platform_device *pdev)
|
|||
|
||||
rate = clk_get_rate(spifc->clk);
|
||||
|
||||
master->num_chipselect = 1;
|
||||
master->dev.of_node = pdev->dev.of_node;
|
||||
master->bits_per_word_mask = SPI_BPW_MASK(8);
|
||||
master->auto_runtime_pm = true;
|
||||
master->transfer_one = meson_spifc_transfer_one;
|
||||
master->min_speed_hz = rate >> 6;
|
||||
master->max_speed_hz = rate >> 1;
|
||||
host->num_chipselect = 1;
|
||||
host->dev.of_node = pdev->dev.of_node;
|
||||
host->bits_per_word_mask = SPI_BPW_MASK(8);
|
||||
host->auto_runtime_pm = true;
|
||||
host->transfer_one = meson_spifc_transfer_one;
|
||||
host->min_speed_hz = rate >> 6;
|
||||
host->max_speed_hz = rate >> 1;
|
||||
|
||||
meson_spifc_hw_init(spifc);
|
||||
|
||||
pm_runtime_set_active(spifc->dev);
|
||||
pm_runtime_enable(spifc->dev);
|
||||
|
||||
ret = devm_spi_register_master(spifc->dev, master);
|
||||
ret = devm_spi_register_controller(spifc->dev, host);
|
||||
if (ret) {
|
||||
dev_err(spifc->dev, "failed to register spi master\n");
|
||||
dev_err(spifc->dev, "failed to register spi host\n");
|
||||
goto out_clk;
|
||||
}
|
||||
|
||||
|
@ -351,14 +351,14 @@ static int meson_spifc_probe(struct platform_device *pdev)
|
|||
clk_disable_unprepare(spifc->clk);
|
||||
pm_runtime_disable(spifc->dev);
|
||||
out_err:
|
||||
spi_master_put(master);
|
||||
spi_controller_put(host);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void meson_spifc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
struct spi_controller *host = platform_get_drvdata(pdev);
|
||||
struct meson_spifc *spifc = spi_controller_get_devdata(host);
|
||||
|
||||
pm_runtime_get_sync(&pdev->dev);
|
||||
clk_disable_unprepare(spifc->clk);
|
||||
|
@ -368,11 +368,11 @@ static void meson_spifc_remove(struct platform_device *pdev)
|
|||
#ifdef CONFIG_PM_SLEEP
|
||||
static int meson_spifc_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
struct spi_controller *host = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_controller_get_devdata(host);
|
||||
int ret;
|
||||
|
||||
ret = spi_master_suspend(master);
|
||||
ret = spi_controller_suspend(host);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -384,8 +384,8 @@ static int meson_spifc_suspend(struct device *dev)
|
|||
|
||||
static int meson_spifc_resume(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
struct spi_controller *host = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_controller_get_devdata(host);
|
||||
int ret;
|
||||
|
||||
if (!pm_runtime_suspended(dev)) {
|
||||
|
@ -396,7 +396,7 @@ static int meson_spifc_resume(struct device *dev)
|
|||
|
||||
meson_spifc_hw_init(spifc);
|
||||
|
||||
ret = spi_master_resume(master);
|
||||
ret = spi_controller_resume(host);
|
||||
if (ret)
|
||||
clk_disable_unprepare(spifc->clk);
|
||||
|
||||
|
@ -407,8 +407,8 @@ static int meson_spifc_resume(struct device *dev)
|
|||
#ifdef CONFIG_PM
|
||||
static int meson_spifc_runtime_suspend(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
struct spi_controller *host = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_controller_get_devdata(host);
|
||||
|
||||
clk_disable_unprepare(spifc->clk);
|
||||
|
||||
|
@ -417,8 +417,8 @@ static int meson_spifc_runtime_suspend(struct device *dev)
|
|||
|
||||
static int meson_spifc_runtime_resume(struct device *dev)
|
||||
{
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
struct spi_controller *host = dev_get_drvdata(dev);
|
||||
struct meson_spifc *spifc = spi_controller_get_devdata(host);
|
||||
|
||||
return clk_prepare_enable(spifc->clk);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue