Unverified Commit e6825bae authored by Paul Cercueil's avatar Paul Cercueil Committed by Mark Brown
Browse files

ASoC: ingenic: Unconditionally depend on devicetree 



All boards with Ingenic SoCs probe with devicetree already, we have no
use for a non-devicetree path.

This solves some compilation warnings that were caused by unused
variables in the case where CONFIG_OF was disabled.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200523125455.12392-1-paul@crapouillou.net


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 93e0f69a

sound/soc/codecs/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -682,6 +682,7 @@ config SND_SOC_CX2072X 


config SND_SOC_JZ4740_CODEC

	depends on MIPS || COMPILE_TEST

	depends on OF

	select REGMAP_MMIO

	tristate "Ingenic JZ4740 internal CODEC"

	help
@@ -693,6 +694,7 @@ config SND_SOC_JZ4740_CODEC 


config SND_SOC_JZ4725B_CODEC

	depends on MIPS || COMPILE_TEST

	depends on OF

	select REGMAP

	tristate "Ingenic JZ4725B internal CODEC"

	help
@@ -704,6 +706,7 @@ config SND_SOC_JZ4725B_CODEC 


config SND_SOC_JZ4770_CODEC

	depends on MIPS || COMPILE_TEST

	depends on OF

	select REGMAP

	tristate "Ingenic JZ4770 internal CODEC"

	help

sound/soc/codecs/jz4725b.c

+1 −3
Original line number Diff line number Diff line
@@ -574,19 +574,17 @@ static int jz4725b_codec_probe(struct platform_device *pdev) 
	return ret;

}



#ifdef CONFIG_OF

static const struct of_device_id jz4725b_codec_of_matches[] = {

	{ .compatible = "ingenic,jz4725b-codec", },

	{ }

};

MODULE_DEVICE_TABLE(of, jz4725b_codec_of_matches);

#endif



static struct platform_driver jz4725b_codec_driver = {

	.probe = jz4725b_codec_probe,

	.driver = {

		.name = "jz4725b-codec",

		.of_match_table = of_match_ptr(jz4725b_codec_of_matches),

		.of_match_table = jz4725b_codec_of_matches,

	},

};

module_platform_driver(jz4725b_codec_driver);

sound/soc/codecs/jz4740.c

+1 −3
Original line number Diff line number Diff line
@@ -344,19 +344,17 @@ static int jz4740_codec_probe(struct platform_device *pdev) 
	return ret;

}



#ifdef CONFIG_OF

static const struct of_device_id jz4740_codec_of_matches[] = {

	{ .compatible = "ingenic,jz4740-codec", },

	{ }

};

MODULE_DEVICE_TABLE(of, jz4740_codec_of_matches);

#endif



static struct platform_driver jz4740_codec_driver = {

	.probe = jz4740_codec_probe,

	.driver = {

		.name = "jz4740-codec",

		.of_match_table = of_match_ptr(jz4740_codec_of_matches),

		.of_match_table = jz4740_codec_of_matches,

	},

};

sound/soc/codecs/jz4770.c

+1 −1
Original line number Diff line number Diff line
@@ -937,7 +937,7 @@ static struct platform_driver jz4770_codec_driver = { 
	.probe			= jz4770_codec_probe,

	.driver			= {

		.name		= "jz4770-codec",

		.of_match_table = of_match_ptr(jz4770_codec_of_matches),

		.of_match_table = jz4770_codec_of_matches,

	},

};

module_platform_driver(jz4770_codec_driver);

sound/soc/jz4740/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
config SND_JZ4740_SOC_I2S

	tristate "SoC Audio (I2S protocol) for Ingenic JZ4740 SoC"

	depends on MIPS || COMPILE_TEST

	depends on HAS_IOMEM

	depends on OF && HAS_IOMEM

	select SND_SOC_GENERIC_DMAENGINE_PCM

	help

	  Say Y if you want to use I2S protocol and I2S codec on Ingenic JZ4740