diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-30 23:15:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-30 23:15:31 +0200 |
| commit | b388dc1f62a9bdd9c4758a0664e61d0f9a9da519 (patch) | |
| tree | 696fd3c245700ee59ebcf3a65b90f8773b904624 /arch/arm64/boot/dts/amlogic/meson-gx.dtsi | |
| parent | ASoC: remove duplicate definition of dapm_routes/num_dapm_routes (diff) | |
| parent | Linux 4.13-rc7 (diff) | |
| download | linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.xz linux-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.zip | |
Merge tag 'v4.13-rc7' into asoc-component
Linux 4.13-rc7
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 35b8c88c3220..738ed689ff69 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -400,7 +400,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"; |