[Deepin-Kernel-SIG] [linux 6.6-y] [CIX] Apply support for CIX

[Avenger-285714]

No description provided.

[sourcery-ai]

We failed to fetch the diff for pull request #650

You can try again by commenting this pull request with @sourcery-ai review, or contact us for help.

[MingcongBai]

Build failure in dma350:

In file included from drivers/dma/arm_dma350.c:31:
drivers/dma/dma350_ch_drv.h:1998:6: 错误：conflicting types for ‘dma350_ch_enable_intr’ due to enum/integer mismatch; have ‘void(void *, uint32_t)’ {或称 ‘void(void *, unsigned int)’} [-Werror=enum-int-mismatch]
 1998 | void dma350_ch_enable_intr(void __iomem *addr, uint32_t intr)
      |      ^~~~~~~~~~~~~~~~~~~~~
drivers/dma/dma350_ch_drv.h:438:6: 附注：previous declaration of ‘dma350_ch_enable_intr’ with type ‘void(void *, enum dma350_ch_intr_t)’
  438 | void dma350_ch_enable_intr(void __iomem *addr, enum dma350_ch_intr_t intr);
      |      ^~~~~~~~~~~~~~~~~~~~~
drivers/dma/dma350_ch_drv.h:2004:6: 错误：conflicting types for ‘dma350_ch_disable_intr’ due to enum/integer mismatch; have ‘void(void *, uint32_t)’ {或称 ‘void(void *, unsigned int)’} [-Werror=enum-int-mismatch]
 2004 | void dma350_ch_disable_intr(void __iomem *addr, uint32_t intr)
      |      ^~~~~~~~~~~~~~~~~~~~~~
drivers/dma/dma350_ch_drv.h:451:6: 附注：previous declaration of ‘dma350_ch_disable_intr’ with type ‘void(void *, enum dma350_ch_intr_t)’
  451 | void dma350_ch_disable_intr(void __iomem *addr, enum dma350_ch_intr_t intr);
      |      ^~~~~~~~~~~~~~~~~~~~~~

[Avenger-285714]

Build failure in dma350:

In file included from drivers/dma/arm_dma350.c:31:
drivers/dma/dma350_ch_drv.h:1998:6: 错误：conflicting types for ‘dma350_ch_enable_intr’ due to enum/integer mismatch; have ‘void(void *, uint32_t)’ {或称 ‘void(void *, unsigned int)’} [-Werror=enum-int-mismatch]
 1998 | void dma350_ch_enable_intr(void __iomem *addr, uint32_t intr)
      |      ^~~~~~~~~~~~~~~~~~~~~
drivers/dma/dma350_ch_drv.h:438:6: 附注：previous declaration of ‘dma350_ch_enable_intr’ with type ‘void(void *, enum dma350_ch_intr_t)’
  438 | void dma350_ch_enable_intr(void __iomem *addr, enum dma350_ch_intr_t intr);
      |      ^~~~~~~~~~~~~~~~~~~~~
drivers/dma/dma350_ch_drv.h:2004:6: 错误：conflicting types for ‘dma350_ch_disable_intr’ due to enum/integer mismatch; have ‘void(void *, uint32_t)’ {或称 ‘void(void *, unsigned int)’} [-Werror=enum-int-mismatch]
 2004 | void dma350_ch_disable_intr(void __iomem *addr, uint32_t intr)
      |      ^~~~~~~~~~~~~~~~~~~~~~
drivers/dma/dma350_ch_drv.h:451:6: 附注：previous declaration of ‘dma350_ch_disable_intr’ with type ‘void(void *, enum dma350_ch_intr_t)’
  451 | void dma350_ch_disable_intr(void __iomem *addr, enum dma350_ch_intr_t intr);
      |      ^~~~~~~~~~~~~~~~~~~~~~

已修复

[MingcongBai]

确认编译修复，无可用测试设备，以不影响发行为准放行

[opsiff]

please use another pull request to sumbit configs change not refer to the pull request.

[deepin-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MingcongBai, opsiff

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• deepin/OWNERS [MingcongBai,opsiff]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment