From patchwork Mon Apr 10 23:26:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1767345 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=WtBwl+Tq; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=gYY5R/bO; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PwQ916gRwz1yZP for ; Tue, 11 Apr 2023 09:26:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=gl9PjRR6I7oixXzS5Y+/YJeSy5sFmIaEyi8TZ/Ci7Bw=; b=WtBwl+Tq2yg4H1 njXHYSLHn6oMtjb/ws0lTqJZghoUQI9kkkd67thmP92tlA3/GG+Jw1clIMW58uzvhqihxwKMpZE7N N7yrB4wCUmq/9UjyiL3k00gqk8oyP/NwZpzjJcoprVSGIL0kaPPmZA5o7PwT+/HhVtsYFBKsL4pi/ t5DuIOJnOx7ZPgFF+GXhiq3cjG2jhovOk8aLoVRq+0Voh03UB80XnzU8HhnuFttvkuceS7uITAgh8 N1ZGxhWXpdRbqVLgYys2EnOfvz7Iv5A/V+vdwKrvTjqWmIIj0PgfyEaRjIfedG8qqIUARYBuILaDa CiGGzUD6BsO8jivEPl1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm0tr-00G3nH-28; Mon, 10 Apr 2023 23:26:15 +0000 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pm0to-00G3mP-2J for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2023 23:26:14 +0000 Received: by mail-qt1-x82a.google.com with SMTP id fc12so3071380qtb.5 for ; Mon, 10 Apr 2023 16:26:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681169170; x=1683761170; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=o5xk/MfzEgCGEbDCZl2/zk2N4beMPIzmmN1fAUVp9es=; b=gYY5R/bOVwtUytQ1++T3sJXwB1bfcBvodcJvw8EThW3W4Ulj31GcBz2cxeZTq2/qK2 sjzzoaPOtshpc3aR5NNBh1QsV5ngQpQzQ/Rs6ZT4LswzDuDdoXn/M3LyN3HD63gGNpS2 5MUcXY1GCa6dDY9JzZS1pmmGudXwDkD4MNGTslcbK+a6iyr8fIVc0p8LNE0Gm1p2iwk8 wxEeZ7xPWsQkWki7Ie2noMc2BDCDPI+DspmjSjz06YmDIP9O4ItjT6D4wvuJD8zo3v4x I+hqj2UsjBwEDSQSipxHdDQP9+zLtqHcSleqC/h6qrzsjwFlqb/L66+IRS9coqFWlLuG OQHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681169170; x=1683761170; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o5xk/MfzEgCGEbDCZl2/zk2N4beMPIzmmN1fAUVp9es=; b=28mbMkv989JgH4lm4WPkaqKqRIaGuCltkMQDGf0G/JlUi0UDrLwlWewn7QFdwJBXJA J/8FcBERUCLj+xQ0D/y+yaBwbS5f2PnMnyBBI3LA42k6xVYEPvGGJaevLE4hm4RZCvei dN0CJxEGmyBPLZRY9Ws1zJaM1HA5aNYptQJVgRoE3JdqP/wO93SfU63UFFynvlfhEDZO bmZ6XT8ymAcWu6CJGQkDs8ZIAPFjRfAcvqa5jfHP6m6yUFdgyiK7LG4S27OmNgPOmxl4 zWDHskRYFKxYe40jjBlwzWH5w8OtvnuAdHvr2CiQ/oAVTIiYlxMDI2pltQr15UDBgxGZ R4og== X-Gm-Message-State: AAQBX9cYW4HuLMw+uh3vrMZi11OD7PjrvH/Z/zuhU0WDYyRPReKukW43 VmT4W+rCtVRgIGDD1fFRAvw= X-Google-Smtp-Source: AKy350b2zCyGJAaJZ8ktIXAx8cSic4hR6TYVKmoGY6uqYBXAnIefdYJq1ZZJkPioVBd+uesbVClb+A== X-Received: by 2002:ac8:5986:0:b0:3e6:95f2:8431 with SMTP id e6-20020ac85986000000b003e695f28431mr16212905qte.12.1681169170228; Mon, 10 Apr 2023 16:26:10 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id v126-20020a379384000000b007460093cccdsm3604775qkd.25.2023.04.10.16.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 16:26:09 -0700 (PDT) From: Florian Fainelli To: soc@kernel.org Cc: William Zhang , Florian Fainelli , linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, bcm-kernel-feedback-list@broadcom.com Subject: [GIT PULL 1/4] Broadcom devicetree changes for 6.4 Date: Mon, 10 Apr 2023 16:26:03 -0700 Message-Id: <20230410232606.1917803-1-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230410_162612_778319_9C6040F4 X-CRM114-Status: UNSURE ( 6.93 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:82a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [f.fainelli[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: https://github.com/Broadcom/stblinux.git tags/arm-soc/for-6.4/devicetree for you to fetch changes up to 7858dded8c1e983740b46857660526575583d2a2: ARM: dts: broadcom: bcmbca: Add spi controller node (2023-03-14 14:07:06 -0700) ---------------------------------------------------------------- This pull request contains Broadcom ARM-based SoCs Device Tree changes for 6.4, please pull the following: - William adds the new-style High Speed SPI controller node to the BCA SoCs ---------------------------------------------------------------- William Zhang (1): ARM: dts: broadcom: bcmbca: Add spi controller node arch/arm/boot/dts/bcm47622.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/bcm63138.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/bcm63148.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/bcm63178.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/bcm6756.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/bcm6846.dtsi | 18 ++++++++++++++++++ arch/arm/boot/dts/bcm6855.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/bcm6878.dtsi | 19 +++++++++++++++++++ arch/arm/boot/dts/bcm947622.dts | 4 ++++ arch/arm/boot/dts/bcm963138.dts | 4 ++++ arch/arm/boot/dts/bcm963138dvt.dts | 4 ++++ arch/arm/boot/dts/bcm963148.dts | 4 ++++ arch/arm/boot/dts/bcm963178.dts | 4 ++++ arch/arm/boot/dts/bcm96756.dts | 4 ++++ arch/arm/boot/dts/bcm96846.dts | 4 ++++ arch/arm/boot/dts/bcm96855.dts | 4 ++++ arch/arm/boot/dts/bcm96878.dts | 4 ++++ 17 files changed, 184 insertions(+) From patchwork Mon Apr 10 23:26:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1767344 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=qH2trKoT; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=STcjU1HR; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PwQ921q1Bz1yZZ for ; Tue, 11 Apr 2023 09:26:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Jiv0xXc5dY5xK59iJNt61lqjo083NANskcsnmBdNTWc=; b=qH2trKoT1Dpl9I u2AB/aSWMTJ9FeJR0+SWFA7CfOCuQeA5jx5Ppt6utO1TOY/H8nMYUWW/mxZURgWaWyLojNezi+RXG McoKEDUBv0lsO09DZRhxE45PVuOsuq2nexySeoZlJV1WfNuZ4bivxTD1s8m8Ql/VLFtTVw0GNRKZU zP1amsx1F6GV1OTYecux7+JEqppno/01VLE67aUhzvBIve3v4Ty1H52mEgio2vRH3eVmDVPqOCQsg IGwJnnEklimU0PC/oCkp/hyMoL+EyHKb/1JRlMYVojTewjfmOHFtm+XghL255wJafJ9YJg9iVdCqk NUqkIcGY4tAzM4EKttlw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm0tu-00G3o3-2K; Mon, 10 Apr 2023 23:26:18 +0000 Received: from mail-qv1-xf2a.google.com ([2607:f8b0:4864:20::f2a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pm0tq-00G3mi-11 for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2023 23:26:15 +0000 Received: by mail-qv1-xf2a.google.com with SMTP id e9so4415434qvv.2 for ; Mon, 10 Apr 2023 16:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681169172; x=1683761172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CSU6Vq12+kQQDFtPvaoQYJxeQIpt2bVcjbp22aExHYs=; b=STcjU1HRhsoW14iqZ7Lz8KxP707PZzoAicCGNCRtg/ox0T0UpKIlZNXKkU1xfmZIFF QzPYZ4OjmKrl7TGZNoOXvVrJD37a3Fe61B2cNYiSGwQ60H0RUoZV/NMDsr4pq+LRztMB AHMwhq8Zy8jVNRyhPlCTBM+iWnksts8NpEaNjM/h1OuTAFmPAbHBY+2sFNrzllKvKmgQ rgZZm1XgZzsm7c87bf6QKlo0+3Wp+ZykUdg0Fpcl5dhmLAFaioWGdDhuQSYi3rzZtABX wPQwfd4rm86CYRGcMkJYDg14MQaaXxszeXJWLwli2uBCmkkOgJAxCl3+g+Qe5t6/L4t6 e5Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681169172; x=1683761172; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CSU6Vq12+kQQDFtPvaoQYJxeQIpt2bVcjbp22aExHYs=; b=V+v/dSYw20IKFgrpPzWGi9jP+jj/kCd/9orsYWk5WK5hA48N9riuT7FL2mfNOrgHJB u2I8d/IGLyKW5urXPhKW5hoIZREiXRqjFaaXGffoSTHeLEl6T4+jYXPuQMmDA/+8BXH4 0O7KEYayYgbgtrn+lMs/hU/hG1YRfeY/iYlUXGsp8MPpGC7ynsiDfygf0S71uEDwJAiT OjVb3rC0FOw1GPzAgqnN/tWNhwJsRXVjyBikBIlxxRACKc7pSpLkMeT+P5IG2f/l1k+B nMlXP0POAYtK4/fHa11/uKScJAfOTuPKYx0BC+AO2Yps6XE3IIgg6cxPbk2k6gvDon3m PaEQ== X-Gm-Message-State: AAQBX9fa6AcuKahIU2PFDKj+1276ZX4K8ViBQ0GvkYp2cr+PcshqHiqZ VuOoWVu1GMa9x49eBBh0yqo= X-Google-Smtp-Source: AKy350Z3E+Hedpxlul+1kqpyTcrUKCkttLnoXXbAXHBVwUoV8xii/kNEFcNWMoGko7cwCECX5sABHA== X-Received: by 2002:ad4:4eef:0:b0:5a3:725e:425c with SMTP id dv15-20020ad44eef000000b005a3725e425cmr17110492qvb.2.1681169172057; Mon, 10 Apr 2023 16:26:12 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id v126-20020a379384000000b007460093cccdsm3604775qkd.25.2023.04.10.16.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 16:26:11 -0700 (PDT) From: Florian Fainelli To: soc@kernel.org Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Florian Fainelli , William Zhang , Rob Herring , linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, bcm-kernel-feedback-list@broadcom.com Subject: [GIT PULL 2/4] Broadcom devicetree-arm64 changes for 6.4 Date: Mon, 10 Apr 2023 16:26:04 -0700 Message-Id: <20230410232606.1917803-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410232606.1917803-1-f.fainelli@gmail.com> References: <20230410232606.1917803-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230410_162614_353693_C5BF37A4 X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f2a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [f.fainelli[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: https://github.com/Broadcom/stblinux.git tags/arm-soc/for-6.4/devicetree-arm64 for you to fetch changes up to e6d356b146b75f1f77621aab7950a1eb550859f9: arm64: dts: broadcom: bcmbca: bcm4908: add TP-Link C2300 USB LED triggers (2023-03-14 14:21:54 -0700) ---------------------------------------------------------------- This pull request contains Broadcom ARM64-based SoCs Device Tree changes for 6.4, please pull the following: - Rob fixes the GICv3 ITS node name for the Stingray platforms - William adds the new-style High Speed SPI controller nodes to the BCA SocS - Rafal fixes the NAND controller interrupt name for BCM4908, LED node(s) and procmon for BCM4908. He also adds support for the USB ports, and declares USB triggered LEDs for the Netgear R8000P and TP-Link C2300. ---------------------------------------------------------------- Rafał Miłecki (6): arm64: dts: broadcom: bcmbca: bcm4908: fix NAND interrupt name arm64: dts: broadcom: bcmbca: bcm4908: fix LED nodenames arm64: dts: broadcom: bcmbca: bcm4908: fix procmon nodename arm64: dts: broadcom: bcmbca: bcm4908: add on-SoC USB ports arm64: dts: broadcom: bcmbca: bcm4908: add Netgear R8000P USB LED triggers arm64: dts: broadcom: bcmbca: bcm4908: add TP-Link C2300 USB LED triggers Rob Herring (1): arm64: dts: broadcom: stringray: Fix GICv3 ITS node name William Zhang (1): arm64: dts: broadcom: bcmbca: Add spi controller node .../dts/broadcom/bcmbca/bcm4906-netgear-r8000p.dts | 4 ++ .../bcmbca/bcm4906-tplink-archer-c2300-v1.dts | 6 ++- .../dts/broadcom/bcmbca/bcm4908-asus-gt-ac5300.dts | 10 ++-- arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 61 +++++++++++++++++++++- arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 20 +++++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 19 +++++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 19 +++++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 20 +++++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 18 +++++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 18 +++++++ arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 4 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 4 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 4 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 ++ arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 ++ .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- 18 files changed, 216 insertions(+), 9 deletions(-) From patchwork Mon Apr 10 23:26:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1767347 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Yn2wUYGa; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=foeMZWFs; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PwQ991fBHz1yZP for ; Tue, 11 Apr 2023 09:26:53 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1cn/DGbim1Vo31rEjepNgYmY36Cp9Cfkiaz56JMBSaM=; b=Yn2wUYGaY6Pi0r NhaNXDbZxwSecxdpc9GiJmrV0LTEPBa1wXY3g6Ys8k45xYTlE0KI6lTf4B3z2UO8AwPkPyn3sEU/3 oT50TShHXIfvefy3jqvQasM6Lj8IFIaRj1fbfgnVeChLFA7+S3nnTjIIO3mA2qTcmqN35P3L8a3IN Ahm5TM3O5eIeEdEm+9zf0W71ZeGo7PGxckhlsFe56b7Oh+8Lv+Fi/MbowhPsRVpTX+Z+deYNJ0LC5 P/+K2ZncwKHHoanY8A/kNyJPcFLkJbrsfVU1fjxynOBOarcS4+2f9H1i6tn+KudzDh0wF27AA2w6i 3ZgKCYi2jImO84YesHGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm0ty-00G3os-2e; Mon, 10 Apr 2023 23:26:22 +0000 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pm0ts-00G3nG-1V for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2023 23:26:17 +0000 Received: by mail-qt1-x834.google.com with SMTP id a23so3671837qtj.8 for ; Mon, 10 Apr 2023 16:26:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681169174; x=1683761174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VQQjgv80HUN6UIYUFa11nZUMT8IVR3Ic5+4VvO5LWJA=; b=foeMZWFsjGg8wQM+b1iffBsbNGh5uWYMTq/+8esVZ5a6x9P4uqhMciT4BvviFpbrw4 IznAfmQMcYG8IJCgN57c3jaryo78vVSvh8dU0IcGAUqapj448Me7jd1QjhGa0rV8vElr /Q1VlJfDcUuiKTJM1XYBsnYV3/x0spSA3HwmZHsosGZVZXyBL3DozvwH45X9JWYAQjkR WtA7MygeR9Db/dccdtAPlvW4Ni7RteXxgOMJ9oeOEhKZRbGuJpQ5Mn/tKiCVmcnLXfuy APSPTzATiqvqnr1+5XFnMGLqLNDdkFhyY++AbI1ozRTOxQWqPHa8eebxhAHLChhu+4FP Kypg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681169174; x=1683761174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VQQjgv80HUN6UIYUFa11nZUMT8IVR3Ic5+4VvO5LWJA=; b=PqzWz5Zd7AJY8gu6Fy3pXCCVnWWZYfuge1qIeVZtVralZtgXt4xRR/kMr7SkXmOMza VoHqKSHzkM2q2mv+1uthznpvJ7+L9UmoGudmJbjXOBNH8gsB8FMym7p38NnZ4GVG6zhd NtqZOk2tj0SVfFo6C4weLynAuseGS0rGqYgTcICxcJ9/lca85zmKr4jU9McYsA40G7Vq yVvm1hBGi1XayqsK6WUfPwjoNK4Q1vbP7JmRw3E9r6VdTmbhuuh3QZQaHCTdEtD5fXas zGKAGN4ZWFrPO+16hk/toFMM4S6jiHbt37um16EjyMcVIJil6lqazMtE8i7AcXcMgw3x 8v7Q== X-Gm-Message-State: AAQBX9e1JxRiaGwWfDnJHOnNlRRF+PDSZT3rR/vgGvyM2u7hGOuCXNQQ mLKGNt/mvPjxeL9a74WCQks= X-Google-Smtp-Source: AKy350bgLARCg2Ao0KQz/Hn91OyQZBEHqX0wiVXNUXIkTlirxQMrCkGiKr0BS2GlY90zyGxqt5BpnA== X-Received: by 2002:a05:622a:142:b0:3e2:ccf9:bf9d with SMTP id v2-20020a05622a014200b003e2ccf9bf9dmr21773439qtw.61.1681169174208; Mon, 10 Apr 2023 16:26:14 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id v126-20020a379384000000b007460093cccdsm3604775qkd.25.2023.04.10.16.26.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 16:26:13 -0700 (PDT) From: Florian Fainelli To: soc@kernel.org Cc: Zhaoyang Li , Dan Carpenter , Dongliang Mu , Florian Fainelli , Nick Alcock , Luis Chamberlain , Ye Xingchen , linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, bcm-kernel-feedback-list@broadcom.com Subject: [GIT PULL 3/4] Broadcom drivers changes for 6.4 Date: Mon, 10 Apr 2023 16:26:05 -0700 Message-Id: <20230410232606.1917803-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410232606.1917803-1-f.fainelli@gmail.com> References: <20230410232606.1917803-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230410_162616_502789_2A406359 X-CRM114-Status: GOOD ( 12.21 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:834 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [f.fainelli[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: https://github.com/Broadcom/stblinux.git tags/arm-soc/for-6.4/drivers for you to fetch changes up to c3fbced9af885a6f217fd95509a613d6590916ce: soc: bcm: brcmstb: biuctrl: fix of_iomap leak (2023-04-03 13:37:24 -0700) ---------------------------------------------------------------- This pull request contains Broadcom SoCs drivers changes for 6.4, please pull the following: - Zhaoyang fixes an of_iomap() leak in the STB BIU driver - Florian removes the bare-metal ARM suspend/resume code which has long been replaced by the standard PSCI suspend/resume. ---------------------------------------------------------------- Florian Fainelli (1): soc: bcm: brcmstb: Remove bare-metal ARM suspend/resume code Nick Alcock (2): kbuild, soc: bcm: raspberrypi-power: remove MODULE_LICENSE in non-modules kbuild, soc: bcm: bcm2835-power: remove MODULE_LICENSE in non-modules Ye Xingchen (1): bus: brcmstb_gisb: Use devm_platform_get_and_ioremap_resource() Zhaoyang Li (1): soc: bcm: brcmstb: biuctrl: fix of_iomap leak drivers/bus/brcmstb_gisb.c | 4 +- drivers/soc/bcm/bcm2835-power.c | 1 - drivers/soc/bcm/brcmstb/Kconfig | 4 +- drivers/soc/bcm/brcmstb/biuctrl.c | 4 + drivers/soc/bcm/brcmstb/pm/Makefile | 1 - drivers/soc/bcm/brcmstb/pm/aon_defs.h | 105 ---- drivers/soc/bcm/brcmstb/pm/pm-arm.c | 874 ---------------------------------- drivers/soc/bcm/brcmstb/pm/s2-arm.S | 69 --- drivers/soc/bcm/raspberrypi-power.c | 1 - 9 files changed, 6 insertions(+), 1057 deletions(-) delete mode 100644 drivers/soc/bcm/brcmstb/pm/aon_defs.h delete mode 100644 drivers/soc/bcm/brcmstb/pm/pm-arm.c delete mode 100644 drivers/soc/bcm/brcmstb/pm/s2-arm.S From patchwork Mon Apr 10 23:26:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 1767346 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=RNfb2KeO; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=qIZzy67r; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PwQ9467M8z1ybB for ; Tue, 11 Apr 2023 09:26:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5DTTsg9gdiCiuy7boaWnVHSb2U2PelIepNb6eFftkls=; b=RNfb2KeOJ2UEx0 JB9N7Jz4TQ1DgYAGYFDu9/1yQEwfulu5wtnqkNQBS/z6oA6wA1j6etQPGcC99uB6a+VE5aOde4D7S hLLdaEl1eRobDNUkt94xecyna2wl/bKUc6ijcQzksA7gtZwLJ+ZzaZAC55dV4BhgLfn+fXVkkUED1 7AG8OcZ7CfIWf0kjeZ1SMKM3I8AUnViSVFLdipKhewhEUzsXBhABz2JJYFyRGwhZHsJvQi0lzxdOx b5is9a1w3/8tMoY383Q62rRinrzZTL74Q39slMD54fTJPKBEQukO+/j2bMMXV+2qu0Yz1Y5xETQjT eIysNuNFxhq0WRbL3irQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1pm0tz-00G3p3-2f; Mon, 10 Apr 2023 23:26:23 +0000 Received: from mail-qt1-x82d.google.com ([2607:f8b0:4864:20::82d]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pm0tu-00G3nT-14 for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2023 23:26:19 +0000 Received: by mail-qt1-x82d.google.com with SMTP id ay36so3495154qtb.11 for ; Mon, 10 Apr 2023 16:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681169176; x=1683761176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TTQV6cSmows/yMKRVXpvkfgSiCRACrDK63Q//T1ObiU=; b=qIZzy67rQsSVjBiayMgcnKPatZx2CU8UW2LyMIuf6bHZ0g1wVKSKJn61UYypZIs5ws YYVCuxVVSz02bT/lUg/k1rHLZkPpvSBGIf6oRxGfjXxUNjPpaZO5oNj7uZmuF88Ft4Dp /nUwaOS3HWKiH+B4noHy6fmBShquVkqfAQDgrHiKe6BZ8RFwNfnyl7OpufZhWuVi1JC6 qopAgA+kZ1RKClpGaZVsVmXvBnrbHC5Am601IR1TkNdXaRQmnv9aD+E8jWD3N4U2R1HC pL1xqMTlYB1GHtWG1dGwXcsZlBQfui/pT4iYLCKFgnfPCPXfNA9Sg72TzHyR33ASvg0q o9kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681169176; x=1683761176; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TTQV6cSmows/yMKRVXpvkfgSiCRACrDK63Q//T1ObiU=; b=pw736xZQd1/yg1tcusLG38jbmETsMWA6zAyPfsxY0hf6tLoy23yARKLv6zmQ6O8VX+ 4xu6Zd110IGdB3mz9L91mpN3Kql9nOfSMUHlibwBqfekzWgTnVJCzpVKu2ZVLGm6plfW 0gVvgcmVz8EyULlCCOvq4AXGpKfbkAg7/gA6b+Om6VLZGMIYPNcu9EXyFTEDT1Bcpkrr FWLyex/en+BSD3dhMLzI8DreXIOOv0nAs6G9gnU0H1enD4F8OaQEJiXnOQ2vY11kB9Gu GYQxXbuLmcv0+eWfd5r3FVzwSe6GXIwBrd/aF/ZV8laaFGPFWKBmNXYasuJEYZbCUHZw 0cjA== X-Gm-Message-State: AAQBX9djQRFH9wnQq+hMBggy+u38UhgUwNJfbwdgmjhxSMJQIVUw6+zy rx7LXO6XQiRTpPNK4H9HdF4= X-Google-Smtp-Source: AKy350arlprb5SFts029avtTtenRhI0iMvtmfJ1gaiFk8NhIMopWJJ4byEmywiwZ8xY0sBMeXbKUUA== X-Received: by 2002:ac8:7d16:0:b0:3e4:ce72:29b with SMTP id g22-20020ac87d16000000b003e4ce72029bmr1458194qtb.16.1681169175910; Mon, 10 Apr 2023 16:26:15 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id v126-20020a379384000000b007460093cccdsm3604775qkd.25.2023.04.10.16.26.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 16:26:15 -0700 (PDT) From: Florian Fainelli To: soc@kernel.org Cc: Rob Herring , Florian Fainelli , linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, bcm-kernel-feedback-list@broadcom.com Subject: [GIT PULL 4/4] Broadcom soc changes for 6.4 Date: Mon, 10 Apr 2023 16:26:06 -0700 Message-Id: <20230410232606.1917803-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230410232606.1917803-1-f.fainelli@gmail.com> References: <20230410232606.1917803-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230410_162618_366119_B9DF1B87 X-CRM114-Status: UNSURE ( 8.52 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:82d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [f.fainelli[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org The following changes since commit fe15c26ee26efa11741a7b632e9f23b01aca4cc6: Linux 6.3-rc1 (2023-03-05 14:52:03 -0800) are available in the Git repository at: https://github.com/Broadcom/stblinux.git tags/arm-soc/for-6.4/soc for you to fetch changes up to 3c01b05407bfeb42c4db0f7cc079437228ab0ab2: ARM: bcm: Use of_address_to_resource() (2023-03-24 14:08:43 -0700) ---------------------------------------------------------------- This pull request contains ARM-based platform code changes for 6.4, please pull the following: - Rob makes use of the of_address_to_resource() helper instead of open coding it in the Kona SMC code. ---------------------------------------------------------------- Rob Herring (1): ARM: bcm: Use of_address_to_resource() arch/arm/mach-bcm/bcm_kona_smc.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-)