X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0012-spi-bcm2835-Remove-unused-code.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0012-spi-bcm2835-Remove-unused-code.patch;h=0000000000000000000000000000000000000000;hp=41d6c8d3639a42aca746358817661e53e49c296d;hb=7d7aa2fd924c27829ec25f825481554dd81bce97;hpb=e7bfda2c243e66a75ff966ba04c28b1590b5d24c

diff --git a/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Remove-unused-code.patch b/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Remove-unused-code.patch
deleted file mode 100644
index 41d6c8d363..0000000000
--- a/target/linux/brcm2708/patches-4.19/950-0012-spi-bcm2835-Remove-unused-code.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 80dc41f5617db0dbe3e17a399603a50b91997c5b Mon Sep 17 00:00:00 2001
-From: Phil Elwell <phil@raspberrypi.org>
-Date: Tue, 8 Nov 2016 21:35:38 +0000
-Subject: [PATCH] spi-bcm2835: Remove unused code
-
----
- drivers/spi/spi-bcm2835.c | 61 ---------------------------------------
- 1 file changed, 61 deletions(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -678,17 +678,8 @@ static void bcm2835_spi_set_cs(struct sp
- 	bcm2835_wr(bs, BCM2835_SPI_CS, cs);
- }
- 
--static int chip_match_name(struct gpio_chip *chip, void *data)
--{
--	return !strcmp(chip->label, data);
--}
--
- static int bcm2835_spi_setup(struct spi_device *spi)
- {
--	int err;
--	struct gpio_chip *chip;
--	struct device_node *pins;
--	u32 pingroup_index;
- 	/*
- 	 * sanity checking the native-chipselects
- 	 */
-@@ -706,58 +697,6 @@ static int bcm2835_spi_setup(struct spi_
- 		return -EINVAL;
- 	}
- 
--#if 0
--	/* now translate native cs to GPIO */
--	/* first look for chip select pins in the devices pin groups */
--	for (pingroup_index = 0;
--	     (pins = of_parse_phandle(spi->master->dev.of_node,
--				     "pinctrl-0",
--				      pingroup_index)) != 0;
--	     pingroup_index++) {
--		u32 pin;
--		u32 pin_index;
--		for (pin_index = 0;
--		     of_property_read_u32_index(pins,
--						"brcm,pins",
--						pin_index,
--						&pin) == 0;
--		     pin_index++) {
--			if (((spi->chip_select == 0) &&
--			     ((pin == 8) || (pin == 36) || (pin == 46))) ||
--			    ((spi->chip_select == 1) &&
--			     ((pin == 7) || (pin == 35)))) {
--				spi->cs_gpio = pin;
--				break;
--			}
--		}
--		of_node_put(pins);
--	}
--	/* if that fails, assume GPIOs 7-11 are used */
--	if (!gpio_is_valid(spi->cs_gpio) ) {
--		/* get the gpio chip for the base */
--		chip = gpiochip_find("pinctrl-bcm2835", chip_match_name);
--		if (!chip)
--			return 0;
--
--		/* and calculate the real CS */
--		spi->cs_gpio = chip->base + 8 - spi->chip_select;
--	}
--
--	/* and set up the "mode" and level */
--	dev_info(&spi->dev, "setting up native-CS%i as GPIO %i\n",
--		 spi->chip_select, spi->cs_gpio);
--
--	/* set up GPIO as output and pull to the correct level */
--	err = gpio_direction_output(spi->cs_gpio,
--				    (spi->mode & SPI_CS_HIGH) ? 0 : 1);
--	if (err) {
--		dev_err(&spi->dev,
--			"could not set CS%i gpio %i as output: %i",
--			spi->chip_select, spi->cs_gpio, err);
--		return err;
--	}
--#endif
--
- 	return 0;
- }
-