From patchwork Sun Nov 21 17:15:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 12693236 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BEE3FC433F5 for ; Sun, 21 Nov 2021 17:17:15 +0000 (UTC) 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=Ll9UhvnJzuqvNYC34I5cYkVslnFj4YhWyOPsZ15mDjM=; b=fS/H76vGJghwA0 XMm7VIRSx6dg82Qg2Kpcmu857RlZsQz+l9v4KyNZuM5lCyE9blmeZuOlyIJywNkQrV4NmB/zx8FUS 7+krxCKb45XV1dVQPbm20Z/wUxB1pvvVeU/AoFdL5Evyc6VRZYIx1AZY+bxMKNAHAYws1oYFsTqhD p3XWu0l+spI6G3j2tM4GYjdDx19xP7DCJ2XCroO5pMOOwNYWQ7I3UU7LD1haWWYL32MJIQ27weIQD xAomWYAe0KZ1q/OK0dF2XNoKbjYLNEMt0rH5rBMmrm7g9ylhS+ApHWG9J/PvlDdEoNMu6z6ZJjZce QlWkjbR01nL7ilqHV8zQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1moqRX-00E1Pf-5l; Sun, 21 Nov 2021 17:15:55 +0000 Received: from soltyk.jannau.net ([144.76.91.90]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1moqRT-00E1Nc-C6 for linux-arm-kernel@lists.infradead.org; Sun, 21 Nov 2021 17:15:53 +0000 Received: from coburn.home.jannau.net (p579ad520.dip0.t-ipconnect.de [87.154.213.32]) by soltyk.jannau.net (Postfix) with ESMTPSA id 6D529261B2C; Sun, 21 Nov 2021 18:15:47 +0100 (CET) From: Janne Grunau To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Marc Zyngier Cc: Mark Kettenis , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 1/3] arm64: dts: apple: change ethernet0 device type to ethernet Date: Sun, 21 Nov 2021 18:15:43 +0100 Message-Id: <20211121171545.27402-2-j@jannau.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211121171545.27402-1-j@jannau.net> References: <20211121171545.27402-1-j@jannau.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211121_091551_595868_703EA7F3 X-CRM114-Status: GOOD ( 10.05 ) 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Fixes make dtbs_check errors for t8103-j274.dts due to missing pci properties. Fixes: e1bebf978151 ("arm64: dts: apple: j274: Expose PCI node for the Ethernet MAC address") Reviewed-by: Mark Kettenis Signed-off-by: Janne Grunau --- arch/arm64/boot/dts/apple/t8103-j274.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/apple/t8103-j274.dts b/arch/arm64/boot/dts/apple/t8103-j274.dts index 33a80f9501dc..02c36301e985 100644 --- a/arch/arm64/boot/dts/apple/t8103-j274.dts +++ b/arch/arm64/boot/dts/apple/t8103-j274.dts @@ -60,7 +60,7 @@ &port01 { &port02 { bus-range = <3 3>; - ethernet0: pci@0,0 { + ethernet0: ethernet@0,0 { reg = <0x30000 0x0 0x0 0x0 0x0>; /* To be filled by the loader */ local-mac-address = [00 10 18 00 00 00]; From patchwork Sun Nov 21 17:15:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 12693238 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 519E2C433F5 for ; Sun, 21 Nov 2021 17:17:24 +0000 (UTC) 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=rdJRKNlyz0Zwql+ccXXYb+8Iyqzj5aGQx//Sir0mjtw=; b=ojCCYKvIuCoXS8 QYUKVYD5+mIZpVk8KfVPzVpJEHTDkDI3AW2tlYGg3EiPVpE1oONoEL+sFNcERpzcUhdfnRiv8urWd gBLf+YEy3EXfP24O2mZMGat+j6BuAA+MiQIDQi+4AzEgPR/LxNeW1nFf2NEAebo/8R9Y8byRfnNjg FLS1rAeRWtXuVFpr5sTXzP3igG7r1eYs2Df0O7B84iU4f8DficyH8h1Iz18SQU073DCaHsXuFr89/ fauGdTOU9OmUdRHfBxjpEWB3U+9xXL7vqhg1LG0uUzcoy0gGpjWSxaDYrInPuRiW5iDUpxO+w8Pb0 FJA8tjb26Wn3SOs2UrkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1moqRr-00E1Si-0F; Sun, 21 Nov 2021 17:16:15 +0000 Received: from soltyk.jannau.net ([144.76.91.90]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1moqRT-00E1Nu-F9 for linux-arm-kernel@lists.infradead.org; Sun, 21 Nov 2021 17:15:54 +0000 Received: from coburn.home.jannau.net (p579ad520.dip0.t-ipconnect.de [87.154.213.32]) by soltyk.jannau.net (Postfix) with ESMTPSA id 1D3E7261B2E; Sun, 21 Nov 2021 18:15:48 +0100 (CET) From: Janne Grunau To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Wolfram Sang , Olof Johansson , Arnd Bergmann Cc: Mark Kettenis , Rob Herring , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] dt-bindings: i2c: apple,i2c: allow multiple compatibles Date: Sun, 21 Nov 2021 18:15:44 +0100 Message-Id: <20211121171545.27402-3-j@jannau.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211121171545.27402-1-j@jannau.net> References: <20211121171545.27402-1-j@jannau.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211121_091551_680327_AEA9C7E2 X-CRM114-Status: UNSURE ( 8.63 ) X-CRM114-Notice: Please train this message. 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The intention was to have a SoC-specific and base compatible string to allow forward compatibility and SoC specific quirks, Fixes: df7c4a8c1b47 ("dt-bindings: i2c: Add Apple I2C controller bindings") Signed-off-by: Janne Grunau Cc: Mark Kettenis Reviewed-by: Sven Peter --- Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml index 22fc8483256f..f1cb96c08212 100644 --- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml @@ -20,9 +20,10 @@ allOf: properties: compatible: - enum: - - apple,t8103-i2c - - apple,i2c + items: + - enum: + - apple,t8103-i2c + - const: apple,i2c reg: maxItems: 1 @@ -51,7 +52,7 @@ unevaluatedProperties: false examples: - | i2c@35010000 { - compatible = "apple,t8103-i2c"; + compatible = "apple,t8103-i2c", "apple,i2c"; reg = <0x35010000 0x4000>; interrupt-parent = <&aic>; interrupts = <0 627 4>; From patchwork Sun Nov 21 17:15:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 12693239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4FC8C433F5 for ; Sun, 21 Nov 2021 17:17:35 +0000 (UTC) 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=HmmGOJtKz0freWBmhYYxs0oDqQ1G5I/PERi2SV7UQn8=; b=qnd/P3PN+fylZg IsmaYhqSFYCqYn4C6wfB7gBOWAOmgQfZW4Di+MOwMyyav+43vwAQOhSH3nb0l4IU2oIQXpboNbCRG M5NsbM9Y8fwKzh1HAgRf9IgHMCYenJBfSP8aBD8k/n6iC0j7xCflHCQPuQs6rbrMr7oXGRxz0Lq/9 Pd+GEzZvvFndOr5iyTm7fCC/+3Ud0qHTkiz3m+dzE8gMiVTCe+QewbCzpZH+mWQnDUTP12S2aQT+d 63l9+leMGg4r2mMfH5YGbsNQU5nxFNClqfDNj8e3nTCdDjDjpmoTfqRYzpRJeRGTSO9vWyR6R3Ey3 PIqvae0SOflOeSJWHPhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1moqS0-00E1UC-TI; Sun, 21 Nov 2021 17:16:25 +0000 Received: from soltyk.jannau.net ([144.76.91.90]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1moqRU-00E1Nw-2v for linux-arm-kernel@lists.infradead.org; Sun, 21 Nov 2021 17:15:54 +0000 Received: from coburn.home.jannau.net (p579ad520.dip0.t-ipconnect.de [87.154.213.32]) by soltyk.jannau.net (Postfix) with ESMTPSA id CA18B261B2F; Sun, 21 Nov 2021 18:15:48 +0100 (CET) From: Janne Grunau To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Linus Walleij , Mark Kettenis , Marc Zyngier Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes Date: Sun, 21 Nov 2021 18:15:45 +0100 Message-Id: <20211121171545.27402-4-j@jannau.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211121171545.27402-1-j@jannau.net> References: <20211121171545.27402-1-j@jannau.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211121_091552_314911_7D1FDF12 X-CRM114-Status: UNSURE ( 8.77 ) X-CRM114-Notice: Please train this message. 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Required for devices trying to use pinctrl devices as interrupt controller. Fixes: 0a8282b83119 ("arm64: apple: Add pinctrl nodes") Signed-off-by: Janne Grunau Cc: Mark Kettenis Reviewed-by: Sven Peter --- arch/arm64/boot/dts/apple/t8103.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/apple/t8103.dtsi b/arch/arm64/boot/dts/apple/t8103.dtsi index fc8b2bb06ffe..c320c8baeb41 100644 --- a/arch/arm64/boot/dts/apple/t8103.dtsi +++ b/arch/arm64/boot/dts/apple/t8103.dtsi @@ -143,6 +143,7 @@ pinctrl_ap: pinctrl@23c100000 { apple,npins = <212>; interrupt-controller; + #interrupt-cells = <2>; interrupt-parent = <&aic>; interrupts = , , @@ -169,6 +170,7 @@ pinctrl_aop: pinctrl@24a820000 { apple,npins = <42>; interrupt-controller; + #interrupt-cells = <2>; interrupt-parent = <&aic>; interrupts = , , @@ -189,6 +191,7 @@ pinctrl_nub: pinctrl@23d1f0000 { apple,npins = <23>; interrupt-controller; + #interrupt-cells = <2>; interrupt-parent = <&aic>; interrupts = , , @@ -209,6 +212,7 @@ pinctrl_smc: pinctrl@23e820000 { apple,npins = <16>; interrupt-controller; + #interrupt-cells = <2>; interrupt-parent = <&aic>; interrupts = , ,