diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2017-08-23 01:37:31 +0300 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-08-23 01:37:31 +0300 |
| commit | 4db26f83a7a1f8b844e4543cd82a87bee1d224e2 (patch) | |
| tree | 260f68e5671b902344f8b568a45bd6df645b5bcb /arch/arm64/boot/dts/amlogic/meson-gx.dtsi | |
| parent | b16c71c9f6ff50d4e4398cefd9113d82ee2fe8e6 (diff) | |
| parent | aae4e7a8bc44722fe70d58920a36916b1043195e (diff) | |
| download | linux-4db26f83a7a1f8b844e4543cd82a87bee1d224e2.tar.xz | |
Merge tag 'v4.13-rc4' into v4.14/dt64
Linux 4.13-rc4
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gx.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi index f49831ea428c..f175db846286 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -414,7 +414,7 @@ }; pwm_AO_ab: pwm@550 { - compatible = "amlogic,meson-gx-pwm", "amlogic,meson-gxbb-pwm"; + compatible = "amlogic,meson-gx-ao-pwm", "amlogic,meson-gxbb-ao-pwm"; reg = <0x0 0x00550 0x0 0x10>; #pwm-cells = <3>; status = "disabled"; |