diff options
| author | Han Xu <han.xu@nxp.com> | 2017-06-15 15:39:50 -0500 |
|---|---|---|
| committer | Han Xu <han.xu@nxp.com> | 2017-06-15 16:25:39 -0500 |
| commit | f1a219b1f410d7640b23f9725319df2ee8e4301f (patch) | |
| tree | 9fe6bbfec5dbed3c5691f3d2226375533429ed00 /arch | |
| parent | 87096594094e5a02586cbdc84ee2b6f5a2c9138b (diff) | |
MLK-15076: arm: dts: insulate ULP kernel boot from M4 boot
i.MX7ULP QSPI dtb was used to update the M4 images, it should not able
to boot the kernel even without the M4 image in QSPI.
Also fixed the typo in dtsi to correct the QSPI register address
mapping range.
Signed-off-by: Han Xu <han.xu@nxp.com>
(cherry picked from commit 6fb558d7e38a4f60944a791d4ff12fd5a5f039f5)
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp-evk-qspi.dts | 30 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7ulp.dtsi | 2 |
2 files changed, 31 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7ulp-evk-qspi.dts b/arch/arm/boot/dts/imx7ulp-evk-qspi.dts index 450ea0e7d322..c9761a1a6ed0 100644 --- a/arch/arm/boot/dts/imx7ulp-evk-qspi.dts +++ b/arch/arm/boot/dts/imx7ulp-evk-qspi.dts @@ -9,6 +9,18 @@ #include "imx7ulp-evk.dts" +/ { + regulators { + compatible = "simple-bus"; + + dummy: regulator-dummy { + compatible = "regulator-fixed"; + regulator-name = "dummy"; + regulator-always-on; + }; + }; +}; + &qspi1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_qspi1_1>; @@ -23,6 +35,24 @@ }; }; +&rpmsg{ + status = "disabled"; +}; + +&cpu0 { + arm-supply= <&dummy>; + operating-points = < + /* KHz uV */ + 503666 1025000 + >; +}; + +&usdhc0 { + vqmmc-supply = <&dummy>; + no-1-8-v; + non-removable; +}; + &iomuxc { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx7ulp.dtsi b/arch/arm/boot/dts/imx7ulp.dtsi index 77007a712e5c..323fa580bd59 100644 --- a/arch/arm/boot/dts/imx7ulp.dtsi +++ b/arch/arm/boot/dts/imx7ulp.dtsi @@ -587,7 +587,7 @@ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx7ulp-qspi"; - reg = <0x410A5000 0x10000>, <0xC0000000 0x10000000>; + reg = <0x410A5000 0x1000>, <0xC0000000 0x10000000>; reg-names = "QuadSPI", "QuadSPI-memory"; interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX7ULP_CLK_DUMMY>, |