diff options
| author | Olof Johansson <olof@lixom.net> | 2019-07-23 10:13:23 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-07-23 10:13:24 -0700 |
| commit | 7bd9d465140a93c0a21ba2d2f426451c78bfcc7d (patch) | |
| tree | 194536ed512560339cd97f6866e43c89d1c9e2e6 /arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | |
| parent | 02a0242549aaec4490e9280cebbb1474b36281ca (diff) | |
| parent | 8d0148473dece51675d11dd59b8db5fe4b5d2e7e (diff) | |
| download | linux-7bd9d465140a93c0a21ba2d2f426451c78bfcc7d.tar.bz2 | |
Merge tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes
i.MX fixes for 5.3:
- Fix i.MX8MM SAI3 RXC/TXFS pinmux configuration.
- Fix i.MX7ULP usb-phy unit address to drop extra '0x' notation.
- Fix typo of clock frequency property name in a few i.MX6UL board
I2C buses.
- Drop "fsl,imx6sx-sai" from i.MX8M SAI device, as it's not compatible
with i.MX6SX SAI.
* tag 'imx-fixes-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: dts: imx8mq: fix SAI compatible
arm64: dts: imx8mm: Correct SAI3 RXC/TXFS pin's mux option #1
ARM: dts: imx6ul: fix clock frequency property name of I2C buses
ARM: dts: imx7ulp: Fix usb-phy unit address format
Link: https://lore.kernel.org/r/20190723090827.GU15632@dragon
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index cbe61b61a212..c2a9dd57e56a 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -112,7 +112,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; |