i2c: tegra: allow VI support to be compiled out

Save a bit of code for older Tegra platforms by compiling out
VI's I2C mode support that's used only for Tegra210.

$ size i2c-tegra.o
   text    data     bss     dec     hex filename
  11381     292       8   11681    2da1 i2c-tegra.o (full)
  10193     292       8   10493    28fd i2c-tegra.o (no-dvc)
   9145     292       8    9445    24e5 i2c-tegra.o (no-vi,no-dvc)

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index fe886415d7711cebc43a484d4e3f98cead57ef00..bcbbf23aa530c946749464abe0af4385e920df31 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -297,6 +297,7 @@ struct tegra_i2c_dev {
 };
 
 #define IS_DVC(dev) (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && (dev)->is_dvc)
+#define IS_VI(dev)  (IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) && (dev)->is_vi)
 
 static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
                       unsigned int reg)
@@ -317,7 +318,7 @@ static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, unsigned int reg)
 {
        if (IS_DVC(i2c_dev))
                reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;
-       else if (i2c_dev->is_vi)
+       else if (IS_VI(i2c_dev))
                reg = 0xc00 + (reg << 2);
 
        return reg;
@@ -330,7 +331,7 @@ static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val, unsigned int reg)
        /* read back register to make sure that register writes completed */
        if (reg != I2C_TX_FIFO)
                readl_relaxed(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, reg));
-       else if (i2c_dev->is_vi)
+       else if (IS_VI(i2c_dev))
                readl_relaxed(i2c_dev->base + tegra_i2c_reg_addr(i2c_dev, I2C_INT_STATUS));
 }
 
@@ -438,7 +439,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
        u32 *dma_buf;
        int err;
 
-       if (i2c_dev->is_vi)
+       if (IS_VI(i2c_dev))
                return 0;
 
        if (!i2c_dev->hw->has_apb_dma) {
@@ -636,7 +637,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
        i2c_writel(i2c_dev, val, I2C_CNFG);
        i2c_writel(i2c_dev, 0, I2C_INT_MASK);
 
-       if (i2c_dev->is_vi)
+       if (IS_VI(i2c_dev))
                tegra_i2c_vi_init(i2c_dev);
 
        switch (t->bus_freq_hz) {
@@ -688,7 +689,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
                return err;
        }
 
-       if (!IS_DVC(i2c_dev) && !i2c_dev->is_vi) {
+       if (!IS_DVC(i2c_dev) && !IS_VI(i2c_dev)) {
                u32 sl_cfg = i2c_readl(i2c_dev, I2C_SL_CNFG);
 
                sl_cfg |= I2C_SL_CNFG_NACK | I2C_SL_CNFG_NEWSL;
@@ -831,7 +832,7 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)
                i2c_dev->msg_buf_remaining = buf_remaining;
                i2c_dev->msg_buf = buf + words_to_transfer * BYTES_PER_FIFO_WORD;
 
-               if (i2c_dev->is_vi)
+               if (IS_VI(i2c_dev))
                        i2c_writesl_vi(i2c_dev, buf, I2C_TX_FIFO, words_to_transfer);
                else
                        i2c_writesl(i2c_dev, buf, I2C_TX_FIFO, words_to_transfer);
@@ -1627,7 +1628,9 @@ static const struct tegra_i2c_hw_feature tegra194_i2c_hw = {
 static const struct of_device_id tegra_i2c_of_match[] = {
        { .compatible = "nvidia,tegra194-i2c", .data = &tegra194_i2c_hw, },
        { .compatible = "nvidia,tegra186-i2c", .data = &tegra186_i2c_hw, },
+#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
        { .compatible = "nvidia,tegra210-i2c-vi", .data = &tegra210_i2c_hw, },
+#endif
        { .compatible = "nvidia,tegra210-i2c", .data = &tegra210_i2c_hw, },
        { .compatible = "nvidia,tegra124-i2c", .data = &tegra124_i2c_hw, },
        { .compatible = "nvidia,tegra114-i2c", .data = &tegra114_i2c_hw, },
@@ -1654,7 +1657,8 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev)
            of_device_is_compatible(np, "nvidia,tegra20-i2c-dvc"))
                i2c_dev->is_dvc = true;
 
-       if (of_device_is_compatible(np, "nvidia,tegra210-i2c-vi"))
+       if (IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) &&
+           of_device_is_compatible(np, "nvidia,tegra210-i2c-vi"))
                i2c_dev->is_vi = true;
 }
 
@@ -1683,7 +1687,7 @@ static int tegra_i2c_init_clocks(struct tegra_i2c_dev *i2c_dev)
        if (i2c_dev->hw == &tegra20_i2c_hw || i2c_dev->hw == &tegra30_i2c_hw)
                i2c_dev->clocks[i2c_dev->nclocks++].id = "fast-clk";
 
-       if (i2c_dev->is_vi)
+       if (IS_VI(i2c_dev))
                i2c_dev->clocks[i2c_dev->nclocks++].id = "slow";
 
        err = devm_clk_bulk_get(i2c_dev->dev, i2c_dev->nclocks,
@@ -1801,7 +1805,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
         * VI I2C device shouldn't be marked as IRQ-safe because VI I2C won't
         * be used for atomic transfers.
         */
-       if (!i2c_dev->is_vi)
+       if (!IS_VI(i2c_dev))
                pm_runtime_irq_safe(i2c_dev->dev);
 
        pm_runtime_enable(i2c_dev->dev);
@@ -1873,7 +1877,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
         * power ON/OFF during runtime PM resume/suspend, meaning that
         * controller needs to be re-initialized after power ON.
         */
-       if (i2c_dev->is_vi) {
+       if (IS_VI(i2c_dev)) {
                err = tegra_i2c_init(i2c_dev);
                if (err)
                        goto disable_clocks;