diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-12-08 21:10:50 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-12-12 10:22:17 +0100 |
| commit | fa04682f213f81840ca17022ca5aa9439bc22f2c (patch) | |
| tree | 7df5bbad4ef622683414f6b1aa4f084845e0fbf3 /target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c | |
| parent | 52c7375c134afd204f6ac9d46265f77f7800123c (diff) | |
| download | upstream-fa04682f213f81840ca17022ca5aa9439bc22f2c.tar.gz upstream-fa04682f213f81840ca17022ca5aa9439bc22f2c.tar.bz2 upstream-fa04682f213f81840ca17022ca5aa9439bc22f2c.zip | |
ar71xx: clean up spi controller related patches
Remove various hacks for fast read, un-break device tree support
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c index 9ef5c4455e..e37b73fd00 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-rb91x.c @@ -152,17 +152,6 @@ static struct gen_74x164_chip_platform_data rb711gr100_ssr_data = { .init_data = rb711gr100_ssr_initdata, }; -static struct ath79_spi_controller_data rb711gr100_spi0_cdata = { - .cs_type = ATH79_SPI_CS_TYPE_INTERNAL, - .cs_line = 0, - .is_flash = true, -}; - -static struct ath79_spi_controller_data rb711gr100_spi1_cdata = { - .cs_type = ATH79_SPI_CS_TYPE_GPIO, - .cs_line = RB91X_GPIO_SSR_STROBE, -}; - static struct spi_board_info rb711gr100_spi_info[] = { { .bus_num = 0, @@ -170,20 +159,24 @@ static struct spi_board_info rb711gr100_spi_info[] = { .max_speed_hz = 25000000, .modalias = "m25p80", .platform_data = &rb711gr100_spi_flash_data, - .controller_data = &rb711gr100_spi0_cdata }, { .bus_num = 0, .chip_select = 1, .max_speed_hz = 10000000, .modalias = "74x164", .platform_data = &rb711gr100_ssr_data, - .controller_data = &rb711gr100_spi1_cdata } }; +static int rb711gr100_spi_cs_gpios[2] = { + -ENOENT, + RB91X_GPIO_SSR_STROBE, +}; + static struct ath79_spi_platform_data rb711gr100_spi_data __initdata = { .bus_num = 0, .num_chipselect = 2, + .cs_gpios = rb711gr100_spi_cs_gpios, }; static struct gpio_led rb711gr100_leds[] __initdata = { |