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

Commit bb07d751 authored by Fabio Estevam's avatar Fabio Estevam Committed by Sascha Hauer
Browse files

ARM: mx3: Setup AIPS registers 



It was observed on a mx31pdk board that audio playback only worked when the bootloader was Redboot, and
did not work when U-boot was used.

Comparing the sources of these bootloaders showed that the AIPS registers were not setup in U-boot.

Instead of relying on the bootloader to setup the AIPS registers, do it in the kernel so that audio
playback can work independantly of the bootloader being used.

Copied the AIPS settings from Redboot to the kernel.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 3ac804e3

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

+3 −0
Original line number Diff line number Diff line
@@ -177,6 +177,9 @@ void __init imx31_soc_init(void) 
	}



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



	imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS1_BASE_ADDR));

	imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS2_BASE_ADDR));

}

#endif /* ifdef CONFIG_SOC_IMX31 */

arch/arm/plat-mxc/cpu.c

+24 −0
Original line number Diff line number Diff line 


#include <linux/module.h>

#include <linux/io.h>

#include <mach/hardware.h>



unsigned int __mxc_cpu_type;
@@ -18,3 +19,26 @@ void imx_print_silicon_rev(const char *cpu, int srev) 
		pr_info("CPU identified as %s, silicon rev %d.%d\n",

				cpu, (srev >> 4) & 0xf, srev & 0xf);

}



void __init imx_set_aips(void __iomem *base)

{

	unsigned int reg;

/*

 * Set all MPROTx to be non-bufferable, trusted for R/W,

 * not forced to user-mode.

 */

	__raw_writel(0x77777777, base + 0x0);

	__raw_writel(0x77777777, base + 0x4);



/*

 * Set all OPACRx to be non-bufferable, to not require

 * supervisor privilege level for access, allow for

 * write access and untrusted master access.

 */

	__raw_writel(0x0, base + 0x40);

	__raw_writel(0x0, base + 0x44);

	__raw_writel(0x0, base + 0x48);

	__raw_writel(0x0, base + 0x4C);

	reg = __raw_readl(base + 0x50) & 0x00FFFFFF;

	__raw_writel(reg, base + 0x50);

}

arch/arm/plat-mxc/include/mach/common.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ extern void mxc_restart(char, const char *); 
extern void mxc_arch_reset_init(void __iomem *);

extern int mx53_revision(void);

extern int mx53_display_revision(void);

extern void imx_set_aips(void __iomem *);



enum mxc_cpu_pwr_mode {

	WAIT_CLOCKED,		/* wfi only */