From patchwork Mon Jan 15 16:56:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 762762 Delivered-To: patch@linaro.org Received: by 2002:a5d:5903:0:b0:337:62d3:c6d5 with SMTP id v3csp1240085wrd; Mon, 15 Jan 2024 08:56:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHSuIAMvGR0U6HclDy/OQBZo3FdxWQ/VFAnxwilihM2pZ5bKvFdlLVyk3o2KL8hgDT7qA4z X-Received: by 2002:a05:6808:1705:b0:3bd:58c5:8ca2 with SMTP id bc5-20020a056808170500b003bd58c58ca2mr6542781oib.41.1705337810808; Mon, 15 Jan 2024 08:56:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705337810; cv=none; d=google.com; s=arc-20160816; b=nnB1DQUxLU/tcrDIzjp7y4x7ABsVmfn5SHO0wktjF6R02/EI4eNx14/LXvUXgb30NW yvWGkQzDjb2nUs/FJa+8DucUqc8ENDIOi+9NknxrDadG9ZIQdTTLG+0aGEBUq6FtpiwB 23tLIS0Z9oPTlqau89xkITcGA/yGJv7OEh4Yjy3bUd2Z61wkxSHSg4mF+aaepKy2cmNr 3Lrqf6BC0T8IWvb2wromPiQYvq0DqxOxn8SJ2njxXYUw3rn2FY2vvJQl69uf6vUNr/CB 9MLjlsTSemurUHLrfDyIxwnG7vxg1h8qCPPWpsbK0tn22mph6wiiLMWFyRrqHlxqwfv5 BvIw== 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:cc:to :from:dkim-signature; bh=tp5kXRZIwxQA5ZiZbQiX86tGc9m7nGG30xQAkxSTGS8=; fh=lfuYXVtC1uxUzJXcx1BLjy5YFppJmZ2782Wl5dyoqHg=; b=PTEjJ9A8NZxzQPXfoQHACDObSjoMBEHtKfcEIKu0c1UoIP6NarYhY7BKhXLlXEoVU5 ir1rmrTS8lo8Ll6i+G7PlhbHY0FDGrl847fw6X6H+yS3nXrjYkKbPxlb3VFvhOR0xam+ hA/qn1kauejmAdNMQy/DGfOhtEI7deXax5t4sYAW966gvLJTwep58aCaGA7gIppv7UdT c0OvwTIGdoyJSZiumQrEpfXuf8RcUyG/esujIwfdcTibrP2h+FFwx5d8frMqU2mTJwx+ QZcAfQqU7pyTAFr+dvo8Z2I4NG/DSlGvxdPBzpizoiETGEHLGRq8elykVeyJUA2aFCsP +5vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZOmbvnue; 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 a22-20020a05620a02f600b0078326c80239si7974339qko.514.2024.01.15.08.56.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2024 08:56:50 -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=pass header.i=@linaro.org header.s=google header.b=ZOmbvnue; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPQGF-0006Gf-2w; Mon, 15 Jan 2024 11:56:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPQGA-0006FM-U3 for qemu-devel@nongnu.org; Mon, 15 Jan 2024 11:56:27 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rPQG9-0001Wt-BL for qemu-devel@nongnu.org; Mon, 15 Jan 2024 11:56:26 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40e80046246so3684525e9.1 for ; Mon, 15 Jan 2024 08:56:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705337783; x=1705942583; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tp5kXRZIwxQA5ZiZbQiX86tGc9m7nGG30xQAkxSTGS8=; b=ZOmbvnuemk7mmLA6u/WBpzJC8XVuTV/H64E/GnLppA8Pqtfd8xSlNsRuGMNk7zgAMv HOrBgibTOFB/dL7Gd4zwMGlupQbA9lUrsYiBICtkBuUQLIZ4nMOYyYc1hm1oECZNmRVV GAwFqK3pRPOYcV66glOvVDUIrTMY1+Q9Zy8KZLvMN9teNFdhKxmvZCD9j4rc0Im6HTiP 0mabU9wxaedwEeIK0JH2crJkRv6Cq4IqGwUAsNEsOJK8Qu8qJhymo8TQJ6wRA7azJWpV MJbn8pcFBR+E15ErKSvehan1ji1k9qk5+GwoZaJXAQjB1JyF2tSAgVdjNI77k4OcUJpq dcSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705337783; x=1705942583; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tp5kXRZIwxQA5ZiZbQiX86tGc9m7nGG30xQAkxSTGS8=; b=aRnr9q6PVJ51iAr8rqHNc59m2hk128Ev648vZPnI09KBX86rcw1ypUEcGHED5dyP2W TMbS8D4ittokJepQMF0VemOL6tCgrr/mv344YiF7w+0oZJu/qpCEzxdPbLfu/8z9XS3M b3NzNCE3M+vupQwy5Jr8BnJXdu7rnW4hu7uYJEnLCal6nFNltEX5O24pSXPRM8D5KZxS ixJ822XYbIrQNsnUrXmh3eMTd66vRdC9kHvvDLq3K3qeExjTd+zys+r60kzODTCEv/Yn MsglHcIwEkZedbFT8Jr1cwtdeCe4pPJMya3a0Ag3M4R4od4rzsbNiSXAIy5HYyEyxFsA pMoQ== X-Gm-Message-State: AOJu0YxNd6d2qDVOjR3I+lzDvC1wPdK7W1d5zEAku/gw3bgY7jMSOpyj N2lQcp8Afi8/qlEwBW4XtykVMO+mkQrbyQI/7RNOlr40qec= X-Received: by 2002:a05:600c:4b10:b0:40e:7114:e42d with SMTP id i16-20020a05600c4b1000b0040e7114e42dmr1490467wmp.17.1705337783189; Mon, 15 Jan 2024 08:56:23 -0800 (PST) Received: from m1x-phil.lan ([176.187.209.30]) by smtp.gmail.com with ESMTPSA id v2-20020a5d5902000000b00337a6feab88sm4035876wrd.100.2024.01.15.08.56.22 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 Jan 2024 08:56:22 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Beniamino Galvani , qemu-arm@nongnu.org, Strahinja Jankovic , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Guenter Roeck Subject: [PATCH 1/2] hw/arm/allwinner-a10: Unconditionally map the USB Host controllers Date: Mon, 15 Jan 2024 17:56:14 +0100 Message-ID: <20240115165615.78323-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240115165615.78323-1-philmd@linaro.org> References: <20240115165615.78323-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org The USB Controllers are part of the chipset, thus are always present and mapped in memory. Reported-by: Guenter Roeck Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Guenter Roeck Tested-by: Guenter Roeck --- hw/arm/allwinner-a10.c | 49 +++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 29 deletions(-) diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c index b0ea3f7f66..0135632996 100644 --- a/hw/arm/allwinner-a10.c +++ b/hw/arm/allwinner-a10.c @@ -79,15 +79,10 @@ static void aw_a10_init(Object *obj) object_initialize_child(obj, "i2c0", &s->i2c0, TYPE_AW_I2C); - if (machine_usb(current_machine)) { - int i; - - for (i = 0; i < AW_A10_NUM_USB; i++) { - object_initialize_child(obj, "ehci[*]", &s->ehci[i], - TYPE_PLATFORM_EHCI); - object_initialize_child(obj, "ohci[*]", &s->ohci[i], - TYPE_SYSBUS_OHCI); - } + for (size_t i = 0; i < AW_A10_NUM_USB; i++) { + object_initialize_child(obj, "ehci[*]", &s->ehci[i], + TYPE_PLATFORM_EHCI); + object_initialize_child(obj, "ohci[*]", &s->ohci[i], TYPE_SYSBUS_OHCI); } object_initialize_child(obj, "mmc0", &s->mmc0, TYPE_AW_SDHOST_SUN4I); @@ -165,28 +160,24 @@ static void aw_a10_realize(DeviceState *dev, Error **errp) qdev_get_gpio_in(dev, 1), 115200, serial_hd(0), DEVICE_NATIVE_ENDIAN); - if (machine_usb(current_machine)) { - int i; + for (size_t i = 0; i < AW_A10_NUM_USB; i++) { + g_autofree char *bus = g_strdup_printf("usb-bus.%zu", i); - for (i = 0; i < AW_A10_NUM_USB; i++) { - g_autofree char *bus = g_strdup_printf("usb-bus.%d", i); + object_property_set_bool(OBJECT(&s->ehci[i]), "companion-enable", + true, &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(&s->ehci[i]), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0, + AW_A10_EHCI_BASE + i * 0x8000); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0, + qdev_get_gpio_in(dev, 39 + i)); - object_property_set_bool(OBJECT(&s->ehci[i]), "companion-enable", - true, &error_fatal); - sysbus_realize(SYS_BUS_DEVICE(&s->ehci[i]), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0, - AW_A10_EHCI_BASE + i * 0x8000); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0, - qdev_get_gpio_in(dev, 39 + i)); - - object_property_set_str(OBJECT(&s->ohci[i]), "masterbus", bus, - &error_fatal); - sysbus_realize(SYS_BUS_DEVICE(&s->ohci[i]), &error_fatal); - sysbus_mmio_map(SYS_BUS_DEVICE(&s->ohci[i]), 0, - AW_A10_OHCI_BASE + i * 0x8000); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->ohci[i]), 0, - qdev_get_gpio_in(dev, 64 + i)); - } + object_property_set_str(OBJECT(&s->ohci[i]), "masterbus", bus, + &error_fatal); + sysbus_realize(SYS_BUS_DEVICE(&s->ohci[i]), &error_fatal); + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ohci[i]), 0, + AW_A10_OHCI_BASE + i * 0x8000); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ohci[i]), 0, + qdev_get_gpio_in(dev, 64 + i)); } /* SD/MMC */ From patchwork Mon Jan 15 16:56:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 762763 Delivered-To: patch@linaro.org Received: by 2002:a5d:5903:0:b0:337:62d3:c6d5 with SMTP id v3csp1240158wrd; Mon, 15 Jan 2024 08:57:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHZO+3VqdR08mIn5tTOPiN4aRureZNv0uQWMaEf+Sf8ooujdIvxcVxs7uap4emosE5aUVfJ X-Received: by 2002:a05:6870:5487:b0:206:9830:b427 with SMTP id f7-20020a056870548700b002069830b427mr6870021oan.35.1705337824307; Mon, 15 Jan 2024 08:57:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705337824; cv=none; d=google.com; s=arc-20160816; b=cCyIJxdryUHvLQOUvh4YRFN6VpS0SbZyVNoBaKCednlnbg90t1DfU2RPaqsl416FP8 Bmlw8wZnHdgAxgJ0XFCzegohppF/Jez4u5DCfArBS/4JbdLLKur2wynGnpB8zIXUpRz5 DtxS9pSj3Tdm6Oj1Xfo/MBgHOaog6iYXJWTrmCD28NbEnAhjaTWoUexVUFNzhc6bhjVz 2wr+OyK1WIYGdYgf/EJf+tnrbD4NRYpdSastrYhIzfRUz3DOIJA0kZ7mm4pGTimG//JT soDO2Tog+Khuq/cBIwGWfH7UPc+qAU3THWq0n25Zx5DL7svjj4z9DOtGBTQhabF/5kUa 6E3A== 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:cc:to :from:dkim-signature; bh=s4+bIenrzPyATM30XW9R1b9vb5/8yjsfQP7BFBOigBY=; fh=YgJ9cQ4aL7HaYd+8R0MIBXgkJmL8Yh6LbzLNatL7VKg=; b=Yln89lYuVTiYwHsPcMEV0hGw/Xd+fFq8iWnNGJ5o8EsQdiHJgzUKCHlLw1RgABnYFl S2u6PVFX4TgiBDkghpY2H9F0cQ1KYko/zd3Y55KaUQLKng6oAv6HbnBPQf5vNnI30ejQ 0MHGM71AGgxZ65uVo7qiEuzPyo0+VLdNw46PLgb7VEMXK+JiGEmnt9HlXJxB+86W4+C4 zN8Li4bMM1h86V/bnbu5edFhWsI9wUHcFrY4vg0CwSwHLYSb3MwyxCUsk0LSsTSNpvXY FCYINraksN698f3y+XSjdta/Ij8dSpHJE6V7qbcYYD2hOWK7kzK0yW0z3epLuHEOogrW sySw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eqUfngTt; 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 s9-20020a0ca609000000b0067f2ab77754si8114043qva.142.2024.01.15.08.57.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2024 08:57:04 -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=pass header.i=@linaro.org header.s=google header.b=eqUfngTt; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPQGJ-0006He-HL; Mon, 15 Jan 2024 11:56:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPQGG-0006Gu-DO for qemu-devel@nongnu.org; Mon, 15 Jan 2024 11:56:32 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rPQGE-0001XU-9A for qemu-devel@nongnu.org; Mon, 15 Jan 2024 11:56:31 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3373a30af67so8059608f8f.0 for ; Mon, 15 Jan 2024 08:56:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705337788; x=1705942588; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=s4+bIenrzPyATM30XW9R1b9vb5/8yjsfQP7BFBOigBY=; b=eqUfngTtTQrrPqXxCH4HLFzlPwoB8tbKrJDJCBbBlmvW/5G3Ps8Tbc3AWT2i5IR7JZ kYsKQoXCXzhTXfmRGiVdwxS7mlnMjCZgCjGfj5Z3w9wsIk3Ghq7E9DGCUkN1aS86JET2 iZscy+PsiAM8tiaWWZIwbdl/XpVYqBEBojmT5wzpuUh8Q8v6uuq8CsOZQUcnnsGAgr9X ysCZwiBdSh4OWnMyqgItMyPck/Zpo46i37DWCRiJJg+EIRduNjm3HheoA3J/QC0RMq9W 8CjTVaxphVAGhQeln24t7IT8BL5WkmpX1QZMnsdLAg5rmFPRLx5cSv78/NAPKDGRDWJx tGsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705337788; x=1705942588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=s4+bIenrzPyATM30XW9R1b9vb5/8yjsfQP7BFBOigBY=; b=CsSo89CHar4k0Dr9uDuZmJZDN5sqDCowJ+ssXKX3905+HmYIF+odLxvzldxxOtrVNG /qX7ntpziK1XJU2GRtN9ukB3kmb+5lu3yti0R6B610cetVVf9iDidfWnnR/00sRQBi35 JCR/b1H5mDQhbPvGq+P+FRls7iktVtnLKBGplN51W2Kc8wF0dJdNdqHOBnSI195B9ULh TXw8E5fXHepaJVT/+jhPFvIxQL165nzediZ8NGsGrDJ2m+HNDFXNCa/qM78/RTb58V33 8oBjFBgziMCgw0D8/NijeoTveCpaRpg36Oo/iojat8mHmw48jOp2RZzT7xlrxzRcH6CO uEUQ== X-Gm-Message-State: AOJu0YxOUjGfQErzbZd6J9jC3XDwbMSVkNbSrv04Wx2iYv1Vgg1J8ciF ufhgat4Nh1EP80apbhiZaCnX8hpmgi5JSqQxHIdEtQVXLfU= X-Received: by 2002:a5d:548e:0:b0:336:c52b:e282 with SMTP id h14-20020a5d548e000000b00336c52be282mr2353872wrv.203.1705337788418; Mon, 15 Jan 2024 08:56:28 -0800 (PST) Received: from m1x-phil.lan ([176.187.209.30]) by smtp.gmail.com with ESMTPSA id e19-20020a5d5953000000b0033609b71825sm12312192wri.35.2024.01.15.08.56.27 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 Jan 2024 08:56:28 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Beniamino Galvani , qemu-arm@nongnu.org, Strahinja Jankovic , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Subject: [PATCH 2/2] hw/arm/nseries: Unconditionally map the TUSB6010 USB Host controller Date: Mon, 15 Jan 2024 17:56:15 +0100 Message-ID: <20240115165615.78323-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240115165615.78323-1-philmd@linaro.org> References: <20240115165615.78323-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+patch=linaro.org@nongnu.org The TUSB6010 USB controller is solderer on the N800 and N810 tablets, thus is always present. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/nseries.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 35aff46b4b..35deb74f65 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -1353,9 +1353,7 @@ static void n8x0_init(MachineState *machine, n8x0_spi_setup(s); n8x0_dss_setup(s); n8x0_cbus_setup(s); - if (machine_usb(machine)) { - n8x0_usb_setup(s); - } + n8x0_usb_setup(s); if (machine->kernel_filename) { /* Or at the linux loader. */