summaryrefslogtreecommitdiffstats
path: root/hw/omap.h
Commit message (Collapse)AuthorAgeFilesLines
* exec: move include files to include/exec/Paolo Bonzini2012-12-191-1/+1
| | | | Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
* Move qemu_irq typedef out of qemu-common.hIgor Mammedov2012-11-151-0/+1
| | | | | | | | | | It's necessary for making CPU child of DEVICE without causing circular header deps. Signed-off-by: Igor Mammedov <imammedo@redhat.com> [ehabkost: re-added the typedef to hw/irq.h after rebasing] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
* Rename target_phys_addr_t to hwaddrAvi Kivity2012-10-231-29/+29
| | | | | | | | | | | | | | | target_phys_addr_t is unwieldly, violates the C standard (_t suffixes are reserved) and its purpose doesn't match the name (most target_phys_addr_t addresses are not target specific). Replace it with a finger-friendly, standards conformant hwaddr. Outstanding patchsets can be fixed up with the command git rebase -i --exec 'find -name "*.[ch]" | xargs s/target_phys_addr_t/hwaddr/g' origin Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* hw/omap.h: Use TARGET_PRIxPHYS to define OMAP_FMT_plxPeter Maydell2012-07-141-7/+1
| | | | | | | | | | Use the new TARGET_PRIxPHYS macro to avoid the need to define an OMAP_FMT_plx macro whose expansion depends directly on TARGET_PHYS_ADDR_BITS. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* hw/omap.h: Drop broken MEM_VERBOSE tracingPeter Maydell2012-06-191-95/+0
| | | | | | | | | Remove the MEM_VERBOSE tracing option from omap.h. This worked by intercepting cpu_register_io_memory() calls; it has been broken since cpu_register_io_memory() was removed in favour of the MemoryRegion API. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap: Use cpu_arm_init() to store ARMCPU in omap_mpu_state_sAndreas Färber2012-06-041-1/+1
| | | | | | | Fix tab indentations of comments, add braces, use cpu_reset(). Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Peter Maydell <peter.maydell@linaro.org>
* hw/omap_i2c: Convert to qdevJuha Riihimäki2012-03-151-11/+2
| | | | | | | | | | Convert the omap_i2c device to qdev. Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* arm hw/: Don't use CPUStateAndreas Färber2012-03-141-1/+1
| | | | | | | | | | Scripted conversion: for file in hw/arm-misc.h hw/arm_boot.c hw/arm_pic.c hw/armv7m.c hw/exynos4210.h hw/highbank.c hw/integratorcp.c hw/musicpal.c hw/omap.h hw/pxa.h hw/pxa2xx_gpio.c hw/pxa2xx_pic.c hw/realview.c hw/strongarm.h hw/versatilepb.c hw/vexpress.c hw/xilinx_zynq.c ; do sed -i "s/CPUState/CPUARMState/g" $file done Signed-off-by: Andreas Färber <afaerber@suse.de> Acked-by: Anthony Liguori <aliguori@us.ibm.com>
* hw/omap1.c: Separate dpll_ctl from omap_mpu_stateJuha Riihimäki2012-01-041-5/+1
| | | | | | | | Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* hw/omap1.c: Separate PWT from omap_mpu_stateJuha Riihimäki2012-01-041-9/+1
| | | | | | | | Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* hw/omap1.c: Separate PWL from omap_mpu_stateJuha Riihimäki2012-01-041-7/+1
| | | | | | | | Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* hw/omap1.c: omap_mpuio_init() need not be publicPeter Maydell2012-01-041-4/+0
| | | | | | omap_mpuio_init() is only used and defined in omap1.c, so make it static. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap_l4: rename omap_l4_attach_region() to omap_l4_attach()Avi Kivity2011-11-281-1/+1
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_l4: remove omap_l4_attach()Avi Kivity2011-11-281-2/+0
| | | | | | No longer used. Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_i2c: convert to memory APIBenoît Canet2011-11-281-2/+5
| | | | | Signed-off-by: Benoît Canet <benoit.canet@gmail.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_lcdc: convert to memory APIBenoît Canet2011-11-281-2/+5
| | | | | Signed-off-by: Benoît Canet <benoit.canet@gmail.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_l4: convert to memory APIBenoît Canet2011-11-281-0/+1
| | | | | Signed-off-by: Benoît Canet <benoit.canet@gmail.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_dss: convert to memory APIAvi Kivity2011-11-281-0/+1
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap2: convert to memory API (part II)Avi Kivity2011-11-281-0/+2
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_dma: convert to memory APIAvi Kivity2011-11-281-0/+2
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_sdrc: convert to memory APIAvi Kivity2011-11-281-1/+2
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_tap: convert to memory APIAvi Kivity2011-11-281-0/+1
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_mmc: convert to memory APIAvi Kivity2011-11-281-0/+1
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_l4: add memory API variant of omap_l4_attach()Avi Kivity2011-11-281-1/+6
| | | | | | | | Also add omap_l4_region_size(), since memory API functions need the size during initialization. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap: eliminate l4_register_io_memoryAvi Kivity2011-11-281-2/+0
| | | | | | | | This is a trivial wrapper around cpu_register_io_memory(), adding no value. Inline it into all callers. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap: remove L4_MUX_HACKAvi Kivity2011-11-281-3/+0
| | | | | | | | | | This was introduced apparently to overcome a limitation on the number of cpu_register_io_memory() calls. 477b24ef91175 (July 2008) removed use of the hack, but retained the code. This patch removes the code as well. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Andrzej Zaborowski <balrogg@gmail.com> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_uart: convert to memory APIAvi Kivity2011-11-281-2/+4
| | | | Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_intc: QdevifyPeter Maydell2011-09-231-20/+1
| | | | | | | | | | | | | | | Convert the omap_intc devices to qdev. This includes adding a 'revision' property which will be needed for omap3. The bulk of this patch is the replacement of "s->irq[x][y]" with "qdev_get_gpio_in(s->ih[x], y)" now that the interrupt controller exposes its input lines as qdev gpio inputs. The devices are named "omap-intc" and "omap2-intc", following the filename and the OMAP2/3 hardware names, although some internal functions are still named "omap_inth_*". Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap1: convert to memory API (part VI)Avi Kivity2011-09-211-0/+2
| | | | | | | Easy RAM stuff. Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap_lcdc: remove imif, emiff from structureAvi Kivity2011-09-211-2/+1
| | | | | | | Not used. Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap1: convert to memory API (part IV)Avi Kivity2011-09-211-0/+1
| | | | | Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap1: convert to memory API (part III)Avi Kivity2011-09-211-2/+6
| | | | | Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap1: convert to memory API (part II)Avi Kivity2011-09-211-1/+6
| | | | | Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap1: convert to memory API (part I)Avi Kivity2011-09-211-1/+10
| | | | | Acked-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Avi Kivity <avi@redhat.com>
* omap: Wire up the DMA request line to the GPMCPeter Maydell2011-08-281-1/+2
| | | | Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* hw/omap.h: Add OMAP 3630 to omap_mpu_model enumerationPeter Maydell2011-08-281-1/+4
| | | | | | | | | | Add the OMAP 3630 to the omap_mpu_model enumeration, and add the corresponding cpu_is_omap3630() function. (OMAP3 isn't supported yet but this is useful in upgrading common components to be "OMAP3 ready". We already have this for OMAP3430.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap_gpmc: Support NAND devicesPeter Maydell2011-08-281-0/+1
| | | | | | | | Support accesses to NAND devices, both by mapping them into the GPMC address space, and via the NAND_COMMAND, NAND_ADDRESS and NAND_DATA GPMC registers. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap_gpmc: Take omap_mpu_state* in omap_gpmc_initJuha Riihimäki2011-08-281-1/+2
| | | | | | | | | | | | Take a pointer to the omap mpu state struct in omap_gpmc_init. Some details of GPMC behaviour depend on the OMAP version we are a part of. Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap_gpmc: Clean up omap_gpmc_attach MemoryRegion conversionPeter Maydell2011-08-281-3/+1
| | | | | | | | | | | | | Now that all callers of omap_gpmc_attach pass in a MemoryRegion*, we can remove the base_update and unmap function pointer arguments, and the opaque pointer that was passed into these callbacks. We can also remove the base and size fields from omap_gpmc_cs_file_s as these are no longer necessary (you don't need the base/size to unmap a MemoryRegion the way you did to undo a mapping made with cpu_register_physical_memory()). Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* omap_gpmc/nseries/tusb6010: convert to memory APIAvi Kivity2011-08-221-1/+2
| | | | | | | Somewhat clumsy since it needs a variable sized region. Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* Use glib memory allocation and free functionsAnthony Liguori2011-08-201-1/+1
| | | | | | qemu_malloc/qemu_free no longer exist after this commit. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* hw/omap_gpio.c: Convert to qdevJuha Riihimäki2011-07-301-19/+1
| | | | | | | | | | | Convert the OMAP GPIO module to qdev. Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
* hw/omap_l4.c: Add helper function omap_l4_region_baseJuha Riihimäki2011-07-301-0/+2
| | | | | | | | | | | | Add helper function omap_l4_region_base() to return the base address of a particular region of an L4 target agent. Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com> [Riku Voipio: Fixes and restructuring patchset] Signed-off-by: Riku Voipio <riku.voipio@iki.fi> [Peter Maydell: More fixes and cleanups for upstream submission] Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
* Add endianness as io mem parameterAlexander Graf2010-12-111-1/+2
| | | | | | | | | | | | | As stated before, devices can be little, big or native endian. The target endianness is not of their concern, so we need to push things down a level. This patch adds a parameter to cpu_register_io_memory that allows a device to choose its endianness. For now, all devices simply choose native endian, because that's the same behavior as before. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* hw/omap: Fix default setup for OMAP UART devicesStefan Weil2010-09-101-2/+4
| | | | | | | | | | | | | | | | | | Character devices created by qemu_chr_open don't allow duplicate device names, so naming all UART devices "null" no longer works. Running "qemu-system-arm -M n800" (and some other machines) results in this error message: qemu-system-arm: Duplicate ID 'null' for chardev Can't create serial device, empty char device This is fixed by setting a default label "uart1", "uart2" or "uart3". Cc: Andrzej Zaborowski <andrew.zaborowski@intel.com> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
* hw/omap : make local function static and remove declaration from headercmchao2010-06-301-36/+0
| | | | | Signed-off-by: cmchao <cmchao@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* hw/omwp2.c : separate l4 interconnect modulecmchao2010-06-301-9/+28
| | | | | Signed-off-by: cmchao <cmchao@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* hw/omap2.c : separate spi modulecmchao2010-06-301-0/+2
| | | | | Signed-off-by: cmchao <cmchao@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* hw/omap1.c : separate interrupt controller modulecmchao2010-06-301-0/+2
| | | | | Signed-off-by: cmchao <cmchao@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
* hw/omap2.c : separate sdrc (sdram controller)cmchao2010-06-301-0/+2
| | | | | Signed-off-by: cmchao <cmchao@gmail.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
OpenPOWER on IntegriCloud