diff options
author | Tom Rini | 2024-05-20 09:54:58 -0600 |
---|---|---|
committer | Tom Rini | 2024-05-20 09:55:18 -0600 |
commit | 85854bc3324edd0c81047780ee60033d056fd490 (patch) | |
tree | 63f280b485f19f65f2a871d502a7db7238176b57 /dts/upstream/src/arm/nxp/imx/imx6sx.dtsi | |
parent | 4820864a67b8483e18213d1bc57e12740256717c (diff) | |
parent | 6bb92fcf7d2fea2314d616e5e2391a8bf2b0fdfa (diff) |
Subtree merge tag 'v6.9-dts' of devicetree-rebasing repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/
Tested-by: Heiko Stuebner <heiko@sntech.de> # rk3588-rock5b, rk3588-jaguar,
# rk3588-tiger (pending patch)
Diffstat (limited to 'dts/upstream/src/arm/nxp/imx/imx6sx.dtsi')
-rw-r--r-- | dts/upstream/src/arm/nxp/imx/imx6sx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dts/upstream/src/arm/nxp/imx/imx6sx.dtsi b/dts/upstream/src/arm/nxp/imx/imx6sx.dtsi index df3a375f0a3..0de359d62a4 100644 --- a/dts/upstream/src/arm/nxp/imx/imx6sx.dtsi +++ b/dts/upstream/src/arm/nxp/imx/imx6sx.dtsi @@ -1107,7 +1107,7 @@ status = "disabled"; }; - weim: weim@21b8000 { + weim: memory-controller@21b8000 { #address-cells = <2>; #size-cells = <1>; compatible = "fsl,imx6sx-weim", "fsl,imx6q-weim"; |