diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-04 19:57:17 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-05-04 19:57:17 +0200 |
commit | a7191cda67be0bf9b70761f3bbe1682f40f6d31b (patch) | |
tree | ec34e50d0db23a08e9b0260d4c0adc7097bd75c7 /arm64-hikey-fixes.patch | |
parent | 69d1be1f0ca6008948af4201d0aa7edf86b9394f (diff) | |
parent | 05e55297ee7dac97581503cd45f381a6f994717a (diff) | |
download | kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25.tar.gz kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25.tar.xz kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25.zip |
Merge remote-tracking branch 'origin/master'kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc27kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc26kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc25kernel-4.12.0-0.rc0.git3.1.vanilla.knurd.1.fc24
Diffstat (limited to 'arm64-hikey-fixes.patch')
-rw-r--r-- | arm64-hikey-fixes.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arm64-hikey-fixes.patch b/arm64-hikey-fixes.patch index 18bc05b2b..a698ac122 100644 --- a/arm64-hikey-fixes.patch +++ b/arm64-hikey-fixes.patch @@ -34,44 +34,3 @@ index 35ce53e..d5e5229 100644 postcore_initcall(hi6220_reset_init); + +MODULE_LICENSE("GPL v2"); -From patchwork Mon Apr 3 05:28:42 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [v2,1/2] regulator: hi655x: Describe consumed platform device -From: Jeremy Linton <lintonrjeremy@gmail.com> -X-Patchwork-Id: 9658793 -Message-Id: <20170403052843.12711-2-lintonrjeremy@gmail.com> -To: linux-kernel@vger.kernel.org -Cc: broonie@kernel.org, lgirdwood@gmail.com, puck.chen@hisilicon.com, - lee.jones@linaro.org, Jeremy Linton <lintonrjeremy@gmail.com> -Date: Mon, 3 Apr 2017 00:28:42 -0500 - -The hi655x-regulator driver consumes a similarly named platform device. -Adding that to the module device table, allows modprobe to locate this -driver once the device is created. - -Signed-off-by: Jeremy Linton <lintonrjeremy@gmail.com> ---- - drivers/regulator/hi655x-regulator.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/regulator/hi655x-regulator.c b/drivers/regulator/hi655x-regulator.c -index 065c100..36ae54b 100644 ---- a/drivers/regulator/hi655x-regulator.c -+++ b/drivers/regulator/hi655x-regulator.c -@@ -214,7 +214,14 @@ static int hi655x_regulator_probe(struct platform_device *pdev) - return 0; - } - -+static const struct platform_device_id hi655x_regulator_table[] = { -+ { .name = "hi655x-regulator" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(platform, hi655x_regulator_table); -+ - static struct platform_driver hi655x_regulator_driver = { -+ .id_table = hi655x_regulator_table, - .driver = { - .name = "hi655x-regulator", - }, |