mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-03 07:43:54 -06:00
Aspeed patches :
* New model for the Aspeed LPC controller * Misc cleanups -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmBHYfEACgkQUaNDx8/7 7KF1Og/+Nhg+2Yp0YTOJPDyg+dzsBBiESe6VU7dMczhVlLo9p/6vIpLFTdC0B0AH GOGa6rhz91AN/smTv3ANv7cj43jlFrT3m9ce4h+m8FANqGfcfU0FxVhf63+VbLqv GrKNjnYtqimvuhuIvdbQVbDnl5jwrLJGiNkxTPTFRUjwCKXvzQwhYZukUxhN+d8/ iTsZR75rvgr73OURt0F8y4Bk6WT/COdxoBpFq4hqVcgCwv+ug+TcxNvQCrMssDrB k01rRsj1Y+bRzD5egy/okMbKYnNeFAUu+3525OzueorUjftuzjQvx4MBcBf+LpRy 5QX5eC4bkuIpVTju6Im78IcRTLZ7bjgjPl8vJVjb8l2jnbGNjb9I5BELA8+//WhU 2JwQWTHFFdHXQZQ9PXFumLL7J2KYGuZCnY78Iaa0gL3p0fFFrhIQz+76Y0fBxRLw v17ioCkOO1+rJ26Dus3H6FOS0FK/AyzXebLZtddYR8iV/7hYvF955r2ZDqSj0klB TrUEiTU5vNhS+OI8xIoR/YVtu+vzckLEz8KPFFwMZcrPAPbuNwsLvM/WycppjE/Z gHRgqOfL0IP40iJq35T3E1lakn/s3/i/kJnc+u4XGdq1PEALLYdOjEjfqRHcPHer 3EO+osSKNe08Sffb4LVFsBxjsbVvc2Sb4Lg1r3bX9LgnfU6nD7A= =SWwQ -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20210309' into staging Aspeed patches : * New model for the Aspeed LPC controller * Misc cleanups # gpg: Signature made Tue 09 Mar 2021 11:54:25 GMT # gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1 # gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1 * remotes/legoater/tags/pull-aspeed-20210309: hw/misc: Model KCS devices in the Aspeed LPC controller hw/misc: Add a basic Aspeed LPC controller model hw/arm: ast2600: Correct the iBT interrupt ID hw/arm: ast2600: Set AST2600_MAX_IRQ to value from datasheet hw/arm: ast2600: Force a multiple of 32 of IRQs for the GIC hw/arm/aspeed: Fix location of firmware images in documentation arm/ast2600: Fix SMP booting with -kernel Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
363fc96305
7 changed files with 625 additions and 19 deletions
|
@ -28,6 +28,7 @@
|
|||
#include "hw/sd/aspeed_sdhci.h"
|
||||
#include "hw/usb/hcd-ehci.h"
|
||||
#include "qom/object.h"
|
||||
#include "hw/misc/aspeed_lpc.h"
|
||||
|
||||
#define ASPEED_SPIS_NUM 2
|
||||
#define ASPEED_EHCIS_NUM 2
|
||||
|
@ -61,6 +62,7 @@ struct AspeedSoCState {
|
|||
AspeedGPIOState gpio_1_8v;
|
||||
AspeedSDHCIState sdhci;
|
||||
AspeedSDHCIState emmc;
|
||||
AspeedLPCState lpc;
|
||||
};
|
||||
|
||||
#define TYPE_ASPEED_SOC "aspeed-soc"
|
||||
|
@ -130,6 +132,7 @@ enum {
|
|||
ASPEED_DEV_SDRAM,
|
||||
ASPEED_DEV_XDMA,
|
||||
ASPEED_DEV_EMMC,
|
||||
ASPEED_DEV_KCS,
|
||||
};
|
||||
|
||||
#endif /* ASPEED_SOC_H */
|
||||
|
|
47
include/hw/misc/aspeed_lpc.h
Normal file
47
include/hw/misc/aspeed_lpc.h
Normal file
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
* ASPEED LPC Controller
|
||||
*
|
||||
* Copyright (C) 2017-2018 IBM Corp.
|
||||
*
|
||||
* This code is licensed under the GPL version 2 or later. See
|
||||
* the COPYING file in the top-level directory.
|
||||
*/
|
||||
|
||||
#ifndef ASPEED_LPC_H
|
||||
#define ASPEED_LPC_H
|
||||
|
||||
#include "hw/sysbus.h"
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
#define TYPE_ASPEED_LPC "aspeed.lpc"
|
||||
#define ASPEED_LPC(obj) OBJECT_CHECK(AspeedLPCState, (obj), TYPE_ASPEED_LPC)
|
||||
|
||||
#define ASPEED_LPC_NR_REGS (0x260 >> 2)
|
||||
|
||||
enum aspeed_lpc_subdevice {
|
||||
aspeed_lpc_kcs_1 = 0,
|
||||
aspeed_lpc_kcs_2,
|
||||
aspeed_lpc_kcs_3,
|
||||
aspeed_lpc_kcs_4,
|
||||
aspeed_lpc_ibt,
|
||||
};
|
||||
|
||||
#define ASPEED_LPC_NR_SUBDEVS 5
|
||||
|
||||
typedef struct AspeedLPCState {
|
||||
/* <private> */
|
||||
SysBusDevice parent;
|
||||
|
||||
/*< public >*/
|
||||
MemoryRegion iomem;
|
||||
qemu_irq irq;
|
||||
|
||||
qemu_irq subdevice_irqs[ASPEED_LPC_NR_SUBDEVS];
|
||||
uint32_t subdevice_irqs_pending;
|
||||
|
||||
uint32_t regs[ASPEED_LPC_NR_REGS];
|
||||
uint32_t hicr7;
|
||||
} AspeedLPCState;
|
||||
|
||||
#endif /* _ASPEED_LPC_H_ */
|
Loading…
Add table
Add a link
Reference in a new issue