From patchwork Wed Oct 10 00:46:38 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: 190529 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 7D76E2C008A for ; Wed, 10 Oct 2012 12:33:15 +1100 (EST) Received: from localhost ([::1]:38533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLkSf-0004Fk-C7 for incoming@patchwork.ozlabs.org; Tue, 09 Oct 2012 20:47:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:53187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLkS4-00039n-68 for qemu-devel@nongnu.org; Tue, 09 Oct 2012 20:47:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TLkS2-00017A-Pa for qemu-devel@nongnu.org; Tue, 09 Oct 2012 20:47:08 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:55865) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TLkS2-00010q-IP for qemu-devel@nongnu.org; Tue, 09 Oct 2012 20:47:06 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so5823913pad.4 for ; Tue, 09 Oct 2012 17:47:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=2Q1aitIWMpeZqLTuBZbw48/rlUETTD/fX4dywLSmyQw=; b=lD/Ttb6pBBB685DwAGI65oaFvUoHBI1K0Qat6UwbIR1tq53eypLjymCTgsk3zDRTov A/KYwntVRk/QITNvdEU8f1GYWv5xw8TQxR6ZE593/ZL6dllGIMUsx6hUHhOVfej/2Jv/ uN+hBMAZ43dBjb1UCzcYMkpWaKSCN32724Ke01l/L/XoUY8gKlfUM8TQ7WzO9DO0lx80 VkKV7j0dUMGZChkG8TVUIra9CfT/P6+j7l6Hzfcj7kBM60ViYog1XJbg0IJV6aJm+ezV 8GBosqks7HdmpHizcaDijjtVOn7BiqeAeJal5Bda2p7KoDYtTG92fyxPjOBsCp+HZU7t i7Ig== Received: by 10.68.229.138 with SMTP id sq10mr69194462pbc.126.1349830026155; Tue, 09 Oct 2012 17:47:06 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id nt7sm100213pbb.33.2012.10.09.17.47.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 09 Oct 2012 17:47:05 -0700 (PDT) From: Peter Crosthwaite To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 10 Oct 2012 10:46:38 +1000 Message-Id: <1349830006-12124-6-git-send-email-peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1349830006-12124-1-git-send-email-peter.crosthwaite@xilinx.com> References: <1349830006-12124-1-git-send-email-peter.crosthwaite@xilinx.com> X-Gm-Message-State: ALoCoQmONDdumgiGF6sIzMx2NmTxe5520i4P7pxoHI8GCqkJnVQ5gCghUCX7Ew7Rc4p2N6/j4L7F X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Subject: [Qemu-devel] [PATCH 05/13] stellaris: Removed SSI mux 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 From: Peter A. G. Crosthwaite Removed the explicit SSI mux and wired the CS line directly up to the SSI devices. Signed-off-by: Peter A. G. Crosthwaite --- hw/ssd0323.c | 1 + hw/ssi-sd.c | 1 + hw/stellaris.c | 94 +++++++++---------------------------------------------- 3 files changed, 18 insertions(+), 78 deletions(-) diff --git a/hw/ssd0323.c b/hw/ssd0323.c index 5d05a35..9c42d64 100644 --- a/hw/ssd0323.c +++ b/hw/ssd0323.c @@ -354,6 +354,7 @@ static void ssd0323_class_init(ObjectClass *klass, void *data) k->init = ssd0323_init; k->transfer = ssd0323_transfer; + k->cs_polarity = SSI_CS_HIGH; } static TypeInfo ssd0323_info = { diff --git a/hw/ssi-sd.c b/hw/ssi-sd.c index cbbc645..c5505ee 100644 --- a/hw/ssi-sd.c +++ b/hw/ssi-sd.c @@ -256,6 +256,7 @@ static void ssi_sd_class_init(ObjectClass *klass, void *data) k->init = ssi_sd_init; k->transfer = ssi_sd_transfer; + k->cs_polarity = SSI_CS_LOW; } static TypeInfo ssi_sd_info = { diff --git a/hw/stellaris.c b/hw/stellaris.c index 01050d1..353ca4c 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1154,58 +1154,6 @@ static int stellaris_adc_init(SysBusDevice *dev) return 0; } -/* Some boards have both an OLED controller and SD card connected to - the same SSI port, with the SD card chip select connected to a - GPIO pin. Technically the OLED chip select is connected to the SSI - Fss pin. We do not bother emulating that as both devices should - never be selected simultaneously, and our OLED controller ignores stray - 0xff commands that occur when deselecting the SD card. */ - -typedef struct { - SSISlave ssidev; - qemu_irq irq; - int current_dev; - SSIBus *bus[2]; -} 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; -} - -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); -} - -static const VMStateDescription vmstate_stellaris_ssi_bus = { - .name = "stellaris_ssi_bus", - .version_id = 2, - .minimum_version_id = 2, - .minimum_version_id_old = 2, - .fields = (VMStateField[]) { - VMSTATE_SSI_SLAVE(ssidev, stellaris_ssi_bus_state), - VMSTATE_INT32(current_dev, stellaris_ssi_bus_state), - VMSTATE_END_OF_LIST() - } -}; - -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"); - qdev_init_gpio_in(&dev->qdev, stellaris_ssi_bus_select, 1); - - vmstate_register(&dev->qdev, -1, &vmstate_stellaris_ssi_bus, s); - return 0; -} - /* Board init. */ static stellaris_board_info stellaris_boards[] = { { "LM3S811EVB", @@ -1306,19 +1254,25 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, if (board->dc2 & (1 << 4)) { dev = sysbus_create_simple("pl022", 0x40008000, pic[7]); if (board->peripherals & BP_OLED_SSI) { - DeviceState *mux; void *bus; - + DeviceState *sddev; + DeviceState *ssddev; + + /* Some boards have both an OLED controller and SD card connected to + * the same SSI port, with the SD card chip select connected to a + * GPIO pin. Technically the OLED chip select is connected to the + * SSI Fss pin. We do not bother emulating that as both devices + * should never be selected simultaneously, and our OLED controller + * ignores stray 0xff commands that occur when deselecting the SD + * card. + */ bus = qdev_get_child_bus(dev, "ssi"); - mux = ssi_create_slave(bus, "evb6965-ssi"); - gpio_out[GPIO_D][0] = qdev_get_gpio_in(mux, 0); - - bus = qdev_get_child_bus(mux, "ssi0"); - ssi_create_slave(bus, "ssi-sd"); - bus = qdev_get_child_bus(mux, "ssi1"); - dev = ssi_create_slave(bus, "ssd0323"); - gpio_out[GPIO_C][7] = qdev_get_gpio_in(dev, 0); + sddev = ssi_create_slave(bus, "ssi-sd"); + ssddev = ssi_create_slave(bus, "ssd0323"); + gpio_out[GPIO_D][0] = qemu_irq_split(qdev_get_gpio_in(sddev, 0), + qdev_get_gpio_in(ssddev, 0)); + gpio_out[GPIO_C][7] = qdev_get_gpio_in(ssddev, 1); /* Make sure the select pin is high. */ qemu_irq_raise(gpio_out[GPIO_D][0]); @@ -1395,21 +1349,6 @@ static void stellaris_machine_init(void) machine_init(stellaris_machine_init); -static void stellaris_ssi_bus_class_init(ObjectClass *klass, void *data) -{ - SSISlaveClass *k = SSI_SLAVE_CLASS(klass); - - k->init = stellaris_ssi_bus_init; - k->transfer = stellaris_ssi_bus_transfer; -} - -static TypeInfo stellaris_ssi_bus_info = { - .name = "evb6965-ssi", - .parent = TYPE_SSI_SLAVE, - .instance_size = sizeof(stellaris_ssi_bus_state), - .class_init = stellaris_ssi_bus_class_init, -}; - static void stellaris_i2c_class_init(ObjectClass *klass, void *data) { SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass); @@ -1457,7 +1396,6 @@ static void stellaris_register_types(void) type_register_static(&stellaris_i2c_info); type_register_static(&stellaris_gptm_info); type_register_static(&stellaris_adc_info); - type_register_static(&stellaris_ssi_bus_info); } type_init(stellaris_register_types)