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

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

Merge "msm: msm_bus: fix dt parsing of clock regulators"

parents 0bae6ddc 3ef9d4dc

arch/arm/boot/dts/qcom/msm8996-bus.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -141,6 +141,13 @@ 
			coresight-outports = <0>;

			coresight-child-list = <&funnel_in1>;

			coresight-child-ports = <0>;

			mmagic-ahb-no-rate-supply = <&gdsc_mmagic_bimc>;

			mmagic-mdss-axi-no-rate-supply =

						<&gdsc_mmagic_mdss>;

			mmagic-camss-axi-no-rate-supply =

						<&gdsc_mmagic_camss>;

			mmagic-video-axi-no-rate-supply =

						<&gdsc_mmagic_video>;

			qcom,node-qos-clks {

				clock-names = "mmagic-ahb-no-rate",

				"mmagic-cfg-ahb-no-rate",
@@ -158,13 +165,6 @@ 
			     <&clock_mmss clk_mmagic_camss_noc_cfg_ahb_clk>,

			     <&clock_mmss clk_mmagic_video_axi_clk>,

			     <&clock_mmss clk_mmagic_video_noc_cfg_ahb_clk>;

				mmagic-ahb-no-rate-supply = <&gdsc_mmagic_bimc>;

				mmagic-mdss-axi-no-rate-supply =

							<&gdsc_mmagic_mdss>;

				mmagic-camss-axi-no-rate-supply =

							<&gdsc_mmagic_camss>;

				mmagic-video-axi-no-rate-supply =

							<&gdsc_mmagic_video>;

			};

		};

drivers/platform/msm/msm_bus/msm_bus_of_adhoc.c

+3 −2
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ static void get_qos_params( 
}



static int msm_bus_of_parse_clk_array(struct device_node *dev_node,

			struct device_node *gdsc_node,

			struct platform_device *pdev, struct nodeclk **clk_arr,

			int *num_clks, int id)

{
@@ -272,7 +273,7 @@ static int msm_bus_of_parse_clk_array(struct device_node *dev_node, 


		scnprintf(gdsc_string, MAX_REG_NAME, "%s-supply", clk_name);



		if (of_find_property(dev_node, gdsc_string, NULL))

		if (of_find_property(gdsc_node, gdsc_string, NULL))

			scnprintf((*clk_arr)[idx].reg_name,

				MAX_REG_NAME, "%s", clk_name);

		else
@@ -516,7 +517,7 @@ static int get_bus_node_device_data( 
						"qcom,node-qos-clks");



		if (qos_clk_node)

			msm_bus_of_parse_clk_array(qos_clk_node, pdev,

			msm_bus_of_parse_clk_array(qos_clk_node, dev_node, pdev,

			&node_device->node_qos_clks,

			&node_device->num_node_qos_clks,

			node_device->node_info->id);