diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2022-07-21 15:27:26 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2022-07-25 16:12:00 +0200 |
| commit | d0399a46e7cda63c07e3eb8558bef84cfb068028 (patch) | |
| tree | 109f7d723e2c5fecc52355e6fcb39b7107c12b16 /arch/arm/dts/imx6dl.dtsi | |
| parent | 50b229523bbc5511e1bace34df779f84950bf872 (diff) | |
| download | u-boot-d0399a46e7cda63c07e3eb8558bef84cfb068028.tar.gz | |
imx6dl/imx6qdl: synchronise device trees with linux
Synchronise device trees with linux-next next-20220708.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/dts/imx6dl.dtsi')
| -rw-r--r-- | arch/arm/dts/imx6dl.dtsi | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi index ae5aad6b9e..8e0ed209ed 100644 --- a/arch/arm/dts/imx6dl.dtsi +++ b/arch/arm/dts/imx6dl.dtsi @@ -15,7 +15,7 @@ #address-cells = <1>; #size-cells = <0>; - cpu@0 { + cpu0: cpu@0 { compatible = "arm,cortex-a9"; device_type = "cpu"; reg = <0>; @@ -44,6 +44,8 @@ arm-supply = <®_arm>; pu-supply = <®_pu>; soc-supply = <®_soc>; + nvmem-cells = <&cpu_speed_grade>; + nvmem-cell-names = "speed_grade"; }; cpu@1 { @@ -64,6 +66,7 @@ 396000 1175000 >; clock-latency = <61036>; /* two CLK32 periods */ + #cooling-cells = <2>; clocks = <&clks IMX6QDL_CLK_ARM>, <&clks IMX6QDL_CLK_PLL2_PFD2_396M>, <&clks IMX6QDL_CLK_STEP>, @@ -77,7 +80,7 @@ }; }; - soc { + soc: soc { ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; @@ -85,10 +88,6 @@ }; aips1: bus@2000000 { - iomuxc: iomuxc@20e0000 { - compatible = "fsl,imx6dl-iomuxc"; - }; - pxp: pxp@20f0000 { reg = <0x020f0000 0x4000>; interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>; @@ -295,6 +294,10 @@ compatible = "fsl,imx6dl-hdmi"; }; +&iomuxc { + compatible = "fsl,imx6dl-iomuxc"; +}; + &ipu1_csi1 { ipu1_csi1_from_ipu1_csi1_mux: endpoint { remote-endpoint = <&ipu1_csi1_mux_to_ipu1_csi1>; |