diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-16 11:40:28 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-16 11:40:28 +0000 |
commit | 49dc55b9cb46c392ba3fdfe4deeb04cb6f8035c3 (patch) | |
tree | 427dcf1cba800606a279d9ac4025e00df97667a1 /arch/arm64/boot | |
parent | bbdb668ff5762f9a89f29fd88b5393b696499f38 (diff) | |
parent | a998faa9c4cee7dc68f3f6f82be93bbb99dda322 (diff) |
Merge tag 'v5.4.140' into 5.4-2.3.x-imx
This is the 5.4.140 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 | ||||
-rw-r--r-- | arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 3fa6652c8665..0d88dfa846db 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi @@ -69,7 +69,7 @@ }; }; - sysclk: clock-sysclk { + sysclk: sysclk { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <100000000>; diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 874bc3954c8e..025e02d23da9 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts @@ -118,6 +118,7 @@ pinctrl-names = "default"; pinctrl-0 = <&i2c1_pins>; clock-frequency = <100000>; + /delete-property/ mrvl,i2c-fast-mode; status = "okay"; rtc@6f { |