diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-29 16:28:52 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-29 16:28:52 -0700 |
| commit | 8f697e574012cc73b6b0dcbf30d88a3a0f43b78f (patch) | |
| tree | a6b16bcf33ad08e03837b61eed2fffb31118f1f3 /drivers/staging/fbtft/fbtft_device.c | |
| parent | Input: walkera0701 - use parallel port device model (diff) | |
| parent | Linux 4.3-rc3 (diff) | |
| download | linux-dev-8f697e574012cc73b6b0dcbf30d88a3a0f43b78f.tar.xz linux-dev-8f697e574012cc73b6b0dcbf30d88a3a0f43b78f.zip | |
Merge tag 'v4.3-rc3' into next
Merge with Linux 4.3-rc3 to bring in MFD DA9062 changes to merge DA9062
OnKey driver.
Diffstat (limited to 'drivers/staging/fbtft/fbtft_device.c')
| -rw-r--r-- | drivers/staging/fbtft/fbtft_device.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/staging/fbtft/fbtft_device.c b/drivers/staging/fbtft/fbtft_device.c index 211d504901f2..fa916e88d549 100644 --- a/drivers/staging/fbtft/fbtft_device.c +++ b/drivers/staging/fbtft/fbtft_device.c @@ -397,6 +397,37 @@ static struct fbtft_device_display displays[] = { } } }, { + .name = "ew24ha0", + .spi = &(struct spi_board_info) { + .modalias = "fb_uc1611", + .max_speed_hz = 32000000, + .mode = SPI_MODE_3, + .platform_data = &(struct fbtft_platform_data) { + .display = { + .buswidth = 8, + }, + .gpios = (const struct fbtft_gpio []) { + { "dc", 24 }, + {}, + }, + } + } + }, { + .name = "ew24ha0_9bit", + .spi = &(struct spi_board_info) { + .modalias = "fb_uc1611", + .max_speed_hz = 32000000, + .mode = SPI_MODE_3, + .platform_data = &(struct fbtft_platform_data) { + .display = { + .buswidth = 9, + }, + .gpios = (const struct fbtft_gpio []) { + {}, + }, + } + } + }, { .name = "flexfb", .spi = &(struct spi_board_info) { .modalias = "flexfb", |