Skip to content

Commit

Permalink
ARM: l2c: prima2: remove cache size override
Browse files Browse the repository at this point in the history
The cache size should already be present in the L2 cache auxiliary
control register: it is part of the integration process to configure
the hardware IP.  Most platforms get this right, yet still many
cargo-cult program, and assume that they always need specifying to
the L2 cache code.  Remove them so we can find out which really need
this.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed May 29, 2014
1 parent d941f86 commit c95680e
Showing 1 changed file with 2 additions and 20 deletions.
22 changes: 2 additions & 20 deletions arch/arm/mach-prima2/l2x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,6 @@
#include <linux/of.h>
#include <asm/hardware/cache-l2x0.h>

struct l2x0_aux {
u32 val;
u32 mask;
};

static const struct l2x0_aux prima2_l2x0_aux __initconst = {
.val = L2C_AUX_CTRL_WAY_SIZE(2),
.mask = 0,
};

static const struct l2x0_aux marco_l2x0_aux __initconst = {
.val = L2C_AUX_CTRL_WAY_SIZE(2) | L310_AUX_CTRL_ASSOCIATIVITY_16,
.mask = L2X0_AUX_CTRL_MASK,
};

static const struct of_device_id sirf_l2x0_ids[] __initconst = {
{ .compatible = "sirf,prima2-pl310-cache", .data = &prima2_l2x0_aux, },
{ .compatible = "sirf,marco-pl310-cache", .data = &marco_l2x0_aux, },
Expand All @@ -35,13 +20,10 @@ static const struct of_device_id sirf_l2x0_ids[] __initconst = {
static int __init sirfsoc_l2x0_init(void)
{
struct device_node *np;
const struct l2x0_aux *aux;

np = of_find_matching_node(NULL, sirf_l2x0_ids);
if (np) {
aux = of_match_node(sirf_l2x0_ids, np)->data;
return l2x0_of_init(aux->val, aux->mask);
}
if (np)
return l2x0_of_init(0, ~0);

return 0;
}
Expand Down

0 comments on commit c95680e

Please sign in to comment.