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

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

Merge "spmi-pmic-arb: Fix spmi channel number dt naming convention"

parents 93974768 3b96b1ea

Documentation/devicetree/bindings/spmi/spmi-pmic-arb.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Required properties: 
- reg : offset and length of the PMIC Arbiter Configuration register map.

- interrupts : the PMIC Arbiter interrupt.

- qcom,pmic-arb-ee : the execution environment (EE) identifier.

- qcom,pmic-arb-channel-num : the assigned channel number for channel registers.

- qcom,pmic-arb-channel : the assigned channel number for channel registers.



Optional properties:

- qcom,not-wakeup : boolean property which indicates that SPMI PMIC interrupts

drivers/spmi/spmi-pmic-arb.c

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

/* Copyright (c) 2012-2015, 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
@@ -1193,7 +1193,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) 
		return -ENODEV;

	pmic_arb->ee = (u8)prop;



	ret = spmi_pmic_arb_get_property(pdev, "qcom,pmic-arb-channel-num",

	ret = spmi_pmic_arb_get_property(pdev, "qcom,pmic-arb-channel",

					&prop);

	if (ret)

		return -ENODEV;