Commit aa5e75bc authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-backlight-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight

Pull backlight updates from Lee Jones:
 "Fix-ups:
   - Deprecate pci_get_bus_and_slot() in apple_bl

  Bug Fixes:
   - Enable Chip Select when conducting SPI transfers in corgi_lcd,
     tdo24m, tosa_lcd"

* tag 'for-backlight-next-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight:
  backlight: tdo24m: Fix the SPI CS between transfers
  backlight: apple_bl: Deprecate pci_get_bus_and_slot()
parents bc4e1183 2023b052
......@@ -143,7 +143,7 @@ static int apple_bl_add(struct acpi_device *dev)
struct pci_dev *host;
int intensity;
host = pci_get_bus_and_slot(0, 0);
host = pci_get_domain_bus_and_slot(0, 0, 0);
if (!host) {
pr_err("unable to find PCI host\n");
......
......@@ -177,7 +177,7 @@ static int corgi_ssp_lcdtg_send(struct corgi_lcd *lcd, int adrs, uint8_t data)
struct spi_message msg;
struct spi_transfer xfer = {
.len = 1,
.cs_change = 1,
.cs_change = 0,
.tx_buf = lcd->buf,
};
......
......@@ -369,7 +369,7 @@ static int tdo24m_probe(struct spi_device *spi)
spi_message_init(m);
x->cs_change = 1;
x->cs_change = 0;
x->tx_buf = &lcd->buf[0];
spi_message_add_tail(x, m);
......
......@@ -49,7 +49,7 @@ static int tosa_tg_send(struct spi_device *spi, int adrs, uint8_t data)
struct spi_message msg;
struct spi_transfer xfer = {
.len = 1,
.cs_change = 1,
.cs_change = 0,
.tx_buf = buf,
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment