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

Commit 26bee3e2 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: add PMIC clock divider devices for SDM855"

parents 686e7216 4aae7542

Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. SPMI PMIC clock divider (clkdiv)



clkdiv configures the clock frequency of a set of outputs on the PMIC.

These clocks are typically wired through alternate functions on

gpio pins.



=======================

Properties

=======================



- compatible

	Usage:      required

	Value type: <string>

	Definition: must be "qcom,spmi-clkdiv".



- reg

	Usage:      required

	Value type: <prop-encoded-array>

	Definition: base address of CLKDIV peripherals.



- qcom,num-clkdivs

	Usage:      required

	Value type: <u32>

	Definition: number of CLKDIV peripherals.



- clocks:

	Usage: required

	Value type: <prop-encoded-array>

	Definition: reference to the xo clock.



- clock-names:

	Usage: required

	Value type: <stringlist>

	Definition: must be "xo".



- #clock-cells:

	Usage: required

	Value type: <u32>

	Definition: shall contain 1.



=======

Example

=======



pm8998_clk_divs: clock-controller@5b00 {

	compatible = "qcom,spmi-clkdiv";

	reg = <0x5b00>;

	#clock-cells = <1>;

	qcom,num-clkdivs = <3>;

	clocks = <&xo_board>;

	clock-names = "xo";



	assigned-clocks = <&pm8998_clk_divs 1>,

			  <&pm8998_clk_divs 2>,

			  <&pm8998_clk_divs 3>;

	assigned-clock-rates = <9600000>,

			       <9600000>,

			       <9600000>;

};

Documentation/driver-model/devres.txt

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ CLOCK 
  devm_clk_get()

  devm_clk_put()

  devm_clk_hw_register()

  devm_of_clk_add_hw_provider()



DMA

  dmam_alloc_coherent()

arch/arm64/boot/dts/qcom/pm855.dtsi

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

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

 * Copyright (c) 2017-2018, 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
@@ -29,6 +29,16 @@ 
			qcom,temperature-threshold-set = <1>;

		};



		pm855_clkdiv: clock-controller@5b00 {

			compatible = "qcom,spmi-clkdiv";

			reg = <0x5b00 0x200>;

			#clock-cells = <1>;

			qcom,num-clkdivs = <2>;

			clock-output-names = "pm855_div_clk1", "pm855_div_clk2";

			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

		};



		pm855_rtc: qcom,pm855_rtc {

			compatible = "qcom,qpnp-rtc";

			#address-cells = <1>;

arch/arm64/boot/dts/qcom/pm855b.dtsi

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

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

 * Copyright (c) 2017-2018, 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
@@ -28,6 +28,16 @@ 
			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};



		pm855b_clkdiv: clock-controller@6000 {

			compatible = "qcom,spmi-clkdiv";

			reg = <0x6000 0x100>;

			#clock-cells = <1>;

			qcom,num-clkdivs = <1>;

			clock-output-names = "pm855b_div_clk1";

			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

		};

	};



	qcom,pm855b@3 {

arch/arm64/boot/dts/qcom/pm855l.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,16 @@ 
			#thermal-sensor-cells = <0>;

			qcom,temperature-threshold-set = <1>;

		};



		pm855l_clkdiv: clock-controller@5b00 {

			compatible = "qcom,spmi-clkdiv";

			reg = <0x5b00 0x100>;

			#clock-cells = <1>;

			qcom,num-clkdivs = <1>;

			clock-output-names = "pm855l_div_clk1";

			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

		};

	};



	qcom,pm855l@5 {