diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-27 09:21:44 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-27 09:21:44 +0000 |
| commit | 49ef8ef4cd120f04cd5b4f05fdf89fdfce961505 (patch) | |
| tree | db18a88869914632873359eb366ca93ddcf6fba1 /arch/arm | |
| parent | ed8f0b9dafc6dfcfccb4507a8ae71aa294b2088b (diff) | |
| parent | fd80923202c6bfd723742fc32426a7aa3632abaa (diff) | |
Merge tag 'v5.4.143' into 5.4-2.3.x-imx
Linux 5.4.143
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/am43x-epos-evm.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts index a9f191d78b54..d0ea95830d45 100644 --- a/arch/arm/boot/dts/am43x-epos-evm.dts +++ b/arch/arm/boot/dts/am43x-epos-evm.dts @@ -589,7 +589,7 @@ status = "okay"; pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; - clock-frequency = <400000>; + clock-frequency = <100000>; tps65218: tps65218@24 { reg = <0x24>; diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index f78b4eabd68c..e7178a6db6be 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -755,14 +755,14 @@ status = "disabled"; }; - vica: intc@10140000 { + vica: interrupt-controller@10140000 { compatible = "arm,versatile-vic"; interrupt-controller; #interrupt-cells = <1>; reg = <0x10140000 0x20>; }; - vicb: intc@10140020 { + vicb: interrupt-controller@10140020 { compatible = "arm,versatile-vic"; interrupt-controller; #interrupt-cells = <1>; |