From patchwork Mon Jan 7 16:31:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 154929 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3682236ljp; Mon, 7 Jan 2019 08:47:30 -0800 (PST) X-Google-Smtp-Source: ALg8bN6EpaePFaR8N2snsX35PoOCmxCW1QZRGyrAfePPwjNtdljF3WHtr7Sy9wr9Rcc3zzAjIW7P X-Received: by 2002:adf:efd1:: with SMTP id i17mr51073028wrp.200.1546879649953; Mon, 07 Jan 2019 08:47:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546879649; cv=none; d=google.com; s=arc-20160816; b=BwqTPmTxqjXfPiM3IenKSJsaVTmdMkDNk4jtp0KjKdJ4U3pU5Y/XyDFs+uMIX4tz9P Ojn+irYKZB9a+0v/ILJLkrDnBan92FMknYbG1b19SaQXV4MISTiU03yI58bDtVNY9DUQ fxkd76BhitbwgHvs6c80iFAUpE/YW/CemSAC3ai/iRapaHddAB4nMxBZWP1Ak6ORNA47 Ton5egVSLZtr3ws/wX2zwyaNtvB9OKyf0Ie8513b9WAyhOIEgfrp7vvATsRL/7BN5+l1 NuWWoEvKcMtmhborvEOwwZY10/r/hM5jcbkhfQfBZw3+Lea6gEbV3s4uF8lOAX5IlOQl tKSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=VeXnL2tM16F/u9dffjDOKKDeWnJOZ3mNmXRfne7h87U=; b=qN3UKGgJ/r+NBS2dQrOXbhtlV/0pZlOK/udlIonCUg45sLHZVZuYJp/zm/L1zVOHFG WV+2s1SLzcD0dM+uxvD4l/s/xZ/NhbpceFa3afCnarf9M8XQzWnySQh/kXAkKcGcpM3x nuFQIw5IuSoYiLlfUPs30YCtdBLMOTugybzRnzUEbqU3XWE53fIDt5xJ0srauh69/qM8 URLKcBjDmnY311u5SNQLnVZEq5KWK2z5g/vF5PTL8VBVgTRIKWzTv9gSK34Z7Ta8cj35 NfsramVSvBxIy3epvLzYpswXx+zYFCK2HKE64ivTZMdg+z+KevbUusDLaM63WXTvOosK uXHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QWrtw09+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m143si5378985wmb.23.2019.01.07.08.47.29 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:47:29 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QWrtw09+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:46112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggY3k-0000iV-Vx for patch@linaro.org; Mon, 07 Jan 2019 11:47:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46647) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXp1-0005PK-Sf for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggXou-0002cS-FL for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:10 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:38976) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggXoq-0002Lf-Oq for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:32:06 -0500 Received: by mail-wr1-x430.google.com with SMTP id t27so1066354wra.6 for ; Mon, 07 Jan 2019 08:31:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VeXnL2tM16F/u9dffjDOKKDeWnJOZ3mNmXRfne7h87U=; b=QWrtw09+6uk1/LXmGovZEBvgnEtUdwvCtJ944kmAMYfx1wd/cjrGRXdegBLsO/rQlb 5oLnnPUnp5m97oQFMGxJjSX3I5A739+JztDUlu650vpi+hiS6DlQDtqMxfHJyu4ty7FO hLMl1IGJE1OCAAtXGAvuiCXWLHvlfJzOhd4CE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VeXnL2tM16F/u9dffjDOKKDeWnJOZ3mNmXRfne7h87U=; b=gmD8powTT3dzCuxsh36SClAQE2xTbH4QAGF27nBKzjpunaH+gfqkpfqNjATZlO4okQ LXIgfNFWI+9OGb+hmmGyJV1UkrOhDkhS6t5flhMojWF+WO9cfBObMrQv1R3ohCEBdWYv AXYBHTb5H2L/Dlpg9HynWKC5FMZsS547bByGSnA4dhpsPJ0E9P4WN7k79wV1v7QjsqDb kWu9cfh6M/w1Oehfts0TyhraJWFqU+Z3hgG1T51Lpzn6fPqQrpDDW67FHsPFPiM3cbo9 pAwKu/XOnuhiJ14fatdKRnt2jGtqokANpwCM585HulRupEnXvaLEJSrNyWFMTusDJ46u YCzg== X-Gm-Message-State: AJcUukdsjcjz/R+bOn8jjhIc/sSxVyt5H8Mz4obl1Wocd8+8l+BQ4UVb Dc84DfwOhWlCC9eYJt8viQGdiJfAM2gMfA== X-Received: by 2002:adf:c452:: with SMTP id a18mr53330748wrg.145.1546878715849; Mon, 07 Jan 2019 08:31:55 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j14sm46039759wrv.96.2019.01.07.08.31.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:31:55 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:31:09 +0000 Message-Id: <20190107163117.16269-30-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190107163117.16269-1-peter.maydell@linaro.org> References: <20190107163117.16269-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 Subject: [Qemu-devel] [PULL 29/37] arm: Instantiate NRF51 general purpose I/O X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Steffen Görtz Instantiates GPIO peripheral model Signed-off-by: Steffen Görtz Reviewed-by: Stefan Hajnoczi Reviewed-by: Peter Maydell Signed-off-by: Stefan Hajnoczi Message-id: 20190103091119.9367-7-stefanha@redhat.com Signed-off-by: Peter Maydell --- include/hw/arm/nrf51_soc.h | 2 ++ hw/arm/nrf51_soc.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) -- 2.19.2 diff --git a/include/hw/arm/nrf51_soc.h b/include/hw/arm/nrf51_soc.h index 9e3ba916bd0..84e0278881b 100644 --- a/include/hw/arm/nrf51_soc.h +++ b/include/hw/arm/nrf51_soc.h @@ -14,6 +14,7 @@ #include "hw/arm/armv7m.h" #include "hw/char/nrf51_uart.h" #include "hw/misc/nrf51_rng.h" +#include "hw/gpio/nrf51_gpio.h" #define TYPE_NRF51_SOC "nrf51-soc" #define NRF51_SOC(obj) \ @@ -28,6 +29,7 @@ typedef struct NRF51State { NRF51UARTState uart; NRF51RNGState rng; + NRF51GPIOState gpio; MemoryRegion iomem; MemoryRegion sram; diff --git a/hw/arm/nrf51_soc.c b/hw/arm/nrf51_soc.c index d2a19b8eadd..db817fe5064 100644 --- a/hw/arm/nrf51_soc.c +++ b/hw/arm/nrf51_soc.c @@ -99,6 +99,19 @@ static void nrf51_soc_realize(DeviceState *dev_soc, Error **errp) qdev_get_gpio_in(DEVICE(&s->cpu), BASE_TO_IRQ(NRF51_RNG_BASE))); + /* GPIO */ + object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + + mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gpio), 0); + memory_region_add_subregion_overlap(&s->container, NRF51_GPIO_BASE, mr, 0); + + /* Pass all GPIOs to the SOC layer so they are available to the board */ + qdev_pass_gpios(DEVICE(&s->gpio), dev_soc, NULL); + create_unimplemented_device("nrf51_soc.io", NRF51_IOMEM_BASE, NRF51_IOMEM_SIZE); create_unimplemented_device("nrf51_soc.ficr", NRF51_FICR_BASE, @@ -126,6 +139,9 @@ static void nrf51_soc_init(Object *obj) sysbus_init_child_obj(obj, "rng", &s->rng, sizeof(s->rng), TYPE_NRF51_RNG); + + sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio), + TYPE_NRF51_GPIO); } static Property nrf51_soc_properties[] = {