diff options
| author | Anson Huang <Anson.Huang@nxp.com> | 2017-05-15 17:08:58 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:26:31 +0800 |
| commit | cefdd6ea8b7548c9d6aabfbc8b08292a757854ed (patch) | |
| tree | 85b2182c95ea3e55c366a7190057ec09342bcc3a | |
| parent | e6d5a1f16c6111b0e50351660092d884ce56f7a6 (diff) | |
MLK-14902 ARM64: dts: freescale: imx8qm: make default dtb boot up all cores
Change dtb's core settings as below on i.MX8QM:
boot up 4 CA53 and 2 CA72 (using CA53 specific flash.bin)
fsl-imx8qm-lpddr4-arm2.dts
boot up 4 CA53 (using CA53 specific flash.bin)
fsl-imx8qm-lpddr4-arm2_ca53.dts
boot up 2 CA72 (using CA72 specific flash.bin)
fsl-imx8qm-lpddr4-arm2_ca72.dts
Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca53.dts (renamed from arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72_only.dts) | 14 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72.dts | 21 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi | 1 |
5 files changed, 27 insertions, 19 deletions
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 8c19aefb4d58..3fd232775ed0 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -14,7 +14,7 @@ dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2080a-simu.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-qds.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls2088a-rdb.dtb -dtb-$(CONFIG_ARCH_FSL_IMX8QM) += fsl-imx8qm-lpddr4-arm2.dtb fsl-imx8qm-lpddr4-arm2_ca72.dtb fsl-imx8qm-lpddr4-arm2_ca72_only.dtb +dtb-$(CONFIG_ARCH_FSL_IMX8QM) += fsl-imx8qm-lpddr4-arm2.dtb fsl-imx8qm-lpddr4-arm2_ca53.dtb fsl-imx8qm-lpddr4-arm2_ca72.dtb always := $(dtb-y) subdir-y := $(dts-dirs) diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts index d4dd00592715..2412568c2ef1 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2.dts @@ -330,3 +330,11 @@ >; clocks = <&clk IMX8QM_A53_DIV>; }; + +&A72_0 { + operating-points = < + /* kHz uV */ + 1800000 1150000 + >; + clocks = <&clk IMX8QM_A72_DIV>; +}; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72_only.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca53.dts index a3011d211273..9c42d98899b0 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72_only.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca53.dts @@ -13,20 +13,12 @@ * GNU General Public License for more details. */ -#include "fsl-imx8qm-lpddr4-arm2_ca72.dts" +#include "fsl-imx8qm-lpddr4-arm2.dts" -&A53_0 { +&A72_0 { device_type = ""; }; -&A53_1 { - device_type = ""; -}; - -&A53_2 { - device_type = ""; -}; - -&A53_3 { +&A72_1 { device_type = ""; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72.dts index 7eaf12d2f7f1..55e2e8c51637 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-lpddr4-arm2_ca72.dts @@ -14,12 +14,19 @@ */ #include "fsl-imx8qm-lpddr4-arm2.dts" -#include "fsl-imx8-ca72.dtsi" -&A72_0 { - operating-points = < - /* kHz uV */ - 1800000 1150000 - >; - clocks = <&clk IMX8QM_A72_DIV>; +&A53_0 { + device_type = ""; +}; + +&A53_1 { + device_type = ""; +}; + +&A53_2 { + device_type = ""; +}; + +&A53_3 { + device_type = ""; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi index a4abd2c88413..97253f39eec7 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm.dtsi @@ -15,6 +15,7 @@ #include <dt-bindings/interrupt-controller/arm-gic.h> #include "fsl-imx8-ca53.dtsi" +#include "fsl-imx8-ca72.dtsi" #include <dt-bindings/clock/imx8qm-clock.h> #include <dt-bindings/soc/imx_rsrc.h> #include <dt-bindings/soc/imx8_pd.h> |