diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-22 12:56:55 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-22 12:56:55 +0100 |
commit | f89fd04323f755e7437a0113d986812c3fffe03d (patch) | |
tree | 6d730d85a219e4c656da2184962df71df5111ee4 /arch/arm/boot/dts/imx7d-pico-nymph.dts | |
parent | kernels/ksysfs.c: export kernel address bits (diff) | |
parent | Linux 6.2-rc5 (diff) | |
download | linux-f89fd04323f755e7437a0113d986812c3fffe03d.tar.xz linux-f89fd04323f755e7437a0113d986812c3fffe03d.zip |
Merge 6.2-rc5 into driver-core-next
We need the driver core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/imx7d-pico-nymph.dts')
-rw-r--r-- | arch/arm/boot/dts/imx7d-pico-nymph.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx7d-pico-nymph.dts b/arch/arm/boot/dts/imx7d-pico-nymph.dts index 104a85254adb..5afb1674e012 100644 --- a/arch/arm/boot/dts/imx7d-pico-nymph.dts +++ b/arch/arm/boot/dts/imx7d-pico-nymph.dts @@ -43,7 +43,7 @@ }; &i2c1 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c1>; status = "okay"; @@ -64,7 +64,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; |