From patchwork Thu Mar 1 11:23:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 130144 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2680894edc; Thu, 1 Mar 2018 03:32:35 -0800 (PST) X-Google-Smtp-Source: AG47ELu3fv25R2dbHDU4xgEyMvRzxz4LGEHWl8LVPzqG7ZPx5luXEJeikQ33Mi4hpagAbuORyphs X-Received: by 10.13.241.67 with SMTP id a64mr789451ywf.514.1519903955819; Thu, 01 Mar 2018 03:32:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519903955; cv=none; d=google.com; s=arc-20160816; b=fEdR7iW4ObX4fNP98o4q50XuCkOg5VTg/zP2+5LWO1yLJvaP/JVm7FXHCI7CJ1+0h+ J5b4/eUuavbLmPeejFBAs5+6Sw7//8buimTyz5L/sPHHN92mQ4xCMVI7rBBmMVTZV0uV w1f8ZTntlwVrwGnBeLtLohQYGqWFkiESrpluHwar5HS7h6azBs8LlZGwBh1Snp8zrBUN IQCffqmiGdpkbD2efJZff3Xzj58LOE/7X618mYHIWTEhYbODYYQrbrYx3VvIdcpfIk+W EyQ5Kmiiyb+7B7PpKlUGSAQrOYj9eWY0EymVrG12EVcJNda+vbqMVaRQ5V1n3o+Xl330 Ypkg== 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:arc-authentication-results; bh=FmfA4aBIZyOCZ9VN+Ag3Nw+OuDcekk5kS7LRwh1WBxs=; b=HgRggmOfL9BWb4viKnC5epg6fFafn3F2/GcG7sEp5f9YPKgoG9MvFqh5/jACcm2EyM VPUZq6V0WCk4rWNHoswKYeoSi5pJBUv21qCJId2qqkQQvFVjTKjpHZQ2voOoUTbXWF5G bNDz6XgIqQ6VuZYCQ3C5Xn4dT1o9b1aRdYgUmipw3rPmLQvGXUChLH+j+3skdrSyCm6l MwIFyOvTbylzrqLNz3jsztdegiKZvqIL6tsdS+7fDQf9iRSn9PdVqhfaCzK10kcJP4U8 bIIRemhLXSZLw2nQ/v74ZoWNM9LCDLMMtmnQt/mllj8JAr2TTOMRw4qlMX7gTGhabNfA QnLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r62si616430ywf.488.2018.03.01.03.32.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Mar 2018 03:32:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:55746 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erMRv-0001lJ-8O for patch@linaro.org; Thu, 01 Mar 2018 06:32:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erMJs-0003gR-Sg for qemu-devel@nongnu.org; Thu, 01 Mar 2018 06:24:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erMJr-00085e-Sd for qemu-devel@nongnu.org; Thu, 01 Mar 2018 06:24:16 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46700) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erMJr-00084T-LF for qemu-devel@nongnu.org; Thu, 01 Mar 2018 06:24:15 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1erMJm-0000Yw-00 for qemu-devel@nongnu.org; Thu, 01 Mar 2018 11:24:10 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 11:23:29 +0000 Message-Id: <20180301112403.12487-9-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180301112403.12487-1-peter.maydell@linaro.org> References: <20180301112403.12487-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: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 08/42] arm/vexpress: Add proper display connector emulation 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: Linus Walleij This adds the SiI9022 (and implicitly EDID I2C) device to the ARM Versatile Express machine, and selects the two I2C devices necessary in the arm-softmmu.mak configuration so everything will build smoothly. I am implementing proper handling of the graphics in the Linux kernel and adding proper emulation of SiI9022 and EDID makes the driver probe as nicely as before, retrieving the resolutions supported by the "QEMU monitor" and overall just working nice. Cc: Peter Maydell Signed-off-by: Linus Walleij Message-id: 20180227104903.21353-6-linus.walleij@linaro.org Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell --- hw/arm/vexpress.c | 6 +++++- default-configs/arm-softmmu.mak | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) -- 2.16.2 diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index dc5928ae1a..9fad79177a 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -29,6 +29,7 @@ #include "hw/arm/arm.h" #include "hw/arm/primecell.h" #include "hw/devices.h" +#include "hw/i2c/i2c.h" #include "net/net.h" #include "sysemu/sysemu.h" #include "hw/boards.h" @@ -537,6 +538,7 @@ static void vexpress_common_init(MachineState *machine) uint32_t sys_id; DriveInfo *dinfo; pflash_t *pflash0; + I2CBus *i2c; ram_addr_t vram_size, sram_size; MemoryRegion *sysmem = get_system_memory(); MemoryRegion *vram = g_new(MemoryRegion, 1); @@ -628,7 +630,9 @@ static void vexpress_common_init(MachineState *machine) sysbus_create_simple("sp804", map[VE_TIMER01], pic[2]); sysbus_create_simple("sp804", map[VE_TIMER23], pic[3]); - /* VE_SERIALDVI: not modelled */ + dev = sysbus_create_simple("versatile_i2c", map[VE_SERIALDVI], NULL); + i2c = (I2CBus *)qdev_get_child_bus(dev, "i2c"); + i2c_create_slave(i2c, "sii9022", 0x39); sysbus_create_simple("pl031", map[VE_RTC], pic[4]); /* RTC */ diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ca34cf4462..54f855d072 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -21,6 +21,8 @@ CONFIG_STELLARIS_INPUT=y CONFIG_STELLARIS_ENET=y CONFIG_SSD0303=y CONFIG_SSD0323=y +CONFIG_DDC=y +CONFIG_SII9022=y CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI=y