From 9b30a9b308eedcbbc0e27a263d292dbeeb5c64dd Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Wed, 26 Apr 2017 16:34:52 -0500
Subject: [PATCH] arm: dts: nrf: Fixup nRF52840-QIAA SoC support for device
 tree

Fixup the nRF52840-QIAA to allow getting its SRAM & FLASH sizes from
device tree.

Change-Id: I67ecd7da5f0472402064f158030d9f97f49d7d20
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
index 63435486a87..0d10e1772f6 100644
--- a/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
+++ b/arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
@@ -12,11 +12,13 @@ config SOC
 	string
 	default nRF52840_QIAA
 
+if !HAS_DTS
 config SRAM_SIZE
 	default 256
 
 config FLASH_SIZE
 	default 1024
+endif
 
 config NUM_IRQS
 	int