diff options
| author | Russell King | 2014-04-28 16:41:08 +0200 |
|---|---|---|
| committer | Russell King | 2014-05-30 01:49:55 +0200 |
| commit | 918197be3992801054ff02fc8183bf9429bab98b (patch) | |
| tree | d6ea74486c1736ab654cbcfc3a70565019549089 /arch/arm/boot | |
| parent | ARM: l2c: prima2: remove cache size override (diff) | |
| download | kernel-qcow2-linux-918197be3992801054ff02fc8183bf9429bab98b.tar.gz kernel-qcow2-linux-918197be3992801054ff02fc8183bf9429bab98b.tar.xz kernel-qcow2-linux-918197be3992801054ff02fc8183bf9429bab98b.zip | |
ARM: l2c: prima2: convert to generic l2c OF initialisation
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead. Along with this change, we can delete l2x0.c
from prima2.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/marco.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/prima2.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/marco.dtsi b/arch/arm/boot/dts/marco.dtsi index 0c9647d28765..fb354225740a 100644 --- a/arch/arm/boot/dts/marco.dtsi +++ b/arch/arm/boot/dts/marco.dtsi @@ -36,7 +36,7 @@ ranges = <0x40000000 0x40000000 0xa0000000>; l2-cache-controller@c0030000 { - compatible = "sirf,marco-pl310-cache", "arm,pl310-cache"; + compatible = "arm,pl310-cache"; reg = <0xc0030000 0x1000>; interrupts = <0 59 0>; arm,tag-latency = <1 1 1>; diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi index 1e82571d6823..0d6588d549bf 100644 --- a/arch/arm/boot/dts/prima2.dtsi +++ b/arch/arm/boot/dts/prima2.dtsi @@ -48,7 +48,7 @@ ranges = <0x40000000 0x40000000 0x80000000>; l2-cache-controller@80040000 { - compatible = "arm,pl310-cache", "sirf,prima2-pl310-cache"; + compatible = "arm,pl310-cache"; reg = <0x80040000 0x1000>; interrupts = <59>; arm,tag-latency = <1 1 1>; |