From patchwork Tue Jan 16 01:36:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 861167 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="BXq33byG"; 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 3zLCY46R0Nz9s1h for ; Tue, 16 Jan 2018 12:38:31 +1100 (AEDT) Received: from localhost ([::1]:51993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebGCq-000614-3V for incoming@patchwork.ozlabs.org; Mon, 15 Jan 2018 20:38:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebGC1-0005yE-0B for qemu-devel@nongnu.org; Mon, 15 Jan 2018 20:37:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebGC0-0005ED-4T for qemu-devel@nongnu.org; Mon, 15 Jan 2018 20:37:37 -0500 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]:43241) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebGBx-0005C4-VF; Mon, 15 Jan 2018 20:37:34 -0500 Received: by mail-pl0-x241.google.com with SMTP id f4so3543583plr.10; Mon, 15 Jan 2018 17:37:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GfpjiwYve0+eA8Vi68DD/zLMe0628N08dTKTMLPq/70=; b=BXq33byGSpWIpiub7bCFFyslKJFs/7FK0kqpITQH6V+QaHzb1Qz9mgbdxsgGkGxQcn ChQ5kiu5ek1WMyG/SuzuZpv8PvVpseA/yPisZpFbz79wH6KcB/5M7E2euQ+UrpbzQr0Z 01Jm8HnP4jK8L5UZd1R9bekAmBTYAMWjPBirPl54znkIgBv+y0ruXHbrOlY3YKoEvGRQ hmqAll8yLCKrNDL6QserkQ9OR66io3fq4/qwTXnRS2Quz7pLRLSPE54FO2Zw/enKm5Cv GXYG7X395IV0QRP/GzVHhiovSZ2L06VwtrlkcMbQhTdbgRMp3l0/dqhV3F1ZaJ44qvrO DR2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GfpjiwYve0+eA8Vi68DD/zLMe0628N08dTKTMLPq/70=; b=npt8Uy7XNK6WmijABq/9VKktO61Pr01wzaxhcWtRFZZ1NGQLGq7uSIwZ6gZ5vePuk4 GV822Yk33NmtAOZt5Pczgu/51PsimSAxVes7MPZLFD/kfc2+nGlXH7XLY09ctBu1NqnK EhPMG6wLSogOPlsCBBozwfZW5MKbHDPMh1CzXDs9Kd7xCYnMTmSjdwbSnckLrELC242W 3a8pG18VaPWe3lKP6PbsGlP2I57boTT3UKY4ras9QJ6kKIRP8Ebhg1nRcG6Fm4vtYxR9 v9HAsuT65cC1gPUFl8WTu+NaKICcTkDg5HSbzsGcbZQQ/gRA+NmxP6r1n2+hDF+Rw/oS abOg== X-Gm-Message-State: AKwxytdXAqnpvzim0KhfCpbsYIfsNjmBJfOlx3+CYHtq7MRF0iQnf9ps f3AaaT3iKQCV5nbWozOkN4aYo1In X-Google-Smtp-Source: ACJfBovAk9hYb0b5a7RPvpbKC9w3OqQWn6TAHWNtQOmeAE6iOI9z+aJPxv15SJrM8Cl/gbj1kQdZWA== X-Received: by 10.84.235.131 with SMTP id p3mr12829589plk.18.1516066652710; Mon, 15 Jan 2018 17:37:32 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id s65sm1023795pfk.7.2018.01.15.17.37.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Jan 2018 17:37:32 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 15 Jan 2018 17:36:57 -0800 Message-Id: <20180116013709.13830-3-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180116013709.13830-1-andrew.smirnov@gmail.com> References: <20180116013709.13830-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::241 Subject: [Qemu-devel] [PATCH v4 02/14] 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Andrey Smirnov , Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , qemu-devel@nongnu.org, yurovsky@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Convert i.MX6 to use TYPE_IMX_USDHC since that's what real HW comes with. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daudé Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Signed-off-by: Andrey Smirnov Reviewed-by: Philippe Mathieu-Daudé --- hw/arm/fsl-imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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);