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

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()

diff --git a/drivers/video/backlight/apple_bl.c b/drivers/video/backlight/apple_bl.c
index d843296766896d3abe8e2e2b10c34cbd23aed40a..6a34ab936726287d593509297de055e0f9f41b0f 100644 (file)
--- a/drivers/video/backlight/apple_bl.c
+++ b/drivers/video/backlight/apple_bl.c
@@ -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");

diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index d7c239ea3d09f5f47aefca8cd4d9157608f250f3..f5574060f9c82dcb1802059c8bd229aa5f3f122c 100644 (file)
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -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,
        };
 

diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c
index eab1f842f9c01c1fa74d944e72ec7c6547da12cc..e4bd63e9db6bda265fe9fea5a7f3073bc5661478 100644 (file)
--- a/drivers/video/backlight/tdo24m.c
+++ b/drivers/video/backlight/tdo24m.c
@@ -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);
 

diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c
index 6a41ea92737a30590ac1bb5d9bd7e93f683bb4d8..4dc5ee8debeba2fee5f02807f0b8b454f7363ffd 100644 (file)
--- a/drivers/video/backlight/tosa_lcd.c
+++ b/drivers/video/backlight/tosa_lcd.c
@@ -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,
        };