From patchwork Mon Jun 4 08:08:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 162672 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB91BB6FEF for ; Mon, 4 Jun 2012 18:10:16 +1000 (EST) Received: from localhost ([::1]:47947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbSMd-0005p9-Rw for incoming@patchwork.ozlabs.org; Mon, 04 Jun 2012 04:10:11 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbSLi-0003pR-8F for qemu-devel@nongnu.org; Mon, 04 Jun 2012 04:09:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbSLb-0002mM-UZ for qemu-devel@nongnu.org; Mon, 04 Jun 2012 04:09:13 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:45731) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbSLb-0002hc-OD for qemu-devel@nongnu.org; Mon, 04 Jun 2012 04:09:07 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so5974491dad.4 for ; Mon, 04 Jun 2012 01:09:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=ZQO4T/ZphM1lmSBAV71EZ020So6LgJIQ2/a+0QFhd6A=; b=WWBXAsaQ4VgsA07M6SHGnpMX3oZajYUrHMNZMmZxHeBAB9ZU9Ukc51PP3In9CqMfUN wzd2w4Pz/MGD8TCuOTyVTat2APEb+OTeU4ZVZXPeu6q0nmUNEY6MpRlHUXjFBh/rVta7 zLIwZqV6WOnVUlJKnpzEl8O2831nwmTAhcOC1sZtj0PLk0JMHqBBCtSUt8D9LlHgjh8P 4nwZ8EDNTbqxzfYCLDeAMaH/0pVY3gniHKQRzhd0C8it1WQEB/1LMXL4JYpzQkCgJAWW eHqRTYoQzOBBhVRB+4CXvzX/KsHgNSeAJTLpVdchIEdyTXx6vwEr9QZe06zCHce5GTKm KR1w== Received: by 10.68.222.197 with SMTP id qo5mr21601509pbc.72.1338797346810; Mon, 04 Jun 2012 01:09:06 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id vi10sm12507821pbc.4.2012.06.04.01.09.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 04 Jun 2012 01:09:05 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: qemu-devel@nongnu.org, paul@codesourcery.com, edgar.iglesias@gmail.com, peter.maydell@linaro.org, stefanha@gmail.com Date: Mon, 4 Jun 2012 18:08:24 +1000 Message-Id: <9dad79e29ef57de1872350bd9de425f04afca4b5.1338796049.git.peter.crosthwaite@petalogix.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQma6JAJD3J02qYCaRQDE970NqgbaOLZdEaGi/HQFML1LznQesxmKmyLPupTo0t5EAjBMCwM X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Cc: peter.crosthwaite@petalogix.com, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH V4 5/5] stellaris: Updated spi bus implementation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Setup the stellaris_ssi_bus device to use a single multi-slave ssi bus instead of two busses. Signed-off-by: Peter A. G. Crosthwaite --- changed from v3: This patch is new hw/stellaris.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/hw/stellaris.c b/hw/stellaris.c index e0600a1..07a4187 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1164,22 +1164,21 @@ static int stellaris_adc_init(SysBusDevice *dev) typedef struct { SSISlave ssidev; qemu_irq irq; - int current_dev; - SSIBus *bus[2]; + SSIBus *bus; } stellaris_ssi_bus_state; static void stellaris_ssi_bus_select(void *opaque, int irq, int level) { stellaris_ssi_bus_state *s = (stellaris_ssi_bus_state *)opaque; - s->current_dev = level; + ssi_select_slave(s->bus, (uint32_t)level); } static uint32_t stellaris_ssi_bus_transfer(SSISlave *dev, uint32_t val) { stellaris_ssi_bus_state *s = FROM_SSI_SLAVE(stellaris_ssi_bus_state, dev); - return ssi_transfer(s->bus[s->current_dev], val); + return ssi_transfer(s->bus, val); } static const VMStateDescription vmstate_stellaris_ssi_bus = { @@ -1188,7 +1187,6 @@ static const VMStateDescription vmstate_stellaris_ssi_bus = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField[]) { - VMSTATE_INT32(current_dev, stellaris_ssi_bus_state), VMSTATE_END_OF_LIST() } }; @@ -1197,8 +1195,7 @@ static int stellaris_ssi_bus_init(SSISlave *dev) { stellaris_ssi_bus_state *s = FROM_SSI_SLAVE(stellaris_ssi_bus_state, dev); - s->bus[0] = ssi_create_bus(&dev->qdev, "ssi0"); - s->bus[1] = ssi_create_bus(&dev->qdev, "ssi1"); + s->bus = ssi_create_bus(&dev->qdev, "ssi"); qdev_init_gpio_in(&dev->qdev, stellaris_ssi_bus_select, 1); vmstate_register(&dev->qdev, -1, &vmstate_stellaris_ssi_bus, s); @@ -1312,11 +1309,11 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, mux = ssi_create_slave(bus, "evb6965-ssi", 0); gpio_out[GPIO_D][0] = qdev_get_gpio_in(mux, 0); - bus = qdev_get_child_bus(mux, "ssi0"); + bus = qdev_get_child_bus(mux, "ssi"); + ssi_create_slave(bus, "ssi-sd", 0); - bus = qdev_get_child_bus(mux, "ssi1"); - dev = ssi_create_slave(bus, "ssd0323", 0); + dev = ssi_create_slave(bus, "ssd0323", 1); gpio_out[GPIO_C][7] = qdev_get_gpio_in(dev, 0); /* Make sure the select pin is high. */