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

Commit cc2f81a6 authored by Michael Hennerich's avatar Michael Hennerich Committed by Linus Torvalds
Browse files

spi: bfin spi uses portmux calls 



Use new Blackfin portmux interface, add error handling.

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 131b17d4

drivers/spi/spi_bfin5xx.c

+22 −6
Original line number Diff line number Diff line
@@ -1167,6 +1167,21 @@ static inline int destroy_queue(struct driver_data *drv_data) 
	return 0;

}



static int setup_pin_mux(int action)

{



	u16 pin_req[] = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0};



	if (action) {

		if (peripheral_request_list(pin_req, DRV_NAME))

			return -EFAULT;

	} else {

		peripheral_free_list(pin_req);

	}



	return 0;

}



static int __init bfin5xx_spi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -1184,12 +1199,9 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	if (peripheral_request(P_SPI0_SCK, DRV_NAME) ||

		 peripheral_request(P_SPI0_MISO, DRV_NAME) ||

		 peripheral_request(P_SPI0_MOSI, DRV_NAME)) {



	if (setup_pin_mux(1)) {

		dev_err(&pdev->dev, ": Requesting Peripherals failed\n");

		goto out_error_queue_alloc;

		goto out_error;

	}



	drv_data = spi_master_get_devdata(master);
@@ -1227,7 +1239,9 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev) 


out_error_queue_alloc:

	destroy_queue(drv_data);

out_error:

	spi_master_put(master);



	return status;

}
@@ -1257,6 +1271,8 @@ static int __devexit bfin5xx_spi_remove(struct platform_device *pdev) 
	/* Disconnect from the SPI framework */

	spi_unregister_master(drv_data->master);



	setup_pin_mux(0);



	/* Prevent double remove */

	platform_set_drvdata(pdev, NULL);

include/asm-blackfin/mach-bf533/portmux.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#define P_SPORT0_DRPRI	(P_DONTCARE)



#define P_SPI0_MOSI	(P_DONTCARE)

#define P_SPI0_MIS0	(P_DONTCARE)

#define P_SPI0_MISO	(P_DONTCARE)

#define P_SPI0_SCK	(P_DONTCARE)

#define P_SPI0_SSEL7	(P_DEFINED | P_IDENT(GPIO_PF7))

#define P_SPI0_SSEL6	(P_DEFINED | P_IDENT(GPIO_PF6))