diff options
| author | Tom Rini <trini@konsulko.com> | 2024-03-25 22:15:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-03-25 22:15:47 -0400 |
| commit | ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606 (patch) | |
| tree | 35c2e2eae8ed2cf1dda331b19dd806a33aaad913 /arch | |
| parent | 8ef8dcc54a0d507912ee57e15a541c5cebcfca76 (diff) | |
| parent | dde373bde392c38649c8c4420e0c98ef8d38d9dc (diff) | |
| download | u-boot-ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606.tar.gz u-boot-ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606.tar.bz2 u-boot-ab8d9ca3044acf51d8ff3bf3c4718c48f30ad606.zip | |
Merge tag 'v2024.04-rc5' into next
Prepare v2024.04-rc5
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/k3-am625-verdin-r5.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi (renamed from arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi) | 0 | ||||
| -rw-r--r-- | arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 18 |
4 files changed, 28 insertions, 5 deletions
diff --git a/arch/arm/dts/k3-am625-verdin-r5.dts b/arch/arm/dts/k3-am625-verdin-r5.dts index 6b03e7405a..2b333e70f5 100644 --- a/arch/arm/dts/k3-am625-verdin-r5.dts +++ b/arch/arm/dts/k3-am625-verdin-r5.dts @@ -23,7 +23,7 @@ */ assigned-clocks = <&k3_clks 61 0>, <&k3_clks 135 0>, <&k3_clks 157 20>; assigned-clock-parents = <&k3_clks 61 2>, <0>, <&k3_clks 157 22>; - assigned-clock-rates = <200000000>, <1000000000>, <25000000>; + assigned-clock-rates = <200000000>, <800000000>, <25000000>; clocks = <&k3_clks 61 0>; power-domains = <&k3_pds 61 TI_SCI_PD_EXCLUSIVE>, <&k3_pds 135 TI_SCI_PD_EXCLUSIVE>, diff --git a/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi b/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi index 3743053eb9..3743053eb9 100644 --- a/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi diff --git a/arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi new file mode 100644 index 0000000000..3743053eb9 --- /dev/null +++ b/arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS. + * Author: Neil Armstrong <narmstrong@baylibre.com> + */ + +#include "meson-gx-u-boot.dtsi" + +ðmac { + snps,reset-gpio = <&gpio GPIOZ_14 0>; + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-active-low; +}; diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 39802d6a79..0c49fb9cd4 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -933,19 +933,28 @@ int disable_vpu_nodes(void *blob) { static const char * const nodes_path_8mq[] = { "/vpu@38300000", - "/soc@0/vpu@38300000" + "/soc@0/vpu@38300000", + "/soc@0/video-codec@38300000", + "/soc@0/video-codec@38310000", + "/soc@0/blk-ctrl@38320000", }; static const char * const nodes_path_8mm[] = { "/vpu_g1@38300000", "/vpu_g2@38310000", - "/vpu_h1@38320000" + "/vpu_h1@38320000", + "/soc@0/video-codec@38300000", + "/soc@0/video-codec@38310000", + "/soc@0/blk-ctrl@38330000", }; static const char * const nodes_path_8mp[] = { "/vpu_g1@38300000", "/vpu_g2@38310000", - "/vpu_vc8000e@38320000" + "/vpu_vc8000e@38320000", + "/soc@0/video-codec@38300000", + "/soc@0/video-codec@38310000", + "/soc@0/blk-ctrl@38330000", }; if (is_imx8mq()) @@ -1100,7 +1109,8 @@ int disable_gpu_nodes(void *blob) int disable_npu_nodes(void *blob) { static const char * const nodes_path_8mp[] = { - "/vipsi@38500000" + "/vipsi@38500000", + "/soc@0/npu@38500000", }; return disable_fdt_nodes(blob, nodes_path_8mp, ARRAY_SIZE(nodes_path_8mp)); |