mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 20:21:57 +00:00
b923d40dd4
Resetting DISPC when a DISPC output is enabled causes the DSS to go into an
inconsistent state. Thus if the bootloader has enabled a display, the hwmod code
cannot reset the DISPC module just like that, but the outputs need to be
disabled first.
Add function dispc_disable_outputs() which disables all active overlay manager
and ensure all frame transfers are completed.
Modify omap_dss_reset() to call this function and clear DSS_CONTROL,
DSS_SDI_CONTROL and DSS_PLL_CONTROL so that DSS is in a clean state when the
DSS2 driver starts.
This resolves the hang issue(caused by a L3 error during boot) seen on the
beagle board C3, which has a factory bootloader that enables display. The issue
is resolved with this patch.
Thanks to Tomi and Sricharan for some additional testing.
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: R, Sricharan <r.sricharan@ti.com>
Signed-off-by: Archit Taneja <archit@ti.com>
[paul@pwsan.com: restructured code, removed omap_{read,write}l(), removed
cpu_is_omap*() calls and converted to dev_attr]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
119 lines
5.5 KiB
C
119 lines
5.5 KiB
C
/*
|
|
* omap_hwmod_common_data.h - OMAP hwmod common macros and declarations
|
|
*
|
|
* Copyright (C) 2010-2011 Nokia Corporation
|
|
* Paul Walmsley
|
|
*
|
|
* Copyright (C) 2010-2011 Texas Instruments, Inc.
|
|
* Benoît Cousson
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#ifndef __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
|
|
#define __ARCH_ARM_MACH_OMAP2_OMAP_HWMOD_COMMON_DATA_H
|
|
|
|
#include <plat/omap_hwmod.h>
|
|
|
|
#include "display.h"
|
|
|
|
/* Common address space across OMAP2xxx */
|
|
extern struct omap_hwmod_addr_space omap2xxx_uart1_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_uart2_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_uart3_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer2_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer3_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer4_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer5_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer6_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer7_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer8_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer9_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_timer12_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2xxx_mcbsp2_addrs[];
|
|
|
|
/* Common address space across OMAP2xxx/3xxx */
|
|
extern struct omap_hwmod_addr_space omap2_i2c1_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2_i2c2_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2_dss_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_dss_dispc_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_dss_rfbi_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_dss_venc_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_timer10_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_timer11_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2430_mmc1_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2430_mmc2_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2_mcspi1_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2_mcspi2_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2430_mcspi3_addr_space[];
|
|
extern struct omap_hwmod_addr_space omap2_dma_system_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_mailbox_addrs[];
|
|
extern struct omap_hwmod_addr_space omap2_mcbsp1_addrs[];
|
|
|
|
/* Common IP block data across OMAP2xxx */
|
|
extern struct omap_hwmod_irq_info omap2xxx_timer12_mpu_irqs[];
|
|
extern struct omap_hwmod_dma_info omap2xxx_dss_sdma_chs[];
|
|
|
|
/* Common IP block data */
|
|
extern struct omap_hwmod_dma_info omap2_uart1_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_uart2_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_uart3_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_i2c1_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_i2c2_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_mcspi1_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_mcspi2_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_mcbsp1_sdma_reqs[];
|
|
extern struct omap_hwmod_dma_info omap2_mcbsp2_sdma_reqs[];
|
|
|
|
/* Common IP block data on OMAP2430/OMAP3 */
|
|
extern struct omap_hwmod_dma_info omap2_mcbsp3_sdma_reqs[];
|
|
|
|
/* Common IP block data across OMAP2/3 */
|
|
extern struct omap_hwmod_irq_info omap2_timer1_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer2_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer3_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer4_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer5_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer6_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer7_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer8_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer9_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer10_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_timer11_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_uart1_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_uart2_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_uart3_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_dispc_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_i2c1_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_i2c2_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_gpio1_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_gpio2_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_gpio3_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_gpio4_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_dma_system_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_mcspi1_mpu_irqs[];
|
|
extern struct omap_hwmod_irq_info omap2_mcspi2_mpu_irqs[];
|
|
|
|
/* OMAP hwmod classes - forward declarations */
|
|
extern struct omap_hwmod_class l3_hwmod_class;
|
|
extern struct omap_hwmod_class l4_hwmod_class;
|
|
extern struct omap_hwmod_class mpu_hwmod_class;
|
|
extern struct omap_hwmod_class iva_hwmod_class;
|
|
extern struct omap_hwmod_class omap2_uart_class;
|
|
extern struct omap_hwmod_class omap2_dss_hwmod_class;
|
|
extern struct omap_hwmod_class omap2_dispc_hwmod_class;
|
|
extern struct omap_hwmod_class omap2_rfbi_hwmod_class;
|
|
extern struct omap_hwmod_class omap2_venc_hwmod_class;
|
|
|
|
extern struct omap_hwmod_class omap2xxx_timer_hwmod_class;
|
|
extern struct omap_hwmod_class omap2xxx_wd_timer_hwmod_class;
|
|
extern struct omap_hwmod_class omap2xxx_gpio_hwmod_class;
|
|
extern struct omap_hwmod_class omap2xxx_dma_hwmod_class;
|
|
extern struct omap_hwmod_class omap2xxx_mailbox_hwmod_class;
|
|
extern struct omap_hwmod_class omap2xxx_mcspi_class;
|
|
|
|
extern struct omap_dss_dispc_dev_attr omap2_3_dss_dispc_dev_attr;
|
|
|
|
#endif
|