diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:35:43 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 22:35:43 +0100 |
| commit | 6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f (patch) | |
| tree | e6e7f723ea7ea51ccf79ad21a2715da00b4948c9 /drivers/hsi | |
| parent | Merge tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | dt-bindings: hsi: add omap4 hsi controller bindings (diff) | |
| download | linux-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.tar.xz linux-6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f.zip | |
Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
Pull HSI updates from Sebastian Reichel:
- add HSI OMAP4 bindings
- misc small fixes
* tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
dt-bindings: hsi: add omap4 hsi controller bindings
HSI: hsi_char: pr_err() strings should end with newlines
HSI: omap_ssi_core: fix kilo to be "k" not "K"
Diffstat (limited to 'drivers/hsi')
| -rw-r--r-- | drivers/hsi/clients/hsi_char.c | 4 | ||||
| -rw-r--r-- | drivers/hsi/controllers/omap_ssi_core.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c index 57f70c28fa38..cf9c2a332ad8 100644 --- a/drivers/hsi/clients/hsi_char.c +++ b/drivers/hsi/clients/hsi_char.c @@ -773,13 +773,13 @@ static int __init hsc_init(void) if ((max_data_size < 4) || (max_data_size > 0x10000) || (max_data_size & (max_data_size - 1))) { - pr_err("Invalid max read/write data size"); + pr_err("Invalid max read/write data size\n"); return -EINVAL; } ret = hsi_register_client_driver(&hsc_driver); if (ret) { - pr_err("Error while registering HSI/SSI driver %d", ret); + pr_err("Error while registering HSI/SSI driver %d\n", ret); return ret; } diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 88e48b346916..41a09f506803 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c @@ -334,7 +334,7 @@ static int ssi_clk_event(struct notifier_block *nb, unsigned long event, case POST_RATE_CHANGE: dev_dbg(&ssi->device, "post rate change (%lu -> %lu)\n", clk_data->old_rate, clk_data->new_rate); - omap_ssi->fck_rate = DIV_ROUND_CLOSEST(clk_data->new_rate, 1000); /* KHz */ + omap_ssi->fck_rate = DIV_ROUND_CLOSEST(clk_data->new_rate, 1000); /* kHz */ for (i = 0; i < ssi->num_ports; i++) { omap_port = omap_ssi->port[i]; @@ -467,9 +467,9 @@ static int ssi_hw_init(struct hsi_controller *ssi) } /* Resetting GDD */ writel_relaxed(SSI_SWRESET, omap_ssi->gdd + SSI_GDD_GRST_REG); - /* Get FCK rate in KHz */ + /* Get FCK rate in kHz */ omap_ssi->fck_rate = DIV_ROUND_CLOSEST(ssi_get_clk_rate(ssi), 1000); - dev_dbg(&ssi->device, "SSI fck rate %lu KHz\n", omap_ssi->fck_rate); + dev_dbg(&ssi->device, "SSI fck rate %lu kHz\n", omap_ssi->fck_rate); writel_relaxed(SSI_CLK_AUTOGATING_ON, omap_ssi->sys + SSI_GDD_GCR_REG); omap_ssi->gdd_gcr = SSI_CLK_AUTOGATING_ON; |