lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 190/340] spi: pxa2xx: Fix the controller numbering for Wildcat Point
    Date
    From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

    [ Upstream commit 54c5d3bfb0cfb7b31259765524567871dee11615 ]

    Wildcat Point has two SPI controllers and added one is actually second one.
    Fix the numbering by adding the description of the first one.

    Fixes: caba248db286 ("spi: spi-pxa2xx-pci: Add ID and driver type for WildcatPoint PCH")
    Cc: Leif Liddy <leif.liddy@gmail.com>
    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    Link: https://lore.kernel.org/r/20210208163816.22147-1-andriy.shevchenko@linux.intel.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-pxa2xx-pci.c | 27 +++++++++++++++++++--------
    1 file changed, 19 insertions(+), 8 deletions(-)

    diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
    index f236e3034cf85..aafac128bb5f1 100644
    --- a/drivers/spi/spi-pxa2xx-pci.c
    +++ b/drivers/spi/spi-pxa2xx-pci.c
    @@ -21,7 +21,8 @@ enum {
    PORT_BSW1,
    PORT_BSW2,
    PORT_CE4100,
    - PORT_LPT,
    + PORT_LPT0,
    + PORT_LPT1,
    };

    struct pxa_spi_info {
    @@ -57,8 +58,10 @@ static struct dw_dma_slave bsw1_rx_param = { .src_id = 7 };
    static struct dw_dma_slave bsw2_tx_param = { .dst_id = 8 };
    static struct dw_dma_slave bsw2_rx_param = { .src_id = 9 };

    -static struct dw_dma_slave lpt_tx_param = { .dst_id = 0 };
    -static struct dw_dma_slave lpt_rx_param = { .src_id = 1 };
    +static struct dw_dma_slave lpt1_tx_param = { .dst_id = 0 };
    +static struct dw_dma_slave lpt1_rx_param = { .src_id = 1 };
    +static struct dw_dma_slave lpt0_tx_param = { .dst_id = 2 };
    +static struct dw_dma_slave lpt0_rx_param = { .src_id = 3 };

    static bool lpss_dma_filter(struct dma_chan *chan, void *param)
    {
    @@ -185,12 +188,19 @@ static struct pxa_spi_info spi_info_configs[] = {
    .num_chipselect = 1,
    .max_clk_rate = 50000000,
    },
    - [PORT_LPT] = {
    + [PORT_LPT0] = {
    .type = LPSS_LPT_SSP,
    .port_id = 0,
    .setup = lpss_spi_setup,
    - .tx_param = &lpt_tx_param,
    - .rx_param = &lpt_rx_param,
    + .tx_param = &lpt0_tx_param,
    + .rx_param = &lpt0_rx_param,
    + },
    + [PORT_LPT1] = {
    + .type = LPSS_LPT_SSP,
    + .port_id = 1,
    + .setup = lpss_spi_setup,
    + .tx_param = &lpt1_tx_param,
    + .rx_param = &lpt1_rx_param,
    },
    };

    @@ -285,8 +295,9 @@ static const struct pci_device_id pxa2xx_spi_pci_devices[] = {
    { PCI_VDEVICE(INTEL, 0x2290), PORT_BSW1 },
    { PCI_VDEVICE(INTEL, 0x22ac), PORT_BSW2 },
    { PCI_VDEVICE(INTEL, 0x2e6a), PORT_CE4100 },
    - { PCI_VDEVICE(INTEL, 0x9ce6), PORT_LPT },
    - { },
    + { PCI_VDEVICE(INTEL, 0x9ce5), PORT_LPT0 },
    + { PCI_VDEVICE(INTEL, 0x9ce6), PORT_LPT1 },
    + { }
    };
    MODULE_DEVICE_TABLE(pci, pxa2xx_spi_pci_devices);

    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 00:10    [W:6.669 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site