From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCggo-0006hx-JL for qemu-devel@nongnu.org; Fri, 02 Dec 2016 00:47:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCggl-0001Q7-85 for qemu-devel@nongnu.org; Fri, 02 Dec 2016 00:47:18 -0500 Received: from 001b2d01.pphosted.com ([148.163.156.1]:35595 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCggk-0001P5-UU for qemu-devel@nongnu.org; Fri, 02 Dec 2016 00:47:15 -0500 Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uB25dBQt119522 for ; Fri, 2 Dec 2016 00:47:13 -0500 Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) by mx0a-001b2d01.pphosted.com with ESMTP id 2730g4t7ha-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 02 Dec 2016 00:47:13 -0500 Received: from localhost by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 2 Dec 2016 15:47:11 +1000 From: "Alastair D'Silva" Date: Fri, 2 Dec 2016 16:46:17 +1100 In-Reply-To: <20161202054617.6749-1-alastair@au1.ibm.com> References: <20161202054617.6749-1-alastair@au1.ibm.com> Message-Id: <20161202054617.6749-8-alastair@au1.ibm.com> Subject: [Qemu-devel] [PATCH v3 7/7] arm: Add an RX8900 RTC to the ASpeed board List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org, Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Andrew Jeffery , Joel Stanley , Alastair D'Silva , Chris Smart From: Alastair D'Silva Connect an RX8900 RTC to i2c12 of the AST2500 SOC at address 0x32 Signed-off-by: Alastair D'Silva Signed-off-by: Chris Smart --- hw/arm/aspeed.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index c7206fd..7445242 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -26,6 +26,20 @@ static struct arm_boot_info aspeed_board_binfo = { .nb_cpus = 1, }; +typedef struct IRQConfig { + const char *name; + int irq; + int nvic_irq; +} IRQConfig; + +typedef struct AspeedI2CDevice { + const char *type; + uint8_t address; + int bus; + /* device_inputs not yet implemented */ + const IRQConfig *device_outputs; +} AspeedI2CDevice; + typedef struct AspeedBoardState { AspeedSoCState soc; MemoryRegion ram; @@ -34,6 +48,7 @@ typedef struct AspeedBoardState { typedef struct AspeedBoardConfig { const char *soc_name; uint32_t hw_strap1; + const AspeedI2CDevice *i2c_devices; } AspeedBoardConfig; enum { @@ -64,9 +79,25 @@ enum { SCU_HW_STRAP_MAC0_RGMII) & \ ~SCU_HW_STRAP_2ND_BOOT_WDT) +static const IRQConfig rx8900_out[] = { + {"rx8900-interrupt-out", 0, 22}, + {NULL} +}; + +static const AspeedI2CDevice ast2500_i2c_devices[] = { + {"rx8900", 0x32, 11, rx8900_out}, + {NULL} +}; + static const AspeedBoardConfig aspeed_boards[] = { - [PALMETTO_BMC] = { "ast2400-a0", PALMETTO_BMC_HW_STRAP1 }, - [AST2500_EVB] = { "ast2500-a1", AST2500_EVB_HW_STRAP1 }, + [PALMETTO_BMC] = { + "ast2400-a0", PALMETTO_BMC_HW_STRAP1, + NULL + }, + [AST2500_EVB] = { + "ast2500-a1", AST2500_EVB_HW_STRAP1, + ast2500_i2c_devices + }, }; static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, @@ -95,6 +126,27 @@ static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, } } +static void aspeed_i2c_init(AspeedBoardState *bmc, + const AspeedBoardConfig *cfg) +{ + AspeedSoCState *soc = &bmc->soc; + const AspeedI2CDevice *dev; + const IRQConfig *out; + + for (dev = cfg->i2c_devices; dev != NULL && dev->type != NULL; dev++) { + I2CBus *i2c_bus = aspeed_i2c_get_bus((DeviceState *)&soc->i2c, + dev->bus); + DeviceState *i2c_slave = i2c_create_slave(i2c_bus, dev->type, + dev->address); + + for (out = dev->device_outputs; out != NULL && out->name != NULL; + out++) { + qdev_connect_gpio_out_named(i2c_slave, out->name, out->irq, + qdev_get_gpio_in(DEVICE(&soc->vic), out->nvic_irq)); + } + } +} + static void aspeed_board_init(MachineState *machine, const AspeedBoardConfig *cfg) { @@ -137,6 +189,8 @@ static void aspeed_board_init(MachineState *machine, aspeed_board_binfo.ram_size = ram_size; aspeed_board_binfo.loader_start = sc->info->sdram_base; + aspeed_i2c_init(bmc, cfg); + arm_load_kernel(ARM_CPU(first_cpu), &aspeed_board_binfo); } -- 2.9.3