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

Commit 3bc34a61 authored by Richard Zhao's avatar Richard Zhao Committed by Mark Brown
Browse files

ARM: imx: convert audmux to a platform driver 



It coverts audmux to a platform driver, so that it can be moved into
sound/soc/imx and adopt device tree support later.

Signed-off-by: default avatarRichard Zhao <richard.zhao@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 2405fc97

arch/arm/mach-imx/mm-imx21.c

+6 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ void __init mx21_init_irq(void) 
	mxc_init_irq(MX21_IO_ADDRESS(MX21_AVIC_BASE_ADDR));

}



static const struct resource imx21_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX21_AUDMUX_BASE_ADDR, SZ_4K),

};



void __init imx21_soc_init(void)

{

	mxc_register_gpio("imx21-gpio", 0, MX21_GPIO1_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);
@@ -85,4 +89,6 @@ void __init imx21_soc_init(void) 
	mxc_register_gpio("imx21-gpio", 5, MX21_GPIO6_BASE_ADDR, SZ_256, MX21_INT_GPIO, 0);



	imx_add_imx_dma();

	platform_device_register_simple("imx21-audmux", 0, imx21_audmux_res,

					ARRAY_SIZE(imx21_audmux_res));

}

arch/arm/mach-imx/mm-imx25.c

+7 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ static struct sdma_platform_data imx25_sdma_pdata __initdata = { 
	.script_addrs = &imx25_sdma_script,

};



static const struct resource imx25_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX25_AUDMUX_BASE_ADDR, SZ_16K),

};



void __init imx25_soc_init(void)

{

	/* i.mx25 has the i.mx31 type gpio */
@@ -93,4 +97,7 @@ void __init imx25_soc_init(void) 


	/* i.mx25 has the i.mx35 type sdma */

	imx_add_imx_sdma("imx35-sdma", MX25_SDMA_BASE_ADDR, MX25_INT_SDMA, &imx25_sdma_pdata);

	/* i.mx25 has the i.mx31 type audmux */

	platform_device_register_simple("imx31-audmux", 0, imx25_audmux_res,

					ARRAY_SIZE(imx25_audmux_res));

}

arch/arm/mach-imx/mm-imx27.c

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ void __init mx27_init_irq(void) 
	mxc_init_irq(MX27_IO_ADDRESS(MX27_AVIC_BASE_ADDR));

}



static const struct resource imx27_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX27_AUDMUX_BASE_ADDR, SZ_4K),

};



void __init imx27_soc_init(void)

{

	/* i.mx27 has the i.mx21 type gpio */
@@ -86,4 +90,7 @@ void __init imx27_soc_init(void) 
	mxc_register_gpio("imx21-gpio", 5, MX27_GPIO6_BASE_ADDR, SZ_256, MX27_INT_GPIO, 0);



	imx_add_imx_dma();

	/* imx27 has the imx21 type audmux */

	platform_device_register_simple("imx21-audmux", 0, imx27_audmux_res,

					ARRAY_SIZE(imx27_audmux_res));

}

arch/arm/mach-imx/mm-imx3.c

+13 −0
Original line number Diff line number Diff line
@@ -158,6 +158,10 @@ static struct sdma_platform_data imx31_sdma_pdata __initdata = { 
	.script_addrs = &imx31_to2_sdma_script,

};



static const struct resource imx31_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX31_AUDMUX_BASE_ADDR, SZ_16K),

};



void __init imx31_soc_init(void)

{

	int to_version = mx31_revision() >> 4;
@@ -175,6 +179,8 @@ void __init imx31_soc_init(void) 
	}



	imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);

	platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res,

					ARRAY_SIZE(imx31_audmux_res));

}

#endif /* ifdef CONFIG_SOC_IMX31 */
@@ -241,6 +247,10 @@ static struct sdma_platform_data imx35_sdma_pdata __initdata = { 
	.script_addrs = &imx35_to2_sdma_script,

};



static const struct resource imx35_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX35_AUDMUX_BASE_ADDR, SZ_16K),

};



void __init imx35_soc_init(void)

{

	int to_version = mx35_revision() >> 4;
@@ -259,5 +269,8 @@ void __init imx35_soc_init(void) 
	}



	imx_add_imx_sdma("imx35-sdma", MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata);

	/* i.mx35 has the i.mx31 type audmux */

	platform_device_register_simple("imx31-audmux", 0, imx35_audmux_res,

					ARRAY_SIZE(imx35_audmux_res));

}

#endif /* ifdef CONFIG_SOC_IMX35 */

arch/arm/mach-imx/mm-imx5.c

+22 −0
Original line number Diff line number Diff line
@@ -170,6 +170,18 @@ static struct sdma_platform_data imx53_sdma_pdata __initdata = { 
	.script_addrs = &imx53_sdma_script,

};



static const struct resource imx50_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX50_AUDMUX_BASE_ADDR, SZ_16K),

};



static const struct resource imx51_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX51_AUDMUX_BASE_ADDR, SZ_16K),

};



static const struct resource imx53_audmux_res[] __initconst = {

	DEFINE_RES_MEM(MX53_AUDMUX_BASE_ADDR, SZ_16K),

};



void __init imx50_soc_init(void)

{

	/* i.mx50 has the i.mx31 type gpio */
@@ -179,6 +191,10 @@ void __init imx50_soc_init(void) 
	mxc_register_gpio("imx31-gpio", 3, MX50_GPIO4_BASE_ADDR, SZ_16K, MX50_INT_GPIO4_LOW, MX50_INT_GPIO4_HIGH);

	mxc_register_gpio("imx31-gpio", 4, MX50_GPIO5_BASE_ADDR, SZ_16K, MX50_INT_GPIO5_LOW, MX50_INT_GPIO5_HIGH);

	mxc_register_gpio("imx31-gpio", 5, MX50_GPIO6_BASE_ADDR, SZ_16K, MX50_INT_GPIO6_LOW, MX50_INT_GPIO6_HIGH);



	/* i.mx50 has the i.mx31 type audmux */

	platform_device_register_simple("imx31-audmux", 0, imx50_audmux_res,

					ARRAY_SIZE(imx50_audmux_res));

}



void __init imx51_soc_init(void)
@@ -191,6 +207,9 @@ void __init imx51_soc_init(void) 


	/* i.mx51 has the i.mx35 type sdma */

	imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata);

	/* i.mx51 has the i.mx31 type audmux */

	platform_device_register_simple("imx31-audmux", 0, imx51_audmux_res,

					ARRAY_SIZE(imx51_audmux_res));

}



void __init imx53_soc_init(void)
@@ -206,4 +225,7 @@ void __init imx53_soc_init(void) 


	/* i.mx53 has the i.mx35 type sdma */

	imx_add_imx_sdma("imx35-sdma", MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata);

	/* i.mx53 has the i.mx31 type audmux */

	platform_device_register_simple("imx31-audmux", 0, imx53_audmux_res,

					ARRAY_SIZE(imx53_audmux_res));

}