From patchwork Fri Sep 14 13:22:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 10600759 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6316915A7 for ; Fri, 14 Sep 2018 13:24:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 488A32B67C for ; Fri, 14 Sep 2018 13:24:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C2FC2B683; Fri, 14 Sep 2018 13:24:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AB8A12B67C for ; Fri, 14 Sep 2018 13:24:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=609xBkPtzLOYpHrJCulvha/tGSE14VJJGv7zhvIRH3E=; b=hUDcEEVpQf3+nF 2qLqR8HdXzjrRFkeYIB/4zzhvXSbx2FM5www0369oarWDtyUB/Yz2Gyk77EjsPPD7yErK2pv44enT VksD4xZ4Q+iBaqxDv/WvgpJcl3PiC8U7s4d1vXbqlRDkF13GVAvHVdn4EAXnC1bBQm4bysQ1MfRUo Ygmkof9mPbFEL2ubIWzdxm/LCBKgKlg3RSOFvTKatCt2oZyrYfYswCTjQycaf9qYzp4Jk+rp7afH+ qE4OXs1uHxLOca/8zS5Kh6LII2R/x3xWKgaGKK1BIBwdskDADP/SSNLmz9y8dCSMUXhNgzgw4jr00 58VG8v7FknrGAQvDvVJQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o5U-0001hK-DE; Fri, 14 Sep 2018 13:24:44 +0000 Received: from mx08-00252a01.pphosted.com ([91.207.212.211]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o4c-0001Ga-GE for linux-arm-kernel@lists.infradead.org; Fri, 14 Sep 2018 13:23:57 +0000 Received: from pps.filterd (m0102629.ppops.net [127.0.0.1]) by mx08-00252a01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8ED8LLV005397 for ; Fri, 14 Sep 2018 14:23:40 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : subject : date : message-id : in-reply-to : references; s=pp; bh=4VMo7ZIF5HeO+ZyXfjPkHhDIjaverswf6D8y5mtGoLc=; b=ejk0iVAzf0v7zHPqe8tm363ypka5QYhH6YZXbQm18sKtSj83IO4Hdw9UAgdd/KXuTWFL 86dc+m5FwjhCpvlPNKKW5kpv0C8SV0c5NVlNZqzJgK7jyfHswh1ae31TZL+yaa8oPZte q76543XrFQaAKhiO/kjN1mJiEqJ1dIx7ye+llgh7Wn/cOvGiNR/mzm4nH31B02Twln6C GvkbbnfVuQOjgH29ORqQKDLBy9/bs7L+i5US+cXUZ1gkPE0OVNsmNEkG4SGlzSroNE1r 6wefLgzb4bsZQzzuMBGyGLZHm6xGZ7EXlq46QCRhdN6Y9NeWTfbGiN7Txl2b1uNTTDD7 OA== Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mx08-00252a01.pphosted.com with ESMTP id 2mc2wfu5xc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Fri, 14 Sep 2018 14:23:39 +0100 Received: by mail-wr1-f69.google.com with SMTP id z17-v6so9885280wrr.16 for ; Fri, 14 Sep 2018 06:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=4VMo7ZIF5HeO+ZyXfjPkHhDIjaverswf6D8y5mtGoLc=; b=KS6w/mnn4UYtInhRIiDV/T/ArBPS8JOGeSH/OgcpHmBoJNo2Pg8MyerrUPckhY/uOc R9RhndWmAND7uqiABGA/dKcpWxoZbvuUJGJAiwK7YsWJvyrclhW7M5MTJpEQ1UkqfN9G pl5yKdoerfuDVs0iUXhY6trnSAGwlsnMVPkRxCMWAcz41HZ/md+cGY9gymIgv1DVSIEe EBgh0VP8s7P863MsKIdWcgeaPN8Spx1LZ2SC/qUocTm1aQw1HE1l6twGJmLBLuy8DVrc Njt/EVpQss9U8CHy/mj3j04lUBuUgpHHlQvIbzC8VfHz8VruZMao+AR7Xvc3dentpTJJ BODA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4VMo7ZIF5HeO+ZyXfjPkHhDIjaverswf6D8y5mtGoLc=; b=XTqv00wRTmCRdjcXwUz//x4lFn5CU176tW5C7OM+jUM+ClFFn8ZttVycUPtEw/tdqf kSuYDbVxTljRuhqRlo3YuwhCixHpipyuNjLiH8BvuyoxiVAsgzCvW9EG4quYJ1kUz7cF uL//pIkNxWScuZFjQh3t4pcX9V/IAy/Ca5UWRO9ghlcpN0W7Ld+2njYrlTxOTRiKgbub JVSNLwTuswlO4uts4syEyS3fEONrfJg1valNZsh6XfY3qox7IF4gLbqwQtI6ODMZQawr W7dhlmOuGUNwjRp8nArz8abD3bjvyzNnNEMazMZv8UXyqzCaptUvQgFE1ROSh/qlnOBg X8Qg== X-Gm-Message-State: APzg51DO7w177UvOnoNSMvRMZoZYTP2m+c+TNQFC+aKKoR0h1iOxlLOY zCynBTNcevbiEQ/Pe4oH2FwGaEstDA2B8n66BcPpMr8JvhsSnwURds3aa2oV3ztiepsI3e7Hq5y 3zMHkV7umBNbqFPBYKop0E2SmVa9WGFL7zOg= X-Received: by 2002:a1c:7d51:: with SMTP id y78-v6mr2382175wmc.37.1536931418340; Fri, 14 Sep 2018 06:23:38 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaSKJkI2wng4+pI/44/DDU5aNbNrdxJjUkO8uplyiCsXJ9oI7EYH7gVaD6jTK/FZGuiWLfG+g== X-Received: by 2002:a1c:7d51:: with SMTP id y78-v6mr2382150wmc.37.1536931418009; Fri, 14 Sep 2018 06:23:38 -0700 (PDT) Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:910f:6f88:c896:5552]) by smtp.gmail.com with ESMTPSA id i125-v6sm2505703wmd.23.2018.09.14.06.23.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Sep 2018 06:23:37 -0700 (PDT) From: Phil Elwell To: Rob Herring , Stefan Wahren , Greg Kroah-Hartman , Phil Elwell , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org Subject: [PATCH v2 1/4] staging/vc04_services: Use correct cache line size Date: Fri, 14 Sep 2018 14:22:52 +0100 Message-Id: <1536931375-48769-2-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> References: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-09-14_06:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180914_062350_889552_83F4183D X-CRM114-Status: GOOD ( 19.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Use the compatible string in the DTB to select the correct cache line size for the SoC - 32 for BCM2835, and 64 for BCM2836 and BCM2837. Signed-off-by: Phil Elwell Acked-by: Stefan Wahren --- .../interface/vchiq_arm/vchiq_2835_arm.c | 4 ++- .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 36 ++++++++++++++++------ .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 5 +++ 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index e767209..83d740f 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -109,7 +109,8 @@ free_pagelist(struct vchiq_pagelist_info *pagelistinfo, int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state) { struct device *dev = &pdev->dev; - struct rpi_firmware *fw = platform_get_drvdata(pdev); + struct vchiq_drvdata *drvdata = platform_get_drvdata(pdev); + struct rpi_firmware *fw = drvdata->fw; VCHIQ_SLOT_ZERO_T *vchiq_slot_zero; struct resource *res; void *slot_mem; @@ -127,6 +128,7 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state) if (err < 0) return err; + g_cache_line_size = drvdata->cache_line_size; g_fragments_size = 2 * g_cache_line_size; /* Allocate space for the channels in coherent memory */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index bc05c69..b2ae9259 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -170,6 +170,14 @@ static struct device *vchiq_dev; static DEFINE_SPINLOCK(msg_queue_spinlock); static struct platform_device *bcm2835_camera; +static struct vchiq_drvdata bcm2835_drvdata = { + .cache_line_size = 32, +}; + +static struct vchiq_drvdata bcm2836_drvdata = { + .cache_line_size = 64, +}; + static const char *const ioctl_names[] = { "CONNECT", "SHUTDOWN", @@ -3573,12 +3581,26 @@ void vchiq_platform_conn_state_changed(VCHIQ_STATE_T *state, } } +static const struct of_device_id vchiq_of_match[] = { + { .compatible = "brcm,bcm2835-vchiq", .data = &bcm2835_drvdata }, + { .compatible = "brcm,bcm2836-vchiq", .data = &bcm2836_drvdata }, + {}, +}; +MODULE_DEVICE_TABLE(of, vchiq_of_match); + static int vchiq_probe(struct platform_device *pdev) { struct device_node *fw_node; - struct rpi_firmware *fw; + const struct of_device_id *of_id; + struct vchiq_drvdata *drvdata; int err; + snd_rpi_simple.dev = &pdev->dev; + of_id = of_match_node(vchiq_of_match, pdev->dev.of_node); + drvdata = of_id->data; + if (!drvdata) + return -EINVAL; + fw_node = of_find_compatible_node(NULL, NULL, "raspberrypi,bcm2835-firmware"); if (!fw_node) { @@ -3586,12 +3608,12 @@ static int vchiq_probe(struct platform_device *pdev) return -ENOENT; } - fw = rpi_firmware_get(fw_node); + drvdata->fw = rpi_firmware_get(fw_node); of_node_put(fw_node); - if (!fw) + if (!drvdata->fw) return -EPROBE_DEFER; - platform_set_drvdata(pdev, fw); + platform_set_drvdata(pdev, drvdata); err = vchiq_platform_init(pdev, &g_state); if (err != 0) @@ -3661,12 +3683,6 @@ static int vchiq_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id vchiq_of_match[] = { - { .compatible = "brcm,bcm2835-vchiq", }, - {}, -}; -MODULE_DEVICE_TABLE(of, vchiq_of_match); - static struct platform_driver vchiq_driver = { .driver = { .name = "bcm2835_vchiq", diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h index 40bb0c6..2f3ebc9 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -123,6 +123,11 @@ typedef struct vchiq_arm_state_struct { } VCHIQ_ARM_STATE_T; +struct vchiq_drvdata { + const unsigned int cache_line_size; + struct rpi_firmware *fw; +}; + extern int vchiq_arm_log_level; extern int vchiq_susp_log_level; From patchwork Fri Sep 14 13:22:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 10600779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7209112B for ; Fri, 14 Sep 2018 13:25:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC9682B3A0 for ; Fri, 14 Sep 2018 13:25:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0F072B693; Fri, 14 Sep 2018 13:25:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 279DD2B686 for ; Fri, 14 Sep 2018 13:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IjAhyaDvnZOI9A7aPIYKkvuh65g1mB6n1FBSrAJ+qI0=; b=H0OvPmdpDCkdkk TGoBoBnVXvXZqtL7+V6wDE/sJw73grczMXdjApQO6npFgLrVzYFV1feV/HntGSe/a49jIW/Me7SAu 5w+gW3inc15kFVQpQbdu3g27lYZSEGAoezgNbHJu51zrYYLsxesskmm6gIgJqU0dimRsKQNjc2BrK dQl3q8g8/aJcuEnXy9gQ6/aBICMvqR9XYlEqDzOo3z/9Axt3VP2eTx37WXGow6T4WT1QdoLUW+Wov k4giaCJToe4rQWLDLJFszFb8QEoYOojGKincYk1yjCTDxIhUBf1wKlvDFtRG+90UIqhK2KwYRvjL0 8H+jNijwxguZNwBVJHmA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o6G-0002wX-93; Fri, 14 Sep 2018 13:25:32 +0000 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o4c-0001GJ-K2 for linux-arm-kernel@lists.infradead.org; Fri, 14 Sep 2018 13:23:57 +0000 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8EDHJes000651 for ; Fri, 14 Sep 2018 14:23:39 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : subject : date : message-id : in-reply-to : references; s=pp; bh=D9VvO23KZK4SJ7iBRfpz9Gs0xk0kB9h+qb5Glbj6bl8=; b=NONOpyWLj/ujdx56/RS9dAy1JN4l/HouEs26s1YZ/WOTVxtDY63100JDZQaldujoLWCO 2hqGdT5FZGiBTUDesYfMliyfw4StBYAtJNK2edqMfRIxZTTXr95qbnw5cxUX0OPqAFea N+76jt0o5phzuP41p1W7L8doNZoe/6M0BpaNEIel3/lXLCvJ4LUbbLfZOmYp4WKI6s7R HlaXYlJ2BBtUP/CG441DvS4AKOsXH0bsahNmIw8On9C3KpySdwKu/IMdUq88cjF4mijc OZ5YWqy/jO30to8xCMVBMH/Uh5y1JJcU3RAo90OY0Sax2j+7iWZnJt/vXID/I4gfmXen 6Q== Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by mx07-00252a01.pphosted.com with ESMTP id 2mc3u0k3r0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Fri, 14 Sep 2018 14:23:39 +0100 Received: by mail-wr1-f70.google.com with SMTP id i11-v6so9885673wrr.10 for ; Fri, 14 Sep 2018 06:23:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=D9VvO23KZK4SJ7iBRfpz9Gs0xk0kB9h+qb5Glbj6bl8=; b=MSxF4uSEkxTD5m2z2njBg7AIDX/hA6cKWLkmvSJhRe6ZmxstMsJfNzP4i/0mtJNUhj 1Ja68nk74xrcQ1fwDTrHUyHbn81LJ/w7t8C7W94F8/U9Xebvk8JHTMKMlm5XCnIqJWkI xNh5+7Z1djdQOR9ICZN4FBIllEyiknpkuqrSbsVll0gfrZG0GRwhgIRBxXulpbHBg6ch GSMGBSl4r0gPwa+XZm7qNsyRgo5VMSNY13R5fs7+LN+UwGknMa3VN+a2b3MXBHJ0E036 f2J7YW66iKdapBcyAc5UvF0wHxKm2Rj9CSAgyGnjZ0SetGfhC9XOYMT1/rIdu48gWjtC mhYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=D9VvO23KZK4SJ7iBRfpz9Gs0xk0kB9h+qb5Glbj6bl8=; b=Z3jdTJtmRqYLZvvQCKrwTNp4tWiSL/VbCLMg81PR6N+Gi5AURLcgPgXXREQZnia+b0 c7osGDXaUu4Xx7OvJgWEqt2QHNsc+VZN6RPSaiQbI1caKl4vxVGfj3cpx8h/lY6esxZx bN/qqX8WEEkDp6DnAjfHpqQKRTMe+obL7vQaA60ECBC5jHcyZQxEAWsmW2wqBCYNlyrW gy1Jqb35Lxo3LqT29RKKOdviboD4j7Y1c7mKXk6tG6gpVSuJnQhv7f/boQxbLOaN5eqm RbPci3mZ9/oWjNO1vHxNgCoEVApELUlLZeiV9heLNnLf4od6gDJ7eDjm0Y4udens+M8q eqSg== X-Gm-Message-State: APzg51BhiSqj5sTcBUeOqegdMSF6v2/ma8tmAyyA5mPCQUiOoHyxs97K LCDl1lDMLDqqhuoFi/ykbc4yRYZZIP/PvTuZQtqu7SafbCY7ssmYZ+PYIYTrlFzjWlD4sQ1nzgw yPAMLXCTRee2EiEZKQGGMD3Hj+geLAy6a4Ug= X-Received: by 2002:adf:f24e:: with SMTP id b14-v6mr8906237wrp.184.1536931419142; Fri, 14 Sep 2018 06:23:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ6d+E9aycYXao3hjGqJoQE0opb4B4zXuwOZAzhZA2AbPX7MNCimzZM8yb6DJ/aQLtjH20Xmw== X-Received: by 2002:adf:f24e:: with SMTP id b14-v6mr8906219wrp.184.1536931418892; Fri, 14 Sep 2018 06:23:38 -0700 (PDT) Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:910f:6f88:c896:5552]) by smtp.gmail.com with ESMTPSA id i125-v6sm2505703wmd.23.2018.09.14.06.23.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Sep 2018 06:23:38 -0700 (PDT) From: Phil Elwell To: Rob Herring , Stefan Wahren , Greg Kroah-Hartman , Phil Elwell , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org Subject: [PATCH v2 2/4] dt-bindings: soc: Document "brcm,bcm2836-vchiq" Date: Fri, 14 Sep 2018 14:22:53 +0100 Message-Id: <1536931375-48769-3-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> References: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-09-14_06:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180914_062351_072542_25E3A325 X-CRM114-Status: GOOD ( 16.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP "brcm,bcm2836-vchiq" should be used on BCM2836 and BCM2837 to ensure correct operation. Signed-off-by: Phil Elwell --- Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt index 8dd7b3a..f331316 100644 --- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt +++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt @@ -2,7 +2,8 @@ Broadcom VCHIQ firmware services Required properties: -- compatible: Should be "brcm,bcm2835-vchiq" +- compatible: Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise + "brcm,bcm2836-vchiq". - reg: Physical base address and length of the doorbell register pair - interrupts: The interrupt number See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt From patchwork Fri Sep 14 13:22:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 10600787 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 65195112B for ; Fri, 14 Sep 2018 13:26:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49EB32B698 for ; Fri, 14 Sep 2018 13:26:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3C1062B6A4; Fri, 14 Sep 2018 13:26:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A940D2B698 for ; Fri, 14 Sep 2018 13:26:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ClnVQv56kLAu2Lp8so8UijxXXsjnqoMm/FMMwZAmUcY=; b=dGGHHErsrlWNsa dgGY1WtFDlaFNzrRKB5ZGv0aTgDH0EoPkZBz72xV2VX+eqBVDyd3Jte+jzaz11KgUhtKR5I13S/E/ 63usFOXxRXkZy1vq8JKmYhnyMKTwG4ay7MwpdiYkIV2l04QavLC/iFOJAupn50GBKssw/lQxTTK59 vPOdliyIGOvAR3gYjkhOJwHy4qIhLWkxT+Z1LT/XRG7832OeH/IvZudtfiA7CYMfRS5YabQwFwapz mzl8zWV5H73UWvb2BGAnSieVhcJICvwreWvv9t9VLCbIvJiELHVIqOMTb4HHYeFmAWAaRCHeZ5kGk EXlHFtrFo0Wt/i8QhjTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o6y-0003UP-Is; Fri, 14 Sep 2018 13:26:16 +0000 Received: from mx07-00252a01.pphosted.com ([62.209.51.214]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o4c-0001HW-K0 for linux-arm-kernel@lists.infradead.org; Fri, 14 Sep 2018 13:23:57 +0000 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8ED82ZL027724 for ; Fri, 14 Sep 2018 14:23:41 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : subject : date : message-id : in-reply-to : references; s=pp; bh=pKi84y+keahwARTFwSxVyQpsxR4R0x2Sufg1qgudeCU=; b=hsmYu+pT4VDMI+k2nQjKl5QtuZDQQc6WLKlMiP6/cpC1TOKiIKh2Wr2ZjG7+vWesErTS 1VrPpEvHBq1C5MpaBHXZpxTDA7SS4V7iup4nApNF5Guy4YdkFi07LZ72+wdYFhJylclz lm+IyCfKsKXKq1FEXRJQKeek+Sy9LXRJCJenzmNeCypgclTCNXEMt2ZzzyNW7fjHT+WY mWk/+L9RDtzC8QxiAO2iGEl98AIK7WoLNGozCXqRY9BX8LXxcQHZV/PmmuFWwSKzD9B5 OmHE6huaB8rgz8Vi6DM7oW13e8X5XH1W2pu9B479DwQ/Fk6hEmZDjcOIJHua2rm2IuOt hQ== Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by mx07-00252a01.pphosted.com with ESMTP id 2mc3u0k3r8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Fri, 14 Sep 2018 14:23:41 +0100 Received: by mail-wr1-f69.google.com with SMTP id t10-v6so9843998wrs.17 for ; Fri, 14 Sep 2018 06:23:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=pKi84y+keahwARTFwSxVyQpsxR4R0x2Sufg1qgudeCU=; b=A9W/6v/3uZ1VyK1rF2Sg6ZD3zlHhcvdaIyA610v4m5wE2IGX5C/5L3zWmxVLSjLCpF tQbLm7F0fE9g/uc1vBZsrgbDJW9O6d5C3OSEJD1aPVmoGsWHDCtU7zrEHJuRpmjSWxYt YoPmsV/s7+DBw+FHcV6rCx05jQv1+ST5++B5Cin7fc6U6TQgVeM2UUJzA822FQ//Qqz/ ZWiBlrBRsrsJL3rwrDq1jNNBC1VQh3bCGMYM3c6aO7fZurt8326r6ONOzobdPx59N2N6 B93s6lE7Vws3mmQJtQYqteqmVoyplx55yGZI6K+3sU+wrVBR+qSdvWB1yjkNKNgaZTXr QZPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=pKi84y+keahwARTFwSxVyQpsxR4R0x2Sufg1qgudeCU=; b=akBafiX1BcuXQYVpIQftC3Bq/37TWi3+Q30Zlbjow/T8OBLEUbqOxBGWJmJnA3nKWq +zreIUx0jB4OPACPCC0uL9YiIYcNUbz6i9sBk7EhZcQWTdTo8MVG9mFHtYBpgK1vK8Gs aLeLbnJNQMzJ9l+Fq9NzEZB2vtck7iU3mAFJCyNIUaVbH2BH/gk4RtbdUttcv2CNWlvG y3fiLPR0FzWee9bEzRW/EROy52PEqYQjVCxBtmc5+rwh78fuMP1shEzjCs5wvq+LSWkM R/nu+2UwRemZwphsV/BfcDinxhm5kMw9p6oQrqBfeShyJ90s42FEMD9dveN4d2A0msbL LHfg== X-Gm-Message-State: APzg51A0jVMqFLxYjJzKQ+M01QXhms5stx/0EoQG5Unh1jBtsZt93O1+ YqrKk/267D3JHqdgxVcmYE40VdLt/srvAFj4nm47uQzt7yoFkaUHKwiFODl2HogKQ2VuPmX0vc9 pcHw1qjOcpjs2SucBsCfFXhpCr/MjkV8Uj0c= X-Received: by 2002:a1c:8c0b:: with SMTP id o11-v6mr2442927wmd.11.1536931420835; Fri, 14 Sep 2018 06:23:40 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda3NMXw6jH3VtS+c8hJUQU3EzY5aICGGrWImJlSBOPwl7Xq0TD/IqkxTy7N7TRYt1b3CUrmDw== X-Received: by 2002:a1c:8c0b:: with SMTP id o11-v6mr2442904wmd.11.1536931420493; Fri, 14 Sep 2018 06:23:40 -0700 (PDT) Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:910f:6f88:c896:5552]) by smtp.gmail.com with ESMTPSA id i125-v6sm2505703wmd.23.2018.09.14.06.23.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Sep 2018 06:23:39 -0700 (PDT) From: Phil Elwell To: Rob Herring , Stefan Wahren , Greg Kroah-Hartman , Phil Elwell , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org Subject: [PATCH v2 3/4] ARM: dts: bcm283x: Correct vchiq compatible string Date: Fri, 14 Sep 2018 14:22:54 +0100 Message-Id: <1536931375-48769-4-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> References: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-09-14_06:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180914_062351_055501_8FE92B7B X-CRM114-Status: GOOD ( 19.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To allow VCHIQ to determine the correct cache line size, use the new "brcm,bcm2836-vchiq" compatible string on BCM2836 and BCM2837. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +- arch/arm/boot/dts/bcm2836-rpi.dtsi | 6 ++++++ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index cb2d6d7..215d8cc 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -30,7 +30,7 @@ #power-domain-cells = <1>; }; - mailbox@7e00b840 { + vchiq: mailbox@7e00b840 { compatible = "brcm,bcm2835-vchiq"; reg = <0x7e00b840 0xf>; interrupts = <0 2>; diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts index 2fef70a..ac4408b 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2836.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi new file mode 100644 index 0000000..c4c858b --- /dev/null +++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "bcm2835-rpi.dtsi" + +&vchiq { + compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq"; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts index 4adb85e..eca36e3 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2837.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" #include "bcm283x-rpi-lan7515.dtsi" #include "bcm283x-rpi-usb-host.dtsi" diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts index c318bcb..a0ba0f6 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2837.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" #include "bcm283x-rpi-smsc9514.dtsi" #include "bcm283x-rpi-usb-host.dtsi" diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi index 7b7ab6a..4a89a18 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; #include "bcm2837.dtsi" -#include "bcm2835-rpi.dtsi" +#include "bcm2836-rpi.dtsi" / { memory { From patchwork Fri Sep 14 13:22:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Elwell X-Patchwork-Id: 10600795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 932EA1750 for ; Fri, 14 Sep 2018 13:39:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 772842B640 for ; Fri, 14 Sep 2018 13:39:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A7DD2B653; Fri, 14 Sep 2018 13:39:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E3E662B645 for ; Fri, 14 Sep 2018 13:39:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KUfhiKeB3Bmyd34BVyuokprZflGJmvBExTjKsRjXLng=; b=QXAqelKrgKHWt9 DXkWSy8d2iyXOup/aoBxMaRoIWek/f9WnuZ/TkUSwKNjln71yAPxjK0LjUqyPY83FSfJqG5bYk7Oi duLgVzHDSubaIIJ2TKphK/4MHgRXR1EslkR8K5V3oqrRa7/7OOEHH5IpSA2PccnnRy1XI0LPMDmUX H0fXoDrS8frI8GsZhRn0IoIXbk9u/qspxkRbEioo09sry9uk3UJESSIH1lM5PTqNpJcQghHKE35hi wiE60A8L9HDZaUTXiz4RwFfmYUdj+VBWjcfRs0QO7YpC+ILy2Bxu9nOttZWYdwFAJtaFTCMT4PAbc I6EwrK1Vk+MdG73BqlyQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0oJz-0008QE-Pz; Fri, 14 Sep 2018 13:39:43 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0oJx-0008Br-6F for linux-arm-kernel@bombadil.infradead.org; Fri, 14 Sep 2018 13:39:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Y//216+Nufaw8Q5Doy1UB2uh9vFamOmJ8MlFr8zsxeA=; b=S7HrG9UBa4B4CNpGH3iWlrkQg BZBvAxOZ4eNY489SULmWmzt8N8JiEGDydFK71XmWXRphM2+ab6S/bWh1M0WGld+pA2C/AIXyKutp1 RB3mqH5oJw4B8G9iiO+rpakbrRQAhpJdXV7wYkgDCui/sjCcCrPjnWZpsubuLECp0XtLwSLVwxfwf 0bo6B3KBagQrkNwAiQ5T6HT+ACxD3zSoZVnCROF6W2cuUnC7e/+Agj172hq5KZBniW7jTDW3ZRbKu cR6TAPIREUb3o7Ze5ZJP/HDfmD4iBEEKw4drwAidIO3eBuq0FTL/jBRSvY2C6v1j4dekSu6KcONwA 0hn4z40Fw==; Received: from mx07-00252a01.pphosted.com ([62.209.51.214]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g0o4i-0006FQ-Bl for linux-arm-kernel@lists.infradead.org; Fri, 14 Sep 2018 13:23:58 +0000 Received: from pps.filterd (m0102628.ppops.net [127.0.0.1]) by mx07-00252a01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8ED83DQ027727 for ; Fri, 14 Sep 2018 14:23:42 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; h=from : to : subject : date : message-id : in-reply-to : references; s=pp; bh=Y//216+Nufaw8Q5Doy1UB2uh9vFamOmJ8MlFr8zsxeA=; b=NTe6lhsYLOu2tp3zOQFT6ZgKxUuyIyiw0jNuSd9p/ZGdHX/kjZm+3I+95EjDxTtTQ86a uGY8a40lsUnKfB1NLZurP5DVm2h8gCnUWsPFKjIb42C3UEbsPw8dQ8O7v/JXgZlYT7w2 skFPhbslVwZGj3Qbt/4TVmXJoJFXjYDE9s3l/Vd6P9L6DA6C/5rwTp+synuci5LGjCoO QxGetRHzDPZLlCiXirxV34yPw3M8tABMQF8cIdlOo4DvZgbXsI4crLRTw4SSf9+KPgm7 WDzjgL/PnG8/mDMpR9YrO+izhhT6JM9oSv4KTEMU9OF64hIQrE4yg+QSYPY+OWm9s9Tx Ug== Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by mx07-00252a01.pphosted.com with ESMTP id 2mc3u0k3rh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK) for ; Fri, 14 Sep 2018 14:23:42 +0100 Received: by mail-wr1-f71.google.com with SMTP id t10-v6so9844050wrs.17 for ; Fri, 14 Sep 2018 06:23:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=Y//216+Nufaw8Q5Doy1UB2uh9vFamOmJ8MlFr8zsxeA=; b=WzOQJAukHSh5H/wYj12nP4GyKH+QBxGvhf2vpu8Zi6yDwkuVGXyBb4J2BFEFOvBtjq fH+iXWQxDhsK9axZFdHF6xaVQ7Ycz3kUfFkcQD1l/99S2eAPvD6D1bYJqeBeqVCOkkp+ 4XanY/edrtTqcCAbg0ImWt2iSfvIrgnjUxAsg2+uhpSkKTdw5eDmVVS8YacG67Zyr5GP PwhHAwMZq16ai4I1PP/heg7aCXV3pBLd443RRxIm/apXMCODEn76AAdjJbiCYEza9Gcb yazCHvsYzQW6wLGA9uudan6ytHzC+K3fwmsSu1JJUFmpEQ0ycSd8UPuwdzsXCBl1kgUp M2gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=Y//216+Nufaw8Q5Doy1UB2uh9vFamOmJ8MlFr8zsxeA=; b=kw1+cFk3sT9rmf2D9sNPDkMUx6P7ceh2pf4UFbGGw3/fSNrvj7TnkCQGuqni13Yuae 0saW6pZ9pWBLQkySTmRaBKcaxywDGlWIDoVol+yrUEkik5V9M3xjTNnHK0ToNKh9cQC6 8BwkMOZglNMxWIjBYG0jF4J1qA4JTNJDPm3bzSKJxMn+Jy7HxRUV/ps0hHCrjzN+E4NP sUqRfmqNN5sQWgiwqE8Bp7qKBh3YAgAzRrpae8wMmGj1JulnurnwL3MdoUc7z+v1A313 k4DRKoAyxxFCspDN9Vy6NsYOv05I+GpieI1/yKD4g0+FKWiCSRmy2T1vEIE1rDxUV8lK KpyQ== X-Gm-Message-State: APzg51CdBYAsBuj7lDfMYHKr/iS6FJzf7LxtyzW7Fo/UCpgnV4q65MNo iT+80ahAjfdZvie5794p1CYm6QYH49gNwCrh9wUxmM8ypwcmCWnsarkcSESo9saRN7YbMC03lW3 43QXzAJKFn1L5Ik8UTop95Qbi24NmH0L804s= X-Received: by 2002:a7b:c04c:: with SMTP id u12-v6mr2413705wmc.24.1536931421546; Fri, 14 Sep 2018 06:23:41 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda0eLYCP0Ef9J6l8MAjvoKqNsocEZkycSw5xmj/P54H0lpSZ2oUqexJT+HF++heHE25rO60eg== X-Received: by 2002:a7b:c04c:: with SMTP id u12-v6mr2413689wmc.24.1536931421371; Fri, 14 Sep 2018 06:23:41 -0700 (PDT) Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:910f:6f88:c896:5552]) by smtp.gmail.com with ESMTPSA id i125-v6sm2505703wmd.23.2018.09.14.06.23.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Sep 2018 06:23:40 -0700 (PDT) From: Phil Elwell To: Rob Herring , Stefan Wahren , Greg Kroah-Hartman , Phil Elwell , devicetree@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Russell King , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org Subject: [PATCH v2 4/4] ARM: dts: bcm283x: Correct mailbox register sizes Date: Fri, 14 Sep 2018 14:22:55 +0100 Message-Id: <1536931375-48769-5-git-send-email-phil@raspberrypi.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> References: <1536931375-48769-1-git-send-email-phil@raspberrypi.org> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-09-14_06:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180914_142356_435189_1DE3F9EE X-CRM114-Status: GOOD ( 18.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The size field in a Device Tree "reg" property is encoded in bytes, not words. Signed-off-by: Phil Elwell --- arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi index 215d8cc..29f970f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -32,7 +32,7 @@ vchiq: mailbox@7e00b840 { compatible = "brcm,bcm2835-vchiq"; - reg = <0x7e00b840 0xf>; + reg = <0x7e00b840 0x3c>; interrupts = <0 2>; }; };