bus: NVIDIA Tegra ACONNECT changes for v4.9-rc1

This contains a patch that makes use of some symbols that were added in
 v4.8 and a second patch takes advantage to enable building the driver as
 a loadable module.
 -----BEGIN PGP SIGNATURE-----
 
 iQIwBAABCAAaBQJX0tBkExx0cmVkaW5nQG52aWRpYS5jb20ACgkQ3SOs138+s6FS
 /A//YN3Ws4vMydW5urpIbu2qGCCODsQd3ywNJjBMAYkCLGTLsDLOg6TlqSr7p7gC
 /pS7h7B4cy6VSjpRZE50kNtCw7gjTbAHo0M+ZvrHpQr7pYcl2ozL60Zw1XXI5JEh
 E3SNYihsnpnG4u+jmz8Pv5QrFFK02QM8heJrwbKUkUYfYT6h3L4E/A8q+GCBjTe3
 qwOJhoVD5k77C1b0kFL9YJDOtVCA7qUm4qE8zPzyE5TNpxJ3J7rpvqCr9r9XFeRJ
 VxLDJXYmWax1rvLnakItHI5apY2T93Kfjes5pd6CHLWVLEsbPxJowVD4YNNzqFSb
 +UOcHLNviTbPB5UPdeKNwmqS/e3v45K5Ugs4OroHNLaAAsnx1PLjZkhs1CPPRqWk
 iXS6KdmJ1OGRyEythWtG623pBBHHw/UR9v287wfzkYmUBmXuBNB617SyY/Qy6mV4
 XzpW9P30FWalmSn/U699fXYIyFiHpXvJDoFZCyIuKxzTeuOkJnV9p/7T13A3hjBH
 Tiekf65i5f+LhnluHJvjLfjm4J+vADYPP6SKrmnX6iPvKRiuWKtQGXmTbuAKjPKI
 o7SqxOZpBfUlmFbkVsC0Z2AMsNpcvv0badyeYdiQmIJphaiNOaj6v0/WFdQRFGqS
 pU2uYcyNLpj1gFMqzHZBThSAGWjIUqMF1La0w9SRreI1iEo=
 =f0Jl
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.9-bus' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Pull "bus: NVIDIA Tegra ACONNECT changes for v4.9-rc1" from Thierry Reding:

This contains a patch that makes use of some symbols that were added in
v4.8 and a second patch takes advantage to enable building the driver as
a loadable module.

* tag 'tegra-for-4.9-bus' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  bus: tegra-aconnect: Use of_pm_clk_add_clk()
  bus: tegra-aconnect: Make symbol tristate
This commit is contained in:
Arnd Bergmann 2016-09-15 00:39:02 +02:00
commit 8cfc48bcc7
2 changed files with 3 additions and 25 deletions

View file

@ -132,12 +132,8 @@ config SUNXI_RSB
with various RSB based devices, such as AXP223, AXP8XX PMICs,
and AC100/AC200 ICs.
# TODO: This uses pm_clk_*() symbols that aren't exported in v4.7 and hence
# the driver will fail to build as a module. However there are patches to
# address that queued for v4.8, so this can be turned into a tristate symbol
# after v4.8-rc1.
config TEGRA_ACONNECT
bool "Tegra ACONNECT Bus Driver"
tristate "Tegra ACONNECT Bus Driver"
depends on ARCH_TEGRA_210_SOC
depends on OF && PM
select PM_CLK

View file

@ -15,24 +15,6 @@
#include <linux/pm_clock.h>
#include <linux/pm_runtime.h>
static int tegra_aconnect_add_clock(struct device *dev, char *name)
{
struct clk *clk;
int ret;
clk = clk_get(dev, name);
if (IS_ERR(clk)) {
dev_err(dev, "%s clock not found\n", name);
return PTR_ERR(clk);
}
ret = pm_clk_add_clk(dev, clk);
if (ret)
clk_put(clk);
return ret;
}
static int tegra_aconnect_probe(struct platform_device *pdev)
{
int ret;
@ -44,11 +26,11 @@ static int tegra_aconnect_probe(struct platform_device *pdev)
if (ret)
return ret;
ret = tegra_aconnect_add_clock(&pdev->dev, "ape");
ret = of_pm_clk_add_clk(&pdev->dev, "ape");
if (ret)
goto clk_destroy;
ret = tegra_aconnect_add_clock(&pdev->dev, "apb2ape");
ret = of_pm_clk_add_clk(&pdev->dev, "apb2ape");
if (ret)
goto clk_destroy;