diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-01-27 16:46:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-01-27 16:46:51 +0100 |
| commit | ec026b5020688a8bde5fae9a69ae3c59b66ba3ae (patch) | |
| tree | f476a1a9970af763720bd64b090879fc9874dbcf /arch/arm/boot/dts/imx6sx.dtsi | |
| parent | ARM64: dts: meson-gx: Add firmware reserved memory zones (diff) | |
| parent | ARM: dts: imx: Pass 'chosen' and 'memory' nodes (diff) | |
| download | linux-ec026b5020688a8bde5fae9a69ae3c59b66ba3ae.tar.xz linux-ec026b5020688a8bde5fae9a69ae3c59b66ba3ae.zip | |
Merge tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into HEAD
Pull "i.MX fixes for 4.10, 3rd round" from Shawn Guo:
- Fix a 'defined but not used' warning in MMDC driver when
CONFIG_PERF_EVENTS is disabled.
- Fix i.MX6DL device tree GPIO4_11 range setting.
- A bandaid fix for boot failure found on a couple of platforms due to
missing 'chosen' and 'memory' node.
* tag 'imx-fixes-4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx: Pass 'chosen' and 'memory' nodes
ARM: dts: imx6dl: fix GPIO4 range
ARM: imx: hide unused variable in #ifdef
Diffstat (limited to 'arch/arm/boot/dts/imx6sx.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index 10f333016197..dd4ec85ecbaa 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi @@ -15,6 +15,14 @@ / { #address-cells = <1>; #size-cells = <1>; + /* + * The decompressor and also some bootloaders rely on a + * pre-existing /chosen node to be available to insert the + * command line and merge other ATAGS info. + * Also for U-Boot there must be a pre-existing /memory node. + */ + chosen {}; + memory { device_type = "memory"; reg = <0 0>; }; aliases { can0 = &flexcan1; |