drm/tegra: add missing include

Submitted by Arnd Bergmann on July 1, 2016, 10:16 a.m.

Details

Message ID 20160701101630.3063718-1-arnd@arndb.de
State New
Headers show
Series "drm/tegra: add missing include" ( rev: 1 ) in DRI devel

Not browsing as part of any series.

Commit Message

Arnd Bergmann July 1, 2016, 10:16 a.m.
A newly merged patch to configure the XBAR caused a build failure
in some configurations:

drivers/gpu/drm/tegra/sor.c: In function 'tegra_sor_set_pinmux':
drivers/gpu/drm/tegra/sor.c:252:10: error: implicit declaration of function 'pinctrl_lookup_state' [-Werror=implicit-function-declaration]
  state = pinctrl_lookup_state(sor->pinctrl, name);
          ^~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/tegra/sor.c:252:8: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
  state = pinctrl_lookup_state(sor->pinctrl, name);

The functions are declared in linux/pinctrl/consumer.h, so we need
to include that file instead of relying on the inclusion to happen
through another header.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 9e9d1315f4f4 ("drm/tegra: sor: Make XBAR configurable per SoC")
---
 drivers/gpu/drm/tegra/sor.c | 1 +
 1 file changed, 1 insertion(+)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c
index 8425edaa4e8a..9ff6aa7585cf 100644
--- a/drivers/gpu/drm/tegra/sor.c
+++ b/drivers/gpu/drm/tegra/sor.c
@@ -13,6 +13,7 @@ 
 #include <linux/io.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>

Comments

On Fri, Jul 01, 2016 at 12:16:20PM +0200, Arnd Bergmann wrote:
> A newly merged patch to configure the XBAR caused a build failure
> in some configurations:
> 
> drivers/gpu/drm/tegra/sor.c: In function 'tegra_sor_set_pinmux':
> drivers/gpu/drm/tegra/sor.c:252:10: error: implicit declaration of function 'pinctrl_lookup_state' [-Werror=implicit-function-declaration]
>   state = pinctrl_lookup_state(sor->pinctrl, name);
>           ^~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/tegra/sor.c:252:8: error: assignment makes pointer from integer without a cast [-Werror=int-conversion]
>   state = pinctrl_lookup_state(sor->pinctrl, name);
> 
> The functions are declared in linux/pinctrl/consumer.h, so we need
> to include that file instead of relying on the inclusion to happen
> through another header.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: 9e9d1315f4f4 ("drm/tegra: sor: Make XBAR configurable per SoC")
> ---
>  drivers/gpu/drm/tegra/sor.c | 1 +
>  1 file changed, 1 insertion(+)

This was actually introduced in 035f79bcd5e5 ("drm/tegra: sor: Support
DPAUX pin control"), which is causing other problems at runtime, so I've
backed it out again.

Thanks,
Thierry