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

Commit 82935c75 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add clock node entry for LPASS hw vote"

parents 2ff1a14a 56f42fa0

arch/arm64/boot/dts/qcom/sm6150-audio.dtsi

+8 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -12,6 +12,7 @@ 
 */



#include "msm-audio-lpass.dtsi"

#include "dt-bindings/clock/qcom,audio-ext-clk.h"



&msm_audio_ion {

	iommus = <&apps_smmu 0x1721 0x0>;
@@ -27,6 +28,12 @@ 
		qcom,clk-div = <192>;

		qcom,clk-mult = <10>;

	};



	lpass_core_hw_vote: lpass_core_hw_vote {

		compatible = "qcom,audio-ref-clk";

		qcom,codec-ext-clk-src = <AUDIO_LPASS_CORE_HW_VOTE>;

		#clock-cells = <1>;

	};

};



&audio_apr {

arch/arm64/boot/dts/qcom/sm6150-lpi.dtsi

+4 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, 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
@@ -35,6 +35,9 @@ 
				      <0x0001C000>, <0x0001D000>,

				      <0x0001E000>, <0x0001F000>;



		clock-names = "lpass_core_hw_vote";

		clocks = <&lpass_core_hw_vote 0>;



		lpi_wcd934x_reset_active: lpi_wcd934x_reset_active {

			mux {

				pins = "gpio29";

include/dt-bindings/clock/qcom,audio-ext-clk.h

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

/* Copyright (c) 2018-2019, 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
@@ -23,7 +23,7 @@ 
#define AUDIO_LPASS_MCLK_5	6

#define AUDIO_LPASS_MCLK_6	7

#define AUDIO_LPASS_MCLK_7	8

#define AUDIO_LPASS_NPA_RSC_ISLAND	9

#define AUDIO_LPASS_CORE_HW_VOTE	9

#define AUDIO_EXTERNAL_PLL	10



#endif