Message ID | 20180209110314.11766-15-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | df2a5cf4c83de02376fe90e925219c6b9d1821d7 |
Headers | show
Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp501495ljc; Fri, 9 Feb 2018 03:10:31 -0800 (PST) X-Google-Smtp-Source: AH8x226Mu+NKdOxj9Z7Pe3isUPudV2JxDlqlwDPlYihQrUctnDqyQBxQsAS1ymoZNdF3wAM+t0zv X-Received: by 10.37.12.130 with SMTP id 124mr1394668ybm.39.1518174631719; Fri, 09 Feb 2018 03:10:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518174631; cv=none; d=google.com; s=arc-20160816; b=EFz3NtTvdAruNCCdMikl7SJlAaHkw6+E+ErqJNCuT94odfGFk97fJS4uvOL6IBPR4M xdPYtVY/0JAjCkJqsD9+gzoGzVC1hXDukuAUbZIn6W5XjUNQ3hhcZnRKl0NlsKuyblb1 2YkfShV1gb9J7FUrRtAH/oPxWEtYzYr8wHD1ed99BqIFBGTXQcERimdpeFdNh6hoFKwO BBjGUGwnFWfB0+pERNxzO9/MSOon4RHqtrMqOeED8uqNlAedtqRwGlIRG46Z/reqFxym 0Brtzx0LBJ9N6bNriMM87cCpWuvPphsGYfccA1Chz4Tz4r/duwtoArh9ZxHl6zGaiUK5 /uhQ== 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=LQTiB97WsB0tizYKJaMM9ZIiuOTWbjQPkdBDRzeTbns=; b=zk8lSUWhjtgu2Oizrq9CseBcVdnwm+FgTkHkRVbFLx5JDKfQw8LOzAZlX/hDZ3oofx AAImRGNM83nknPs1jNkBLSdgwqNQq0EbiEn4kfWMaerLuOLNqz613Zm44usYMdwZ0Zfw OX7nO3Xc3a4ZV70xj6Bg5UiNV1OHfAAt4E09Y6DTkrP1rh5n10HxJBNEV5gshY7FYDMT Shh5OPCm4U8j5P0mDXpB45uIfSBcuVQ1UZ0dixrFcVB/7/KqJmJg2jewd4yab922w6RM cQES1Jncs5rDCvwe2YgzTqHXIqhHXLYPcG4m6YuDnlUZw79RbIRWTi1T0trrd59N4OTW 0Jkg== 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i15si356278ybl.405.2018.02.09.03.10.31 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 09 Feb 2018 03:10:31 -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]:34885 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1ek6Zb-0006kf-0O for patch@linaro.org; Fri, 09 Feb 2018 06:10:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ek6So-000106-Il for qemu-devel@nongnu.org; Fri, 09 Feb 2018 06:03:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ek6Sk-0001uX-FU for qemu-devel@nongnu.org; Fri, 09 Feb 2018 06:03:30 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:46254) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ek6Sk-0001td-9r for qemu-devel@nongnu.org; Fri, 09 Feb 2018 06:03:26 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1ek6Sj-0002ai-7m for qemu-devel@nongnu.org; Fri, 09 Feb 2018 11:03:25 +0000 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 9 Feb 2018 11:02:58 +0000 Message-Id: <20180209110314.11766-15-peter.maydell@linaro.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209110314.11766-1-peter.maydell@linaro.org> References: <20180209110314.11766-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 14/30] hw: i.MX: Convert i.MX6 to use TYPE_IMX_USDHC X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c index b0d4088290..e6559a8b12 100644 --- a/hw/arm/fsl-imx6.c +++ b/hw/arm/fsl-imx6.c @@ -93,7 +93,7 @@ static void fsl_imx6_init(Object *obj) } for (i = 0; i < FSL_IMX6_NUM_ESDHCS; i++) { - object_initialize(&s->esdhc[i], sizeof(s->esdhc[i]), TYPE_SYSBUS_SDHCI); + object_initialize(&s->esdhc[i], sizeof(s->esdhc[i]), TYPE_IMX_USDHC); qdev_set_parent_bus(DEVICE(&s->esdhc[i]), sysbus_get_default()); snprintf(name, NAME_SIZE, "sdhc%d", i + 1); object_property_add_child(obj, name, OBJECT(&s->esdhc[i]), NULL);