i2c: tegra: allow compiling out support for Tegra's special controllers
v3 cover i2c: tegra: allow compiling out support for Tegra's special controllers
Two patches that, combined, reduce I2C driver's code by ~2kB and a bit from runtime overhead for non-Tegra20 or non-Tegra210 builds.
v3: added parentheses for IS_DVC and IS_VI macros as requested by
Wolfram Sang (from checkpatch --strict report).
v2: remove KConfig symbols as per Dmitry Osipenko's suggestion.
This assumes that for relevant SoCs the special controller implementations will be used anyway.
Michał Mirosław (2):
i2c: tegra: allow DVC support to be compiled out
i2c: tegra: allow VI support to be compiled out
drivers/i2c/busses/i2c-tegra.c | 35 +++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-)
Signature · 1 line
2.39.2
PATCH v3 1/2 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
- 10385 240 8 10633 2989 i2c-tegra.o
+ 9617 240 8 9865 2689 i2c-tegra.o---
v3: add parentheses for IS_DVC() macro value
v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
(Assuming that for Tegra20 the DVC part will be used anyway.)
--- drivers/i2c/busses/i2c-tegra.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-tegra.c +11 -6
@@ -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 );
@@ -637,7 +639,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 |
@@ -701,7 +703,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 ;
@@ -931,7 +933,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 );/*
@@ -970,7 +972,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) {
@@ -1646,7 +1648,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);
@@ -1661,7 +1665,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" ))
Signature · 1 line
2.39.2
PATCH v3 2/2 i2c: tegra: allow VI support to be compiled out
In reply to Michał MirosławSave 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 10385 240 8 10633 2989 i2c-tegra.o (full) 9617 240 8 9865 2689 i2c-tegra.o (no-dvc) 9389 240 8 9637 25a5 i2c-tegra.o (no-vi) 8617 240 8 8865 22a1 i2c-tegra.o (no-vi,no-dvc)
---
v3: add parentheses for IS_VI() macro value
v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
(Assuming that for Tegra210 the VI part will be used anyway.)
--- drivers/i2c/busses/i2c-tegra.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-tegra.c +12 -8
@@ -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;
@@ -446,7 +447,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) {
@@ -651,7 +652,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) {
@@ -703,7 +704,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 ;
@@ -1642,7 +1643,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, },
@@ -1669,7 +1672,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; }
@@ -1698,7 +1702,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,
@@ -1816,7 +1820,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);
@@ -1890,7 +1894,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;
Signature · 1 line
2.39.2