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-11 15:11:48 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "madera: Add ref clk for codec"

Browse source 
This reverts commit 987d71921e6d284257daff68be69375138ce3d56.
This is not needed anymore since the clk is always on 32K clk.

Change-Id: I7aedfd7d10d558ed1e780637f4b57dfdd3989faf
Mot-CRs-Fixed: (CR)
Reviewed-on: https://gerrit.mot.com/1262244
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Reviewed-by: Rav(CR) Vembu <raviv@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Ravi Vembu 2018-10-29 14:05:27 -05:00 • committed by Ravikumar Vembu
commit dab0198581
2 changed files with 1 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

54
drivers/mfd/madera-core.c
View file

@ -148,53 +148,6 @@ const struct of_device_id madera_of_match[] = {
EXPORT_SYMBOL_GPL(madera_of_match);
#endif
/*
* Routine to enable clock.
* this routine can be extended to select from multiple
* sources based on clk_src_name.
*/
static int madera_clock_select(struct madera *madera)
{
int r = 0;
madera->m_clk = clk_get(madera->dev, "cdc_mclk2");
if (madera->m_clk == NULL)
goto err_clk;
if (madera->clk_run == false)
r = clk_prepare_enable(madera->m_clk);
if (r)
goto err_clk;
madera->clk_run = true;
return r;
err_clk:
dev_err(madera->dev, "Error enabling Ref Clock\n");
r = -1;
return r;
}
/*
* Routine to disable clocks
*/
static int madera_clock_deselect(struct madera *madera)
{
int r = -1;
if (madera->m_clk != NULL) {
if (madera->clk_run == true) {
clk_disable_unprepare(madera->m_clk);
madera->clk_run = false;
}
return 0;
}
return r;
}
static int madera_poll_reg(struct madera *madera,
int timeout, unsigned int reg,
unsigned int mask, unsigned int target)
@ -769,8 +722,6 @@ int madera_dev_init(struct madera *madera)
goto err_devs;
}
madera_clock_select(madera);
/**
* Don't use devres here because the only device we have to get
* against is the MFD device and DCVDD will likely be supplied by
@ -781,7 +732,7 @@ int madera_dev_init(struct madera *madera)
if (IS_ERR(madera->dcvdd)) {
ret = PTR_ERR(madera->dcvdd);
dev_err(dev, "Failed to request DCVDD: %d\n", ret);
goto err_ref_clk;
goto err_devs;
}
madera->dcvdd_notifier.notifier_call = madera_dcvdd_notify;
@ -978,8 +929,6 @@ err_notifier:
regulator_unregister_notifier(madera->dcvdd, &madera->dcvdd_notifier);
err_dcvdd:
regulator_put(madera->dcvdd);
err_ref_clk:
madera_clock_deselect(madera);
err_devs:
mfd_remove_devices(dev);
return ret;
@ -999,7 +948,6 @@ int madera_dev_exit(struct madera *madera)
regulator_bulk_disable(madera->num_core_supplies,
madera->core_supplies);
madera_clock_deselect(madera);
return 0;
}
EXPORT_SYMBOL_GPL(madera_dev_exit);

3
include/linux/mfd/madera/core.h
View file

@ -17,7 +17,6 @@
#include <linux/regulator/consumer.h>
#include <linux/mfd/madera/pdata.h>
#include <linux/irqchip/irq-madera.h>
#include <linux/clk.h>
enum madera_type {
CS47L35 = 1,
@ -73,8 +72,6 @@ struct madera {
struct mutex reg_setting_lock;
struct blocking_notifier_head notifier;
struct clk *m_clk;
bool clk_run;
};
extern int madera_of_read_uint_array(struct madera *madera, const char *prop,