From patchwork Fri Nov 2 00:13:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 992146 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; dmarc=none (p=none dis=none) header.from=amsat.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="vDjFzCfj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42mN1S3kQvzB4bf for ; Fri, 2 Nov 2018 11:17:16 +1100 (AEDT) Received: from localhost ([::1]:47679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIN9G-0003s2-3V for incoming@patchwork.ozlabs.org; Thu, 01 Nov 2018 20:17:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIN5c-0000sn-6D for qemu-devel@nongnu.org; Thu, 01 Nov 2018 20:13:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIN5b-000550-7Y for qemu-devel@nongnu.org; Thu, 01 Nov 2018 20:13:28 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37078) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIN5a-00052l-GG; Thu, 01 Nov 2018 20:13:27 -0400 Received: by mail-wr1-x444.google.com with SMTP id z3-v6so239857wru.4; Thu, 01 Nov 2018 17:13:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jptOgypxnHPUyadZ/A+zoqijFj8p+it2NGZN8FWvCJ4=; b=vDjFzCfj/smhj1vJikv+ffPZks6tlOXFtK15iK/9+sxjQSy0UALlFZaDjKP7QiVGZK 9prOU84NmTG3hO1z0NgzqZ4etHU/n4VJNLQJLS8j33ataFLv2HCJAHOAAd3SxusFbAw3 ytTsPaiGQwqDbq9qxsOxaBnp5aPxAbGXoP4RqvmFtvuNCQpWa325MHIt+B3qc7MGxuKm UMCQagwg9aFBSwS/Trrc3dLzdWcsq5kPzaN7tzGVUmkEQ72zDDWumVRtdl5G8Relvp0g oglZq7kPyJW/JG3D9MzRcORM41AR1ID8vLj1LTDGgeBnp658bvqyEsv5pf3cmDjVHF6v 6WvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jptOgypxnHPUyadZ/A+zoqijFj8p+it2NGZN8FWvCJ4=; b=qyiVdRev+liGpHoGVUA6tvIzgP4WSU6rde+xV+XbSSzrzyjnm1t9d9aRkLt6BGzELN tcWzgJejrLU4kEJ0KsCwk6+nt0XehIj2Li3MCXyEjsdkbjwLatBqnft7TrXqJxIc5TeC XeU94T6UUQ6ok6nC25P659b94ArFU0Y8lrmN3yqNgFV061lNI2cUVHfo8yUvUx2djjmP EFVvGNqWnf3fC+ErOEGj5y+yATCMmQk5Be3ePTUH1cMK8n6C8avEYbF8g18HYN3c6NZU pUHn0yxPd562oDssOz5JeqJHlTR/nbovs6UXN96Vju3V75wFfi+/Sfo+dmVGq1jukBtz jZ6w== X-Gm-Message-State: AGRZ1gK7OGx6Tgt8d7NLZ/lHcZPA5Kz65nxCRI9tfDYF8Ub2mmnQWhwm 6ObkuhF6nhGz7jDFi4W+qlY= X-Google-Smtp-Source: AJdET5fMqyzZyRendAsAnoFwebXEFgsP2zv3S8wkAO1al6zaLP+c7votxFM70c12wP6U8wG+jtOcuA== X-Received: by 2002:adf:ea82:: with SMTP id s2-v6mr1463579wrm.180.1541117604692; Thu, 01 Nov 2018 17:13:24 -0700 (PDT) Received: from x1.redhat.com ([195.166.127.210]) by smtp.gmail.com with ESMTPSA id z6-v6sm10539894wrs.19.2018.11.01.17.13.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 17:13:24 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Peter Maydell , Guenter Roeck Date: Fri, 2 Nov 2018 01:13:00 +0100 Message-Id: <20181102001303.32640-5-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181102001303.32640-1-f4bug@amsat.org> References: <20181102001303.32640-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH for 3.2 v2 4/7] hw/arm/bcm2835: Rename some definitions 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: qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The UART1 is part of the AUX peripheral, the PCM_CLOCK (yet unimplemented) is part of the CPRMAN. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- hw/arm/bcm2835_peripherals.c | 2 +- include/hw/arm/raspi_platform.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 6be7660e8c..6d742ffe37 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -187,7 +187,7 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp) return; } - memory_region_add_subregion(&s->peri_mr, UART1_OFFSET, + memory_region_add_subregion(&s->peri_mr, AUX_OFFSET, sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->aux), 0)); sysbus_connect_irq(SYS_BUS_DEVICE(&s->aux), 0, qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ, diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h index 6467e88ae6..105876dc0b 100644 --- a/include/hw/arm/raspi_platform.h +++ b/include/hw/arm/raspi_platform.h @@ -36,7 +36,7 @@ * Doorbells & Mailboxes */ #define PM_OFFSET 0x100000 /* Power Management, Reset controller * and Watchdog registers */ -#define PCM_CLOCK_OFFSET 0x101098 +#define CPRMAN_OFFSET 0x101000 #define RNG_OFFSET 0x104000 #define GPIO_OFFSET 0x200000 #define UART0_OFFSET 0x201000 @@ -44,7 +44,7 @@ #define I2S_OFFSET 0x203000 #define SPI0_OFFSET 0x204000 #define BSC0_OFFSET 0x205000 /* BSC0 I2C/TWI */ -#define UART1_OFFSET 0x215000 +#define AUX_OFFSET 0x215000 /* AUX: UART1/SPI1/SPI2 */ #define EMMC_OFFSET 0x300000 #define SMI_OFFSET 0x600000 #define BSC1_OFFSET 0x804000 /* BSC1 I2C/TWI */