A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-10 14:19:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "Bluetooth: Remove unused regulator entries"

Browse source
This commit is contained in:
qctecmdr 2020-02-08 00:48:03 -08:00 • committed by Gerrit - the friendly Code Review server
commit 18fc76a46e
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/bluetooth/btpower.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
/*
@ -38,20 +38,11 @@ static const struct of_device_id bt_power_match_table[] = {
};
static struct bt_power_vreg_data bt_power_vreg_info[] = {
{NULL, "qcom,bt-vdd-vl", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-vm", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-5c", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-vh", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-io", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-xtal", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-core", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-pa", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-ldo", 0, 0, 0, false, false},
{NULL, "qcom,bt-vdd-aon", 950000, 950000, 0, false, true},
{NULL, "qcom,bt-vdd-dig", 950000, 952000, 0, false, true},
{NULL, "qcom,bt-vdd-rfa1", 1900000, 1900000, 0, false, true},
{NULL, "qcom,bt-vdd-rfa2", 1900000, 1900000, 0, false, true},
{NULL, "qcom,bt-vdd-asd", 3024000, 3304000, 10000, false, false},
{NULL, "qcom,bt-vdd-asd", 0, 0, 0, false, false},
};
#define BT_VREG_INFO_SIZE ARRAY_SIZE(bt_power_vreg_info)
@ -476,7 +467,7 @@ static int bt_power_vreg_get(struct platform_device *pdev)
bt_power_pdata->vreg_info =
devm_kzalloc(&(pdev->dev),
sizeof(*bt_power_pdata->vreg_info),
sizeof(bt_power_vreg_info),
GFP_KERNEL);
if (!bt_power_pdata->vreg_info) {
ret = -ENOMEM;