From 4a7bf65a439329d54b2e9ed9b1b4fcdbe08c2239 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Mon, 6 Jan 2014 10:43:36 +0800 Subject: [PATCH] rk: l2c: only init when chip is rockchip --- arch/arm/boot/dts/rk3188.dtsi | 2 +- arch/arm/mach-rockchip/common.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index a692e3f9c325..f2c72a5873b7 100755 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi @@ -60,7 +60,7 @@ }; L2: cache-controller@10138000 { - compatible = "arm,pl310-cache"; + compatible = "rockchip,pl310-cache", "arm,pl310-cache"; reg = <0x10138000 0x1000>; cache-unified; cache-level = <2>; diff --git a/arch/arm/mach-rockchip/common.c b/arch/arm/mach-rockchip/common.c index 93a9b4cb641f..c84f65543198 100644 --- a/arch/arm/mach-rockchip/common.c +++ b/arch/arm/mach-rockchip/common.c @@ -68,18 +68,13 @@ static int __init rockchip_cpu_axi_init(void) } early_initcall(rockchip_cpu_axi_init); -static const struct of_device_id pl330_ids[] __initconst = { - { .compatible = "arm,pl310-cache" }, - {} -}; - static int __init rockchip_pl330_l2_cache_init(void) { struct device_node *np; void __iomem *base; u32 aux[2] = { 0, ~0 }, prefetch, power; - np = of_find_matching_node(NULL, pl330_ids); + np = of_find_compatible_node(NULL, NULL, "rockchip,pl310-cache"); if (!np) return -ENODEV; -- 2.34.1