diff options
| author | Rob Herring <robh@kernel.org> | 2014-05-13 18:34:35 -0500 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-05-13 18:34:35 -0500 |
| commit | eafd370dfe487facfdef499057f4eac9aa0b4bf5 (patch) | |
| tree | 0925a67cd658cdf4811f49b4cd2073f663166bd0 /arch/arm/boot/dts/imx53-qsb-common.dtsi | |
| parent | c3fc952d2fbe3ec78defd70cf73d5d76d27092ec (diff) | |
| parent | fb2caa50fbacd21719a90dd66b617ce3cb4fd6d7 (diff) | |
| download | op-kernel-dev-eafd370dfe487facfdef499057f4eac9aa0b4bf5.zip op-kernel-dev-eafd370dfe487facfdef499057f4eac9aa0b4bf5.tar.gz | |
Merge branch 'dt-bus-name' into for-next
Diffstat (limited to 'arch/arm/boot/dts/imx53-qsb-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx53-qsb-common.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi index 3f825a6..ede04fa 100644 --- a/arch/arm/boot/dts/imx53-qsb-common.dtsi +++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi @@ -14,7 +14,8 @@ / { memory { - reg = <0x70000000 0x40000000>; + reg = <0x70000000 0x20000000>, + <0xb0000000 0x20000000>; }; display0: display@di0 { |
