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

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

Merge changes Ifa271522,Ib35876bd into msm-4.14 

* changes:
  ARM: dts: msm: add lab and ibb regulator entries for SDM855
  drm/msm/dsi-staging: add check for regulator count prior to enable
parents bc99c92d c4144746

arch/arm64/boot/dts/qcom/sdm855-sde-display.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -122,6 +122,8 @@ 




		qcom,dsi-panel = <&dsi_sharp_4k_dsc_video>;

		qcom,dsi-panel = <&dsi_sharp_4k_dsc_video>;

		vddio-supply = <&pm855_l14>;

		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;





	};

	};
@@ -145,6 +147,8 @@ 




		qcom,dsi-panel = <&dsi_sharp_4k_dsc_cmd>;

		qcom,dsi-panel = <&dsi_sharp_4k_dsc_cmd>;

		vddio-supply = <&pm855_l14>;

		vddio-supply = <&pm855_l14>;

		lab-supply = <&lcdb_ldo_vreg>;

		ibb-supply = <&lcdb_ncp_vreg>;





	};

	};

drivers/gpu/drm/msm/dsi-staging/dsi_pwr.c

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

/*

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

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and
@@ -341,6 +341,11 @@ int dsi_pwr_enable_regulator(struct dsi_regulator_info *regs, bool enable) 
{

{

	int rc = 0;

	int rc = 0;





	if (regs->count == 0) {

		pr_debug("No valid regulators to enable\n");

		return 0;

	}



	if (!regs->vregs) {

	if (!regs->vregs) {

		pr_err("Invalid params\n");

		pr_err("Invalid params\n");

		return -EINVAL;

		return -EINVAL;