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

Commit 7bfe4978 authored by Russell King's avatar Russell King
Browse files

pcmcia: soc_common: request legacy detect GPIO with active low 



Request the legacy card detect signal with the active low property and
remove our own negation of the detection value.  This allows us to use
the firmware-defined polarities rather than hard-coding it into the
driver.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent a4941191

drivers/pcmcia/soc_common.c

+8 −5
Original line number Diff line number Diff line
@@ -165,8 +165,14 @@ static int soc_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 


	for (i = 0; i < ARRAY_SIZE(skt->stat); i++) {

		if (gpio_is_valid(skt->stat[i].gpio)) {

			unsigned long flags = GPIOF_IN;



			/* CD is active low by default */

			if (i == SOC_STAT_CD)

				flags |= GPIOF_ACTIVE_LOW;



			ret = devm_gpio_request_one(skt->socket.dev.parent,

						    skt->stat[i].gpio, GPIOF_IN,

						    skt->stat[i].gpio, flags,

						    skt->stat[i].name);

			if (ret) {

				__soc_pcmcia_hw_shutdown(skt, i);
@@ -233,11 +239,8 @@ static unsigned int soc_common_pcmcia_skt_state(struct soc_pcmcia_socket *skt) 
	state.bvd1 = 1;

	state.bvd2 = 1;



	/* CD is active low by default */

	if (skt->stat[SOC_STAT_CD].desc)

		state.detect = !gpiod_get_raw_value(skt->stat[SOC_STAT_CD].desc);



	/* RDY and BVD are active high by default */

		state.detect = !!gpiod_get_value(skt->stat[SOC_STAT_CD].desc);

	if (skt->stat[SOC_STAT_RDY].desc)

		state.ready = !!gpiod_get_value(skt->stat[SOC_STAT_RDY].desc);

	if (skt->stat[SOC_STAT_BVD1].desc)