In message: [PATCH linux-yocto] arm64: dts: imx8mp: Restore pgc_mlmix back
on 20/09/2024 Kevin Hao wrote:
> From: Kevin Hao <kexin....@windriver.com>
>
> The stable commit 0150dbc01d26 ("arm64: dts: imx8mp: Fix pgc_mlmix
> location") shuffled the pgc_mlmix device nodel. However, pgc_mlmix was
> missed due to the merge conflicts in commit 793df66c1def ("Merge branch
> 'v6.6/standard/base' into v6.6/standard/nxp-sdk-6.6/nxp-soc"). Restore
> it back to fix below build errors:
> Error: arch/arm64/boot/dts/freescale/imx8mp-evk.dts:12.1-2 syntax error
> FATAL ERROR: Unable to parse input tree
> make[3]: *** [scripts/Makefile.lib:423:
> arch/arm64/boot/dts/freescale/imx8mp-evk.dtb] Error 1
> make[2]: *** [scripts/Makefile.build:480: arch/arm64/boot/dts/freescale]
> Error 2
> make[2]: *** Waiting for unfinished jobs....
>
> Also add a missing '}' for pgc_gpu2d.
>
> Reported-by: leimaohui <leimao...@fujitsu.com>
> Signed-off-by: Kevin Hao <kexin....@windriver.com>
> ---
> Hi Bruce,
>
> Please merge this into the following two branches:
> linux-yocto/v6.6/standard/nxp-sdk-6.6/nxp-soc
> linux-yocto/v6.6/standard/preempt-rt/nxp-sdk-6.6/nxp-soc
staged on top of the -stable updates, so it will
get pushed along with them
Bruce
> ---
> arch/arm64/boot/dts/freescale/imx8mp.dtsi | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> index 49d2fbad3cc8..63de3fbb354b 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> @@ -784,6 +784,23 @@ pgc_usb2_phy: power-domain@3 {
> reg =
> <IMX8MP_POWER_DOMAIN_USB2_PHY>;
> };
>
> + pgc_mlmix: power-domain@4 {
> + #power-domain-cells = <0>;
> + reg =
> <IMX8MP_POWER_DOMAIN_MLMIX>;
> + clocks = <&clk
> IMX8MP_CLK_ML_AXI>,
> + <&clk
> IMX8MP_CLK_ML_AHB>,
> + <&clk
> IMX8MP_CLK_NPU_ROOT>;
> + assigned-clocks = <&clk
> IMX8MP_CLK_ML_CORE>,
> + <&clk
> IMX8MP_CLK_ML_AXI>,
> + <&clk
> IMX8MP_CLK_ML_AHB>;
> + assigned-clock-parents = <&clk
> IMX8MP_SYS_PLL1_800M>,
> + <&clk
> IMX8MP_SYS_PLL1_800M>,
> + <&clk
> IMX8MP_SYS_PLL1_800M>;
> + assigned-clock-rates =
> <800000000>,
> +
> <800000000>,
> +
> <300000000>;
> + };
> +
> pgc_gpumix: power-domain@7 {
> #power-domain-cells = <0>;
> reg =
> <IMX8MP_POWER_DOMAIN_GPUMIX>;
> @@ -806,6 +823,7 @@ pgc_gpu2d: power-domain@6 {
> reg =
> <IMX8MP_POWER_DOMAIN_GPU2D>;
> clocks = <&clk
> IMX8MP_CLK_GPU2D_ROOT>;
> power-domains = <&pgc_gpumix>;
> + };
> pgc_vpumix: power-domain@8 {
> #power-domain-cells = <0>;
> reg =
> <IMX8MP_POWER_DOMAIN_VPUMIX>;
>
> ---
> base-commit: 9e20a24ffe9be528c1b9529763ef053239eca34f
> change-id: 20240920-imx8-ccf6029d1db2
>
> Best regards,
> --
> Kevin Hao <haoke...@gmail.com>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14407):
https://lists.yoctoproject.org/g/linux-yocto/message/14407
Mute This Topic: https://lists.yoctoproject.org/mt/108555492/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
