Skip to content

L
linux
Commit cb2b5839 authored by Thierry Reding's avatar Thierry Reding
Browse files
Options

memory: tegra: Properly spell "tegra" 

Rename all occurrences of "terga" to "tegra". It's an easy typo to make
and a difficult one to spot.
Reviewed-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent f2222a9e
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
drivers/memory/tegra/mc.c
View file @ cb2b5839
...@@ -74,7 +74,7 @@ static const struct of_device_id tegra_mc_of_match[] = { ...@@ -74,7 +74,7 @@ static const struct of_device_id tegra_mc_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, tegra_mc_of_match); MODULE_DEVICE_TABLE(of, tegra_mc_of_match);
static int terga_mc_block_dma_common(struct tegra_mc *mc, static int tegra_mc_block_dma_common(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
unsigned long flags; unsigned long flags;
...@@ -90,13 +90,13 @@ static int terga_mc_block_dma_common(struct tegra_mc *mc, ...@@ -90,13 +90,13 @@ static int terga_mc_block_dma_common(struct tegra_mc *mc,
return 0; return 0;
} }
static bool terga_mc_dma_idling_common(struct tegra_mc *mc, static bool tegra_mc_dma_idling_common(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
return (mc_readl(mc, rst->status) & BIT(rst->bit)) != 0; return (mc_readl(mc, rst->status) & BIT(rst->bit)) != 0;
} }
static int terga_mc_unblock_dma_common(struct tegra_mc *mc, static int tegra_mc_unblock_dma_common(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
unsigned long flags; unsigned long flags;
...@@ -112,17 +112,17 @@ static int terga_mc_unblock_dma_common(struct tegra_mc *mc, ...@@ -112,17 +112,17 @@ static int terga_mc_unblock_dma_common(struct tegra_mc *mc,
return 0; return 0;
} }
static int terga_mc_reset_status_common(struct tegra_mc *mc, static int tegra_mc_reset_status_common(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
return (mc_readl(mc, rst->control) & BIT(rst->bit)) != 0; return (mc_readl(mc, rst->control) & BIT(rst->bit)) != 0;
} }
const struct tegra_mc_reset_ops terga_mc_reset_ops_common = { const struct tegra_mc_reset_ops tegra_mc_reset_ops_common = {
.block_dma = terga_mc_block_dma_common, .block_dma = tegra_mc_block_dma_common,
.dma_idling = terga_mc_dma_idling_common, .dma_idling = tegra_mc_dma_idling_common,
.unblock_dma = terga_mc_unblock_dma_common, .unblock_dma = tegra_mc_unblock_dma_common,
.reset_status = terga_mc_reset_status_common, .reset_status = tegra_mc_reset_status_common,
}; };
static inline struct tegra_mc *reset_to_mc(struct reset_controller_dev *rcdev) static inline struct tegra_mc *reset_to_mc(struct reset_controller_dev *rcdev)
......
drivers/memory/tegra/mc.h
View file @ cb2b5839
...@@ -35,7 +35,7 @@ static inline void mc_writel(struct tegra_mc *mc, u32 value, ...@@ -35,7 +35,7 @@ static inline void mc_writel(struct tegra_mc *mc, u32 value,
writel_relaxed(value, mc->regs + offset); writel_relaxed(value, mc->regs + offset);
} }
extern const struct tegra_mc_reset_ops terga_mc_reset_ops_common; extern const struct tegra_mc_reset_ops tegra_mc_reset_ops_common;
#ifdef CONFIG_ARCH_TEGRA_2x_SOC #ifdef CONFIG_ARCH_TEGRA_2x_SOC
extern const struct tegra_mc_soc tegra20_mc_soc; extern const struct tegra_mc_soc tegra20_mc_soc;
......
drivers/memory/tegra/tegra114.c
View file @ cb2b5839
...@@ -975,7 +975,7 @@ const struct tegra_mc_soc tegra114_mc_soc = { ...@@ -975,7 +975,7 @@ const struct tegra_mc_soc tegra114_mc_soc = {
.smmu = &tegra114_smmu_soc, .smmu = &tegra114_smmu_soc,
.intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION | .intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION |
MC_INT_DECERR_EMEM, MC_INT_DECERR_EMEM,
.reset_ops = &terga_mc_reset_ops_common, .reset_ops = &tegra_mc_reset_ops_common,
.resets = tegra114_mc_resets, .resets = tegra114_mc_resets,
.num_resets = ARRAY_SIZE(tegra114_mc_resets), .num_resets = ARRAY_SIZE(tegra114_mc_resets),
}; };
drivers/memory/tegra/tegra124.c
View file @ cb2b5839
...@@ -1074,7 +1074,7 @@ const struct tegra_mc_soc tegra124_mc_soc = { ...@@ -1074,7 +1074,7 @@ const struct tegra_mc_soc tegra124_mc_soc = {
.intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR | .intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |
MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE | MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |
MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM,
.reset_ops = &terga_mc_reset_ops_common, .reset_ops = &tegra_mc_reset_ops_common,
.resets = tegra124_mc_resets, .resets = tegra124_mc_resets,
.num_resets = ARRAY_SIZE(tegra124_mc_resets), .num_resets = ARRAY_SIZE(tegra124_mc_resets),
}; };
...@@ -1104,7 +1104,7 @@ const struct tegra_mc_soc tegra132_mc_soc = { ...@@ -1104,7 +1104,7 @@ const struct tegra_mc_soc tegra132_mc_soc = {
.intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR | .intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |
MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE | MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |
MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM,
.reset_ops = &terga_mc_reset_ops_common, .reset_ops = &tegra_mc_reset_ops_common,
.resets = tegra124_mc_resets, .resets = tegra124_mc_resets,
.num_resets = ARRAY_SIZE(tegra124_mc_resets), .num_resets = ARRAY_SIZE(tegra124_mc_resets),
}; };
......
drivers/memory/tegra/tegra20.c
View file @ cb2b5839
...@@ -198,7 +198,7 @@ static const struct tegra_mc_reset tegra20_mc_resets[] = { ...@@ -198,7 +198,7 @@ static const struct tegra_mc_reset tegra20_mc_resets[] = {
TEGRA20_MC_RESET(VI, 0x100, 0x178, 0x104, 14), TEGRA20_MC_RESET(VI, 0x100, 0x178, 0x104, 14),
}; };
static int terga20_mc_hotreset_assert(struct tegra_mc *mc, static int tegra20_mc_hotreset_assert(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
unsigned long flags; unsigned long flags;
...@@ -214,7 +214,7 @@ static int terga20_mc_hotreset_assert(struct tegra_mc *mc, ...@@ -214,7 +214,7 @@ static int terga20_mc_hotreset_assert(struct tegra_mc *mc,
return 0; return 0;
} }
static int terga20_mc_hotreset_deassert(struct tegra_mc *mc, static int tegra20_mc_hotreset_deassert(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
unsigned long flags; unsigned long flags;
...@@ -230,7 +230,7 @@ static int terga20_mc_hotreset_deassert(struct tegra_mc *mc, ...@@ -230,7 +230,7 @@ static int terga20_mc_hotreset_deassert(struct tegra_mc *mc,
return 0; return 0;
} }
static int terga20_mc_block_dma(struct tegra_mc *mc, static int tegra20_mc_block_dma(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
unsigned long flags; unsigned long flags;
...@@ -246,19 +246,19 @@ static int terga20_mc_block_dma(struct tegra_mc *mc, ...@@ -246,19 +246,19 @@ static int terga20_mc_block_dma(struct tegra_mc *mc,
return 0; return 0;
} }
static bool terga20_mc_dma_idling(struct tegra_mc *mc, static bool tegra20_mc_dma_idling(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
return mc_readl(mc, rst->status) == 0; return mc_readl(mc, rst->status) == 0;
} }
static int terga20_mc_reset_status(struct tegra_mc *mc, static int tegra20_mc_reset_status(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
return (mc_readl(mc, rst->reset) & BIT(rst->bit)) == 0; return (mc_readl(mc, rst->reset) & BIT(rst->bit)) == 0;
} }
static int terga20_mc_unblock_dma(struct tegra_mc *mc, static int tegra20_mc_unblock_dma(struct tegra_mc *mc,
const struct tegra_mc_reset *rst) const struct tegra_mc_reset *rst)
{ {
unsigned long flags; unsigned long flags;
...@@ -274,13 +274,13 @@ static int terga20_mc_unblock_dma(struct tegra_mc *mc, ...@@ -274,13 +274,13 @@ static int terga20_mc_unblock_dma(struct tegra_mc *mc,
return 0; return 0;
} }
static const struct tegra_mc_reset_ops terga20_mc_reset_ops = { static const struct tegra_mc_reset_ops tegra20_mc_reset_ops = {
.hotreset_assert = terga20_mc_hotreset_assert, .hotreset_assert = tegra20_mc_hotreset_assert,
.hotreset_deassert = terga20_mc_hotreset_deassert, .hotreset_deassert = tegra20_mc_hotreset_deassert,
.block_dma = terga20_mc_block_dma, .block_dma = tegra20_mc_block_dma,
.dma_idling = terga20_mc_dma_idling, .dma_idling = tegra20_mc_dma_idling,
.unblock_dma = terga20_mc_unblock_dma, .unblock_dma = tegra20_mc_unblock_dma,
.reset_status = terga20_mc_reset_status, .reset_status = tegra20_mc_reset_status,
}; };
const struct tegra_mc_soc tegra20_mc_soc = { const struct tegra_mc_soc tegra20_mc_soc = {
...@@ -290,7 +290,7 @@ const struct tegra_mc_soc tegra20_mc_soc = { ...@@ -290,7 +290,7 @@ const struct tegra_mc_soc tegra20_mc_soc = {
.client_id_mask = 0x3f, .client_id_mask = 0x3f,
.intmask = MC_INT_SECURITY_VIOLATION | MC_INT_INVALID_GART_PAGE | .intmask = MC_INT_SECURITY_VIOLATION | MC_INT_INVALID_GART_PAGE |
MC_INT_DECERR_EMEM, MC_INT_DECERR_EMEM,
.reset_ops = &terga20_mc_reset_ops, .reset_ops = &tegra20_mc_reset_ops,
.resets = tegra20_mc_resets, .resets = tegra20_mc_resets,
.num_resets = ARRAY_SIZE(tegra20_mc_resets), .num_resets = ARRAY_SIZE(tegra20_mc_resets),
}; };
drivers/memory/tegra/tegra210.c
View file @ cb2b5839
...@@ -1132,7 +1132,7 @@ const struct tegra_mc_soc tegra210_mc_soc = { ...@@ -1132,7 +1132,7 @@ const struct tegra_mc_soc tegra210_mc_soc = {
.intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR | .intmask = MC_INT_DECERR_MTS | MC_INT_SECERR_SEC | MC_INT_DECERR_VPR |
MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE | MC_INT_INVALID_APB_ASID_UPDATE | MC_INT_INVALID_SMMU_PAGE |
MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM, MC_INT_SECURITY_VIOLATION | MC_INT_DECERR_EMEM,
.reset_ops = &terga_mc_reset_ops_common, .reset_ops = &tegra_mc_reset_ops_common,
.resets = tegra210_mc_resets, .resets = tegra210_mc_resets,
.num_resets = ARRAY_SIZE(tegra210_mc_resets), .num_resets = ARRAY_SIZE(tegra210_mc_resets),
}; };
drivers/memory/tegra/tegra30.c
View file @ cb2b5839
...@@ -999,7 +999,7 @@ const struct tegra_mc_soc tegra30_mc_soc = { ...@@ -999,7 +999,7 @@ const struct tegra_mc_soc tegra30_mc_soc = {
.smmu = &tegra30_smmu_soc, .smmu = &tegra30_smmu_soc,
.intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION | .intmask = MC_INT_INVALID_SMMU_PAGE | MC_INT_SECURITY_VIOLATION |
MC_INT_DECERR_EMEM, MC_INT_DECERR_EMEM,
.reset_ops = &terga_mc_reset_ops_common, .reset_ops = &tegra_mc_reset_ops_common,
.resets = tegra30_mc_resets, .resets = tegra30_mc_resets,
.num_resets = ARRAY_SIZE(tegra30_mc_resets), .num_resets = ARRAY_SIZE(tegra30_mc_resets),
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7