Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3c4fd76 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: update headers for upstream compliance"

parents 072e3e29 e0bdd112

Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ USERINCLUDE += \ 
# Use LINUXINCLUDE when you must reference the include/ directory.

# Needed to be compatible with the O= option

LINUXINCLUDE    += \

                -I$(srctree)/techpack/audio/include/uapi \

                -I$(srctree)/techpack/audio/include/uapi/audio \

                -I$(srctree)/techpack/audio/include

asoc/codecs/wcd9335.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <soc/swr-wcd.h>

#include <soc/snd_event.h>

#include <sound/pcm.h>

asoc/codecs/wcd934x/wcd934x-mbhc.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.

 */

#include <linux/module.h>

#include <linux/init.h>
@@ -12,7 +12,7 @@ 
#include <linux/gpio.h>

#include <linux/delay.h>

#include <linux/regmap.h>

#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>

#include <sound/soc.h>

asoc/codecs/wcd934x/wcd934x.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/regmap.h>

#include <linux/spi/spi.h>

#include <linux/regulator/consumer.h>

#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <soc/swr-wcd.h>

#include <soc/snd_event.h>

#include <sound/pcm.h>

asoc/codecs/wcd9xxx-common-v2.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -8,7 +8,7 @@ 
#include <sound/soc.h>

#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>

#include <asoc/core.h>

#include <asoc/wcd9xxx-common-v2.h>