Unverified Commit aefe7a8e authored by Mark Brown's avatar Mark Brown
Browse files

GPIO inclusion fixes to misc sound drivers 

Merge series from Linus Walleij <linus.walleij@linaro.org>:

Mostly dropping unused headers, and a single driver rewrite.
parents c13cf199 26e91f61

arch/arm/boot/dts/nvidia/tegra20-colibri.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ lvp0 { 
	tegra_ac97: ac97@70002000 {

		status = "okay";

		nvidia,codec-reset-gpio =

			<&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_HIGH>;

			<&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>;

		nvidia,codec-sync-gpio =

			<&gpio TEGRA_GPIO(P, 0) GPIO_ACTIVE_HIGH>;

	};

sound/soc/generic/audio-graph-card.c

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 


#include <linux/clk.h>

#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/of.h>

sound/soc/generic/audio-graph-card2.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
// based on ${LINUX}/sound/soc/generic/audio-graph-card.c

#include <linux/clk.h>

#include <linux/device.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/of.h>

sound/soc/generic/simple-card-utils.c

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
// Copyright (c) 2016 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/module.h>

#include <linux/of.h>

sound/soc/hisilicon/hi6210-i2s.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/clk.h>

#include <linux/jiffies.h>

#include <linux/io.h>

#include <linux/gpio.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>