diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-11-18 03:13:23 +0100 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2020-11-18 03:13:23 +0100 |
commit | 05909cd9a0c8811731b38697af13075e8954314f (patch) | |
tree | aa5306e756666407c95067b20b21b32ff27fd11a /arch/arm/boot/dts/imx6dl-aristainetos_7.dts | |
parent | Input: elan_i2c_core - move header inclusion inside (diff) | |
parent | Linux 5.9 (diff) | |
download | linux-05909cd9a0c8811731b38697af13075e8954314f.tar.xz linux-05909cd9a0c8811731b38697af13075e8954314f.zip |
Merge tag 'v5.9' into next
Sync up with mainline to bring in the latest DTS files.
Diffstat (limited to 'arch/arm/boot/dts/imx6dl-aristainetos_7.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts index 8d8c8c27e482..4d58cb4436d9 100644 --- a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts +++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts @@ -69,5 +69,6 @@ }; &pwm3 { + #pwm-cells = <2>; status = "okay"; }; |