From patchwork Mon Jan 8 15:42:51 2018 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: 856890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZbBqZBby"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zFfzZ2lbXz9ryr for ; Tue, 9 Jan 2018 02:57:14 +1100 (AEDT) Received: from localhost ([::1]:41362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZnU-0004KK-Dd for incoming@patchwork.ozlabs.org; Mon, 08 Jan 2018 10:57:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYZbh-0002VM-2L for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:45:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYZbg-00082Q-7b for qemu-devel@nongnu.org; Mon, 08 Jan 2018 10:45:01 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:36215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYZbg-00082C-30; Mon, 08 Jan 2018 10:45:00 -0500 Received: by mail-qk0-x242.google.com with SMTP id d21so3644267qkj.3; Mon, 08 Jan 2018 07:44:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OoS2yqXSmLhI1DroCQbSJIrXVyuwogG1ulUTy17/uAs=; b=ZbBqZBbyG0/Wlag6xJu36XViNuoFRZBSku0KZKnu7IvcBRfmk9qEbbgwHctQCodEkv LDzpPTKap0RhkjpiTEPrbrR8zG2ZXlAlNjXZIGQ27G3HLRPTeDqtdSbIUEQlP8b4MwSs 9CooDluDxp9gY8nKlbhq7mMcDwJasd9JO2FlnHPvVoenfeEeBdnJd/qlXHTdq3MWA/Gl 4vmBKEeRMYNB7GSD1Kd0ZalQe1qMXXh24oMSN4KUQYQ/9+oGvo/up70On4ksiXOpNATY mALCLtY3KEjC7CJck8Fb5skWMZHz1XN30EQnRPsoy5tzJ07crdAEUsN9GeClk8cLb+AW tmaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=OoS2yqXSmLhI1DroCQbSJIrXVyuwogG1ulUTy17/uAs=; b=UTLErE6QRpbtfQYh7NzytsPLgPYaL6cYlQDBWTj2NMZPCTYhAbrtIkDmcI105ooOgi EMFqVrK3V0GdHQJuOcSbXcvKF/Nm7IIyNZiTkXjFJGTF4l/5fqDs7hE2xNHqccH1ni8F knQ9joKqxt9lWh0olTx+allLGJ+1eyZWxmpn1f5SpzFNjwnM2WDKFA8YelZ6caWpsq1w wyhNTdE6tDKfbDdVh+WCKAY+iZQQcGVxiHOPD4YEENeYs6hj6n9FxmQk5kxDl71K9cPb ST0tuWPxY/Rtul6Jad2pLfT/czIDTZM5ynGoXOFatBk3Eg/kc4L42WF0ArHcJ/tnj62/ 6gBA== X-Gm-Message-State: AKwxytfZKageQJwaIRY3zpr0SvPAhnGDqSO7BezyvqY+PiqwZ+EXn7CO DJU3KYh1EYc1Vaq3UvBd/OU= X-Google-Smtp-Source: ACJfBotwnxuUQlsclOc4e0oYA2xYMzGA5N4FnaJIE7ZzJxcCFF13Q4OV6V/RkCtBa1tFHkBOz2ulhg== X-Received: by 10.55.17.143 with SMTP id 15mr15966858qkr.148.1515426299540; Mon, 08 Jan 2018 07:44:59 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id u36sm7832382qtc.58.2018.01.08.07.44.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jan 2018 07:44:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Andrey Smirnov , Igor Mitsyanko Date: Mon, 8 Jan 2018 12:42:51 -0300 Message-Id: <20180108154303.6522-20-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180108154303.6522-1-f4bug@amsat.org> References: <20180108154303.6522-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v5 19/31] hw/arm/bcm2835_peripherals: use the "brcm, bcm2835-sdhci" device 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: , Cc: "Edgar E . Iglesias" , Prasad J Pandit , =?utf-8?q?Gr=C3=A9gory_Estrade?= , qemu-devel@nongnu.org, Peter Crosthwaite , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Krzysztof Kozlowski , Jean-Christophe Dubois , Sai Pavan Boddu , qemu-arm@nongnu.org, Clement Deschamps , Andrew Baumann , Eduardo Habkost Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/bcm2835_peripherals.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 12e0dd11af..6a9fd79bcf 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -18,9 +18,6 @@ /* Peripheral base address on the VC (GPU) system bus */ #define BCM2835_VC_PERI_BASE 0x7e000000 -/* Capabilities for SD controller: no DMA, high-speed, default clocks etc. */ -#define BCM2835_SDHC_CAPAREG 0x52034b4 - static void bcm2835_peripherals_init(Object *obj) { BCM2835PeripheralState *s = BCM2835_PERIPHERALS(obj); @@ -91,7 +88,7 @@ static void bcm2835_peripherals_init(Object *obj) qdev_set_parent_bus(DEVICE(&s->rng), sysbus_get_default()); /* Extended Mass Media Controller */ - object_initialize(&s->sdhci, sizeof(s->sdhci), TYPE_SYSBUS_SDHCI); + object_initialize(&s->sdhci, sizeof(s->sdhci), "brcm,bcm2835-sdhci"); object_property_add_child(obj, "sdhci", OBJECT(&s->sdhci), NULL); qdev_set_parent_bus(DEVICE(&s->sdhci), sysbus_get_default()); @@ -255,20 +252,6 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->rng), 0)); /* Extended Mass Media Controller */ - object_property_set_int(OBJECT(&s->sdhci), BCM2835_SDHC_CAPAREG, "capareg", - &err); - if (err) { - error_propagate(errp, err); - return; - } - - object_property_set_bool(OBJECT(&s->sdhci), true, "pending-insert-quirk", - &err); - if (err) { - error_propagate(errp, err); - return; - } - object_property_set_bool(OBJECT(&s->sdhci), true, "realized", &err); if (err) { error_propagate(errp, err);