Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f893f63 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "regulator: qpnp-amoled: Change the initcall order"

parents 4f5357f2 b7a510e2

drivers/mfd/qcom-spmi-pmic.c

+7 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2014, 2017-2018, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2014-2015, 2017-2019, The Linux Foundation. All rights reserved. */



#include <linux/kernel.h>

#include <linux/module.h>
@@ -150,7 +150,12 @@ static struct spmi_driver pmic_spmi_driver = { 
		.of_match_table = pmic_spmi_id_table,

	},

};

module_spmi_driver(pmic_spmi_driver);



static int __init pmic_spmi_init(void)

{

	return spmi_driver_register(&pmic_spmi_driver);

}

arch_initcall(pmic_spmi_init);



MODULE_DESCRIPTION("Qualcomm SPMI PMIC driver");

MODULE_ALIAS("spmi:spmi-pmic");

drivers/regulator/qpnp-amoled-regulator.c

+13 −1
Original line number Diff line number Diff line
@@ -811,7 +811,19 @@ static struct platform_driver qpnp_amoled_regulator_driver = { 
	.probe		= qpnp_amoled_regulator_probe,

	.remove		= qpnp_amoled_regulator_remove,

};

module_platform_driver(qpnp_amoled_regulator_driver);



static int __init qpnp_amoled_regulator_init(void)

{

	return platform_driver_register(&qpnp_amoled_regulator_driver);

}



static void __exit qpnp_amoled_regulator_exit(void)

{

	platform_driver_unregister(&qpnp_amoled_regulator_driver);

}



MODULE_DESCRIPTION("QPNP AMOLED regulator driver");

MODULE_LICENSE("GPL v2");



arch_initcall(qpnp_amoled_regulator_init);

module_exit(qpnp_amoled_regulator_exit);