From patchwork Mon Oct 14 16:03:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 176323 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4764834ill; Mon, 14 Oct 2019 10:00:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxSlnrIynCDofTaaDYrFCgv+1fUeCYgILUqguAmHc/LLimPCkGC5A0Z+96ij2yCrpDYnP45 X-Received: by 2002:a05:620a:16b9:: with SMTP id s25mr31806724qkj.102.1571072404512; Mon, 14 Oct 2019 10:00:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571072404; cv=none; d=google.com; s=arc-20160816; b=Y5ESdEc6xZXUIhisJPoTkZi0V/xKOqQP0GhtB1EZqR/Gr4K8eBKet4pN+IBELf6pIi 4q+xdqslbGOvaGTb6rvOvksK8H3KfjX2G+q6Y6o1B7xbrF54t/tb20NIJJC4BfOE12XA vbPK7wiWh7NK4y2gTDBExG6gkyk7Xn2wp26g80/nyorycjbTa5nwsWhFCVyi8V2pdCG6 DWMyc6BH5QKSAbUUukoy77WHMk/x+daIb0WfkAyaAe4wNB5ds/si/0qlSj6JUia7slfj pn9yCbPRq10IiJeF+EBnos3sWdJ68k1ZAD0UZL1GY1wdJK2AsedB6Fay8H1AcHU0KzF0 PEfg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=5mJ0GPrObe+pueZ1GTRIi8XqZtfYiyJoa0nyAQxJfzA=; b=X7/yJ+V4hkQi44z3XvSXkUqeT3qEwCrXBGF2LZQc9vEBvru4gn2i0+s0n2Uqi+T7Br lqLnN4nLp82CLv9S2DYWcDQ4PT6WsZ1BcdZVJBqWIFR+FHG4tPeFhjM1B+b95KLbo/Tq HwGQjO+/SS5ueYCI9hOrTZRyTfLJKmtxTaPI7qyWqfoMUz01ySEYMcciZRflEGmhvH4d K3y4JqvdT0dlKoP4YgqRl5JFcgz4QbnLSjbODxvRXNu34BcZbJMHZShlcDgsxbVy4bZP Qy01ejz4AhU/5ZEOoGXLBOYoadrw1XZGOLpbTHNMfmRVdVM/4nhj9y95dS/4ri+vzS+F Wu6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=H+YQ1Sem; 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=pass (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 f16si18889836qke.254.2019.10.14.10.00.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Oct 2019 10:00:04 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=H+YQ1Sem; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK3hT-0008EQ-Aa for patch@linaro.org; Mon, 14 Oct 2019 13:00:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37500) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iK2qu-0005X5-9V for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iK2qt-0008GD-2o for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:44 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33463) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iK2qs-0008Fr-T3 for qemu-devel@nongnu.org; Mon, 14 Oct 2019 12:05:43 -0400 Received: by mail-wr1-x430.google.com with SMTP id b9so20414959wrs.0 for ; Mon, 14 Oct 2019 09:05:42 -0700 (PDT) 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=5mJ0GPrObe+pueZ1GTRIi8XqZtfYiyJoa0nyAQxJfzA=; b=H+YQ1SemLM71n5ni4tE20PJB/OT6wdi7eDL7Oh/5+27r68/X0BRoJU9L+4+gI3+Cre /GlJjIZUj5lXkJ4p/wFjTonjpnlcS6EhkYr+3xU2sBvEUEugx8dQCsPjMBeZsGB8TgGu QfubcusS873uxqEmJWtrlaUj3Ve+TeIkOtHSS/VXtPYP8vdPfkr+Ofb+oAe1GIXbmcpq 4xuGgzYqTWHV2FMQCDJ5T1b0BphV44xVT9jtCUhXhlkExzUDV0tDEMaaUc/7ZGTYcOqx Om7QKoDckN0JfGGSVtxxgeKQy3oUdkzvSsTG0ZITjLpgit0IosGDjIZ+AJttdny4UkzW eSsw== 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=5mJ0GPrObe+pueZ1GTRIi8XqZtfYiyJoa0nyAQxJfzA=; b=jKVfms911LpgGagCxOsjiVuGR3blQpcqgmgwbueznqsApB/AVrHAe2O4q7gNV08BbI wmEic/0d9Ak1EQwLZG78aqv4xma6zfXjSwSfDfBPNsMIYtpWEX7Lr5cNPZq2SUG+g8kY lnw5FgKgHv4UldVb0Sl4vfGbfeILrgUFPFF7m3Na5nTygu2Yf5api7lvbMRRwOHSRSdd CFo7Fh5Ucfa3wVw1ZxuihAsRoFIpu/srZjimx0K2aKmyDnYFl+m4wjrz5vWrmNMsyDQA pg891QV3R6gya31D9N0ZumPoEfzenERdc45tyhPKSlMqx9kmA9C+dQjI+jRFglj8ExRQ TenA== X-Gm-Message-State: APjAAAVAigOpSun1qvsigqXtT4POP/ngf7mHRZ5rlcDWtKzC16pJKFjI pOTs4Tt+3C+izFcWHtNbFDj7SwLxch3iLw== X-Received: by 2002:adf:fa92:: with SMTP id h18mr26479638wrr.220.1571069141489; Mon, 14 Oct 2019 09:05:41 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id 5sm18029779wrk.86.2019.10.14.09.05.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Oct 2019 09:05:40 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 62/68] aspeed/soc: Add ASPEED Video stub Date: Mon, 14 Oct 2019 17:03:58 +0100 Message-Id: <20191014160404.19553-63-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191014160404.19553-1-peter.maydell@linaro.org> References: <20191014160404.19553-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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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: Joel Stanley Signed-off-by: Joel Stanley Signed-off-by: Cédric Le Goater Message-id: 20190925143248.10000-24-clg@kaod.org Signed-off-by: Peter Maydell --- include/hw/arm/aspeed_soc.h | 1 + hw/arm/aspeed_ast2600.c | 5 +++++ hw/arm/aspeed_soc.c | 6 ++++++ 3 files changed, 12 insertions(+) -- 2.20.1 diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index 43478f61787..cccb684a19b 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -96,6 +96,7 @@ enum { ASPEED_SDMC, ASPEED_SCU, ASPEED_ADC, + ASPEED_VIDEO, ASPEED_SRAM, ASPEED_SDHCI, ASPEED_GPIO, diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c index af047463a35..931887ac681 100644 --- a/hw/arm/aspeed_ast2600.c +++ b/hw/arm/aspeed_ast2600.c @@ -44,6 +44,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { [ASPEED_SCU] = 0x1E6E2000, [ASPEED_XDMA] = 0x1E6E7000, [ASPEED_ADC] = 0x1E6E9000, + [ASPEED_VIDEO] = 0x1E700000, [ASPEED_SDHCI] = 0x1E740000, [ASPEED_GPIO] = 0x1E780000, [ASPEED_GPIO_1_8V] = 0x1E780800, @@ -236,6 +237,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM], ASPEED_SOC_IOMEM_SIZE); + /* Video engine stub */ + create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO], + 0x1000); + if (s->num_cpus > sc->num_cpus) { warn_report("%s: invalid number of CPUs %d, using default %d", sc->name, s->num_cpus, sc->num_cpus); diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c index 6defb143acd..f4fe243458f 100644 --- a/hw/arm/aspeed_soc.c +++ b/hw/arm/aspeed_soc.c @@ -34,6 +34,7 @@ static const hwaddr aspeed_soc_ast2400_memmap[] = { [ASPEED_SDMC] = 0x1E6E0000, [ASPEED_SCU] = 0x1E6E2000, [ASPEED_XDMA] = 0x1E6E7000, + [ASPEED_VIDEO] = 0x1E700000, [ASPEED_ADC] = 0x1E6E9000, [ASPEED_SRAM] = 0x1E720000, [ASPEED_SDHCI] = 0x1E740000, @@ -63,6 +64,7 @@ static const hwaddr aspeed_soc_ast2500_memmap[] = { [ASPEED_SCU] = 0x1E6E2000, [ASPEED_XDMA] = 0x1E6E7000, [ASPEED_ADC] = 0x1E6E9000, + [ASPEED_VIDEO] = 0x1E700000, [ASPEED_SRAM] = 0x1E720000, [ASPEED_SDHCI] = 0x1E740000, [ASPEED_GPIO] = 0x1E780000, @@ -231,6 +233,10 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM], ASPEED_SOC_IOMEM_SIZE); + /* Video engine stub */ + create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO], + 0x1000); + if (s->num_cpus > sc->num_cpus) { warn_report("%s: invalid number of CPUs %d, using default %d", sc->name, s->num_cpus, sc->num_cpus);