Commit a55efa7e authored by Michał Mirosław's avatar Michał Mirosław Committed by Wolfram Sang
Browse files

i2c: tegra: allow DVC support to be compiled out 



Save a bit of code for newer Tegra platforms by compiling out
DVC's I2C mode support that's used only for Tegra2.

$ size i2c-tegra.o
    text    data     bss     dec     hex filename
-  11381     292       8   11681    2da1 i2c-tegra.o
+  10193     292       8   10493    28fd i2c-tegra.o

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent fcc8a89a

drivers/i2c/busses/i2c-tegra.c

+11 −6
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ struct tegra_i2c_dev { 
	bool is_vi;

};



#define IS_DVC(dev) (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && (dev)->is_dvc)



static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,

		       unsigned int reg)

{
@@ -313,7 +315,7 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned int reg) 
 */

static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, unsigned int reg)

{

	if (i2c_dev->is_dvc)

	if (IS_DVC(i2c_dev))

		reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;

	else if (i2c_dev->is_vi)

		reg = 0xc00 + (reg << 2);
@@ -622,7 +624,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) 


	WARN_ON_ONCE(err);



	if (i2c_dev->is_dvc)

	if (IS_DVC(i2c_dev))

		tegra_dvc_init(i2c_dev);



	val = I2C_CNFG_NEW_MASTER_FSM | I2C_CNFG_PACKET_MODE_EN |
@@ -686,7 +688,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) 
		return err;

	}



	if (!i2c_dev->is_dvc && !i2c_dev->is_vi) {

	if (!IS_DVC(i2c_dev) && !i2c_dev->is_vi) {

		u32 sl_cfg = i2c_readl(i2c_dev, I2C_SL_CNFG);



		sl_cfg |= I2C_SL_CNFG_NACK | I2C_SL_CNFG_NEWSL;
@@ -916,7 +918,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) 
	}



	i2c_writel(i2c_dev, status, I2C_INT_STATUS);

	if (i2c_dev->is_dvc)

	if (IS_DVC(i2c_dev))

		dvc_writel(i2c_dev, DVC_STATUS_I2C_DONE_INTR, DVC_STATUS);



	/*
@@ -955,7 +957,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) 


	i2c_writel(i2c_dev, status, I2C_INT_STATUS);



	if (i2c_dev->is_dvc)

	if (IS_DVC(i2c_dev))

		dvc_writel(i2c_dev, DVC_STATUS_I2C_DONE_INTR, DVC_STATUS);



	if (i2c_dev->dma_mode) {
@@ -1631,7 +1633,9 @@ static const struct of_device_id tegra_i2c_of_match[] = { 
	{ .compatible = "nvidia,tegra114-i2c", .data = &tegra114_i2c_hw, },

	{ .compatible = "nvidia,tegra30-i2c", .data = &tegra30_i2c_hw, },

	{ .compatible = "nvidia,tegra20-i2c", .data = &tegra20_i2c_hw, },

#if IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC)

	{ .compatible = "nvidia,tegra20-i2c-dvc", .data = &tegra20_i2c_hw, },

#endif

	{},

};

MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
@@ -1646,7 +1650,8 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev) 
	multi_mode = device_property_read_bool(i2c_dev->dev, "multi-master");

	i2c_dev->multimaster_mode = multi_mode;



	if (of_device_is_compatible(np, "nvidia,tegra20-i2c-dvc"))

	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&

	    of_device_is_compatible(np, "nvidia,tegra20-i2c-dvc"))

		i2c_dev->is_dvc = true;



	if (of_device_is_compatible(np, "nvidia,tegra210-i2c-vi"))