From f70575805708cabdedea7498aaa3f710fde4d920 Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 31 Jan 2024 03:29:01 +0000 Subject: [PATCH] add lvds1024*800 --- kernel/drivers/mailbox/rockchip-mailbox.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/kernel/drivers/mailbox/rockchip-mailbox.c b/kernel/drivers/mailbox/rockchip-mailbox.c index b55c3a3..66ebea2 100644 --- a/kernel/drivers/mailbox/rockchip-mailbox.c +++ b/kernel/drivers/mailbox/rockchip-mailbox.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2015, Fuzhou Rockchip Electronics Co., Ltd */ @@ -263,7 +263,7 @@ mb->mbox.chans[i].con_priv = &mb->chans[i]; } - ret = mbox_controller_register(&mb->mbox); + ret = devm_mbox_controller_register(&pdev->dev, &mb->mbox); if (ret < 0) { dev_err(&pdev->dev, "Failed to register mailbox: %d\n", ret); goto disable_clk; @@ -294,28 +294,23 @@ return ret; } -static int rockchip_mbox_remove(struct platform_device *pdev) -{ - struct rockchip_mbox *mb = platform_get_drvdata(pdev); - - if (!mb) - return -EINVAL; - - mbox_controller_unregister(&mb->mbox); - - return 0; -} - static struct platform_driver rockchip_mbox_driver = { .probe = rockchip_mbox_probe, - .remove = rockchip_mbox_remove, .driver = { .name = "rockchip-mailbox", .of_match_table = of_match_ptr(rockchip_mbox_of_match), }, }; +#if defined(CONFIG_ROCKCHIP_THUNDER_BOOT) +static int __init rockchip_mbox_driver_init(void) +{ + return platform_driver_register(&rockchip_mbox_driver); +} +core_initcall(rockchip_mbox_driver_init); +#else module_platform_driver(rockchip_mbox_driver); +#endif MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("Rockchip mailbox: communicate between CPU cores and MCU"); -- Gitblit v1.6.2