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/arm/dts | |
| parent | 8ef8dcc54a0d507912ee57e15a541c5cebcfca76 (diff) | |
| parent | dde373bde392c38649c8c4420e0c98ef8d38d9dc (diff) | |
Merge tag 'v2024.04-rc5' into next
Prepare v2024.04-rc5
Diffstat (limited to 'arch/arm/dts')
| -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 |
3 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/dts/k3-am625-verdin-r5.dts b/arch/arm/dts/k3-am625-verdin-r5.dts index 6b03e7405af..2b333e70f5c 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 3743053eb9c..3743053eb9c 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 00000000000..3743053eb9c --- /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; +}; |