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

Commit ca04ce14 authored by Arun KS's avatar Arun KS
Browse files

drivers: soc: sdx_ext_ipc: Make gpio DT entries optional 



To reuse the driver for multiple configurations where all the gpios
are not mandatory. Make gpios optional to get probe successful.

Change-Id: Iacfe4a09d55caa1622fdbc2470c693a8610ec1de
Signed-off-by: default avatarArun KS <arunks@codeaurora.org>
parent 3f791019

Documentation/devicetree/bindings/arm/msm/sdx-ext-ipc.txt

+1 −4
Original line number Diff line number Diff line
@@ -8,14 +8,11 @@ state of one subsytem to another. Modem can indicate different events 
Required Properties:

- compatible:	"qcom,sdx-ext-ipc".



Required named gpio properties:

Optional named gpio properties:

- qcom,mdm2ap-status-gpio: gpio for modem to indicate the boot status to APQ.



- qcom,ap2mdm-status-gpio: gpio for APQ to indicate the boot status to modem.







Optional named gpio properties:

- qcom,mdm2ap-status2-gpio: gpio for modem to indicate to APQ that it is in

		E911 call or doing firmware upgrade.

drivers/soc/qcom/sdx_ext_ipc.c

+67 −39
Original line number Diff line number Diff line
@@ -94,6 +94,9 @@ static ssize_t e911_show(struct device *dev, struct device_attribute *attr, 
	int ret, state;

	struct gpio_cntrl *mdm = dev_get_drvdata(dev);



	if (mdm->gpios[MDM2AP_STATUS2] < 0)

		return -ENXIO;



	mutex_lock(&mdm->e911_lock);

	state = gpio_get_value(mdm->gpios[MDM2AP_STATUS2]);

	ret = scnprintf(buf, 2, "%d\n", state);
@@ -111,6 +114,9 @@ static ssize_t e911_store(struct device *dev, struct device_attribute *attr, 
	if (kstrtoint(buf, 0, &e911))

		return -EINVAL;



	if (mdm->gpios[MDM2AP_STATUS2] < 0)

		return -ENXIO;



	mutex_lock(&mdm->e911_lock);

	if (e911)

		gpio_set_value(mdm->gpios[MDM2AP_STATUS2], 1);
@@ -162,37 +168,47 @@ static int setup_ipc(struct gpio_cntrl *mdm) 
	node = mdm->dev->of_node;

	for (i = 0; i < ARRAY_SIZE(gpio_map); i++) {

		val = of_get_named_gpio(node, gpio_map[i], 0);

		if (val >= 0)

			mdm->gpios[i] = val;

		mdm->gpios[i] = (val >= 0) ? val : -1;

	}



	if (mdm->gpios[AP2MDM_STATUS] >= 0) {

		ret = gpio_request(mdm->gpios[AP2MDM_STATUS], "AP2MDM_STATUS");

		if (ret) {

		dev_err(mdm->dev, "Failed to configure AP2MDM_STATUS gpio\n");

			dev_err(mdm->dev,

				"Failed to configure AP2MDM_STATUS gpio\n");

			return ret;

		}

		gpio_direction_input(mdm->gpios[AP2MDM_STATUS]);



		irq = gpio_to_irq(mdm->gpios[AP2MDM_STATUS]);

		if (irq < 0) {

			dev_err(mdm->dev, "bad AP2MDM_STATUS IRQ resource\n");

			return irq;

		}

		mdm->status_irq = irq;

	} else

		dev_info(mdm->dev, "AP2MDM_STATUS not used\n");



	if (mdm->gpios[MDM2AP_STATUS] >= 0) {

		ret = gpio_request(mdm->gpios[MDM2AP_STATUS], "MDM2AP_STATUS");

		if (ret) {

			dev_err(mdm->dev, "Failed to configure MDM2AP_STATUS gpio\n");

			return ret;

		}

		gpio_direction_output(mdm->gpios[MDM2AP_STATUS], 1);

	} else

		dev_info(mdm->dev, "MDM2AP_STATUS not used\n");



	ret = gpio_request(mdm->gpios[MDM2AP_STATUS2], "MDM2AP_STATUS2");

	if (mdm->gpios[MDM2AP_STATUS2] >= 0) {

		ret = gpio_request(mdm->gpios[MDM2AP_STATUS2],

						"MDM2AP_STATUS2");

		if (ret) {

			dev_err(mdm->dev, "Failed to configure MDM2AP_STATUS2 gpio\n");

			return ret;

		}

		gpio_direction_output(mdm->gpios[MDM2AP_STATUS2], 0);



	irq = gpio_to_irq(mdm->gpios[AP2MDM_STATUS]);

	if (irq < 0) {

		dev_err(mdm->dev, "bad AP2MDM_STATUS IRQ resource\n");

		return irq;

	}

	mdm->status_irq = irq;

	} else

		dev_info(mdm->dev, "MDM2AP_STATUS2 not used\n");



	return 0;

}
@@ -227,8 +243,11 @@ static int sdx_ext_ipc_probe(struct platform_device *pdev) 
		return ret;

	}



	if (mdm->gpios[MDM2AP_STATUS] >= 0) {

		mdm->panic_blk.notifier_call = sdx_ext_ipc_panic;

	atomic_notifier_chain_register(&panic_notifier_list, &mdm->panic_blk);

		atomic_notifier_chain_register(&panic_notifier_list,

						&mdm->panic_blk);

	}



	mutex_init(&mdm->policy_lock);

	mutex_init(&mdm->e911_lock);
@@ -251,15 +270,19 @@ static int sdx_ext_ipc_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, mdm);



	ret = devm_request_irq(mdm->dev, mdm->status_irq, ap_status_change,

	if (mdm->gpios[AP2MDM_STATUS] >= 0) {

		ret = devm_request_irq(mdm->dev, mdm->status_irq,

				ap_status_change,

				IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING,

				"ap status", mdm);

		if (ret < 0) {

		dev_err(mdm->dev, "%s: AP2MDM_STATUS IRQ#%d request failed,\n",

			dev_err(mdm->dev,

				 "%s: AP2MDM_STATUS IRQ#%d request failed,\n",

				__func__, mdm->status_irq);

			goto irq_fail;

		}

		irq_set_irq_wake(mdm->status_irq, 1);

	}

	return 0;



irq_fail:
@@ -267,7 +290,9 @@ static int sdx_ext_ipc_probe(struct platform_device *pdev) 
sys_fail1:

	device_remove_file(mdm->dev, &dev_attr_e911);

sys_fail:

	atomic_notifier_chain_unregister(&panic_notifier_list, &mdm->panic_blk);

	if (mdm->gpios[MDM2AP_STATUS] >= 0)

		atomic_notifier_chain_unregister(&panic_notifier_list,

						&mdm->panic_blk);

	remove_ipc(mdm);

	devm_kfree(&pdev->dev, mdm);

	return ret;
@@ -278,8 +303,11 @@ static int sdx_ext_ipc_remove(struct platform_device *pdev) 
	struct gpio_cntrl *mdm;



	mdm = dev_get_drvdata(&pdev->dev);

	if (mdm->gpios[AP2MDM_STATUS] >= 0)

		disable_irq_wake(mdm->status_irq);

	atomic_notifier_chain_unregister(&panic_notifier_list, &mdm->panic_blk);

	if (mdm->gpios[MDM2AP_STATUS] >= 0)

		atomic_notifier_chain_unregister(&panic_notifier_list,

						&mdm->panic_blk);

	remove_ipc(mdm);

	device_remove_file(mdm->dev, &dev_attr_policy);

	return 0;