From patchwork Mon Dec 27 18:00:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 12699976 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 28BC2C433F5 for ; Mon, 27 Dec 2021 18:02:02 +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=WI3Kiw4PDCq3QPnT+sXsYIPUMY27eaWmaINpmc1Wd9A=; b=vORgabeR5NBDyj /krD0LvTz2bNcFsI4IX1uE9GYd1cOfLqhhzYIgNZHJ3d9ToMg7Ke3odIn4VNem7CciBUZ42P2mpzm kNbYdcE1fZtQS4LKU9tVUc1+2emsvkBvwiA+B82O/DHVkoSyKa+5wC72iArIe14/rSujcHu6pq5Ak F4x+s4SB3CH96SZnx0phDmlZqGIP8RxIMPpSST9n8WoLbLPAHSzPQ9opKRruLRBtz1VntYBMIBAb0 0B3fa9w2CtTP7xwqbLl/N181DI3aJfFREbvT9JPZuzTuKveu6ACLv644irQgyGd0cB/B9rLKYXNXN bzMVG3R1H13D3/oHornw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n1uIs-00HCyh-0H; Mon, 27 Dec 2021 18:00:58 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n1uIf-00HCtH-3t; Mon, 27 Dec 2021 18:00:46 +0000 Received: by mail-wr1-x434.google.com with SMTP id e5so33670349wrc.5; Mon, 27 Dec 2021 10:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OPoQgTS1KmVFy90W+NvwmeK9gvsrVLDXWCHILurYpF4=; b=R6a1sE60uGxkTSpchGmaw0fcubKH43ijxIMCNwBV0tRzTrlu1VljnquWFpLBo5Ydvu v83W/iKkvv9yFHIF7bHaMawQa7eTPSp5RQ+jukanfcEILTo8MKkjQRdvV7Fdgw1xrHJA uFDzcdBKS3LiG7ksWv7Cwe6y2hOVZlJkvPXcpotucohOS90+Z9pEXmJah3ENfWj515Zp SKgRCh1Ny+SGqZu9WcyO8dpu1KShg8WM4MULg6xgEj+268mTNm+LjNEirbt2hqyaXCw3 FlOzA5HVb61WoqtltTVuAi0uOvFxzXdZod69NXCIlJlYjOcH9iD//6CXlLnQM48aZzd5 TEtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OPoQgTS1KmVFy90W+NvwmeK9gvsrVLDXWCHILurYpF4=; b=k5EVQMDTrr6bqgvnaBD2KGslUtI8/7hd29QugKPahkCZ56d2EWHyTChyNdAgycHkGj S158GfuXKLGWB45Ranv2nectjvtgkxNP/VW1scVxcKj8mMpHLW8boNCW09w6Dr6O0sCD TjeOEpBPwfa9GJwnAqec71qQPnL239sWy5Pux74DjPDAZs6q+uCadVqYx8p3kdygkNCV pvsO7TVbp7H7r3DXL/v/zmlkQXV7E5Gn8293TTohyCc98z2/amZQ/OwIi+SegKnfqZNC W66BrfeNO58kWuqvm3Vu6drFWKf8HAZxZEUmJb4lXxFezFc5QmpVcrVfvWJ3wOoCxsgt ToLg== X-Gm-Message-State: AOAM531qTj+lt11kBykgpLYx+5R7I1aJjwL5Y62yZFJYc8rVquQNhQyz 37eBsWhfcw3MhLuUCiwuhl+8L3k59V8= X-Google-Smtp-Source: ABdhPJzH3wWk4vzNSxrurF8PiDQCpZOr2Tvtc+/Setuzmad0Ya+yIxzDoJRnDBxWyxG9Z1YJddhgMA== X-Received: by 2002:adf:de84:: with SMTP id w4mr12966739wrl.67.1640628041292; Mon, 27 Dec 2021 10:00:41 -0800 (PST) Received: from localhost.localdomain (dynamic-2a01-0c23-c4b2-f800-f22f-74ff-fe21-0725.c23.pool.telefonica.de. [2a01:c23:c4b2:f800:f22f:74ff:fe21:725]) by smtp.googlemail.com with ESMTPSA id o11sm18572946wmq.15.2021.12.27.10.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Dec 2021 10:00:40 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Martin Blumenstingl Subject: [PATCH 1/3] ARM: dts: meson: Fix the UART compatible strings Date: Mon, 27 Dec 2021 19:00:24 +0100 Message-Id: <20211227180026.4068352-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211227180026.4068352-1-martin.blumenstingl@googlemail.com> References: <20211227180026.4068352-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211227_100045_181397_69D95E3C X-CRM114-Status: GOOD ( 11.13 ) 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 dt-bindings for the UART controller only allow the following values for Meson6 SoCs: - "amlogic,meson6-uart", "amlogic,meson-ao-uart" - "amlogic,meson6-uart" Use the correct fallback compatible string "amlogic,meson-ao-uart" for AO UART. Drop the "amlogic,meson-uart" compatible string from the EE domain UART controllers. Fixes: ec9b59162fd831 ("ARM: dts: meson6: use stable UART bindings") Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 3be7cba603d5..26eaba3fa96f 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -59,7 +59,7 @@ hwrng: rng@8100 { }; uart_A: serial@84c0 { - compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0x84c0 0x18>; interrupts = ; fifo-size = <128>; @@ -67,7 +67,7 @@ uart_A: serial@84c0 { }; uart_B: serial@84dc { - compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0x84dc 0x18>; interrupts = ; status = "disabled"; @@ -105,7 +105,7 @@ saradc: adc@8680 { }; uart_C: serial@8700 { - compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart"; reg = <0x8700 0x18>; interrupts = ; status = "disabled"; @@ -228,7 +228,7 @@ ir_receiver: ir-receiver@480 { }; uart_AO: serial@4c0 { - compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart"; + compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart"; reg = <0x4c0 0x18>; interrupts = ; status = "disabled"; From patchwork Mon Dec 27 18:00:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 12699978 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 D8DCEC433F5 for ; Mon, 27 Dec 2021 18:02: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=l5ZkmdegNwza4lc0wVEC3dgYoMPd0KLZVtBBgNR7RdM=; b=fI8Bx7bXOSESDk Ng94txNnu2t14WXJVvnDGEvE5FbEZqZkfK3ajTy2crsVf1NwEeq645GR7IWvU2bswXYZS71c1JuTa 2Em46awsncywGmtcCviPNZadAs9v11BzXaklTNQjaz8yvnSHTofJ/NFEWhajO8LkRfmyrN5rK2fEj M3zPWOD+qv80XkkcsoQlrLIrBlq3g24a7ZT86xPMRaywZr7L0XwU+8q7HkdnbUVde+9bK50zKushi Pjle3eGwyL2plfyRCwMSYQq6kg9gdUlKk4XU8NQZJapCAwzTOrH7OwbjgrSBdffxXBoA3NQ9I39nX CudIyYNmXfpxK3bC9nFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n1uJH-00HD8v-4e; Mon, 27 Dec 2021 18:01:23 +0000 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n1uIi-00HCtI-8M; Mon, 27 Dec 2021 18:00:49 +0000 Received: by mail-wr1-x435.google.com with SMTP id q16so33675779wrg.7; Mon, 27 Dec 2021 10:00:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AifEVwl64n8+jB0pcjGlLMYOzYJ44R5sKYb/8MP+sB4=; b=c4ODpaquaFJ1vesePUF39r9v1GVlO1r76gUPCVX9vUqod4/vCG4Uw0nflrxboG961B ooT2tfUmpzsYQqS7PdPN1AwdvOkyh2I/tGLYIOi82uyMQL+0P2Evm43th/D913QTfTHP 08BcsuIOcc7z9/xWRB5m+SOfUujCipq435CaHWnzl2jAur+Zx+eTL7ePsovNYX+TTD4o j0XvAZTjxxvDE4z17fdwp0OaZTfIaBw8pQOcOxbl1nFw8XaAfIzVvAn7S/O9YZR4SGim sC0XCWfbn0NA7b+0DCy3sMLa+2bwjJUWtz34dD88Gp7q5mztAdbleO3I6u1Ied4Xw/J1 3cVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AifEVwl64n8+jB0pcjGlLMYOzYJ44R5sKYb/8MP+sB4=; b=IntsLjnuwbdxaP++0nurO1qQYwdDZ98Y2bifore/qilpqdsr0WjdOBOqn/08YIYkNo mqYYGjsPoEYrq3SjIf2QQt6qOIVvzhMRozl5TfZzYQz9nFqMbqyfiAUwpmwjz10kjXl0 cTfPdZsXPeocvIh2zhme4g13FKl9DOlWftntcGQFi3pN/Od1Up3p8s7OaocKsiAZvjIv gE/+szOxcmymodwXtR0jSihXe/qgHr2YbqiGxgSLOYZeHNaDSbwVlm4lIo2RmTTGPo2Q 9+rxENv6dT1a3+srigy5+Ch9aBZknzsP1qgoq3k9SW1nYVTcgd3LkqO5DsEAdvcChoLQ DemQ== X-Gm-Message-State: AOAM531UjLA4p9YnthAHLjW1+9fo89s0ZwJR6ee1+5dGtuk1scyLPA2D teNGbxMbOjvKOS3gIzlyZi0f8ewcR/k= X-Google-Smtp-Source: ABdhPJyWwMW74S5bnU02w2MBV1shDTKIeHX9GvY/jJmgla2vz/DdH8PRpGgLn3sNuKlKuw3lvo6w6Q== X-Received: by 2002:a5d:47c2:: with SMTP id o2mr13517205wrc.637.1640628042247; Mon, 27 Dec 2021 10:00:42 -0800 (PST) Received: from localhost.localdomain (dynamic-2a01-0c23-c4b2-f800-f22f-74ff-fe21-0725.c23.pool.telefonica.de. [2a01:c23:c4b2:f800:f22f:74ff:fe21:725]) by smtp.googlemail.com with ESMTPSA id o11sm18572946wmq.15.2021.12.27.10.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Dec 2021 10:00:41 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Martin Blumenstingl Subject: [PATCH 2/3] ARM: dts: meson8: Fix the UART device-tree schema validation Date: Mon, 27 Dec 2021 19:00:25 +0100 Message-Id: <20211227180026.4068352-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211227180026.4068352-1-martin.blumenstingl@googlemail.com> References: <20211227180026.4068352-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211227_100048_334603_C94A8D74 X-CRM114-Status: GOOD ( 11.88 ) 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 dt-bindings for the UART controller only allow the following values for Meson8 SoCs: - "amlogic,meson8-uart", "amlogic,meson-ao-uart" - "amlogic,meson8-uart" Use the correct fallback compatible string "amlogic,meson-ao-uart" for AO UART. Drop the "amlogic,meson-uart" compatible string from the EE domain UART controllers. Also update the order of the clocks to match the order defined in the yaml schema. Fixes: 6ca77502050eff ("ARM: dts: meson8: use stable UART bindings with correct gate clock") Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson8.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index f80ddc98d3a2..9997a5d0333a 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -736,27 +736,27 @@ &timer_abcde { }; &uart_AO { - compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart"; + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &uart_A { - compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8-uart"; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &uart_B { - compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8-uart"; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &uart_C { - compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8-uart"; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &usb0 { From patchwork Mon Dec 27 18:00:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 12699977 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 647D2C433EF for ; Mon, 27 Dec 2021 18:02:17 +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=6VIMAmEGyr5M/76YuxrNnZOfad7TWsMh/POl0AVXPpc=; b=CrFIJpAW4w8U1D ifZ6KIszvPeh37XM6P58fZotWX0h8R5TsUkY8UPNDAFcdhJqf6dL7HR0wJ/wc2hMQE35N1UaT425u uFaEvkH5jxbPrI16Ou8PmW9oyZDRr3XUgYc7XrOH3sTuIW9dNnF6r7S4+BIfcoXGjlDvIUD3PwwmN 6xAsvgU02kaSPwVlB2FL2f+53QaVecOVV/Xic5/EhLsCgAjiTkZj3VR9cH12Br9wwU5X+VYaoJNwn 5x40TtJc59lur8dbFQVn52L7m8KaMQkDU+UYX+PUSZ9r6MvkEkHE1A1FH305CnRYRzEKuC+LiT0Na kZkS6sMOPO4LttTFuDvw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n1uJ3-00HD2p-Mh; Mon, 27 Dec 2021 18:01:09 +0000 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n1uIi-00HCtZ-6y; Mon, 27 Dec 2021 18:00:49 +0000 Received: by mail-wr1-x432.google.com with SMTP id r17so33706604wrc.3; Mon, 27 Dec 2021 10:00:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VZQ7gHCQAZlakeETbiUb1MioVO2i5AohZAAATv78NYM=; b=PrHCsm0XE/g7kyILFqCoEKld6mssfEEGh0AbSwxZTlaIoxDoa+FussVbhdXziv5TC6 LbG7qxPRXgniX84SeExqUEjNrJUdx5+5YTdXyUqLg9LbqF0v1YirchKYBlpFhZPOekn+ sdL1DXEcBtSx1fXhz1OmGscxqU+siP1MxziUBVB4Ls/+kfBbCerm4ifjfn1gvMavchnj Jl1tzVl4qHkWXYNgDvUwDMkmN/d8/weUS/91uMArs6OFQhbOcAXIeGcei/MwJACs08zy galWcRcRBJdMHVs3yJv5/9d1vW7Yql4x32NvlKMV3yOQBB3GUufGc/PJK2ZjprQvSaF4 z4xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VZQ7gHCQAZlakeETbiUb1MioVO2i5AohZAAATv78NYM=; b=ni8k+vv0l4lGJAOnw1ofUAsF+6QKWdyNZbrPP0T8F3Q9gK8l/84wQRdre1gp4tWux4 6A+6edvLTXPVNvhyb27dPYEEr//jP6FNkIdm1lMy9mXw79d4LWw5Xl8BHG6k3V5WLGyE 8YF8MKFSA4P9ZopsKs4qx03jYhvJyGbza3mdxOMhIyl9EMGD1nNKIWtY9ZAVRZ/8tT0D t/8AFy5/I2AsEC20cRPZiTHftvsnKPsgSqbCbNGnGoyq/irlSVPwyz2UNjNRUYb/DRx6 9ohbDBczuvHYNWtmJjg2Hj2a2RS+JqxgZN5cI3J4Fr65eOD44wxC/aXxC79XxYNNPOK1 4BBw== X-Gm-Message-State: AOAM5307uPab8PcUgTF/QKTSHLO/5EEp9OnP7r7mRVzQmR7vspE/0afb DOtvd+V2OwB0cNgW8IL16cEYUaLvXoY= X-Google-Smtp-Source: ABdhPJwztOIQ+ohCI+e9b0xdHnsHB1yXoWTIDrywhAAv1mi1cNk/1YC13UuJgxs0uHI+hDja1E5MwQ== X-Received: by 2002:adf:dc92:: with SMTP id r18mr13285103wrj.584.1640628042921; Mon, 27 Dec 2021 10:00:42 -0800 (PST) Received: from localhost.localdomain (dynamic-2a01-0c23-c4b2-f800-f22f-74ff-fe21-0725.c23.pool.telefonica.de. [2a01:c23:c4b2:f800:f22f:74ff:fe21:725]) by smtp.googlemail.com with ESMTPSA id o11sm18572946wmq.15.2021.12.27.10.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Dec 2021 10:00:42 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Martin Blumenstingl Subject: [PATCH 3/3] ARM: dts: meson8b: Fix the UART device-tree schema validation Date: Mon, 27 Dec 2021 19:00:26 +0100 Message-Id: <20211227180026.4068352-4-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211227180026.4068352-1-martin.blumenstingl@googlemail.com> References: <20211227180026.4068352-1-martin.blumenstingl@googlemail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211227_100048_294823_500DDB9C X-CRM114-Status: GOOD ( 11.88 ) 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 dt-bindings for the UART controller only allow the following values for Meson8 SoCs: - "amlogic,meson8b-uart", "amlogic,meson-ao-uart" - "amlogic,meson8b-uart" Use the correct fallback compatible string "amlogic,meson-ao-uart" for AO UART. Drop the "amlogic,meson-uart" compatible string from the EE domain UART controllers. Also update the order of the clocks to match the order defined in the yaml bindings. Fixes: b02d6e73f5fc96 ("ARM: dts: meson8b: use stable UART bindings with correct gate clock") Signed-off-by: Martin Blumenstingl --- arch/arm/boot/dts/meson8b.dtsi | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index b49b7cbaed4e..94f1c03decce 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -724,27 +724,27 @@ &timer_abcde { }; &uart_AO { - compatible = "amlogic,meson8b-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8b-uart", "amlogic,meson-ao-uart"; + clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &uart_A { - compatible = "amlogic,meson8b-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8b-uart"; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &uart_B { - compatible = "amlogic,meson8b-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8b-uart"; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &uart_C { - compatible = "amlogic,meson8b-uart", "amlogic,meson-uart"; - clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>; - clock-names = "baud", "xtal", "pclk"; + compatible = "amlogic,meson8b-uart"; + clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>; + clock-names = "xtal", "pclk", "baud"; }; &usb0 {