Skip to content

Conversation

@xuyan213
Copy link

This patch adds the Phytium Multimedia Card driver.

This patch adds the Phytium Multimedia Card driver.

Signed-off-by: xu yan <xuyan1481@phytium.com>
Signed-off-by: Cheng Quan <chengquan@phytium.com.cn>
Signed-off-by: Lai Xueyu <laixueyu1280@phytium.com.cn>
Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn>
Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>
@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign utsweetyfish for approval. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

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

@deepin-ci-robot
Copy link

deepin pr auto review

@Avenger-285714 Avenger-285714 merged commit 787cf42 into deepin-community:linux-6.6.y May 27, 2024
opsiff pushed a commit to opsiff/UOS-kernel that referenced this pull request Dec 22, 2025
This patch adds the Phytium Multimedia Card driver.

Signed-off-by: xu yan <xuyan1481@phytium.com>
Signed-off-by: Cheng Quan <chengquan@phytium.com.cn>
Signed-off-by: Lai Xueyu <laixueyu1280@phytium.com.cn>
Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn>
Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>
(cherry picked from commit 4bd50db)
Link: deepin-community#147
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Conflicts:
	drivers/mmc/host/Makefile
opsiff added a commit to opsiff/UOS-kernel that referenced this pull request Dec 22, 2025
…rning void

0edb555: platform: Make platform_driver::remove() return void
cause build error, so convert .remove from int to void

Log:
drivers/mmc/host/phytium-mci-plat.c:181:19: error: initialization of ‘void (*)(struct platform_device *)’ from incompatible pointer type ‘int (*)(struct platform_device *)’ [-Werror=incompatible-pointer-types]
  181 |         .remove = phytium_mci_remove,
      |                   ^~~~~~~~~~~~~~~~~~
drivers/mmc/host/phytium-mci-plat.c:181:19: note: (near initialization for ‘phytium_mci_driver.<anonymous>.remove’)

Link: deepin-community#147
(cherry picked from commit 6757682)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
opsiff added a commit to opsiff/UOS-kernel that referenced this pull request Dec 22, 2025
Rename from_timer() to timer_container_of() and
Rename del_timer() to timer_delete()

Link: deepin-community#147
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
opsiff added a commit to opsiff/UOS-kernel that referenced this pull request Dec 22, 2025
0edb555: platform: Make platform_driver::remove() return void
cause build error, so convert .remove from int to void

Log:
drivers/mmc/host/phytium-sdci.c:1426:19: error: initialization of ‘void (*)(struct platform_device *)’ from incompatible pointer type ‘int (*)(struct platform_device *)’ [-Werror=incompatible-pointer-types]
 1426 |         .remove = phytium_sdci_remove,
      |                   ^~~~~~~~~~~~~~~~~~~
drivers/mmc/host/phytium-sdci.c:1426:19: note: (near initialization for ‘phytium_sdci_driver.<anonymous>.remove’)

Link: deepin-community#147
(cherry picked from commit 4db2a31)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
lanlanxiyiji pushed a commit that referenced this pull request Dec 26, 2025
This patch adds the Phytium Multimedia Card driver.

Signed-off-by: xu yan <xuyan1481@phytium.com>
Signed-off-by: Cheng Quan <chengquan@phytium.com.cn>
Signed-off-by: Lai Xueyu <laixueyu1280@phytium.com.cn>
Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn>
Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>
(cherry picked from commit 4bd50db)
Link: #147
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Conflicts:
	drivers/mmc/host/Makefile
lanlanxiyiji pushed a commit that referenced this pull request Dec 26, 2025
…rning void

0edb555: platform: Make platform_driver::remove() return void
cause build error, so convert .remove from int to void

Log:
drivers/mmc/host/phytium-mci-plat.c:181:19: error: initialization of ‘void (*)(struct platform_device *)’ from incompatible pointer type ‘int (*)(struct platform_device *)’ [-Werror=incompatible-pointer-types]
  181 |         .remove = phytium_mci_remove,
      |                   ^~~~~~~~~~~~~~~~~~
drivers/mmc/host/phytium-mci-plat.c:181:19: note: (near initialization for ‘phytium_mci_driver.<anonymous>.remove’)

Link: #147
(cherry picked from commit 6757682)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
lanlanxiyiji pushed a commit that referenced this pull request Dec 26, 2025
Rename from_timer() to timer_container_of() and
Rename del_timer() to timer_delete()

Link: #147
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
lanlanxiyiji pushed a commit that referenced this pull request Dec 26, 2025
0edb555: platform: Make platform_driver::remove() return void
cause build error, so convert .remove from int to void

Log:
drivers/mmc/host/phytium-sdci.c:1426:19: error: initialization of ‘void (*)(struct platform_device *)’ from incompatible pointer type ‘int (*)(struct platform_device *)’ [-Werror=incompatible-pointer-types]
 1426 |         .remove = phytium_sdci_remove,
      |                   ^~~~~~~~~~~~~~~~~~~
drivers/mmc/host/phytium-sdci.c:1426:19: note: (near initialization for ‘phytium_sdci_driver.<anonymous>.remove’)

Link: #147
(cherry picked from commit 4db2a31)
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants