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

Commit acab2f6f authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Relocate AUXDATA relating to MSP (Audio) 



MSP no longer requires clock-name bindings, so we need to move them to
a more appropriate header indicating that we're still passing DMA
related platform data to them.

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent a6c9fe36

arch/arm/mach-ux500/cpu-db8500.c

+8 −9
Original line number Diff line number Diff line
@@ -224,6 +224,14 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  NULL),

	OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  NULL),

	OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  NULL),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,

		       "ux500-msp-i2s.0", &msp0_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,

		       "ux500-msp-i2s.1", &msp1_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,

		       "ux500-msp-i2s.2", &msp2_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,

		       "ux500-msp-i2s.3", &msp3_platform_data),

	/* Requires clock name bindings. */

	OF_DEV_AUXDATA("stericsson,db8500-musb", 0xa03e0000, "musb-ux500.0", NULL),

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
@@ -236,15 +244,6 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { 
	/* Requires device name bindings. */

	OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE,

		"pinctrl-db8500", NULL),

	/* Requires clock name and DMA bindings. */

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,

		"ux500-msp-i2s.0", &msp0_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000,

		"ux500-msp-i2s.1", &msp1_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000,

		"ux500-msp-i2s.2", &msp2_platform_data),

	OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000,

		"ux500-msp-i2s.3", &msp3_platform_data),

	/* Requires clock name bindings and channel address lookup table. */

	OF_DEV_AUXDATA("stericsson,db8500-dma40", 0x801C0000, "dma40.0", NULL),

	{},