Unverified Commit 9ec80025 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'litex-6.13-rc1' of https://github.com/litex-hub/linux into soc/drivers 



LiteX updates for next

Remaining LiteX updates from 2024, reviewed and
successfully tested against v6.13-rc1.

Signed-off-by: default avatarGabriel Somlo <gsomlo@gmail.com>

* tag 'litex-6.13-rc1' of https://github.com/litex-hub/linux:
  drivers/soc/litex: Use devm_register_restart_handler()

Link: https://lore.kernel.org/r/Z41PgCffqPUTyxkE@errol.ini.cmu.edu


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f51df260 c7345869

drivers/soc/litex/litex_soc_ctrl.c

+5 −18
Original line number Diff line number Diff line
@@ -69,14 +69,11 @@ static int litex_check_csr_access(void __iomem *reg_addr) 


struct litex_soc_ctrl_device {

	void __iomem *base;

	struct notifier_block reset_nb;

};



static int litex_reset_handler(struct notifier_block *this, unsigned long mode,

			       void *cmd)

static int litex_reset_handler(struct sys_off_data *data)

{

	struct litex_soc_ctrl_device *soc_ctrl_dev =

		container_of(this, struct litex_soc_ctrl_device, reset_nb);

	struct litex_soc_ctrl_device *soc_ctrl_dev = data->cb_data;



	litex_write32(soc_ctrl_dev->base + RESET_REG_OFF, RESET_REG_VALUE);

	return NOTIFY_DONE;
@@ -105,11 +102,9 @@ static int litex_soc_ctrl_probe(struct platform_device *pdev) 
	if (error)

		return error;



	platform_set_drvdata(pdev, soc_ctrl_dev);



	soc_ctrl_dev->reset_nb.notifier_call = litex_reset_handler;

	soc_ctrl_dev->reset_nb.priority = 128;

	error = register_restart_handler(&soc_ctrl_dev->reset_nb);

	error = devm_register_restart_handler(&pdev->dev,

					      litex_reset_handler,

					      soc_ctrl_dev);

	if (error) {

		dev_warn(&pdev->dev, "cannot register restart handler: %d\n",

			 error);
@@ -118,20 +113,12 @@ static int litex_soc_ctrl_probe(struct platform_device *pdev) 
	return 0;

}



static void litex_soc_ctrl_remove(struct platform_device *pdev)

{

	struct litex_soc_ctrl_device *soc_ctrl_dev = platform_get_drvdata(pdev);



	unregister_restart_handler(&soc_ctrl_dev->reset_nb);

}



static struct platform_driver litex_soc_ctrl_driver = {

	.driver = {

		.name = "litex-soc-controller",

		.of_match_table = litex_soc_ctrl_of_match,

	},

	.probe = litex_soc_ctrl_probe,

	.remove = litex_soc_ctrl_remove,

};



module_platform_driver(litex_soc_ctrl_driver);