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

Commit 9b2af7c8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Align with the gpio name change in driver"

parents 74ff77c2 2d684bc4

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

+7 −13
Original line number Diff line number Diff line
@@ -8,26 +8,20 @@ state of one subsytem to another. Modem can indicate different events 
Required Properties:

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



Required 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,status-out-gpio: gpio to indicate the boot status to remote processor.



- qcom,status-in-gpio: gpio for remote processor to indicate the boot status.



Optional named gpio properties:

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

- qcom,status-out2-gpio: gpio to indicate to remote processor that it is in

		E911 call or doing firmware upgrade.



- qcom,ap2mdm-status2-gpio: gpio for APQ to indicate graceful shutdown to modem.



- qcom,default-policy-nop: Set default policy from PANIC to NOP.



Example:

	sdx_ext_ipc: qcom,sdx_ext_ipc {

		compatible = "qcom,sdx-ext-ipc";

		qcom,ap2mdm-status-gpio = <&tlmm 64 0x00>;

		qcom,ap2mdm-status2-gpio = <&tlmm 65 0x00>;

		qcom,mdm2ap-status-gpio = <&tlmm 63 0x00>;

		qcom,mdm2ap-status2-gpio = <&tlmm 66 0x00>;

		qcom,status-in-gpio = <&tlmm 64 0x00>;

		qcom,status-out-gpio = <&tlmm 63 0x00>;

		qcom,status-out2-gpio = <&tlmm 66 0x00>;

	};

arch/arm64/boot/dts/qcom/sa515m-v2-ccard-pcie-ep.dts

+3 −3
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@ 


&sdx_ext_ipc {

		compatible = "qcom,sa515m-ccard";

		qcom,ap2mdm-status-gpio = <&tlmm 76 0x00>;

		qcom,mdm2ap-status-gpio = <&tlmm 33 0x00>;

		qcom,mdm2ap-status2-gpio = <&tlmm 31 0x00>;

		qcom,status-in-gpio = <&tlmm 76 0x00>;

		qcom,status-out-gpio = <&tlmm 33 0x00>;

		qcom,status-out2-gpio = <&tlmm 31 0x00>;

		status = "okay";

};

arch/arm64/boot/dts/qcom/sdxprairie.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -1593,9 +1593,9 @@ 


	sdx_ext_ipc: qcom,sdx_ext_ipc {

		compatible = "qcom,sdx-ext-ipc";

		qcom,ap2mdm-status-gpio = <&tlmm 64 0x00>;

		qcom,mdm2ap-status-gpio = <&tlmm 63 0x00>;

		qcom,mdm2ap-status2-gpio = <&tlmm 66 0x00>;

		qcom,status-in-gpio = <&tlmm 64 0x00>;

		qcom,status-out-gpio = <&tlmm 63 0x00>;

		qcom,status-out2-gpio = <&tlmm 66 0x00>;

		status = "disabled";

	};

};

drivers/soc/qcom/sdx_ext_ipc.c

+79 −51
Original line number Diff line number Diff line
@@ -30,16 +30,16 @@ static const char * const policies[] = { 
};



enum gpios {

	AP2MDM_STATUS = 0,

	MDM2AP_STATUS,

	MDM2AP_STATUS2,

	STATUS_IN = 0,

	STATUS_OUT,

	STATUS_OUT2,

	NUM_GPIOS,

};



static const char * const gpio_map[] = {

	[AP2MDM_STATUS] = "qcom,ap2mdm-status-gpio",

	[MDM2AP_STATUS] = "qcom,mdm2ap-status-gpio",

	[MDM2AP_STATUS2] = "qcom,mdm2ap-status2-gpio",

	[STATUS_IN] = "qcom,status-in-gpio",

	[STATUS_OUT] = "qcom,status-out-gpio",

	[STATUS_OUT2] = "qcom,status-out2-gpio",

};



struct gpio_cntrl {
@@ -94,8 +94,11 @@ 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[STATUS_OUT2] < 0)

		return -ENXIO;



	mutex_lock(&mdm->e911_lock);

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

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

	ret = scnprintf(buf, 2, "%d\n", state);

	mutex_unlock(&mdm->e911_lock);
@@ -111,11 +114,14 @@ static ssize_t e911_store(struct device *dev, struct device_attribute *attr, 
	if (kstrtoint(buf, 0, &e911))

		return -EINVAL;



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

		return -ENXIO;



	mutex_lock(&mdm->e911_lock);

	if (e911)

		gpio_set_value(mdm->gpios[MDM2AP_STATUS2], 1);

		gpio_set_value(mdm->gpios[STATUS_OUT2], 1);

	else

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

		gpio_set_value(mdm->gpios[STATUS_OUT2], 0);

	mutex_unlock(&mdm->e911_lock);



	return count;
@@ -126,13 +132,13 @@ static irqreturn_t ap_status_change(int irq, void *dev_id) 
{

	struct gpio_cntrl *mdm = dev_id;

	int state;

	struct gpio_desc *gp_status = gpio_to_desc(mdm->gpios[AP2MDM_STATUS]);

	struct gpio_desc *gp_status = gpio_to_desc(mdm->gpios[STATUS_IN]);

	int active_low = 0;



	if (gp_status)

		active_low = gpiod_is_active_low(gp_status);



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

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

	if ((!active_low && !state) || (active_low && state)) {

		if (mdm->policy)

			dev_info(mdm->dev, "Host undergoing SSR, leaving SDX as it is\n");
@@ -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;

	}



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

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

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

		if (ret) {

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

			dev_err(mdm->dev,

				"Failed to configure STATUS_IN gpio\n");

			return ret;

		}

	gpio_direction_input(mdm->gpios[AP2MDM_STATUS]);

		gpio_direction_input(mdm->gpios[STATUS_IN]);



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

	if (ret) {

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

		return ret;

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

		if (irq < 0) {

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

			return irq;

		}

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

		mdm->status_irq = irq;

	} else

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



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

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

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

		if (ret) {

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

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

			return ret;

		}

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

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

	} else

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



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

	if (irq < 0) {

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

		return irq;

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

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

						"STATUS_OUT2");

		if (ret) {

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

			return ret;

		}

	mdm->status_irq = irq;

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

	} else

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



	return 0;

}
@@ -203,7 +219,7 @@ static int sdx_ext_ipc_panic(struct notifier_block *this, 
	struct gpio_cntrl *mdm = container_of(this,

					struct gpio_cntrl, panic_blk);



	gpio_set_value(mdm->gpios[MDM2AP_STATUS], 0);

	gpio_set_value(mdm->gpios[STATUS_OUT], 0);



	return NOTIFY_DONE;

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

	}



	if (mdm->gpios[STATUS_OUT] >= 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[STATUS_IN] >= 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: STATUS_IN 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[STATUS_OUT] >= 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[STATUS_IN] >= 0)

		disable_irq_wake(mdm->status_irq);

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

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

		atomic_notifier_chain_unregister(&panic_notifier_list,

						&mdm->panic_blk);

	remove_ipc(mdm);

	device_remove_file(mdm->dev, &dev_attr_policy);

	return 0;