From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rohit K Bharadwaj Subject: [PATCH] change slave occurence to secondary everywhere Date: Thu, 23 Jul 2020 20:28:11 +0530 Message-ID: <20200723145811.21109-1-bharadwaj.rohit8@gmail.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: Sender: linux-tegra-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: marvin24-Mmb7MZpHnFY@public.gmane.org, gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org, p.zabel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org Cc: Rohit K Bharadwaj , ac100-oU9gvf+ajcQ97yFScArB1dHuzzzSOjJt@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org List-Id: linux-tegra@vger.kernel.org Signed-off-by: Rohit K Bharadwaj --- drivers/staging/nvec/nvec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 360ec0407740..5d7b66719a39 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -718,7 +718,7 @@ static irqreturn_t nvec_interrupt(int irq, void *dev) return IRQ_HANDLED; } -static void tegra_init_i2c_slave(struct nvec_chip *nvec) +static void tegra_init_i2c_secondary(struct nvec_chip *nvec) { u32 val; @@ -744,7 +744,7 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec) } #ifdef CONFIG_PM_SLEEP -static void nvec_disable_i2c_slave(struct nvec_chip *nvec) +static void nvec_disable_i2c_secondary(struct nvec_chip *nvec) { disable_irq(nvec->irq); writel(I2C_SL_NEWSL | I2C_SL_NACK, nvec->base + I2C_SL_CNFG); @@ -784,7 +784,7 @@ static int tegra_nvec_probe(struct platform_device *pdev) platform_set_drvdata(pdev, nvec); nvec->dev = dev; - if (of_property_read_u32(dev->of_node, "slave-addr", &nvec->i2c_addr)) { + if (of_property_read_u32(dev->of_node, "secondary-addr", &nvec->i2c_addr)) { dev_err(dev, "no i2c address specified"); return -ENODEV; } @@ -839,7 +839,7 @@ static int tegra_nvec_probe(struct platform_device *pdev) } disable_irq(nvec->irq); - tegra_init_i2c_slave(nvec); + tegra_init_i2c_secondary(nvec); /* enable event reporting */ nvec_toggle_global_events(nvec, true); @@ -913,7 +913,7 @@ static int nvec_suspend(struct device *dev) if (!err) nvec_msg_free(nvec, msg); - nvec_disable_i2c_slave(nvec); + nvec_disable_i2c_secondary(nvec); return 0; } @@ -923,7 +923,7 @@ static int nvec_resume(struct device *dev) struct nvec_chip *nvec = dev_get_drvdata(dev); dev_dbg(nvec->dev, "resuming\n"); - tegra_init_i2c_slave(nvec); + tegra_init_i2c_secondary(nvec); nvec_toggle_global_events(nvec, true); return 0; -- 2.25.1