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

Commit eccf2979 authored by Pavan Savoy's avatar Pavan Savoy Committed by Greg Kroah-Hartman
Browse files

drivers/misc/ti-st: remove gpio handling 



A platform hook to enable/disable the chip was introduced to perform specific
activities to power-up and power-down the WL chip.
Moving the power-up/down sequence also there makes more sense, since different
platforms have begun to have their own ways to power-up/down the chip.
This patch removes all of the gpio handling done by the driver in
st_kim_start/st_kim_stop & any of the gpio request done in the probe function.

Signed-off-by: default avatarPavan Savoy <pavan_savoy@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4eb64ee1

drivers/misc/ti-st/st_kim.c

+1 −36
Original line number Original line Diff line number Diff line
@@ -454,11 +454,6 @@ long st_kim_start(void *kim_data) 
		if (pdata->chip_enable)

		if (pdata->chip_enable)

			pdata->chip_enable(kim_gdata);

			pdata->chip_enable(kim_gdata);





		/* Configure BT nShutdown to HIGH state */

		gpio_set_value(kim_gdata->nshutdown, GPIO_LOW);

		mdelay(5);	/* FIXME: a proper toggle */

		gpio_set_value(kim_gdata->nshutdown, GPIO_HIGH);

		mdelay(100);

		/* re-initialize the completion */

		/* re-initialize the completion */

		INIT_COMPLETION(kim_gdata->ldisc_installed);

		INIT_COMPLETION(kim_gdata->ldisc_installed);

		/* send notification to UIM */

		/* send notification to UIM */
@@ -500,8 +495,7 @@ long st_kim_start(void *kim_data) 
 *	(b) upon failure to either install ldisc or download firmware.

 *	(b) upon failure to either install ldisc or download firmware.

 *	The function is responsible to (a) notify UIM about un-installation,

 *	The function is responsible to (a) notify UIM about un-installation,

 *	(b) flush UART if the ldisc was installed.

 *	(b) flush UART if the ldisc was installed.

 *	(c) reset BT_EN - pull down nshutdown at the end.

 *	(c) invoke platform's chip disabling routine.

 *	(d) invoke platform's chip disabling routine.

 */

 */

long st_kim_stop(void *kim_data)

long st_kim_stop(void *kim_data)

{

{
@@ -533,13 +527,6 @@ long st_kim_stop(void *kim_data) 
		return -ETIMEDOUT;

		return -ETIMEDOUT;

	}

	}





	/* By default configure BT nShutdown to LOW state */

	gpio_set_value(kim_gdata->nshutdown, GPIO_LOW);

	mdelay(1);

	gpio_set_value(kim_gdata->nshutdown, GPIO_HIGH);

	mdelay(1);

	gpio_set_value(kim_gdata->nshutdown, GPIO_LOW);



	/* platform specific disable */

	/* platform specific disable */

	if (pdata->chip_disable)

	if (pdata->chip_disable)

		pdata->chip_disable(kim_gdata);

		pdata->chip_disable(kim_gdata);
@@ -731,20 +718,6 @@ static int kim_probe(struct platform_device *pdev) 
	/* refer to itself */

	/* refer to itself */

	kim_gdata->core_data->kim_data = kim_gdata;

	kim_gdata->core_data->kim_data = kim_gdata;





	/* Claim the chip enable nShutdown gpio from the system */

	kim_gdata->nshutdown = pdata->nshutdown_gpio;

	status = gpio_request(kim_gdata->nshutdown, "kim");

	if (unlikely(status)) {

		pr_err(" gpio %ld request failed ", kim_gdata->nshutdown);

		return status;

	}



	/* Configure nShutdown GPIO as output=0 */

	status = gpio_direction_output(kim_gdata->nshutdown, 0);

	if (unlikely(status)) {

		pr_err(" unable to configure gpio %ld", kim_gdata->nshutdown);

		return status;

	}

	/* get reference of pdev for request_firmware

	/* get reference of pdev for request_firmware

	 */

	 */

	kim_gdata->kim_pdev = pdev;

	kim_gdata->kim_pdev = pdev;
@@ -780,18 +753,10 @@ static int kim_probe(struct platform_device *pdev) 




static int kim_remove(struct platform_device *pdev)

static int kim_remove(struct platform_device *pdev)

{

{

	/* free the GPIOs requested */

	struct ti_st_plat_data	*pdata = pdev->dev.platform_data;

	struct kim_data_s	*kim_gdata;

	struct kim_data_s	*kim_gdata;





	kim_gdata = dev_get_drvdata(&pdev->dev);

	kim_gdata = dev_get_drvdata(&pdev->dev);





	/* Free the Bluetooth/FM/GPIO

	 * nShutdown gpio from the system

	 */

	gpio_free(pdata->nshutdown_gpio);

	pr_info("nshutdown GPIO Freed");



	debugfs_remove_recursive(kim_debugfs_dir);

	debugfs_remove_recursive(kim_debugfs_dir);

	sysfs_remove_group(&pdev->dev.kobj, &uim_attr_grp);

	sysfs_remove_group(&pdev->dev.kobj, &uim_attr_grp);

	pr_info("sysfs entries removed");

	pr_info("sysfs entries removed");