From: Marcel Ziswiler Date: Fri, 10 Apr 2015 21:36:00 +0000 (+0200) Subject: ARM: tegra: Fix hda2codec_2x clock and reset names X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=869bd180b8e6a81525acab21a5ee4428685bda2a;p=linux-beck.git ARM: tegra: Fix hda2codec_2x clock and reset names The binding documentation says that these should be named hda2codec_2x but the DTSI names them hdacodec_2x. Signed-off-by: Marcel Ziswiler [treding@nvidia.com: add a brief commit message] Signed-off-by: Thierry Reding --- diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi index 13cc7ca5e031..08611cda1e1d 100644 --- a/arch/arm/boot/dts/tegra124.dtsi +++ b/arch/arm/boot/dts/tegra124.dtsi @@ -633,11 +633,11 @@ clocks = <&tegra_car TEGRA124_CLK_HDA>, <&tegra_car TEGRA124_CLK_HDA2HDMI>, <&tegra_car TEGRA124_CLK_HDA2CODEC_2X>; - clock-names = "hda", "hda2hdmi", "hdacodec_2x"; + clock-names = "hda", "hda2hdmi", "hda2codec_2x"; resets = <&tegra_car 125>, /* hda */ <&tegra_car 128>, /* hda2hdmi */ <&tegra_car 111>; /* hda2codec_2x */ - reset-names = "hda", "hda2hdmi", "hdacodec_2x"; + reset-names = "hda", "hda2hdmi", "hda2codec_2x"; status = "disabled"; };