Merge branch 'vexpress/fixes' of git://git.linaro.org/people/pawelmoll/linux into fixes
From Pawel Moll: - makes the V2P-CA15_A7 (a.k.a. TC2) work with 3.8 kernels - improves vexpress-sysreg.c behaviour on arm64 platforms * 'vexpress/fixes' of git://git.linaro.org/people/pawelmoll/linux: mfd: vexpress-sysreg: Don't skip initialization on probe ARM: vexpress: Enable A7 cores in V2P-CA15_A7's Device Tree ARM: vexpress: extend the MPIDR range used for pen release check
This commit is contained in:
commit
3836414f45
|
@ -45,7 +45,6 @@
|
||||||
reg = <1>;
|
reg = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* A7s disabled till big.LITTLE patches are available...
|
|
||||||
cpu2: cpu@2 {
|
cpu2: cpu@2 {
|
||||||
device_type = "cpu";
|
device_type = "cpu";
|
||||||
compatible = "arm,cortex-a7";
|
compatible = "arm,cortex-a7";
|
||||||
|
@ -63,7 +62,6 @@
|
||||||
compatible = "arm,cortex-a7";
|
compatible = "arm,cortex-a7";
|
||||||
reg = <0x102>;
|
reg = <0x102>;
|
||||||
};
|
};
|
||||||
*/
|
|
||||||
};
|
};
|
||||||
|
|
||||||
memory@80000000 {
|
memory@80000000 {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
*/
|
*/
|
||||||
ENTRY(versatile_secondary_startup)
|
ENTRY(versatile_secondary_startup)
|
||||||
mrc p15, 0, r0, c0, c0, 5
|
mrc p15, 0, r0, c0, c0, 5
|
||||||
and r0, r0, #15
|
bic r0, #0xff000000
|
||||||
adr r4, 1f
|
adr r4, 1f
|
||||||
ldmia r4, {r5, r6}
|
ldmia r4, {r5, r6}
|
||||||
sub r4, r4, r5
|
sub r4, r4, r5
|
||||||
|
|
|
@ -313,19 +313,11 @@ static void vexpress_sysreg_config_complete(unsigned long data)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void __init vexpress_sysreg_early_init(void __iomem *base)
|
void __init vexpress_sysreg_setup(struct device_node *node)
|
||||||
{
|
{
|
||||||
struct device_node *node = of_find_compatible_node(NULL, NULL,
|
if (WARN_ON(!vexpress_sysreg_base))
|
||||||
"arm,vexpress-sysreg");
|
|
||||||
|
|
||||||
if (node)
|
|
||||||
base = of_iomap(node, 0);
|
|
||||||
|
|
||||||
if (WARN_ON(!base))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
vexpress_sysreg_base = base;
|
|
||||||
|
|
||||||
if (readl(vexpress_sysreg_base + SYS_MISC) & SYS_MISC_MASTERSITE)
|
if (readl(vexpress_sysreg_base + SYS_MISC) & SYS_MISC_MASTERSITE)
|
||||||
vexpress_master_site = VEXPRESS_SITE_DB2;
|
vexpress_master_site = VEXPRESS_SITE_DB2;
|
||||||
else
|
else
|
||||||
|
@ -336,9 +328,23 @@ void __init vexpress_sysreg_early_init(void __iomem *base)
|
||||||
WARN_ON(!vexpress_sysreg_config_bridge);
|
WARN_ON(!vexpress_sysreg_config_bridge);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void __init vexpress_sysreg_early_init(void __iomem *base)
|
||||||
|
{
|
||||||
|
vexpress_sysreg_base = base;
|
||||||
|
vexpress_sysreg_setup(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
void __init vexpress_sysreg_of_early_init(void)
|
void __init vexpress_sysreg_of_early_init(void)
|
||||||
{
|
{
|
||||||
vexpress_sysreg_early_init(NULL);
|
struct device_node *node = of_find_compatible_node(NULL, NULL,
|
||||||
|
"arm,vexpress-sysreg");
|
||||||
|
|
||||||
|
if (node) {
|
||||||
|
vexpress_sysreg_base = of_iomap(node, 0);
|
||||||
|
vexpress_sysreg_setup(node);
|
||||||
|
} else {
|
||||||
|
pr_info("vexpress-sysreg: No Device Tree node found.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -426,9 +432,11 @@ static int vexpress_sysreg_probe(struct platform_device *pdev)
|
||||||
return -EBUSY;
|
return -EBUSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!vexpress_sysreg_base)
|
if (!vexpress_sysreg_base) {
|
||||||
vexpress_sysreg_base = devm_ioremap(&pdev->dev, res->start,
|
vexpress_sysreg_base = devm_ioremap(&pdev->dev, res->start,
|
||||||
resource_size(res));
|
resource_size(res));
|
||||||
|
vexpress_sysreg_setup(pdev->dev.of_node);
|
||||||
|
}
|
||||||
|
|
||||||
if (!vexpress_sysreg_base) {
|
if (!vexpress_sysreg_base) {
|
||||||
dev_err(&pdev->dev, "Failed to obtain base address!\n");
|
dev_err(&pdev->dev, "Failed to obtain base address!\n");
|
||||||
|
|
Loading…
Reference in New Issue