diff options
| author | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-07-31 11:10:27 +0200 |
|---|---|---|
| committer | BJ DevOps Team <bjdevops@NXP1.onmicrosoft.com> | 2022-07-31 11:10:27 +0200 |
| commit | 3022f258824ad5e88871094191dad3ff9fded291 (patch) | |
| tree | e4f84ece58a51ef3d755f6b39c5a638bb74e3288 /arch/arm | |
| parent | 429f360b7cecd5b92bce3324f0eaa43a63e17a34 (diff) | |
| parent | 043ecbd141dc649c99d2f15ce905ee266d82b65c (diff) | |
Merge remote-tracking branch 'origin/imx_v2022.04' into lf_v2022.04
* origin/imx_v2022.04:
LFU-372-3 imx8ulp: Enable SCMI thermal for temperature
LFU-372-2 DTS: imx8ulp: Add SCMI sensor node
LFU-372-1 thermal: Add SCMI Sensor based thermal driver
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/imx8ulp.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8ulp/soc.c | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/arch/arm/dts/imx8ulp-evk-u-boot.dtsi b/arch/arm/dts/imx8ulp-evk-u-boot.dtsi index 0c2dcc0792..b22d62c0d9 100644 --- a/arch/arm/dts/imx8ulp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8ulp-evk-u-boot.dtsi @@ -33,6 +33,18 @@ u-boot,dm-spl; }; +&{/firmware} { + u-boot,dm-pre-reloc; +}; + +&{/firmware/scmi} { + u-boot,dm-pre-reloc; +}; + +&{/firmware/scmi/protocol@15} { + u-boot,dm-pre-reloc; +}; + &per_bridge3 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8ulp.dtsi b/arch/arm/dts/imx8ulp.dtsi index 155d29fb19..901766957d 100644 --- a/arch/arm/dts/imx8ulp.dtsi +++ b/arch/arm/dts/imx8ulp.dtsi @@ -157,6 +157,11 @@ reg = <0x11>; #power-domain-cells = <1>; }; + + scmi_sensor: protocol@15 { + reg = <0x15>; + #thermal-sensor-cells = <0>; + }; }; }; diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 2a3f417ab9..38e279a7f6 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -355,7 +355,7 @@ int print_cpuinfo(void) (cpurev & 0x000F0) >> 4, (cpurev & 0x0000F) >> 0, mxc_get_clock(MXC_ARM_CLK) / 1000000); -#if defined(CONFIG_IMX_PMC_TEMPERATURE) +#if defined(CONFIG_SCMI_THERMAL) struct udevice *udev; int ret, temp; |