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

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

Merge "ARM: dts: msm: add device to get disp rsc handle"

parents 315543a1 aa2197dd

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

+6 −0
Original line number Diff line number Diff line
@@ -1969,6 +1969,12 @@ 
				  <CONTROL_TCS 0>;

		status = "disabled";



		msm_bus_disp_rsc {

			compatible = "qcom,msm-bus-rsc";

			qcom,msm-bus-id = <MSM_BUS_RSC_DISP>;

			status = "disabled";

		};



		sde_rsc_rpmh {

			compatible = "qcom,sde-rsc-rpmh";

			cell-index = <0>;

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+4 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include <linux/clk.h>
@@ -1928,7 +1928,7 @@ static int msm_bus_rsc_probe(struct platform_device *pdev) 
		return ret;

	}



	for (i = 0; i < MSM_BUS_RSC_COUNT - 1; i++) {

	for (i = 0; i < MSM_BUS_RSC_COUNT; i++) {

		if (!rsc_clients[i].rsc_id) {

			rsc_clients[i].rsc_id = rsc_id;

			rsc_clients[i].client = &pdev->dev;
@@ -1936,6 +1936,7 @@ static int msm_bus_rsc_probe(struct platform_device *pdev) 
				rsc_clients[i].rsc_id = 0;

				rsc_clients[i].client = NULL;

			}

			break;

		}

	}

	return 0;
@@ -1945,7 +1946,7 @@ int msm_bus_rsc_remove(struct platform_device *pdev) 
{

	int i;



	for (i = 0; i < MSM_BUS_RSC_COUNT - 1; i++) {

	for (i = 0; i < MSM_BUS_RSC_COUNT; i++) {

		rsc_clients[i].rsc_id = 0;

		rsc_clients[i].client = NULL;

	}