From 4e35498518a41c46fe42b686202475f04a6690ef Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Wed, 20 Sep 2017 18:41:18 +0200 Subject: imx6dl-colibri-eval-v3: fix weim node With the move from the 3.14.52 to the 4.1 kernel the way the weim node defines chipselects changed. A phandle to the gpr node is needed. Only the following 4 configuration can be specified in the ranges property: CS0(128M), CS1 (0M), CS2(0M), CS3(0M) CS0(64M), CS1(64M), CS2(0M), CS3(0M) CS0(64M), CS1(32M), CS2(32M), CS3(0M) CS0(32M), CS1(32M), CS2(32M), CS3(32M) Signed-off-by: Max Krummenacher Acked-by: Stefan Agner --- arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts | 6 ++++-- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts index cf977aabc2c5..aae9fd814be3 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-cam-eval-v3.dts @@ -290,10 +290,12 @@ &weim { status = "okay"; - /* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */ + fsl,weim-cs-gpr = <&gpr>; + /* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2, 32MB on CS3 */ ranges = <0 0 0x08000000 0x02000000 1 0 0x0a000000 0x02000000 - 2 0 0x0c000000 0x02000000>; + 2 0 0x0c000000 0x02000000 + 3 0 0x0e000000 0x02000000>; /* SRAM on CS0 */ sram@0,0 { compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index acd9031cf0a7..346b93e438dc 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -262,10 +262,12 @@ &weim { status = "okay"; - /* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2 */ + fsl,weim-cs-gpr = <&gpr>; + /* weim memory map: 32MB on CS0, 32MB on CS1, 32MB on CS2, 32MB on CS3 */ ranges = <0 0 0x08000000 0x02000000 1 0 0x0a000000 0x02000000 - 2 0 0x0c000000 0x02000000>; + 2 0 0x0c000000 0x02000000 + 3 0 0x0e000000 0x02000000>; /* SRAM on CS0 */ sram@0,0 { compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram"; -- cgit v1.2.3