diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-11-19 13:18:47 +0900 |
| commit | 326f3abf19360014dfae968aa3ab891d25599618 (patch) | |
| tree | a57251231cb889e4e6b0f26d023990578b7bd98e /arch/arm/boot/dts/imx23.dtsi | |
| parent | ef405e04abd0d4bc3f7082d241517f6db3f5c06d (diff) | |
| parent | 64a574344dadbee5d01819d9d73b594d3cbe448e (diff) | |
| download | blackbird-op-linux-326f3abf19360014dfae968aa3ab891d25599618.tar.gz blackbird-op-linux-326f3abf19360014dfae968aa3ab891d25599618.zip | |
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
Diffstat (limited to 'arch/arm/boot/dts/imx23.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 9ca4ca70c1bc..6d31aa383460 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -69,6 +69,7 @@ interrupts = <13>, <56>; interrupt-names = "gpmi-dma", "bch"; clocks = <&clks 34>; + clock-names = "gpmi_io"; fsl,gpmi-dma-channel = <4>; status = "disabled"; }; |
