Re: [PATCH v5 9/9] pmic: qcom: dont use dev_read_addr to get USID

On 30/11/2023 21:22, Caleb Connolly wrote:

Linux DTs stuff a value indicating if the USID is a USID or a GSID in the reg property, the Linux SPMI driver then reads the two address cells separately. U-boot's dev_read_addr() doesn't know how to handle this, so use ofnode_read_u32_index() to get just the USID.

The Qcom pmic driver doesn't have support for GSID handling, so just ignore the second value for now.

Signed-off-by: Caleb Connolly caleb.connolly@linaro.org

doc/device-tree-bindings/pmic/qcom,spmi-pmic.txt | 94 ------------------------ drivers/power/pmic/pmic_qcom.c | 13 +++- 2 files changed, 10 insertions(+), 97 deletions(-)

diff --git a/doc/device-tree-bindings/pmic/qcom,spmi-pmic.txt b/doc/device-tree-bindings/pmic/qcom,spmi-pmic.txt deleted file mode 100644 index eb78e3ae7703..000000000000 --- a/doc/device-tree-bindings/pmic/qcom,spmi-pmic.txt +++ /dev/null @@ -1,94 +0,0 @@

•      Qualcomm SPMI PMICs multi-function device bindings
  

-The Qualcomm SPMI series presently includes PM8941, PM8841 and PMA8084 -PMICs. These PMICs use a QPNP scheme through SPMI interface. -QPNP is effectively a partitioning scheme for dividing the SPMI extended -register space up into logical pieces, and set of fixed register -locations/definitions within these regions, with some of these regions -specifically used for interrupt handling.

-The QPNP PMICs are used with the Qualcomm Snapdragon series SoCs, and are -interfaced to the chip via the SPMI (System Power Management Interface) bus. -Support for multiple independent functions are implemented by splitting the -16-bit SPMI slave address space into 256 smaller fixed-size regions, 256 bytes -each. A function can consume one or more of these fixed-size register regions.

-Required properties: -- compatible: Should contain one of:

•               "qcom,pm660",
  

•               "qcom,pm660l",
  

•               "qcom,pm7325",
  

•               "qcom,pm8004",
  

•               "qcom,pm8005",
  

•               "qcom,pm8019",
  

•               "qcom,pm8028",
  

•               "qcom,pm8110",
  

•               "qcom,pm8150",
  

•               "qcom,pm8150b",
  

•               "qcom,pm8150c",
  

•               "qcom,pm8150l",
  

•               "qcom,pm8226",
  

•               "qcom,pm8350c",
  

•               "qcom,pm8841",
  

•               "qcom,pm8901",
  

•               "qcom,pm8909",
  

•               "qcom,pm8916",
  

•               "qcom,pm8941",
  

•               "qcom,pm8950",
  

•               "qcom,pm8953",
  

•               "qcom,pm8994",
  

•               "qcom,pm8998",
  

•               "qcom,pma8084",
  

•               "qcom,pmd9635",
  

•               "qcom,pmi8950",
  

•               "qcom,pmi8962",
  

•               "qcom,pmi8994",
  

•               "qcom,pmi8998",
  

•               "qcom,pmk8002",
  

•               "qcom,pmk8350",
  

•               "qcom,pmr735a",
  

•               "qcom,smb2351",
  

•               or generalized "qcom,spmi-pmic".
  

-- reg: Specifies the SPMI USID slave address for this device.

•               For more information see:
  

•               Documentation/devicetree/bindings/spmi/spmi.yaml
  

-Required properties for peripheral child nodes: -- compatible: Should contain "qcom,xxx", where "xxx" is a peripheral name.

-Optional properties for peripheral child nodes: -- interrupts: Interrupts are specified as a 4-tuple. For more information

•               see:
  

•               Documentation/devicetree/bindings/spmi/qcom,spmi-pmic-arb.yaml
  

-- interrupt-names: Corresponding interrupt name to the interrupts property

-Each child node of SPMI slave id represents a function of the PMIC. In the -example below the rtc device node represents a peripheral of pm8941 -SID = 0. The regulator device node represents a peripheral of pm8941 SID = 1.

-Example:

• spmi {

• compatible = "qcom,spmi-pmic-arb";
  

• pm8941@0 {
  

• 	compatible = "qcom,pm8941", "qcom,spmi-pmic";
  

• 	reg = <0x0 SPMI_USID>;
  

• 	rtc {
  

• 		compatible = "qcom,rtc";
  

• 		interrupts = <0x0 0x61 0x1 IRQ_TYPE_EDGE_RISING>;
  

• 		interrupt-names = "alarm";
  

• 	};
  

• };
  

• pm8941@1 {
  

• 	compatible = "qcom,pm8941", "qcom,spmi-pmic";
  

• 	reg = <0x1 SPMI_USID>;
  

• 	regulator {
  

• 		compatible = "qcom,regulator";
  

• 		regulator-name = "8941_boost";
  

• 	};
  

• };
  

• };

diff --git a/drivers/power/pmic/pmic_qcom.c b/drivers/power/pmic/pmic_qcom.c index ad8daf43f06f..f2ac6494811d 100644 --- a/drivers/power/pmic/pmic_qcom.c +++ b/drivers/power/pmic/pmic_qcom.c @@ -66,12 +66,19 @@ static const struct udevice_id pmic_qcom_ids[] = { static int pmic_qcom_probe(struct udevice *dev) { struct pmic_qcom_priv *priv = dev_get_priv(dev);

• int ret;

• priv->usid = dev_read_addr(dev);
• if (priv->usid == FDT_ADDR_T_NONE)

• /*

• * dev_read_addr() can't be used here because the reg property actually
  

• * contains two discrete values, not a single 64-bit address.
  

• * The address is the first value.
  

• */
  

• ret = ofnode_read_u32_index(dev_ofnode(dev), "reg", 0, &priv->usid);

• if (ret < 0) return -EINVAL;

• debug("usid: %d\n", priv->usid);

• return 0; }

Reviewed-by: Neil Armstrong neil.armstrong@linaro.org