Merge "soc: qcom: spss_utils: use pil-mem DT for IAR" (d6669bef) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/spss_utils.c

+20 −7

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@
	#include <linux/bitops.h> /* BIT(x) */		#include <linux/bitops.h> /* BIT(x) */
	#include <linux/platform_device.h> /* platform_driver_register() */		#include <linux/platform_device.h> /* platform_driver_register() */
	#include <linux/of.h> /* of_property_count_strings() */		#include <linux/of.h> /* of_property_count_strings() */
			#include <linux/of_address.h> /* of_address_to_resource() */
	#include <linux/io.h> /* ioremap_nocache() */		#include <linux/io.h> /* ioremap_nocache() */
	#include <linux/notifier.h>		#include <linux/notifier.h>
	#include <linux/sizes.h> /* SZ_4K */		#include <linux/sizes.h> /* SZ_4K */
	@@ -513,7 +514,8 @@ static int spss_parse_dt(struct device_node *node)
	u32 spss_fuse4_bit = 0;		u32 spss_fuse4_bit = 0;
	u32 spss_fuse4_mask = 0;		u32 spss_fuse4_mask = 0;
	void __iomem *spss_fuse4_reg = NULL;		void __iomem *spss_fuse4_reg = NULL;
			struct device_node *np;
			struct resource r;
	u32 val1 = 0;		u32 val1 = 0;
	u32 val2 = 0;		u32 val2 = 0;
	void __iomem *spss_emul_type_reg = NULL;		void __iomem *spss_emul_type_reg = NULL;
	@@ -649,12 +651,23 @@ static int spss_parse_dt(struct device_node *node)
	iounmap(spss_emul_type_reg);		iounmap(spss_emul_type_reg);

	/* PIL-SPSS area */		/* PIL-SPSS area */
			np = of_parse_phandle(node, "pil-mem", 0);
			if (!np) {
			pr_err("no pil-mem entry, check pil-addr\n");
	ret = of_property_read_u32(node, "qcom,pil-addr",		ret = of_property_read_u32(node, "qcom,pil-addr",
	&pil_addr);		&pil_addr);
	if (ret < 0) {		if (ret < 0) {
	pr_err("can't get pil_addr\n");		pr_err("can't get pil_addr\n");
	return -EFAULT;		return -EFAULT;
	}		}
			} else {
			ret = of_address_to_resource(np, 0, &r);
			of_node_put(np);
			if (ret)
			return ret;
			pil_addr = (u32)r.start;
			}

	ret = of_property_read_u32(node, "qcom,pil-size",		ret = of_property_read_u32(node, "qcom,pil-size",
	&pil_size);		&pil_size);
	if (ret < 0) {		if (ret < 0) {