On Wed, Oct 23, 2013 at 10:29:32AM +0200, Denis Carikli wrote:
> Cc: Rob Herring <rob.herring@xxxxxxxxxxx>
> Cc: Pawel Moll <pawel.moll@xxxxxxx>
> Cc: Mark Rutland <mark.rutland@xxxxxxx>
> Cc: Stephen Warren <swarren@xxxxxxxxxxxxx>
> Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx>
> Cc: devicetree@xxxxxxxxxxxxxxx
> Cc: Sascha Hauer <kernel@xxxxxxxxxxxxxx>
> Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
> Cc: Eric Bénard <eric@xxxxxxxxxx>
> Signed-off-by: Denis Carikli <denis@xxxxxxxxxx>
Applied patches #7, #8 and #9.
Shawn
> ---
> arch/arm/boot/dts/imx25.dtsi | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
> index 6ac4c98..cce0669 100644
> --- a/arch/arm/boot/dts/imx25.dtsi
> +++ b/arch/arm/boot/dts/imx25.dtsi
> @@ -339,6 +339,11 @@
> compatible = "fsl,imx25-ssi", "fsl,imx21-ssi";
> reg = <0x50014000 0x4000>;
> interrupts = <11>;
> + clocks = <&clks 118>;
> + clock-names = "ipg";
> + dmas = <&sdma 24 1 0>,
> + <&sdma 25 1 0>;
> + dma-names = "rx", "tx";
> status = "disabled";
> };
>
> @@ -369,6 +374,11 @@
> compatible = "fsl,imx25-ssi", "fsl,imx21-ssi";
> reg = <0x50034000 0x4000>;
> interrupts = <12>;
> + clocks = <&clks 117>;
> + clock-names = "ipg";
> + dmas = <&sdma 28 1 0>,
> + <&sdma 29 1 0>;
> + dma-names = "rx", "tx";
> status = "disabled";
> };
>
> @@ -539,7 +549,7 @@
> #interrupt-cells = <2>;
> };
>
> - sdma@53fd4000 {
> + sdma: sdma@53fd4000 {
> compatible = "fsl,imx25-sdma", "fsl,imx35-sdma";
> reg = <0x53fd4000 0x4000>;
> clocks = <&clks 112>, <&clks 68>;
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
