AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

i2c: qup: add ACPI support

Browse Source 
Add support to get the device parameters from ACPI. Assume
that the clocks are managed by firmware.

Signed-off-by: Naveen Kaje <nkaje@codeaurora.org>
Signed-off-by: Austin Christ <austinwc@codeaurora.org>
Reviewed-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Naveen Kaje 2016-10-11 10:27:56 -06:00 committed by Wolfram Sang
parent f06122f0bd
commit 515da74698
1 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
drivers/i2c/busses/i2c-qup.c
View File

@ -14,6 +14,7 @@
* *
*/ */
#include <linux/acpi.h>
#include <linux/atomic.h> #include <linux/atomic.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
@ -132,6 +133,10 @@
/* Max timeout in ms for 32k bytes */ /* Max timeout in ms for 32k bytes */
#define TOUT_MAX 300 #define TOUT_MAX 300
/* Default values. Use these if FW query fails */
#define DEFAULT_CLK_FREQ 100000
#define DEFAULT_SRC_CLK 20000000
struct qup_i2c_block { struct qup_i2c_block {
int count; int count;
int pos; int pos;
@ -1358,14 +1363,13 @@ static void qup_i2c_disable_clocks(struct qup_i2c_dev *qup)
static int qup_i2c_probe(struct platform_device *pdev) static int qup_i2c_probe(struct platform_device *pdev)
{ {
static const int blk_sizes[] = {4, 16, 32}; static const int blk_sizes[] = {4, 16, 32};
struct device_node *node = pdev->dev.of_node;
struct qup_i2c_dev *qup; struct qup_i2c_dev *qup;
unsigned long one_bit_t; unsigned long one_bit_t;
struct resource *res; struct resource *res;
u32 io_mode, hw_ver, size; u32 io_mode, hw_ver, size;
int ret, fs_div, hs_div; int ret, fs_div, hs_div;
int src_clk_freq; u32 src_clk_freq = DEFAULT_SRC_CLK;
u32 clk_freq = 100000; u32 clk_freq = DEFAULT_CLK_FREQ;
int blocks; int blocks;
qup = devm_kzalloc(&pdev->dev, sizeof(*qup), GFP_KERNEL); qup = devm_kzalloc(&pdev->dev, sizeof(*qup), GFP_KERNEL);
@ -1376,7 +1380,11 @@ static int qup_i2c_probe(struct platform_device *pdev)
init_completion(&qup->xfer); init_completion(&qup->xfer);
platform_set_drvdata(pdev, qup); platform_set_drvdata(pdev, qup);
of_property_read_u32(node, "clock-frequency", &clk_freq); ret = device_property_read_u32(qup->dev, "clock-frequency", &clk_freq);
if (ret) {
dev_notice(qup->dev, "using default clock-frequency %d",
DEFAULT_CLK_FREQ);
}
if (of_device_is_compatible(pdev->dev.of_node, "qcom,i2c-qup-v1.1.1")) { if (of_device_is_compatible(pdev->dev.of_node, "qcom,i2c-qup-v1.1.1")) {
qup->adap.algo = &qup_i2c_algo; qup->adap.algo = &qup_i2c_algo;
@ -1452,20 +1460,30 @@ static int qup_i2c_probe(struct platform_device *pdev)
return qup->irq; return qup->irq;
} }
qup->clk = devm_clk_get(qup->dev, "core"); if (has_acpi_companion(qup->dev)) {
if (IS_ERR(qup->clk)) { ret = device_property_read_u32(qup->dev,
dev_err(qup->dev, "Could not get core clock\n"); "src-clock-hz", &src_clk_freq);
return PTR_ERR(qup->clk); if (ret) {
} dev_notice(qup->dev, "using default src-clock-hz %d",
DEFAULT_SRC_CLK);
}
ACPI_COMPANION_SET(&qup->adap.dev, ACPI_COMPANION(qup->dev));
} else {
qup->clk = devm_clk_get(qup->dev, "core");
if (IS_ERR(qup->clk)) {
dev_err(qup->dev, "Could not get core clock\n");
return PTR_ERR(qup->clk);
}
qup->pclk = devm_clk_get(qup->dev, "iface"); qup->pclk = devm_clk_get(qup->dev, "iface");
if (IS_ERR(qup->pclk)) { if (IS_ERR(qup->pclk)) {
dev_err(qup->dev, "Could not get iface clock\n"); dev_err(qup->dev, "Could not get iface clock\n");
return PTR_ERR(qup->pclk); return PTR_ERR(qup->pclk);
}
qup_i2c_enable_clocks(qup);
src_clk_freq = clk_get_rate(qup->clk);
} }
qup_i2c_enable_clocks(qup);
/* /*
* Bootloaders might leave a pending interrupt on certain QUP's, * Bootloaders might leave a pending interrupt on certain QUP's,
* so we reset the core before registering for interrupts. * so we reset the core before registering for interrupts.
@ -1512,7 +1530,6 @@ static int qup_i2c_probe(struct platform_device *pdev)
size = QUP_INPUT_FIFO_SIZE(io_mode); size = QUP_INPUT_FIFO_SIZE(io_mode);
qup->in_fifo_sz = qup->in_blk_sz * (2 << size); qup->in_fifo_sz = qup->in_blk_sz * (2 << size);
src_clk_freq = clk_get_rate(qup->clk);
fs_div = ((src_clk_freq / clk_freq) / 2) - 3; fs_div = ((src_clk_freq / clk_freq) / 2) - 3;
hs_div = 3; hs_div = 3;
qup->clk_ctl = (hs_div << 8) | (fs_div & 0xff); qup->clk_ctl = (hs_div << 8) | (fs_div & 0xff);
@ -1631,6 +1648,14 @@ static const struct of_device_id qup_i2c_dt_match[] = {
}; };
MODULE_DEVICE_TABLE(of, qup_i2c_dt_match); MODULE_DEVICE_TABLE(of, qup_i2c_dt_match);
#if IS_ENABLED(CONFIG_ACPI)
static const struct acpi_device_id qup_i2c_acpi_match[] = {
{ "QCOM8010"},
{ },
};
MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match);
#endif
static struct platform_driver qup_i2c_driver = { static struct platform_driver qup_i2c_driver = {
.probe = qup_i2c_probe, .probe = qup_i2c_probe,
.remove = qup_i2c_remove, .remove = qup_i2c_remove,
@ -1638,6 +1663,7 @@ static struct platform_driver qup_i2c_driver = {
.name = "i2c_qup", .name = "i2c_qup",
.pm = &qup_i2c_qup_pm_ops, .pm = &qup_i2c_qup_pm_ops,
.of_match_table = qup_i2c_dt_match, .of_match_table = qup_i2c_dt_match,
.acpi_match_table = ACPI_PTR(qup_i2c_acpi_match),
}, },
}; };