diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/pcm052_defconfig | 10 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/board-pcm052.c | 32 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/clock.c | 34 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/crm_regs.h | 16 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/mvf_sema4.c | 234 | ||||
| -rwxr-xr-x | arch/arm/plat-mxc/Makefile | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 6 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mvf.h | 1 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/pit.c | 6 |
10 files changed, 311 insertions, 34 deletions
diff --git a/arch/arm/configs/pcm052_defconfig b/arch/arm/configs/pcm052_defconfig index bd13e16e0cea..dfe3c7ceac20 100644 --- a/arch/arm/configs/pcm052_defconfig +++ b/arch/arm/configs/pcm052_defconfig @@ -249,7 +249,9 @@ CONFIG_IMX_HAVE_PLATFORM_FLEXCAN=y CONFIG_IMX_HAVE_PLATFORM_FSL_USB2_UDC=y CONFIG_IMX_HAVE_PLATFORM_GPMI_NFC=y CONFIG_IMX_HAVE_PLATFORM_IMX2_WDT=y +CONFIG_IMX_HAVE_PLATFORM_MVF_ADC=y CONFIG_IMX_HAVE_PLATFORM_IMX_SNVS_RTC=y +CONFIG_IMX_HAVE_PLATFORM_MVF_CAAM=y CONFIG_IMX_HAVE_PLATFORM_IMX_I2C=y CONFIG_IMX_HAVE_PLATFORM_IMX_SSI=y CONFIG_IMX_HAVE_PLATFORM_IMX_UART=y @@ -676,6 +678,7 @@ CONFIG_MISC_DEVICES=y # CONFIG_DS1682 is not set # CONFIG_TI_DAC7512 is not set # CONFIG_BMP085 is not set +# CONFIG_MVF_ADC is not set # CONFIG_C2PORT is not set # @@ -1219,7 +1222,6 @@ CONFIG_LOGO=y CONFIG_LOGO_LINUX_MONO=y CONFIG_LOGO_LINUX_VGA16=y CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_LOGO_TS_CLUT224=y CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y # CONFIG_SOUND_OSS_CORE_PRECLAIM is not set @@ -1261,7 +1263,8 @@ CONFIG_SND_SOC=y # CONFIG_SND_IMX_SOC is not set CONFIG_SND_MVF_SOC=y CONFIG_SND_MVF_SOC_TWR=y -CONFIG_SND_SOC_MVF_SGTL5000=y +# CONFIG_SND_SOC_MVF_SGTL5000 is not set +CONFIG_SND_SOC_PCM052_SGTL5000=y CONFIG_SND_SOC_I2C_AND_SPI=y # CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_SGTL5000=y @@ -1591,6 +1594,7 @@ CONFIG_CLKSRC_MMIO=y # # MXC Asynchronous Sample Rate Converter support # +# CONFIG_MXC_ASRC is not set # # MXC Bluetooth support @@ -1966,6 +1970,8 @@ CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_USER_API_HASH is not set # CONFIG_CRYPTO_USER_API_SKCIPHER is not set CONFIG_CRYPTO_HW=y +# CONFIG_CRYPTO_DEV_FSL_CAAM is not set +# CONFIG_CRYPTO_DEV_FSL_CAAM_SM is not set CONFIG_BINARY_PRINTF=y # diff --git a/arch/arm/mach-mvf/Makefile b/arch/arm/mach-mvf/Makefile index fad70a4a9dc7..3128d4288c3d 100644 --- a/arch/arm/mach-mvf/Makefile +++ b/arch/arm/mach-mvf/Makefile @@ -3,7 +3,7 @@ # # Object file lists. -obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o mvf_fec.o usb_dr.o usb_dr2.o pm.o +obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o mvf_fec.o usb_dr.o usb_dr2.o pm.o mvf_sema4.o obj-y += l2switch.o obj-$(CONFIG_ARCH_MVFA5) += clock.o mvf_suspend.o diff --git a/arch/arm/mach-mvf/board-pcm052.c b/arch/arm/mach-mvf/board-pcm052.c index 84bd65623ebb..8048349afae7 100644 --- a/arch/arm/mach-mvf/board-pcm052.c +++ b/arch/arm/mach-mvf/board-pcm052.c @@ -147,14 +147,14 @@ static iomux_v3_cfg_t pcm052_pads[] = { #endif /*SAI2*/ -// MVF600_PAD6_PTA16_SAI2_TX_BCLK, + MVF600_PAD6_PTA16_SAI2_TX_BCLK, MVF600_PAD8_PTA18_SAI2_TX_DATA, -// MVF600_PAD3_PTA10_SAI2_TX_SYNC, // originally PAD9_PTA19 - MVF600_PAD11_PTA21_SAI2_RX_BCLK, -// MVF600_PAD23_PTB1_SAI2_RX_DATA, // originally PAD12_PTA22 -// MVF600_PAD13_PTA23_SAI2_RX_SYNC, // UNUSED + MVF600_PAD9_PTA19_SAI2_TX_SYNC, +// MVF600_PAD11_PTA21_SAI2_RX_BCLK, + MVF600_PAD23_PTB1_SAI2_RX_DATA, // originally PAD12_PTA22 +// MVF600_PAD24_PTB2_SAI2_RX_SYNC, // originally PAD13_PTA23 // MVF600_PAD40_PTB18_EXT_AUDIO_MCLK, // UNUSED -// MVF600_PAD33_PTB11__CKO2, // phyCORE MCLK + MVF600_PAD33_PTB11__CKO2, // phyCORE MCLK /*DCU0*/ MVF600_PAD25_PTB3_LCD_ENABLE, @@ -204,15 +204,15 @@ static iomux_v3_cfg_t pcm052_pads[] = { * FTM0 CH0~3 are connected to demo LED0~3 * PAD30 mux with LCD enable signal */ - MVF600_PAD22_PTB0_FTM0CH0, - MVF600_PAD23_PTB1_FTM0CH1, - MVF600_PAD24_PTB2_FTM0CH2, +// MVF600_PAD22_PTB0_FTM0CH0, +// MVF600_PAD23_PTB1_FTM0CH1, +// MVF600_PAD24_PTB2_FTM0CH2, // MVF600_PAD25_PTB3_FTM0CH3, - MVF600_PAD28_PTB6_FTM0CH6, - MVF600_PAD29_PTB7_FTM0CH7, +// MVF600_PAD28_PTB6_FTM0CH6, +// MVF600_PAD29_PTB7_FTM0CH7, /*MVF600_PAD30_PTB8_FTM1CH0,*/ - MVF600_PAD31_PTB9_FTM1CH1, +// MVF600_PAD31_PTB9_FTM1CH1, /* Touch Screen */ MVF600_PAD32_PTB10_TS_IRQ, @@ -236,7 +236,7 @@ static struct mxc_audio_platform_data pcm052_audio_data; static int pcm052_sgtl5000_init(void) { - pcm052_audio_data.sysclk = 24576000; + pcm052_audio_data.sysclk = 12288000; return 0; } @@ -252,7 +252,7 @@ static struct mxc_audio_platform_data pcm052_audio_data = { }; static struct platform_device pcm052_audio_device = { - .name = "mvf-sgtl5000", + .name = "pcm052-sgtl5000", }; static struct imxuart_platform_data mvf_uart1_pdata = { @@ -523,8 +523,8 @@ static void __init pcm052_board_init(void) mvfa5_add_dcu(0, &mvf_dcu_pdata); -// mxc_register_device(&pcm052_audio_device, &pcm052_audio_data); -// mvfa5_add_sai(2, &mvf_sai_pdata); + mxc_register_device(&pcm052_audio_device, &pcm052_audio_data); + mvfa5_add_sai(2, &mvf_sai_pdata); // mvf_add_wdt(0); diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c index 74ce8a9f290e..199483ccb32a 100644 --- a/arch/arm/mach-mvf/clock.c +++ b/arch/arm/mach-mvf/clock.c @@ -1389,7 +1389,7 @@ static struct clk dcu0_clk = { static unsigned long get_audio_external_clock_rate(struct clk *clk) { - return 24576000; + return 24567000; } static struct clk audio_external_clk = { @@ -1405,11 +1405,10 @@ static int _clk_sai2_set_parent(struct clk *clk, struct clk *parent) mux = _get_mux6(parent, &audio_external_clk, NULL, NULL, &pll4_audio_main_clk, NULL, NULL); - + reg |= (mux << MXC_CCM_CSCMR1_SAI2_CLK_SEL_OFFSET); - __raw_writel(reg, MXC_CCM_CSCMR1); - + return 0; } @@ -1448,10 +1447,18 @@ static int _clk_sai2_enable(struct clk *clk) { u32 reg; + /* enable SAI2 clock */ reg = __raw_readl(MXC_CCM_CSCDR1); - reg |= MXC_CCM_CSCDR1_SAI2_EN; + reg |= MXC_CCM_CSCDR1_SAI2_EN | (0xF << MXC_CCM_CSCDR1_SAI2_DIV_OFFSET); __raw_writel(reg, MXC_CCM_CSCDR1); + /* enable CKO2 observation of SAI2 */ + reg = __raw_readl(MXC_CCM_CCOSR) + & ~MXC_CCM_CCOSR_CKO2_SEL_MASK; + reg |= MXC_CCM_CCOSR_CKO2_EN | MXC_CCM_CCOSR_CKO2_SEL_SAI2 | + (2 << MXC_CCM_CCOSR_CKO2_DIV_OFFSET); + __raw_writel(reg, MXC_CCM_CCOSR); + return 0; } @@ -1459,10 +1466,16 @@ static void _clk_sai2_disable(struct clk *clk) { u32 reg; + /* disable SAI2 clock */ reg = __raw_readl(MXC_CCM_CSCDR1); reg &= ~MXC_CCM_CSCDR1_SAI2_EN; __raw_writel(reg, MXC_CCM_CSCDR1); + /* disable CKO2 observation of SAI2 */ + reg = __raw_readl(MXC_CCM_CCOSR); + reg &= ~MXC_CCM_CCOSR_CKO2_EN; + __raw_writel(reg, MXC_CCM_CCOSR); + return 0; } @@ -1488,7 +1501,7 @@ static unsigned long _clk_sai_round_rate(struct clk *clk, static struct clk sai2_clk = { __INIT_CLK_DEBUG(sai2_clk) - .parent = &audio_external_clk, + .parent = &pll4_audio_main_clk, .enable_reg = MXC_CCM_CCGR1, .enable_shift = MXC_CCM_CCGRx_CG1_OFFSET, .enable = _clk_sai2_enable, @@ -1926,7 +1939,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "cpu_clk", cpu_clk), /* arm core clk */ _REGISTER_CLOCK(NULL, "periph_clk", periph_clk), /* platform bus clk */ _REGISTER_CLOCK(NULL, "ipg_clk", ipg_clk), -// _REGISTER_CLOCK(NULL, "audio ext clk", audio_external_clk), + _REGISTER_CLOCK(NULL, "audio ext clk", audio_external_clk), _REGISTER_CLOCK(NULL, "mvf-uart.0", uart_clk[0]), _REGISTER_CLOCK(NULL, "mvf-uart.1", uart_clk[0]), _REGISTER_CLOCK(NULL, "mvf-uart.2", uart_clk[0]), @@ -1940,8 +1953,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("imx2-wdt.0", NULL, dummy_clk), _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc1_clk), _REGISTER_CLOCK("mvf-dcu.0", NULL, dcu0_clk), -// _REGISTER_CLOCK("mvf-sai.0", NULL, sai2_clk), -// _REGISTER_CLOCK(NULL, "i2c_clk", i2c_clk[2]), + _REGISTER_CLOCK("mvf-sai.0", NULL, sai2_clk), _REGISTER_CLOCK("imx-i2c.2", NULL, i2c_clk[2]), _REGISTER_CLOCK(NULL, "usb-clk", usb_clk), _REGISTER_CLOCK(NULL, "mvf-usb.0", usb_phy0_clk), @@ -2018,8 +2030,8 @@ int __init mvf_clocks_init(unsigned long ckil, unsigned long osc, clk_set_parent(&dcu0_clk, &pll1_pfd2_452M); clk_set_rate(&dcu0_clk, 113000000); - clk_set_parent(&sai2_clk, &audio_external_clk); - clk_set_rate(&sai2_clk, 24576000); + clk_set_parent(&sai2_clk, &pll4_audio_main_clk); + clk_set_rate(&sai2_clk, 24567000); clk_set_parent(&qspi0_clk, &pll1_pfd4_528M); clk_set_rate(&qspi0_clk, 66000000); diff --git a/arch/arm/mach-mvf/crm_regs.h b/arch/arm/mach-mvf/crm_regs.h index 57fac5bbe973..4cfc7898aa87 100644 --- a/arch/arm/mach-mvf/crm_regs.h +++ b/arch/arm/mach-mvf/crm_regs.h @@ -185,6 +185,10 @@ #define MXC_CCM_BASE MVF_IO_ADDRESS(MVF_CCM_BASE_ADDR) +#define MVF_I2S0_BASE MVF_IO_ADDRESS(MVF_I2S0_BASE_ADDR) +#define MVF_I2S0_TCR2 (MVF_I2S0_BASE + 0xF008) +#define MVF_I2S0_RCR2 (MVF_I2S0_BASE + 0xF088) + /* Register addresses of CCM*/ #define MXC_CCM_CCR (MXC_CCM_BASE + 0x00) #define MXC_CCM_CSR (MXC_CCM_BASE + 0x04) @@ -199,6 +203,7 @@ #define MXC_CCM_CLPCR (MXC_CCM_BASE + 0x2c) #define MXC_CCM_CISR (MXC_CCM_BASE + 0x30) #define MXC_CCM_CIMR (MXC_CCM_BASE + 0x34) +#define MXC_CCM_CCOSR (MXC_CCM_BASE + 0x38) #define MXC_CCM_CGPR (MXC_CCM_BASE + 0x3c) #define MXC_CCM_CCGR0 (MXC_CCM_BASE + 0x40) #define MXC_CCM_CCGR1 (MXC_CCM_BASE + 0x44) @@ -435,6 +440,17 @@ #define MXC_CCM_CIMR_LRF_PLL2 (1 << 1) #define MXC_CCM_CIMR_LRF_PLL1 (1) +/* CCOSR */ +#define MXC_CCM_CCOSR_CKO2_EN (1 << 26) +#define MXC_CCM_CCOSR_CKO2_DIV_OFFSET (22) + +#define MXC_CCM_CCOSR_CKO2_SEL_MASK (0x3F << 16) +#define MXC_CCM_CCOSR_CKO2_SEL_SAI2 (0xD << 16) +#define MXC_CCM_CCOSR_CKO2_SEL_PLL4_MAIN (0x1A << 16) + +#define MXC_CCM_CCOSR_CKO1_EN (1 << 10) +#define MXC_CCM_CCOSR_CKO1_DIV_OFFSET (6) + /* Define the bits in registers CGPR */ #define MXC_CCM_CGPR_EFUSE_PROG (1 << 4) #define MXC_CCM_CGPR_QSPI1_ACCZ (1 << 1) diff --git a/arch/arm/mach-mvf/mvf_sema4.c b/arch/arm/mach-mvf/mvf_sema4.c new file mode 100644 index 000000000000..311b56a69d73 --- /dev/null +++ b/arch/arm/mach-mvf/mvf_sema4.c @@ -0,0 +1,234 @@ +/* +* header goes here +*/ + +#include <linux/kernel.h> +#include <linux/types.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/device.h> +#include <linux/sched.h> + +#include <mach/mvf.h> + +#define NUM_GATES 16 +#define MASK_FROM_GATE(gate_num) ((u32)(1 << (NUM_GATES*2 - 1 - idx[gate_num]))) + +#define THIS_CORE (0) +#define LOCK_VALUE (THIS_CORE + 1) + +#define SEMA4_CP0INE (MVF_SEMA4_BASE_ADDR + 0x40) +#define SEMA4_CP0NTF (MVF_SEMA4_BASE_ADDR + 0x80) + +//#if 0 +#include <linux/mm.h> +#include <linux/version.h> +#include <linux/kdev_t.h> +#include <linux/fs.h> +#include <linux/cdev.h> +#include <mach/hardware.h> +#include <linux/string.h> +#include <linux/uaccess.h> +#include <linux/delay.h> +#include <linux/time.h> +//#endif + +#include <linux/mvf_sema4.h> + +// ************************************ Local Data ************************************************* + +static MVF_SEMA4* gates[NUM_GATES]; + +static bool initialized = false; + +// account for the way the bits are set / returned in CP0INE and CP0NTF +static const int idx[16] = {3, 2, 1, 0, 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12}; + + +// ************************************ Interrupt handler ************************************************* + +static irqreturn_t sema4_irq_handler(int irq, void *dev_id) +{ + int gate_num; + + u32 cp0ntf = readl(MVF_IO_ADDRESS(SEMA4_CP0NTF)); + + for(gate_num=0; gate_num<NUM_GATES; gate_num++) + { + // interrupt from this gate? + if(cp0ntf & MASK_FROM_GATE(gate_num)) + { + // grab the gate to stop the interrupts + writeb(LOCK_VALUE, MVF_IO_ADDRESS(MVF_SEMA4_BASE_ADDR) + gate_num); + + // make sure there's a gate assigned + if(gates[gate_num]) + { + if(gates[gate_num]->use_interrupts) + // wake up whoever was aiting + wake_up_interruptible(&(gates[gate_num]->wait_queue)); + } + } + } + + return IRQ_HANDLED; +} + +// ************************************ Utility functions ************************************************* + +static int find_sema4(MVF_SEMA4 *sema4) +{ + int i; + + for(i=0; i<NUM_GATES; i++) + { + if(gates[i] == sema4) + return i; + } + + return -EINVAL; +} + +static int initialize(void) +{ + int i; + + // clear the gates table + for(i=0; i<NUM_GATES; i++) + gates[i] = NULL; + + // clear out all notification requests + writel(0, MVF_IO_ADDRESS(SEMA4_CP0INE)); + + //Register the interrupt handler + if (request_irq(MVF_INT_SEMA4, sema4_irq_handler, 0, "mvf_sema4_handler", NULL) != 0) + { + printk(KERN_ERR "Failed to register MVF_INT_SEMA4 interrupt.\n"); + return -EIO; + } + + initialized = true; + return 0; +} + +int mvf_sema4_assign(int gate_num, bool use_interrupts, MVF_SEMA4** sema4_p) +{ + int retval; + u32 cp0ine; + unsigned long irq_flags; + + // take the opportunity to initialize the whole sub-system + if(!initialized) + { + retval = initialize(); + if(retval) + return retval; + } + + if((gate_num < 0) || (gate_num >= NUM_GATES)) + return -EINVAL; + + if(gates[gate_num]) + return -EBUSY; + + *sema4_p = (MVF_SEMA4 *)kmalloc(sizeof(MVF_SEMA4), GFP_KERNEL); + if(*sema4_p == NULL) + return -ENOMEM; + + gates[gate_num] = *sema4_p; + (*sema4_p)->gate_num = gate_num; + (*sema4_p)->use_interrupts = use_interrupts; + + if(use_interrupts) + { + init_waitqueue_head(&((*sema4_p)->wait_queue)); + local_irq_save(irq_flags); + cp0ine = readl(MVF_IO_ADDRESS(SEMA4_CP0INE)); + cp0ine |= MASK_FROM_GATE(gate_num); + writel(cp0ine, MVF_IO_ADDRESS(SEMA4_CP0INE)); + local_irq_restore(irq_flags); + } + + return 0; +} + +int mvf_sema4_deassign(MVF_SEMA4 *sema4) +{ + u32 cp0ine; + unsigned long irq_flags; + + int gate_num = find_sema4(sema4); + if(gate_num < 0) + return gate_num; + + if(sema4->use_interrupts) + { + local_irq_save(irq_flags); + cp0ine = readl(MVF_IO_ADDRESS(SEMA4_CP0INE)); + cp0ine &= ~MASK_FROM_GATE(gate_num); + writel(cp0ine, MVF_IO_ADDRESS(SEMA4_CP0INE)); + local_irq_restore(irq_flags); + } + + kfree(sema4); + gates[gate_num] = NULL; + + return 0; +} + +int mvf_sema4_lock(MVF_SEMA4 *sema4, unsigned int timeout_us) +{ + int retval; + int gate_num = find_sema4(sema4); + if(gate_num < 0) + return gate_num; + + // cant use timeouts if not using interruppts + // TODO use spin lock if not using interrupts + if((!sema4->use_interrupts) && timeout_us) + return -EINVAL; + + // try to grab it + writeb(LOCK_VALUE, MVF_IO_ADDRESS(MVF_SEMA4_BASE_ADDR) + gate_num); + if(readb(MVF_IO_ADDRESS(MVF_SEMA4_BASE_ADDR) + gate_num) == LOCK_VALUE) + return 0; + + // no timeout, fail + if(!timeout_us) + return -EBUSY; + + // wait forever? + if(timeout_us == 0xffffffff) + { + if(wait_event_interruptible(sema4->wait_queue, (readb(MVF_IO_ADDRESS(MVF_SEMA4_BASE_ADDR) + gate_num) == LOCK_VALUE))) + return -ERESTARTSYS; + } + else + { + // return: 0 = timeout, >0 = woke up with that many jiffies left, <0 = error + retval = wait_event_interruptible_timeout(sema4->wait_queue, + (readb(MVF_IO_ADDRESS(MVF_SEMA4_BASE_ADDR) + gate_num) == LOCK_VALUE), + usecs_to_jiffies(timeout_us)); + if(retval == 0) + return -ETIME; + else if(retval < 0) + return retval; + } + + return 0; +} + +int mvf_sema4_unlock(MVF_SEMA4 *sema4) +{ + int gate_num = find_sema4(sema4); + if(gate_num < 0) + return gate_num; + + // unlock it + writeb(0, MVF_IO_ADDRESS(MVF_SEMA4_BASE_ADDR) + gate_num); + + return 0; +} + diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index e2abb624f9d1..238788df23da 100755 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -3,12 +3,14 @@ # # Common support -obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o +#obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o +obj-y := clock.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o ifdef CONFIG_ARCH_MVF obj-y += gpio-mvf.o else obj-y += gpio.o +obj-y += time.o endif # MX51 uses the TZIC interrupt controller, older platforms use AVIC diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index eb093e2c0f7f..bde7e316433a 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -258,9 +258,9 @@ typedef enum iomux_config { #define MVF600_PAD40_PTB18_EXT_AUDIO_MCLK \ IOMUX_PAD(0x00A0, 0x00A0, 2, 0x02ec, 2, \ MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE) -#define MVF600_PAD33_PTB11__CKO2 \ - IOMUX_PAD(0x0084, 0x0084, 6, 0x24038, 0x040D, \ - MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE) +#define MVF600_PAD33_PTB11__CKO2 \ + IOMUX_PAD(0x0084, 0x0084, 6, 0x0000, 0, \ + MVF600_SAI_PAD_CTRL | PAD_CTL_OBE_ENABLE) /*DCU0*/ #define MVF600_PAD25_PTB3_LCD_ENABLE \ diff --git a/arch/arm/plat-mxc/include/mach/mvf.h b/arch/arm/plat-mxc/include/mach/mvf.h index 4a47636fa741..fb0e5eb69704 100644 --- a/arch/arm/plat-mxc/include/mach/mvf.h +++ b/arch/arm/plat-mxc/include/mach/mvf.h @@ -124,6 +124,7 @@ #define MVF_DMA0TCD_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00019000) #define MVF_SEMA4_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x0001D000) #define MVF_FLEXBUS_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x0001E000) +#define MVF_I2S0_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00020000) #define MVF_FLEXCAN0_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00021000) #define MVF_DMAMUX0_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00024000) #define MVF_DMAMUX1_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00025000) diff --git a/arch/arm/plat-mxc/pit.c b/arch/arm/plat-mxc/pit.c index ba71bda51c06..e82cca9d06ea 100644 --- a/arch/arm/plat-mxc/pit.c +++ b/arch/arm/plat-mxc/pit.c @@ -90,6 +90,12 @@ static cycle_t pit_read_clk(struct clocksource *cs); static DEFINE_CLOCK_DATA(cd); static void __iomem *sched_clock_reg; +unsigned long long notrace sched_clock(void) +{ + cycle_t cyc = sched_clock_reg ? ((u32)~0 + - __raw_readl(sched_clock_reg)) : 0; + return cyc_to_sched_clock(&cd, cyc, (u32)~0); +} static void notrace mvf_update_sched_clock(void) { |