From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BAFB4C433EF for ; Thu, 24 Mar 2022 18:29:56 +0000 (UTC) Received: from localhost ([::1]:42378 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nXSDb-0007t0-2s for qemu-devel@archiver.kernel.org; Thu, 24 Mar 2022 14:29:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:58844) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nXS0P-0005rH-GG for qemu-devel@nongnu.org; Thu, 24 Mar 2022 14:16:20 -0400 Received: from [2607:f8b0:4864:20::62f] (port=34779 helo=mail-pl1-x62f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nXS0O-00034u-45 for qemu-devel@nongnu.org; Thu, 24 Mar 2022 14:16:17 -0400 Received: by mail-pl1-x62f.google.com with SMTP id i11so5622477plr.1 for ; Thu, 24 Mar 2022 11:16:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smartx-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dh5aVmO3EARkPNjd2r1sV1+I0MHmPFomuINkwCaVeDs=; b=LP9p4lD/45bdCY0knp7T1DdLwKKTIDOVTGIsjLBybHdN9cAn2V5JzSJlwBoF7AiILc yuUpoYDXQ89tmlVjvtSurxqldbMZL3pMvRHf7IkTg8FoyMRJ5U3PpvR1jU5ituJTj4WJ bF1+fdlvOvAIzgN+4Fhz5BuhUI46QY0sa1mpiQS9tv4fiRrlZbXYrZ3NgSBeWDCC+p/K 1wr9ajXpPN45fOwoCBXjoAMHSpQXs18b36mmtXuOY56Eo4V5r6NfY5lOuQUJCdRrkYFI x47juzemxNV5c+S2VRVj5LJRllRoFM/Z2XD3wlO8g9PME0rZmn837jHSZwjB6grmx5xM kplQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dh5aVmO3EARkPNjd2r1sV1+I0MHmPFomuINkwCaVeDs=; b=jJlcoVfchIWGUide5uYOnheBlq1iGHh95A6gkcf/5UNhQiau7arpzaQClk/qm7lMB7 UB1t+IXfuvxtALPneu0UNaJE3Xv8trjAjb5W1xwMlqZ00JmDuOddMUjzsKKzEZmCDmDp YeY/3L65d5weblr3LDf/G/P7xy6MFht5304gMczWpW33YbIUMCPj23wktzHWbMZkFpUt pN6zdlqQs6/sGTzplAuwEgQWgx3krYWCqypjFJm5xW/dgy0zgwQXIB2l1LHuzbI6htMI d9k8kTZveVZqS3mAzZ+eEaKDD1xUOmaNQryOYJl8pPc8qyclW00oDL8Or+ZurE7D13j4 771Q== X-Gm-Message-State: AOAM531rjl4yUID1k/pKEU+q4qKA2tDt69QrQ2+Wqv6YZnVLpxoak+nK P2tGEaO+WwGn9O0oC+E+oH/hi4oN1I3Q8A== X-Google-Smtp-Source: ABdhPJweC4Ku17/8nL3nw5f7ekkVVaL2g4dxczaZE4+tSEdjza+zU5tnDna1MAUM+pgzw4bMhLJpww== X-Received: by 2002:a17:902:e5cc:b0:154:57cf:e393 with SMTP id u12-20020a170902e5cc00b0015457cfe393mr7364086plf.24.1648145774085; Thu, 24 Mar 2022 11:16:14 -0700 (PDT) Received: from dev.lizongyuan.local ([103.177.44.101]) by smtp.gmail.com with ESMTPSA id u10-20020a17090a2b8a00b001c6594e5ddcsm3577725pjd.15.2022.03.24.11.16.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Mar 2022 11:16:13 -0700 (PDT) From: Zongyuan Li To: qemu-devel@nongnu.org Subject: [PATCH v5 2/4] hw/arm/stellaris: replace 'qemu_split_irq' with 'TYPE_SPLIT_IRQ' Date: Fri, 25 Mar 2022 02:15:55 +0800 Message-Id: <20220324181557.203805-3-zongyuan.li@smartx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220324181557.203805-1-zongyuan.li@smartx.com> References: <20220324181557.203805-1-zongyuan.li@smartx.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::62f (failed) Received-SPF: none client-ip=2607:f8b0:4864:20::62f; envelope-from=zongyuan.li@smartx.com; helo=mail-pl1-x62f.google.com X-Spam_score_int: 29 X-Spam_score: 2.9 X-Spam_bar: ++ X-Spam_report: (2.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_SBL_CSS=3.335, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Peter Maydell , "open list:Stellaris" , Zongyuan Li Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Zongyuan Li --- hw/arm/stellaris.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c index b6c8a5d609..12c673c917 100644 --- a/hw/arm/stellaris.c +++ b/hw/arm/stellaris.c @@ -9,6 +9,7 @@ #include "qemu/osdep.h" #include "qapi/error.h" +#include "hw/core/split-irq.h" #include "hw/sysbus.h" #include "hw/sd/sd.h" #include "hw/ssi/ssi.h" @@ -1160,6 +1161,7 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) DeviceState *ssddev; DriveInfo *dinfo; DeviceState *carddev; + DeviceState *gpio_d_splitter; BlockBackend *blk; /* @@ -1237,9 +1239,18 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board) &error_fatal); ssddev = ssi_create_peripheral(bus, "ssd0323"); - gpio_out[GPIO_D][0] = qemu_irq_split( - qdev_get_gpio_in_named(sddev, SSI_GPIO_CS, 0), + + gpio_d_splitter = qdev_new(TYPE_SPLIT_IRQ); + qdev_prop_set_uint32(gpio_d_splitter, "num-lines", 2); + qdev_realize_and_unref(gpio_d_splitter, NULL, &error_fatal); + qdev_connect_gpio_out( + gpio_d_splitter, 0, + qdev_get_gpio_in_named(sddev, SSI_GPIO_CS, 0)); + qdev_connect_gpio_out( + gpio_d_splitter, 1, qdev_get_gpio_in_named(ssddev, SSI_GPIO_CS, 0)); + gpio_out[GPIO_D][0] = qdev_get_gpio_in(gpio_d_splitter, 0); + gpio_out[GPIO_C][7] = qdev_get_gpio_in(ssddev, 0); /* Make sure the select pin is high. */ -- 2.34.0