diff options
| author | Eric Miao <eric.miao@linaro.org> | 2012-01-14 20:46:38 +0800 |
|---|---|---|
| committer | Eric Miao <eric.miao@linaro.org> | 2012-01-14 20:46:38 +0800 |
| commit | ba31f9bc45d0a96ca50b69feb341d10dc13bee25 (patch) | |
| tree | a1f874131ca888a7f6600e8c86e031385f903aca /arch/arm | |
| parent | 810de279f4eedf874b725371999b96033a7156ab (diff) | |
| parent | 766b224ba0781a69591b297fa685d781f856be2f (diff) | |
Merge branch 'topic/lt-3.2-imx6-misc' into lt-3.2-imx6
* topic/lt-3.2-imx6-misc:
imx6q: fix I/O mapping address/size of mxs_viim.c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 09f0becd197..51b3965a1c1 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -544,8 +544,8 @@ viim@021bc000 { compatible = "fsl,imx6q-viim"; - reg = <0x021bc000 0x4000>, - <0x021c0000 0x4000>; + reg = <0x02098000 0x4000>, + <0x021bc000 0x4000>; interrupts = <0 21 0x04>; }; |