From patchwork Mon Jan 23 15:16:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 47208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1663140wrn; Mon, 23 Jan 2023 07:18:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXtbihUVMVIm4jSNBdoWh1SzGfoJW8vhCK38jPG6Cq/Fh38XHRVD7wR7RYVP9aOerK0Sgr7N X-Received: by 2002:a05:6a20:ca57:b0:b8:9ac4:ae5d with SMTP id hg23-20020a056a20ca5700b000b89ac4ae5dmr23199255pzb.56.1674487098669; Mon, 23 Jan 2023 07:18:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674487098; cv=none; d=google.com; s=arc-20160816; b=dDOmYFHsDFUNCpnnJ5sXd5Ih6MxD+yAylkGquWFNnmDiJ9wWn7/LS5jcJiGeEDOhs9 fcmkZ7oe5uCIgRh5R70i/wfJVP/SXeVNc8J/aIdbO7MO4B3vid1J7VoK9GuHoTQVl9cA aQAcKG/LX4xgxrKG6RPVh4DgNYoAeQXiibIuL0VcKDo5l7Kfjg+t9ZJVGsNkLDLl4hYC n33S9uvuKcQmn3Qj+c19HYd/Y+0mHveg57YqU+/wxrjwIQHKJmEmtEypvljKOaghuZBe jskgpU2mAVs1vd5s68xbkNg4953PX/pZURuQ1Mmy+oVC7hGoIjCPn4Y/iwc0m9uu2SIZ iSZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=YDagDVuTw97PsrwBo815Sg4TXF+qVDL0QTDGxQIG7EE=; b=UPXWX0jYjRNqQVqowToIKWOPxL8IgifgQmZX1UUnZx99Fz44Kv7LavZAq9yaPVCZ+9 snSA7tXd9w4vTQ8+thPUwe2FwWLyeYUtuAwkQLOpvnBTagJareAcqIY5QP4jUPGnHugj qecVI69FS3CbPbJKonwedm8UncYsro83Y7XSVi//2phdfQgEeGygocHRU0o/8LeWougp kpkABDZiY1OTiYGS1b6Vcwm+yU7+888ZhrGN2+byGFRT+k+ntvKoBS+RRd637pHsf6zL CmUlJqhnBaLf460a4y14BN0y90t2MD3fW0wrIoP9xsItqxh7IUf2l1CQjd4GI7rRdoyq 2iow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TxF1shXG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a16-20020a63d210000000b0049e0bab8d55si33973937pgg.133.2023.01.23.07.18.06; Mon, 23 Jan 2023 07:18:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TxF1shXG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232661AbjAWPR0 (ORCPT + 99 others); Mon, 23 Jan 2023 10:17:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232645AbjAWPRH (ORCPT ); Mon, 23 Jan 2023 10:17:07 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7614D2A17B for ; Mon, 23 Jan 2023 07:16:23 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id k16so9279685wms.2 for ; Mon, 23 Jan 2023 07:16:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YDagDVuTw97PsrwBo815Sg4TXF+qVDL0QTDGxQIG7EE=; b=TxF1shXGFnnhvEuPq/MGXBxFzVUaKfv+QXx93477hf5+2xOrwKsS4LLLs8SIZiR30m 1Bdyn9cO4PpAdLYfbZ0vDE0muZ0CqIr/xkW+AEbe33/P143p16ubDdpreRVwBxwVAUC3 9uI9VxmXiRM4klss66ILSgnj9D9bfpoU6I5zgQ3QGW7kpashRN7/CiNzwciBYrF35W66 FxVOSFXTymspb6WO7XlnzP34YGsM+rPscQdB+oRcLxS15uWvjN5KV3Afs4o1DAgoDeM0 jWV1DDbQpZgqP50Uw+Qs1L+xN3+b3+zuw8KNyj8dbQDG4o3HqzhDc0Y6Anb82yO6inVR bgmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=YDagDVuTw97PsrwBo815Sg4TXF+qVDL0QTDGxQIG7EE=; b=EdZz/neXXv2wGg26kaKuonvc0Qi6ko+jKFhvmJRiwZfIOgAzlnRNxVf2QeWf/+9VVR pSujcZM1WXe4bJdwMwWntqrAUMSWZZRcbcuqIO4g2B3WwDrtlPGqMSlvQWO98qg7TyE1 23AHa0Nq3AM4TE5RVzUntUwLI427kxKGfzR97vkYzCxhSTzJhoWSgL4hnhXaXe/iAghr AbJyL1EHtzG/9uoqI8IMIQ8jSiVRH6yKoi0FIJELour16j6y+++cpiCk/70tp44z7/OU TjLr81CuMNg5rznT37xA3s0LcOg/HIQF41kP+K66PMwy2QGLKzdYn8Ewwabi8A5rju+R WUuA== X-Gm-Message-State: AFqh2koyV7f1gc+ucMBPyd2AuV3CxvlH0WI8W+/TX09TM1k47BQ1ngXz rtMUw2LcstHXrgMI6qeX6xN93A== X-Received: by 2002:a1c:750e:0:b0:3da:fcf6:7146 with SMTP id o14-20020a1c750e000000b003dafcf67146mr24529079wmc.14.1674486979176; Mon, 23 Jan 2023 07:16:19 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id f13-20020a7bcc0d000000b003d9780466b0sm10697414wmh.31.2023.01.23.07.16.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 07:16:18 -0800 (PST) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Ray Jui , Scott Branden , Broadcom internal kernel review list , Florian Fainelli , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/2] arm64: dts: broadcom: drop deprecated serial device_type Date: Mon, 23 Jan 2023 16:16:15 +0100 Message-Id: <20230123151616.369963-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755826984162704595?= X-GMAIL-MSGID: =?utf-8?q?1755826984162704595?= The device_type property is deprecated by Devicetree specification and bindings do not allow it. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi index b8b8c0e78cc6..a9186166c068 100644 --- a/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi +++ b/arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi @@ -475,7 +475,6 @@ i2c1: i2c@e0000 { }; uart0: serial@100000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00100000 0x1000>; reg-shift = <2>; @@ -486,7 +485,6 @@ uart0: serial@100000 { }; uart1: serial@110000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00110000 0x1000>; reg-shift = <2>; @@ -497,7 +495,6 @@ uart1: serial@110000 { }; uart2: serial@120000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00120000 0x1000>; reg-shift = <2>; @@ -508,7 +505,6 @@ uart2: serial@120000 { }; uart3: serial@130000 { - device_type = "serial"; compatible = "snps,dw-apb-uart"; reg = <0x00130000 0x1000>; reg-shift = <2>; From patchwork Mon Jan 23 15:16:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 47210 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1663234wrn; Mon, 23 Jan 2023 07:18:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXvTxXvDU+gOrRd6RG/pxwjUiD1vn2TduHsJfmyuFMXoawuXrjaKSoUw6RIgIKcMHMDnI27Z X-Received: by 2002:a17:90b:3d85:b0:229:d224:8c59 with SMTP id pq5-20020a17090b3d8500b00229d2248c59mr20238772pjb.22.1674487108086; Mon, 23 Jan 2023 07:18:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674487108; cv=none; d=google.com; s=arc-20160816; b=m/VkJb61p+QKB/mSpVB/pf7EoYaxEmdbb40g1UxK25VB73Ei7FKUt0WI09nuHWkXeX hWD9X3O9OH3OgJ5IzrV/X8/rDyAI5Boo8Jp3ip0vZ8b409cPkMtvMFxcM07nImRwTuS2 +GjyLibYHO4j0zfbzs6UqvvINBeJBbD+4iT007F+1THkueK4GhNAUQ0OwJv0htfGQt9E 1p7Aa/Qf5e1yi0dtqehzzNUBs/seK6nLeCg7ED2+tPTey5/HhZw+5KcYX2STNR99uSx9 CHM9wNk80RRLmqIIangTafJYkIRHmHPqW2TGJIWTqdXaphYiPGufWsVQ2j93ejXa8jbn +FtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=b9CV+yUJBq8ETRaFGXmwVdEJZEPhzygsxPAPrI9XL9o=; b=eFonrvGx9xXt2KTzuTGPBmCNsV5DUAghAfmN2Xm5L93TcawyR0SFC0WYlMhEB6fG4p eDgoN7fLCfEq/c4oRwtzsQfzURTfzYsI9ml5MSnRuYRhC9YjtR+2N3g6FH6BPFFXmhbM ALtFiu7Qq8oKXmeEQ98LDyVwac/yMQTPFpOgOxMLHR+n1DA2MoOxtjOKuWDMsmWPxQVu 7/gsAJqbtjs6T6xddGBp4rPhGj7QRIkr4zKfm7pAKxCK/OGOzjNZAE1mYI882y0wkJ4d uqaeGQwHGRhWB8qh7oeKEuGakZgutyL3bKiM2p0/j7cre88Dt7bRZ5Pw+7NTqsaR0BzZ XflQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="an4bu/X4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b7-20020a656687000000b004787bf14a62si50269074pgw.439.2023.01.23.07.18.15; Mon, 23 Jan 2023 07:18:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="an4bu/X4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232526AbjAWPR2 (ORCPT + 99 others); Mon, 23 Jan 2023 10:17:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232384AbjAWPRI (ORCPT ); Mon, 23 Jan 2023 10:17:08 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1D1B298F7 for ; Mon, 23 Jan 2023 07:16:26 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so10854513wma.1 for ; Mon, 23 Jan 2023 07:16:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=b9CV+yUJBq8ETRaFGXmwVdEJZEPhzygsxPAPrI9XL9o=; b=an4bu/X4dQl1it6mjZfiunC4hlB7tnosX5OHG3eT+bqLmB8UjTVHrx9DDUz8NHpeN6 zIXBq+ibvVyTQAhRgjNXMqu3i+u2eaXTPh7ej3vc+KSSGIE5czevERG5lpoIrtVVqoSE MqJQuAfOfe/x6AOJS1hs28vH/a+hgWj1PEHdocLqrNQ/3i9qetmQMPYjURsEl+WW4iqK c/hDQtz01PEN9TBUSKtl3pQ+l9A8NYhGUjb3SEFPenRw71bVR8kCIHBef/NsVO8qW6nZ ScWQo4G+fUqfa75sZ5xnJoJvkVzjzNQmvq1lIwFJUixgfwZY/+VsoCqeVgRj8wNYPHcA Q/dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=b9CV+yUJBq8ETRaFGXmwVdEJZEPhzygsxPAPrI9XL9o=; b=0KKzYY0dW6pYL0btZG8OT8VwGZ1NiLz5gXDV+SVDle7IDKu76DMNmsPOKUzbGrJVX/ aX6DzksdG7SGErDWaSo3PYav2PRmZIlSN6kgkmX0HtteRmNL/xq8wa+IhWdRztK9df0u mRwpECHgZY2dsiyNmJNV9T3iEvHBBljfpj2nvFsqDYksXWqTk0RPoaoQ44A8K+qUPPZ7 Y8DI4S1goLLw9asTya+G3dJWDkzGfP6tyFZJa846IXPmJ8WnZ+WkVIvcxJ+3x3y2MgAH qMg2rZrFovnttLAtG8UupvA7M7tQ3aIDsk84Nyh0r9UNPLL20ZYC6qMhEwi7xuS+Tu6Q 8f+A== X-Gm-Message-State: AFqh2kpFTVy4aCiVHdAIQ1e3nAi7wH5DKgB1An2p2kQMahLAkVFj5B/w 0xUXJGFJHjWH14dijAHkmLn7MA== X-Received: by 2002:a05:600c:d2:b0:3da:f475:6480 with SMTP id u18-20020a05600c00d200b003daf4756480mr24604054wmm.7.1674486980573; Mon, 23 Jan 2023 07:16:20 -0800 (PST) Received: from krzk-bin.. ([178.197.216.144]) by smtp.gmail.com with ESMTPSA id f13-20020a7bcc0d000000b003d9780466b0sm10697414wmh.31.2023.01.23.07.16.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 07:16:20 -0800 (PST) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Ray Jui , Scott Branden , Broadcom internal kernel review list , Florian Fainelli , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/2] ARM: dts: broadcom: align UART node name with bindings Date: Mon, 23 Jan 2023 16:16:16 +0100 Message-Id: <20230123151616.369963-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230123151616.369963-1-krzysztof.kozlowski@linaro.org> References: <20230123151616.369963-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755826993750385121?= X-GMAIL-MSGID: =?utf-8?q?1755826993750385121?= Bindings expect UART/serial node names to be "serial". Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- arch/arm/boot/dts/bcm21664-garnet.dts | 2 +- arch/arm/boot/dts/bcm21664.dtsi | 6 +++--- arch/arm/boot/dts/bcm28155-ap.dts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi index 53696078bbf0..ba75784d66a9 100644 --- a/arch/arm/boot/dts/bcm11351.dtsi +++ b/arch/arm/boot/dts/bcm11351.dtsi @@ -50,7 +50,7 @@ smc@3404c000 { reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */ }; - uart@3e000000 { + serial@3e000000 { compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e000000 0x1000>; @@ -60,7 +60,7 @@ uart@3e000000 { reg-io-width = <4>; }; - uart@3e001000 { + serial@3e001000 { compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e001000 0x1000>; @@ -70,7 +70,7 @@ uart@3e001000 { reg-io-width = <4>; }; - uart@3e002000 { + serial@3e002000 { compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e002000 0x1000>; @@ -80,7 +80,7 @@ uart@3e002000 { reg-io-width = <4>; }; - uart@3e003000 { + serial@3e003000 { compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e003000 0x1000>; diff --git a/arch/arm/boot/dts/bcm21664-garnet.dts b/arch/arm/boot/dts/bcm21664-garnet.dts index 1854cd907a1b..cd03fa0c2aae 100644 --- a/arch/arm/boot/dts/bcm21664-garnet.dts +++ b/arch/arm/boot/dts/bcm21664-garnet.dts @@ -16,7 +16,7 @@ memory@80000000 { reg = <0x80000000 0x40000000>; /* 1 GB */ }; - uart@3e000000 { + serial@3e000000 { status = "okay"; }; diff --git a/arch/arm/boot/dts/bcm21664.dtsi b/arch/arm/boot/dts/bcm21664.dtsi index 2684c37cb3a0..ed4de031e48e 100644 --- a/arch/arm/boot/dts/bcm21664.dtsi +++ b/arch/arm/boot/dts/bcm21664.dtsi @@ -50,7 +50,7 @@ smc@3404e000 { reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */ }; - uart@3e000000 { + serial@3e000000 { compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e000000 0x118>; @@ -60,7 +60,7 @@ uart@3e000000 { reg-io-width = <4>; }; - uart@3e001000 { + serial@3e001000 { compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e001000 0x118>; @@ -70,7 +70,7 @@ uart@3e001000 { reg-io-width = <4>; }; - uart@3e002000 { + serial@3e002000 { compatible = "brcm,bcm21664-dw-apb-uart", "snps,dw-apb-uart"; status = "disabled"; reg = <0x3e002000 0x118>; diff --git a/arch/arm/boot/dts/bcm28155-ap.dts b/arch/arm/boot/dts/bcm28155-ap.dts index fce3d5260b00..60c8ab8a2855 100644 --- a/arch/arm/boot/dts/bcm28155-ap.dts +++ b/arch/arm/boot/dts/bcm28155-ap.dts @@ -16,7 +16,7 @@ memory@80000000 { reg = <0x80000000 0x40000000>; /* 1 GB */ }; - uart@3e000000 { + serial@3e000000 { status = "okay"; };