From patchwork Mon Nov 22 22:24:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 12693377 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 3C033C433EF for ; Mon, 22 Nov 2021 22:53:48 +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=4fPfSU4Kn184s9 qQtQ2ScOzFkAdDsX7EmqZtijYZQzeb3orSd5qlWiLtzu5ON7mtmPl9v1WoWiov+vAbYStdgYYeifb 0yBrQ4pdtNkjGuuD8zFjMTEIJcItzg3hW+RzPCuB2OnO2yg2Dn3IsnfB0asjCks6M8uSBVyjcCzYe ZC1UAtRSlgJ6PTuazIDQUTmNOuf9LT/wPd4FrIi4zoWiMZyENEAfcClvXl4x6LLOK9gUCZ71T0jCG mmQHCrZvuMcCZCS3E6mSB3zxi4cl1UwOSfdJW3ZwQIpc6yPGZPQU7P8qXANuFT91aq/lM+XG0bZF8 9UsxWwyzcuWOzci27MyQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpIAQ-000F3s-ME; Mon, 22 Nov 2021 22:52:07 +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 1mpHjx-0008Om-MB for linux-arm-kernel@lists.infradead.org; Mon, 22 Nov 2021 22:24:47 +0000 Received: from coburn.home.jannau.net (p579ad520.dip0.t-ipconnect.de [87.154.213.32]) by soltyk.jannau.net (Postfix) with ESMTPSA id 30079261B42; Mon, 22 Nov 2021 23:24:42 +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 v2 1/3] arm64: dts: apple: change ethernet0 device type to ethernet Date: Mon, 22 Nov 2021 23:24:38 +0100 Message-Id: <20211122222440.21177-2-j@jannau.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211122222440.21177-1-j@jannau.net> References: <20211122222440.21177-1-j@jannau.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_142445_922044_03F4DAF0 X-CRM114-Status: GOOD ( 10.39 ) 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 Mon Nov 22 22:24:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 12693378 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 99CD1C433F5 for ; Mon, 22 Nov 2021 22:55:26 +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=WU6E/0fxJDxoXcSk0xqKf1kYCPv/eDF34y64RtQT/M4=; b=C+dtuzP+9tjOTP taihe2olzvTLZxcTQPSBZ7G0TU3o2knAabV+20+n9GK3GPCIhTkShmUymFIalGJU8aDLfz9rXJOKZ Axnp+u1AI69/wSeyVJqKRuDvlwB/sihjg/NBcSitPzL28iXVdaIqvQgkQKu2Yblc5BV9MADBUZQdO TjHp4wccZMQ+dqckAz2w7uvqTz2siOx5i4mFxeNvihJaCsCLIoTE12zi+4rnOY044RO9ZBpQIqG9J 514gqFiHXg0smp/t1Agt3d3fVoJB1V0a6Qv/K6ROHgReOIOraKnpiCAWLFsPHkqp2VxhjR5uu4qfF gsZFIXqDUNLaCCSj69oQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpIBx-000FRb-A5; Mon, 22 Nov 2021 22:53:42 +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 1mpHjy-0008Ox-6S for linux-arm-kernel@lists.infradead.org; Mon, 22 Nov 2021 22:24:48 +0000 Received: from coburn.home.jannau.net (p579ad520.dip0.t-ipconnect.de [87.154.213.32]) by soltyk.jannau.net (Postfix) with ESMTPSA id CACFB261B43; Mon, 22 Nov 2021 23:24:42 +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 v2 2/3] dt-bindings: i2c: apple, i2c: allow multiple compatibles Date: Mon, 22 Nov 2021 23:24:39 +0100 Message-Id: <20211122222440.21177-3-j@jannau.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211122222440.21177-1-j@jannau.net> References: <20211122222440.21177-1-j@jannau.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_142446_458268_7AC69499 X-CRM114-Status: UNSURE ( 9.23 ) 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 Reviewed-by: Mark Kettenis Acked-by: Wolfram Sang Acked-by: Rob Herring --- Documentation/devicetree/bindings/i2c/apple,i2c.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml index 22fc8483256f..82b953181a52 100644 --- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml @@ -20,9 +20,9 @@ allOf: properties: compatible: - enum: - - apple,t8103-i2c - - apple,i2c + items: + - const: apple,t8103-i2c + - const: apple,i2c reg: maxItems: 1 @@ -51,7 +51,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 Mon Nov 22 22:24:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 12693379 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 9F5CCC433EF for ; Mon, 22 Nov 2021 22:56:51 +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=snDtyEAGLKmdVWmpor6s7rkEHfd292K4Mjzi4tkCa0I=; b=L8I4Ry5xwzM36+ /mivQ+dbyul2DGrkfrK0UAE0oYkftfDBPX9YYY8XJ/IEOP2+NczhefA47fty3Rky7IKYXR6Qjq7OC /8HwQSzXdMGtx/g0nTdIy9TY+6J/xO3OFBK0C1/qgwHhFoSNz7PzEqpooCQEguNDHQIQlpMeixFpI aOvdcV8IfC/QBb+8pJDgfY2Su2Tv9+h9vFGLe3+D7Jloc8sMiduLwSXu1xLVoY3WXTIdLUc0x+++k 8dBg9dRD71J2bGtaIq509QwqTKEh0/v/i1JTpumz0RvlDbzK25OLoa4DsrGpokJywgYr5QI5v8WjT eXL3cubBVFfOUpuH/KlQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mpIDQ-000Fts-25; Mon, 22 Nov 2021 22:55:13 +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 1mpHjy-0008PM-TN for linux-arm-kernel@lists.infradead.org; Mon, 22 Nov 2021 22:24:48 +0000 Received: from coburn.home.jannau.net (p579ad520.dip0.t-ipconnect.de [87.154.213.32]) by soltyk.jannau.net (Postfix) with ESMTPSA id 7ABC9261B44; Mon, 22 Nov 2021 23:24:43 +0100 (CET) From: Janne Grunau To: Hector Martin , Sven Peter , Alyssa Rosenzweig , Rob Herring , Linus Walleij , Marc Zyngier , Mark Kettenis Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] arm64: dts: apple: add #interrupt-cells property to pinctrl nodes Date: Mon, 22 Nov 2021 23:24:40 +0100 Message-Id: <20211122222440.21177-4-j@jannau.net> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211122222440.21177-1-j@jannau.net> References: <20211122222440.21177-1-j@jannau.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211122_142447_209277_A970F254 X-CRM114-Status: UNSURE ( 8.94 ) 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 Reviewed-by: Mark Kettenis --- 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 = , ,