Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff7f0e16 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: fix avtimer clk-div property usage in all targets"

parents 5253de47 aa7ef7d9

arch/arm/boot/dts/qcom/msm-audio.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ 
		reg = <0x0c0a300c 0x4>,

			<0x0c0a3010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

		qcom,clk_div = <27>;

		qcom,clk-div = <27>;

	};



	int_codec: sound {

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1635,7 +1635,7 @@ 
		reg = <0x0770600C 0x4>,

			<0x07706010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

		qcom,clk_div = <27>;

		qcom,clk-div = <27>;

	};



	mcd {

arch/arm/boot/dts/qcom/msm8952.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2164,7 +2164,7 @@ 
		reg = <0x0c0a300c 0x4>,

			<0x0c0a3010 0x4>;

		reg-names = "avtimer_lsb_addr", "avtimer_msb_addr";

		qcom,clk_div = <27>;

		qcom,clk-div = <27>;

	};

};