diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-08 10:30:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-08 10:30:44 -0700 |
| commit | a6afa4199d3d038fbfdff5511f7523b0e30cb774 (patch) | |
| tree | b093a529f5e9c0de573d1e1f6418c421e031baf8 /drivers/mailbox/imx-mailbox.c | |
| parent | bdc753c7fcb4eb009ae246a188ea7ac6dac98ce1 (diff) | |
| parent | b8ae88e1e75e5cb7a6df5298ab75334362ed631c (diff) | |
| download | linux-a6afa4199d3d038fbfdff5511f7523b0e30cb774.tar.gz linux-a6afa4199d3d038fbfdff5511f7523b0e30cb774.tar.bz2 linux-a6afa4199d3d038fbfdff5511f7523b0e30cb774.zip | |
Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- apple: implement poll and flush callbacks
- qcom: fix clocks for IPQ6018 and IPQ8074 irq handler as not-a-thread
- microchip: split reg-space into two
- imx: RST channel fix
- bcm: fix dma_map_sg error handling
- misc: spelling fix in pcc driver
* tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: qcom-ipcc: flag IRQ NO_THREAD
mailbox: pcc: Fix spelling mistake "Plaform" -> "Platform"
mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg
mailbox: qcom-apcs-ipc: add IPQ8074 APSS clock support
dt-bindings: mailbox: qcom: correct clocks for IPQ6018 and IPQ8074
dt-bindings: mailbox: qcom: set correct #clock-cells
mailbox: mpfs: account for mbox offsets while sending
mailbox: mpfs: fix handling of the reg property
dt-bindings: mailbox: fix the mpfs' reg property
mailbox: imx: fix RST channel support
mailbox: apple: Implement poll_data() operation
mailbox: apple: Implement flush() operation
Diffstat (limited to 'drivers/mailbox/imx-mailbox.c')
| -rw-r--r-- | drivers/mailbox/imx-mailbox.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c index 02922073c9ef..20f2ec880ad6 100644 --- a/drivers/mailbox/imx-mailbox.c +++ b/drivers/mailbox/imx-mailbox.c @@ -904,7 +904,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx7ulp = { .xTR = 0x20, .xRR = 0x40, .xSR = {0x60, 0x60, 0x60, 0x60}, - .xCR = {0x64, 0x64, 0x64, 0x64}, + .xCR = {0x64, 0x64, 0x64, 0x64, 0x64}, }; static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp = { @@ -927,7 +927,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8ulp_s4 = { .xTR = 0x200, .xRR = 0x280, .xSR = {0xC, 0x118, 0x124, 0x12C}, - .xCR = {0x110, 0x114, 0x120, 0x128}, + .xCR = {0x8, 0x110, 0x114, 0x120, 0x128}, }; static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = { @@ -938,7 +938,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx93_s4 = { .xTR = 0x200, .xRR = 0x280, .xSR = {0xC, 0x118, 0x124, 0x12C}, - .xCR = {0x110, 0x114, 0x120, 0x128}, + .xCR = {0x8, 0x110, 0x114, 0x120, 0x128}, }; static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = { @@ -949,7 +949,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_scu = { .xTR = 0x0, .xRR = 0x10, .xSR = {0x20, 0x20, 0x20, 0x20}, - .xCR = {0x24, 0x24, 0x24, 0x24}, + .xCR = {0x24, 0x24, 0x24, 0x24, 0x24}, }; static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = { @@ -960,7 +960,7 @@ static const struct imx_mu_dcfg imx_mu_cfg_imx8_seco = { .xTR = 0x0, .xRR = 0x10, .xSR = {0x20, 0x20, 0x20, 0x20}, - .xCR = {0x24, 0x24, 0x24, 0x24}, + .xCR = {0x24, 0x24, 0x24, 0x24, 0x24}, }; static const struct of_device_id imx_mu_dt_ids[] = { |