diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-21 00:00:44 (GMT) |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-01-21 00:00:44 (GMT) |
commit | 50f4df4e6a7ae111fd9b8fada4155675a4410e99 (patch) | |
tree | a174a42f1f38660d0c4d3c4e81e5bb1e14fab0d1 /arch/powerpc/boot | |
parent | 12fcdba1b7ae8b25696433f420b775aeb556d89b (diff) | |
parent | b49d81ded47e9d01f7128fce50d224ccc2150960 (diff) | |
download | linux-50f4df4e6a7ae111fd9b8fada4155675a4410e99.tar.xz |
Merge remote branch 'kumar/next' into merge
Diffstat (limited to 'arch/powerpc/boot')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8308rdb.dts | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/p1022ds.dts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/dts/mpc8308rdb.dts b/arch/powerpc/boot/dts/mpc8308rdb.dts index d3db02f..a0bd188 100644 --- a/arch/powerpc/boot/dts/mpc8308rdb.dts +++ b/arch/powerpc/boot/dts/mpc8308rdb.dts @@ -109,7 +109,7 @@ #address-cells = <1>; #size-cells = <1>; device_type = "soc"; - compatible = "fsl,mpc8315-immr", "simple-bus"; + compatible = "fsl,mpc8308-immr", "simple-bus"; ranges = <0 0xe0000000 0x00100000>; reg = <0xe0000000 0x00000200>; bus-frequency = <0>; diff --git a/arch/powerpc/boot/dts/p1022ds.dts b/arch/powerpc/boot/dts/p1022ds.dts index 2bbecbb..69422eb 100644 --- a/arch/powerpc/boot/dts/p1022ds.dts +++ b/arch/powerpc/boot/dts/p1022ds.dts @@ -291,13 +291,13 @@ ranges = <0x0 0xc100 0x200>; cell-index = <1>; dma00: dma-channel@0 { - compatible = "fsl,eloplus-dma-channel"; + compatible = "fsl,ssi-dma-channel"; reg = <0x0 0x80>; cell-index = <0>; interrupts = <76 2>; }; dma01: dma-channel@80 { - compatible = "fsl,eloplus-dma-channel"; + compatible = "fsl,ssi-dma-channel"; reg = <0x80 0x80>; cell-index = <1>; interrupts = <77 2>; |