From: Kukjin Kim Date: Mon, 8 Apr 2013 16:10:13 +0000 (+0900) Subject: Merge commit 'v3.9-rc5' into next/clk-exynos X-Git-Tag: v3.10-rc1~63^2~4^2~35 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=da821eb7d42935b0f7056d98c75fd1150f6636f4;p=platform%2Fkernel%2Flinux-3.10.git Merge commit 'v3.9-rc5' into next/clk-exynos Conflicts: arch/arm/boot/dts/exynos4.dtsi arch/arm/boot/dts/exynos5440.dtsi --- da821eb7d42935b0f7056d98c75fd1150f6636f4 diff --cc arch/arm/boot/dts/exynos4.dtsi index 6252b2c,1a62bcf..9ac47d5 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@@ -327,24 -275,27 +327,33 @@@ compatible = "arm,pl330", "arm,primecell"; reg = <0x12680000 0x1000>; interrupts = <0 35 0>; + clocks = <&clock 292>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; pdma1: pdma@12690000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x12690000 0x1000>; interrupts = <0 36 0>; + clocks = <&clock 293>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; mdma1: mdma@12850000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x12850000 0x1000>; interrupts = <0 34 0>; + clocks = <&clock 279>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <1>; }; }; }; diff --cc arch/arm/boot/dts/exynos5440.dtsi index a54c4ab,9a99755..c374a31 --- a/arch/arm/boot/dts/exynos5440.dtsi +++ b/arch/arm/boot/dts/exynos5440.dtsi @@@ -152,16 -142,18 +152,22 @@@ compatible = "arm,pl330", "arm,primecell"; reg = <0x120000 0x1000>; interrupts = <0 34 0>; + clocks = <&clock 21>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; pdma1: pdma@121B0000 { compatible = "arm,pl330", "arm,primecell"; reg = <0x121000 0x1000>; interrupts = <0 35 0>; + clocks = <&clock 21>; + clock-names = "apb_pclk"; + #dma-cells = <1>; + #dma-channels = <8>; + #dma-requests = <32>; }; };