summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx53-qsb-common.dtsi
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2014-05-31 02:36:49 +0900
committerKukjin Kim <kgene.kim@samsung.com>2014-05-31 02:36:49 +0900
commitfced6dee29f6fb143fe16ea90331176ff77e6120 (patch)
tree5b6e57e7a757adc2a6518ce291a4d2914397b917 /arch/arm/boot/dts/imx53-qsb-common.dtsi
parentbfed1074f213051e94648bfad0d0611a16d81366 (diff)
parentbe1f7c8d7e2bc8b8c76846aa6f276e8d2ef8975a (diff)
downloadblackbird-op-linux-fced6dee29f6fb143fe16ea90331176ff77e6120.tar.gz
blackbird-op-linux-fced6dee29f6fb143fe16ea90331176ff77e6120.zip
Merge branch 'v3.16-next/cleanup-samsung' into v3.16-next/platform-exynos
Diffstat (limited to 'arch/arm/boot/dts/imx53-qsb-common.dtsi')
-rw-r--r--arch/arm/boot/dts/imx53-qsb-common.dtsi3
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 3f825a6813da..ede04fa4161f 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 {
OpenPOWER on IntegriCloud