From patchwork Wed Jun 24 16:10:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1316375 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49sSnN0lTnz9sSc; Thu, 25 Jun 2020 02:11:20 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jo7zV-0004BT-V9; Wed, 24 Jun 2020 16:11:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jo7zT-0004B2-19 for kernel-team@lists.ubuntu.com; Wed, 24 Jun 2020 16:11:11 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jo7zS-0004lg-Pp for kernel-team@lists.ubuntu.com; Wed, 24 Jun 2020 16:11:10 +0000 Received: by mail-wm1-f69.google.com with SMTP id t18so3100487wmj.5 for ; Wed, 24 Jun 2020 09:11:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zJSPqLRYHPPqtTD/A2fFUyigaaOZgELDDa1qDrtd1gQ=; b=Hhli1sHKE5nCQMe4MW41kdNPYXpL/glAASYVJX00rQOwIX5itWt56Dz5QVBjaKvqI1 cIupzCbupz4fYQsPB+crgJojA9y2ljbAXVXwNxZYpd7P7UjOzla1Tvvrn3Ug0fkte2UE L26nfSkMWnfmDUMDIqgqe6CSEvt92ZclZ9Bc6npNSBn2Wbipkb+M2Gu9M2EYy9sH2SGg u3MzLtJ+mlMOxaGVyf9HtvXxUl7uENsf2qqe/f3r51zq7EZGP/o9OIqhEF58LVD+WLg8 y1U23wvlqQqCkjCgse85pA6fGTYKuiMxJ7sZr+sbRqL8aqA9JdpgRJju084Ad73ndkke mJCQ== X-Gm-Message-State: AOAM5333osqImDw3KX7Lfjy80gT3evSrYm8XLOicz1yq/E3VpFMBKpdG +GwutzO4qV+faGmdsKojmXnnppaS2A52H8dLFmgKSguDRUl9+NfdtvzooNM7tXsmkSpj7VeEa+h OBwOBiQi2SlrJA0pTZuNnasmcn+YK6qnUMHbHs2XAIQ== X-Received: by 2002:a1c:cc0d:: with SMTP id h13mr32929795wmb.168.1593015070033; Wed, 24 Jun 2020 09:11:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweygvmaxxslU9PUPPIuGHoe2bDhlktof4se8rmauVGJxn+GdNQOVuVnhPJB4YWtYi5Ydoo7w== X-Received: by 2002:a1c:cc0d:: with SMTP id h13mr32929773wmb.168.1593015069839; Wed, 24 Jun 2020 09:11:09 -0700 (PDT) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id y6sm9211339wmy.0.2020.06.24.09.11.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 09:11:09 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][focal/linux-raspi][PATCH 1/2] UBUNTU: SAUCE: arm: dts: Clarify the need for "brcm, bcm2835-" Date: Wed, 24 Jun 2020 18:10:34 +0200 Message-Id: <20200624161035.25871-2-juergh@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200624161035.25871-1-juergh@canonical.com> References: <20200624161035.25871-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1875454 Ignore: yes Signed-off-by: Juerg Haefliger --- arch/arm/boot/dts/bcm2711.dtsi | 2 +- arch/arm/boot/dts/bcm283x.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index 8e6354fd383f..fc08d8777e7c 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -525,7 +525,7 @@ }; &gpio { - compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio"; + compatible = "brcm,bcm2711-gpio", "brcm,bcm2835-gpio"; /* UBUNTU: "brcm,bcm2835-gpio" is required for u-boot 2019.07 */ interrupts = , , , diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index abcf677fe416..4ac314a2066d 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -306,7 +306,7 @@ }; uart0: serial@7e201000 { - compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; + compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */ reg = <0x7e201000 0x200>; interrupts = <2 25>; clocks = <&clocks BCM2835_CLOCK_UART>, From patchwork Wed Jun 24 16:10:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1316376 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49sSnN13PPz9sSy; Thu, 25 Jun 2020 02:11:19 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1jo7zX-0004Bw-2h; Wed, 24 Jun 2020 16:11:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jo7zT-0004B9-O9 for kernel-team@lists.ubuntu.com; Wed, 24 Jun 2020 16:11:11 +0000 Received: from mail-wm1-f72.google.com ([209.85.128.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1jo7zT-0004lk-Ge for kernel-team@lists.ubuntu.com; Wed, 24 Jun 2020 16:11:11 +0000 Received: by mail-wm1-f72.google.com with SMTP id a21so2884434wmd.0 for ; Wed, 24 Jun 2020 09:11:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WO/+abh2MjpmDX9X+BGlq4/Rs7Xv39cOTNullK/ZDf0=; b=sJMWmyqOwmNTCBFlb+qKRs5P5XdHEQF5gXZ+YeryVfe5AB/eg4zaYzzQEGeftGQUJ+ w8YDhsl3D0fUZ3bnh3yJboxActi1BlaQzE8NXt1/AktMdxPk2BMZeftXC+yhbImj7Prs wqLgTXlhFh2AH12xF9ztOBMr9hkq1lfx/lt6rhe4p+q9GFbMsy8dCNmQZohpkxY9VYaX RX0OOe5HMYp/Vow1xfvLqeD+ErPCXH+c9TllJBIjrxKmcuB9w3k2iTlu0SO47eUQ2wIm 9QCl0hOuHVHHXWU3AsYu6ndSDWzxf0noqxbhh8vrgpA2nK+jLCEug0FyslYaVKduJAqu 7I6g== X-Gm-Message-State: AOAM533OAGByft2lHB3O0K4whckUhJE5DvTw6nIwMMzqR+Gm/eAOuUsr Nmp8xN21JB0NIvJMm9IjywQyfDGPWfPHSzz+ZvjYNeMtb9pi/vORHMEAZoUKQ3WDLFW0UwmJulm BpttaLuzQCEA/hdapJJ/dllr0BQsS3OTOKNY8rndu8g== X-Received: by 2002:a1c:2044:: with SMTP id g65mr33108451wmg.16.1593015070977; Wed, 24 Jun 2020 09:11:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYDMplUbSeeC/VPrV7I6PRWh8UPoAfuBlUnSmgbTxOMWERnExL9/tEZ49JTcTYYOSv9Gnx+Q== X-Received: by 2002:a1c:2044:: with SMTP id g65mr33108424wmg.16.1593015070723; Wed, 24 Jun 2020 09:11:10 -0700 (PDT) Received: from localhost.localdomain ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id y6sm9211339wmy.0.2020.06.24.09.11.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jun 2020 09:11:10 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][focal/linux-raspi][PATCH 2/2] UBUNTU: SAUCE: arm: dts: Add 'brcm, bcm2835-pl011' for compatible for uart2-5 Date: Wed, 24 Jun 2020 18:10:35 +0200 Message-Id: <20200624161035.25871-3-juergh@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200624161035.25871-1-juergh@canonical.com> References: <20200624161035.25871-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1875454 This compatible is required for serial output from Focal's u-boot v2019.07 on Pi 4B. Add it until u-boot catches up. There is a previous commit which fixes uart0 but the uarts 2-5 need this compatible as well otherwise the Pi 4B won't boot with, for example, 'dtoverlay=uart4'. Signed-off-by: Juerg Haefliger --- arch/arm/boot/dts/bcm2711.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi index fc08d8777e7c..33139549be36 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -117,7 +117,7 @@ }; uart2: serial@7e201400 { - compatible = "arm,pl011", "arm,primecell"; + compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */ reg = <0x7e201400 0x200>; interrupts = ; clocks = <&clocks BCM2835_CLOCK_UART>, @@ -128,7 +128,7 @@ }; uart3: serial@7e201600 { - compatible = "arm,pl011", "arm,primecell"; + compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */ reg = <0x7e201600 0x200>; interrupts = ; clocks = <&clocks BCM2835_CLOCK_UART>, @@ -139,7 +139,7 @@ }; uart4: serial@7e201800 { - compatible = "arm,pl011", "arm,primecell"; + compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */ reg = <0x7e201800 0x200>; interrupts = ; clocks = <&clocks BCM2835_CLOCK_UART>, @@ -150,7 +150,7 @@ }; uart5: serial@7e201a00 { - compatible = "arm,pl011", "arm,primecell"; + compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; /* UBUNTU: "brcm,bcm2835-pl011" is required for u-boot 2019.07 */ reg = <0x7e201a00 0x200>; interrupts = ; clocks = <&clocks BCM2835_CLOCK_UART>,