diff options
| author | Emil Medve <Emilian.Medve@Freescale.com> | 2013-09-11 20:53:07 (GMT) |
|---|---|---|
| committer | Emilian Medve <Emilian.Medve@freescale.com> | 2014-01-01 02:06:43 (GMT) |
| commit | c72da5b67196faa5957ba0b0bed109e6d04dab93 (patch) | |
| tree | b88d8ed80e63c57bea5dfe8b30b9498bf9a22930 /arch | |
| parent | e7b2a3afbde7354eed7ccd1f9cfe21ba0414143e (diff) | |
| download | linux-fsl-qoriq-c72da5b67196faa5957ba0b0bed109e6d04dab93.tar.xz | |
powerpc/b4860: Fix merge duplication
d31c342 Merge branch 'sdk-kernel-3.8' into master
Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
Change-Id: I9d5f3f45bfe4b01583ba0469a405dac13b723aac
Reviewed-on: http://git.am.freescale.net:8181/4680
Reviewed-by: Emilian Medve <Emilian.Medve@freescale.com>
Tested-by: Emilian Medve <Emilian.Medve@freescale.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi index 751a29b..418bcb0 100644 --- a/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4860si-post.dtsi @@ -541,24 +541,6 @@ next-level-cache = <&cpc>; }; - L2_2: l2-cache-controller@c60000 { - compatible = "fsl,b4860-l2-cache-controller"; - reg = <0xc60000 0x1000>; - next-level-cache = <&cpc>; - }; - - L2_3: l2-cache-controller@ca0000 { - compatible = "fsl,b4860-l2-cache-controller"; - reg = <0xca0000 0x1000>; - next-level-cache = <&cpc>; - }; - - L2_4: l2-cache-controller@ce0000 { - compatible = "fsl,b4860-l2-cache-controller"; - reg = <0xce0000 0x1000>; - next-level-cache = <&cpc>; - }; - /include/ "qoriq-rman-0.dtsi" rman: rman@1e0000 { fsl,qman-channels-id = <0x820 0x821>; |