From patchwork Tue Jul 16 13:37:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132768 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="TG5sK2xT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1hX59f2z9sN4 for ; Tue, 16 Jul 2019 23:39:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 32F73C21F5E; Tue, 16 Jul 2019 13:38:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4826EC21E47; Tue, 16 Jul 2019 13:38:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BAA1AC21E5B; Tue, 16 Jul 2019 13:38:09 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 67BBEC21E47 for ; Tue, 16 Jul 2019 13:38:09 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z1so20963213wru.13 for ; Tue, 16 Jul 2019 06:38:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sripBuNDmo08SBMWDGtwqhw8nJzj0nSlSLOrf+gqh+I=; b=TG5sK2xTS+4eIchVV8bAoiYsE8+MVayJwYQgldJPjdv3C43bQUIfO8kernfy0YaUyH vSjlWxypdYA/5Nm/eESctHNMe92XjpzVhoX2wem99ns6UAyMqHqPoNv5/OQzIStNuH0c MjK+YHDNqR4PtgdbHkpDHRmVjCspqOnMuUv2GljuI/izmHiaMBxzgtWVRiPF7hR2PE/Q m8TOOLBqRyfCBUmEXhao65TRH2FS63SpjQQwFmA4FYLnLN1uePgQ/2m3qbjVgb0yM3+D XicWE803ay0bgEsH2qW7kEZTO7qe6JRujukzZQCxdrc4/cUz0WOgdPYKA0ue2jeDJcWA cANg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sripBuNDmo08SBMWDGtwqhw8nJzj0nSlSLOrf+gqh+I=; b=gO5DBj6n/lXGoVWDl4AvKpHyROd/SeArQHkxwgsASnnflLrahwSRSfRbmppHlRpjLJ BBMHKiyiRa0LP2FMOnQQ8K5avpVrl4E1p1KHFJIYrYN/Pr0pTSCZyMENr3FOdYHql54R MUNFbVfSU1iT9u/I4pDs1TpCm2QJxHq5/7bIjObZiIJJ0uJxjyaXHnhD7OX1+ur5W8c8 xYJybUgoAJ/fFuPKn3s4XW2CSiw1ATZZQqzaodIXaLa+V7Px3e//aBSIOyoN9igUBn/K wTQzsc65hDR+6YvHFgvWMnplZwXzCgve9m9xIq5bRwW6+ODU7MskdpLl4r1+QOtOeEBz WzXA== X-Gm-Message-State: APjAAAVyaQ/n5IipQdeetmN3dQA+BrKjQMcKXFoN7yVx9vwvXbdOumPi cohSu3QOaMjRoSOMf+LH25Sjrf8/ X-Google-Smtp-Source: APXvYqzrDhsfkz8g0lzUYLircXXdW3laOHtITTUVovTeOj7co/9HZOmCBuch2YGp7LXCSfcA49MaxA== X-Received: by 2002:adf:80e1:: with SMTP id 88mr35285559wrl.127.1563284288647; Tue, 16 Jul 2019 06:38:08 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.08 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:08 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:48 +0100 Message-Id: <20190716133803.1174-2-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 01/16] dts: Create a dtsi for BCM2835/6/7 specific configuration X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan This follows a similar change in kernel[1]. The change moves configuration that was not applicable for all bcm2835/6/7/8 out of bcm283x.dtsi. The new file is bcm2835-common.dtsi and contains conifguration that is common for bcm2835/6/7 (not bcm2838). [1] https://github.com/raspberrypi/linux/commit/769a7330aa5bebcc98b1ff12ecb767db4e5c644d#diff-5979fba23a5bab2cf66dde09db872dfc Signed-off-by: Andrei Gherzan --- arch/arm/dts/bcm2835-common.dtsi | 53 ++++++++++++++++++++++++++++++++ arch/arm/dts/bcm2835.dtsi | 1 + arch/arm/dts/bcm2836.dtsi | 1 + arch/arm/dts/bcm2837.dtsi | 1 + arch/arm/dts/bcm283x.dtsi | 45 +-------------------------- 5 files changed, 57 insertions(+), 44 deletions(-) create mode 100644 arch/arm/dts/bcm2835-common.dtsi diff --git a/arch/arm/dts/bcm2835-common.dtsi b/arch/arm/dts/bcm2835-common.dtsi new file mode 100644 index 0000000000..17771730a3 --- /dev/null +++ b/arch/arm/dts/bcm2835-common.dtsi @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0 + +/* This include file covers the common peripherals and configuration between + * bcm2835, bcm2836 and bcm2837 implementations. + */ + +/ { + soc { + timer@7e003000 { + compatible = "brcm,bcm2835-system-timer"; + reg = <0x7e003000 0x1000>; + interrupts = <1 0>, <1 1>, <1 2>, <1 3>; + /* This could be a reference to BCM2835_CLOCK_TIMER, + * but we don't have the driver using the common clock + * support yet. + */ + clock-frequency = <1000000>; + }; + + intc: interrupt-controller@7e00b200 { + compatible = "brcm,bcm2835-armctrl-ic"; + reg = <0x7e00b200 0x200>; + interrupt-controller; + #interrupt-cells = <2>; + }; + + thermal: thermal@7e212000 { + compatible = "brcm,bcm2835-thermal"; + reg = <0x7e212000 0x8>; + clocks = <&clocks BCM2835_CLOCK_TSENS>; + #thermal-sensor-cells = <0>; + status = "disabled"; + }; + + v3d: v3d@7ec00000 { + compatible = "brcm,bcm2835-v3d"; + reg = <0x7ec00000 0x1000>; + interrupts = <1 10>; + }; + }; +}; + +&gpio { + i2c_slave_gpio18: i2c_slave_gpio18 { + brcm,pins = <18 19 20 21>; + brcm,function = ; + }; + + jtag_gpio4: jtag_gpio4 { + brcm,pins = <4 5 6 12 13>; + brcm,function = ; + }; +}; diff --git a/arch/arm/dts/bcm2835.dtsi b/arch/arm/dts/bcm2835.dtsi index a5c3824c80..53bf4579cc 100644 --- a/arch/arm/dts/bcm2835.dtsi +++ b/arch/arm/dts/bcm2835.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2835"; diff --git a/arch/arm/dts/bcm2836.dtsi b/arch/arm/dts/bcm2836.dtsi index c933e84138..82d6c4662a 100644 --- a/arch/arm/dts/bcm2836.dtsi +++ b/arch/arm/dts/bcm2836.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2836"; diff --git a/arch/arm/dts/bcm2837.dtsi b/arch/arm/dts/bcm2837.dtsi index beb6c502da..9e95fee78e 100644 --- a/arch/arm/dts/bcm2837.dtsi +++ b/arch/arm/dts/bcm2837.dtsi @@ -1,4 +1,5 @@ #include "bcm283x.dtsi" +#include "bcm2835-common.dtsi" / { compatible = "brcm,bcm2837"; diff --git a/arch/arm/dts/bcm283x.dtsi b/arch/arm/dts/bcm283x.dtsi index 9777644c6c..a024727e4d 100644 --- a/arch/arm/dts/bcm283x.dtsi +++ b/arch/arm/dts/bcm283x.dtsi @@ -56,17 +56,6 @@ #address-cells = <1>; #size-cells = <1>; - timer@7e003000 { - compatible = "brcm,bcm2835-system-timer"; - reg = <0x7e003000 0x1000>; - interrupts = <1 0>, <1 1>, <1 2>, <1 3>; - /* This could be a reference to BCM2835_CLOCK_TIMER, - * but we don't have the driver using the common clock - * support yet. - */ - clock-frequency = <1000000>; - }; - txp@7e004000 { compatible = "brcm,bcm2835-txp"; reg = <0x7e004000 0x20>; @@ -114,13 +103,6 @@ brcm,dma-channel-mask = <0x7f35>; }; - intc: interrupt-controller@7e00b200 { - compatible = "brcm,bcm2835-armctrl-ic"; - reg = <0x7e00b200 0x200>; - interrupt-controller; - #interrupt-cells = <2>; - }; - pm: watchdog@7e100000 { compatible = "brcm,bcm2835-pm", "brcm,bcm2835-pm-wdt"; #power-domain-cells = <1>; @@ -184,8 +166,7 @@ interrupt-controller; #interrupt-cells = <2>; - /* Defines pin muxing groups according to - * BCM2835-ARM-Peripherals.pdf page 102. + /* Defines common pin muxing groups * * While each pin can have its mux selected * for various functions individually, some @@ -263,15 +244,6 @@ brcm,pins = <44 45>; brcm,function = ; }; - i2c_slave_gpio18: i2c_slave_gpio18 { - brcm,pins = <18 19 20 21>; - brcm,function = ; - }; - - jtag_gpio4: jtag_gpio4 { - brcm,pins = <4 5 6 12 13>; - brcm,function = ; - }; jtag_gpio22: jtag_gpio22 { brcm,pins = <22 23 24 25 26 27>; brcm,function = ; @@ -488,14 +460,6 @@ }; - thermal: thermal@7e212000 { - compatible = "brcm,bcm2835-thermal"; - reg = <0x7e212000 0x8>; - clocks = <&clocks BCM2835_CLOCK_TSENS>; - #thermal-sensor-cells = <0>; - status = "disabled"; - }; - aux: aux@7e215000 { compatible = "brcm,bcm2835-aux"; #clock-cells = <1>; @@ -635,13 +599,6 @@ phy-names = "usb2-phy"; }; - v3d: v3d@7ec00000 { - compatible = "brcm,bcm2835-v3d"; - reg = <0x7ec00000 0x1000>; - interrupts = <1 10>; - power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>; - }; - vc4: gpu { compatible = "brcm,bcm2835-vc4"; }; From patchwork Tue Jul 16 13:37:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132771 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="CDSvJKFV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1lm2ht7z9sN4 for ; Tue, 16 Jul 2019 23:41:56 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4CC6AC21E47; Tue, 16 Jul 2019 13:39:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8FE98C21EF2; Tue, 16 Jul 2019 13:38:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2994BC21E47; Tue, 16 Jul 2019 13:38:10 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id ABB2DC21E34 for ; Tue, 16 Jul 2019 13:38:10 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id 207so18723109wma.1 for ; Tue, 16 Jul 2019 06:38:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N/bL2xKZsC6fird3kyj/JJ27rQYF8/s3+WKDQjX4VC0=; b=CDSvJKFVK3nPMAUk/x6heAARs/MoIPfsp1QzADE+/R+U9vl+A4CPG1IBM+LxW+ToSl 5PewRdz9OlW4hBsetJNXJVvsu/jwY3fUYmB12Aqf5E+vL9PaDjvou9ebiN5RJS29qL7V fFMqvICeG8hvSNekGiKmzLXSop8b06dAvIozqi0kzV+YStPiuxIZ2+Pdx/uD0rpp/oyW /zNZTyLwO94w7+BnibducUlE/IisaEmyU5ynYdnDyo/do/ZMOf8WuJcWSamzYmi0PaC/ x0C4ky2K/UqyJyNl3MVv4EoWUw0igWpJK6lwrf4NMs/rA/CYKtW2k24V3yV8fYpETIHb Y0yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=N/bL2xKZsC6fird3kyj/JJ27rQYF8/s3+WKDQjX4VC0=; b=uZBwqf1M1dtmnX+hYaRSLZOcTZ7eh/H8v4yaUv2icoS0WNIwMdr7lBMfKHWJRdQ4BP YcPN0KRM18eZsfA2PhkRS2Bm+GMXQiJI8YZyw2ewb3TbjVexIjXVdaCdp4dK7tridXqz p889/vLCp2AsQfnxUpAoJwPzaKPzi/elT9TmA4RpNMTa/LPBLnKdDN4SL+gN1b3jJhRs OjuM8GIGO8/2ShdASciNlqrWKxUUK+NYCg7cXnCS6/S61NMXyvSb6pAvbU7Il/T2DplQ a9mud3W2pANA/jnA9EH6UZnZeoxJYxC0V37BcO3Q7d37HgxPtjUF8ncULdZNBYlXmbJC JCCg== X-Gm-Message-State: APjAAAXNninMQ5Q1MC0tFXifxGPhF1kylKPfDK9nzcWVyrBotNOnQ+6y 1mfpggihRSI3e1CjV1w6dJSJeQ/G X-Google-Smtp-Source: APXvYqwiSF3ZlP/1Jd3oMhG/FMv2+t495RoTBy8nP0wr5Kr9G0d2n3Hb2mB/tOJXa+HSt70bkx8yBw== X-Received: by 2002:a1c:a6c8:: with SMTP id p191mr29246529wme.99.1563284289802; Tue, 16 Jul 2019 06:38:09 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:09 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:49 +0100 Message-Id: <20190716133803.1174-3-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 02/16] dts: Add initial support for bcm2838 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- arch/arm/dts/Makefile | 4 +- arch/arm/dts/bcm2838-rpi-4-b.dts | 56 ++++++++ arch/arm/dts/bcm2838.dtsi | 237 +++++++++++++++++++++++++++++++ 3 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/bcm2838-rpi-4-b.dts create mode 100644 arch/arm/dts/bcm2838.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 20dbc2ff84..16790af1e1 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -749,7 +749,9 @@ dtb-$(CONFIG_ARCH_BCM283X) += \ bcm2837-rpi-3-a-plus.dtb \ bcm2837-rpi-3-b.dtb \ bcm2837-rpi-3-b-plus.dtb \ - bcm2837-rpi-cm3-io3.dtb + bcm2837-rpi-cm3-io3.dtb \ + bcm2837-rpi-3-b.dtb \ + bcm2838-rpi-4-b.dtb dtb-$(CONFIG_ARCH_BCM63158) += \ bcm963158.dtb diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts new file mode 100644 index 0000000000..07e9a78e8d --- /dev/null +++ b/arch/arm/dts/bcm2838-rpi-4-b.dts @@ -0,0 +1,56 @@ +/dts-v1/; +#include "bcm2838.dtsi" + +/ { + compatible = "raspberrypi,4-model-b","brcm,bcm2838","brcm,bcm2837"; + model = "Raspberry Pi 4 Model B"; + + memory { + reg = <0 0 0x40000000>; + }; + + leds { + act { + gpios = <&gpio 47 0>; + }; + }; +}; + +/* uart0 communicates with the BT module */ +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>; + status = "okay"; +}; + +/* uart1 is mapped to the pin header */ +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins>; + status = "okay"; +}; + +/* SDHCI is used to control the SDIO for wireless */ +&sdhci { + pinctrl-names = "default"; + pinctrl-0 = <&emmc_gpio34>; + status = "okay"; + bus-width = <4>; + non-removable; +}; + +/* SDHOST is used to drive the SD card */ +&sdhost { + pinctrl-names = "default"; + pinctrl-0 = <&sdhost_gpio48>; + status = "okay"; + bus-width = <4>; +}; + +&gpio { + uart1_pins: uart1_pins { + brcm,pins; + brcm,function; + brcm,pull; + }; +}; diff --git a/arch/arm/dts/bcm2838.dtsi b/arch/arm/dts/bcm2838.dtsi new file mode 100644 index 0000000000..19b2d7b905 --- /dev/null +++ b/arch/arm/dts/bcm2838.dtsi @@ -0,0 +1,237 @@ +#include "bcm283x.dtsi" +#include +#include + +/ { + compatible = "brcm,bcm2838"; + + #address-cells = <2>; + #size-cells = <1>; + + interrupt-parent = <&gic>; + + soc { + ranges = <0x7e000000 0x0 0xfe000000 0x01800000>, + <0x7c000000 0x0 0xfc000000 0x02000000>, + <0x40000000 0x0 0xff800000 0x00800000>; + dma-ranges = <0xc0000000 0x0 0x00000000 0x3c000000>; + + gic: gic400@40041000 { + interrupt-controller; + #interrupt-cells = <3>; + compatible = "arm,gic-400"; + reg = <0x40041000 0x1000>, + <0x40042000 0x2000>, + <0x40044000 0x2000>, + <0x40046000 0x2000>; + }; + + thermal: thermal@7d5d2200 { + compatible = "brcm,avs-tmon-bcm2838"; + reg = <0x7d5d2200 0x2c>; + interrupts = ; + interrupt-names = "tmon"; + clocks = <&clocks BCM2835_CLOCK_TSENS>; + #thermal-sensor-cells = <0>; + status = "okay"; + }; + + spi@7e204000 { + reg = <0x7e204000 0x0200>; + interrupts = ; + }; + + pixelvalve@7e206000 { + interrupts = ; + }; + + pixelvalve@7e207000 { + interrupts = ; + }; + + hvs@7e400000 { + interrupts = ; + }; + + emmc2: emmc2@7e340000 { + compatible = "brcm,bcm2711-emmc2"; + status = "okay"; + interrupts = ; + clocks = <&clocks BCM2838_CLOCK_EMMC2>; + reg = <0x7e340000 0x100>; + }; + + pixelvalve@7e807000 { + interrupts = ; + }; + + }; + + arm-pmu { + /* + * N.B. the A72 PMU support only exists in arch/arm64, hence + * the fallback to the A53 version. + */ + compatible = "arm,cortex-a72-pmu", "arm,cortex-a53-pmu"; + interrupts = , + , + , + ; + }; + + timer { + compatible = "arm,armv7-timer"; + interrupts = , + , + , + ; + arm,cpu-registers-not-fw-configured; + always-on; + }; + + cpus: cpus { + #address-cells = <1>; + #size-cells = <0>; + enable-method = "brcm,bcm2836-smp"; // for ARM 32-bit + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <0>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000d8>; + }; + + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <1>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000e0>; + }; + + cpu2: cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <2>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000e8>; + }; + + cpu3: cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <3>; + enable-method = "spin-table"; + cpu-release-addr = <0x0 0x000000f0>; + }; + }; +}; + +&clk_osc { + clock-frequency = <54000000>; +}; + +&clocks { + compatible = "brcm,bcm2838-cprman"; +}; + +&cpu_thermal { + coefficients = <(-487) 410040>; +}; + +&dsi0 { + interrupts = ; +}; + +&dsi1 { + interrupts = ; +}; + +&gpio { + compatible = "brcm,bcm2838-gpio", "brcm,bcm2835-gpio"; + interrupts = , + , + , + ; +}; + +&vec { + interrupts = ; +}; + +&usb { + interrupts = ; +}; + +&hdmi { + interrupts = , + ; +}; + +&uart1 { + interrupts = ; +}; + +&spi1 { + interrupts = ; +}; + +&spi2 { + interrupts = ; +}; + +&i2c0 { + interrupts = ; +}; + +&i2c1 { + interrupts = ; +}; + +&i2c2 { + interrupts = ; +}; + +&mailbox { + interrupts = ; +}; + +&sdhost { + interrupts = ; +}; + +&uart0 { + interrupts = ; +}; + +&dma { + reg = <0x7e007000 0xb00>; + interrupts = , + , + , + , + , + , + , + , /* dmalite 7 */ + , /* dmalite 8 */ + , /* dmalite 9 */ + ; /* dmalite 10 */ + interrupt-names = "dma0", + "dma1", + "dma2", + "dma3", + "dma4", + "dma5", + "dma6", + "dma7", + "dma8", + "dma9", + "dma10"; + brcm,dma-channel-mask = <0x07f5>; +}; From patchwork Tue Jul 16 13:37:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132772 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="a4AvLfxs"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1mP74LPz9s7T for ; Tue, 16 Jul 2019 23:42:29 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 908ADC21F27; Tue, 16 Jul 2019 13:40:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 477D5C21F17; Tue, 16 Jul 2019 13:38:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 189BEC21E49; Tue, 16 Jul 2019 13:38:12 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id CD5F3C21E34 for ; Tue, 16 Jul 2019 13:38:11 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z1so20963380wru.13 for ; Tue, 16 Jul 2019 06:38:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dMiNFj6TkRcrSt2tChTq4J7YXeDeWYDlZxmk6tGUSHA=; b=a4AvLfxsTzSvOtpL1b1+ICh2qDayp9PmL8CAMKi0AEFti8zHHQ4Y8oLgnc9IzEjJC6 RfKhS5kxA2PCIOT4jsQNH6kqDNvAVCqCNYBuaWKewwxNVphuZit1GjvllMj6WYk3mqbg w6whc+SkwUA/Hdn6dzOnqzLuDd07DJXXcHrlQV09DmDEDqc+BOMHLN7cMe+4jwaRdpEQ ZisjAYIy93nazL+JLBNhUowbV82L8oRQ8Gb0DDdRYrJvl3CcUQm3DYvoJuYUW4y7T20k 9d8FdITVA1WAenYiSuF6AE3MtnpTeJhBXNuLVbXi1+7RT70S4lcgj3RmUwAjH4/46xVs ctmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dMiNFj6TkRcrSt2tChTq4J7YXeDeWYDlZxmk6tGUSHA=; b=EzskEMFj9j3xa60Gw70csjRFlmTqHJ+bj8QuxTomxeTli3ADXymbVemg6Xlwb2e6Ow 8fRXJW36dZSqtmTwAB3/xy4z7wQ4O/dCDwrOnKeYwJkmpW0fCQZjgIoWw57WM5Zhg77y YYyeIOwtdvwtQP2CWGOcvCHxtvp5UlF2fdz6PPn2NOt1/7P1+MQTxBWV9Iyd8O70w1wG q8DR1eoQL8RbS8eIcF2WskLJzhx+HS5C/krC30Huxs+xrWmpmfDrBi53VvRO6W2dqua6 YTI2bTfa7gXWKuhjD2UHkuaJ3BbZDhsXEvbkxacCaB9FrsBUy8I4cfIuKavtLVylhz4b n0og== X-Gm-Message-State: APjAAAXiYywFKh9z3S+K+JBSnhA35Fmi3njpcF/EUB1SQSJ/OtnQosMx IJ1EfV4d82aDCYarR87YAFhjjf+n X-Google-Smtp-Source: APXvYqy6lvmrDDylKpU6O8wuofmrjgFY+X3x3+JssG0dH0ia4lEVA5NHKFOcU6B4uSgzLkaijMtSKw== X-Received: by 2002:adf:eac4:: with SMTP id o4mr35297430wrn.290.1563284290987; Tue, 16 Jul 2019 06:38:10 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.09 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:10 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:50 +0100 Message-Id: <20190716133803.1174-4-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 03/16] arm: mach-bcm283x: Define configs for RaspberryPi 4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- arch/arm/mach-bcm283x/Kconfig | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 3eb5a9a897..d5069fe688 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -26,6 +26,23 @@ config BCM2837_64B select BCM2837 select ARM64 +config BCM2838 + bool "Broadcom BCM2838 SoC support" + depends on ARCH_BCM283X + +config BCM2838_32B + bool "Broadcom BCM2838 SoC 32-bit support" + depends on ARCH_BCM283X + select BCM2838 + select ARMV7_LPAE + select CPU_V7A + +config BCM2838_64B + bool "Broadcom BCM2838 SoC 64-bit support" + depends on ARCH_BCM283X + select BCM2838 + select ARM64 + menu "Broadcom BCM283X family" depends on ARCH_BCM283X @@ -127,6 +144,24 @@ config TARGET_RPI_3 This option creates a build targeting the ARMv8/AArch64 ISA. select BCM2837_64B +config TARGET_RPI_4 + bool "Raspberry Pi 4 64-bit build" + help + Support for all BCM2838-based Raspberry Pi variants, such as + the RPi 4 model B, in AArch64 (64-bit) mode. + + This option creates a build targeting the ARMv8/AArch64 ISA. + select BCM2838_64B + +config TARGET_RPI_4_32B + bool "Raspberry Pi 4 32-bit build" + help + Support for all BCM2838-based Raspberry Pi variants, such as + the RPi 4 model B, in AArch32 (32-bit) mode. + + This option creates a build targeting the ARMv7/AArch32 ISA. + select BCM2838_32B + endchoice config SYS_BOARD From patchwork Tue Jul 16 13:37:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132773 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="c3d/WuBz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1ml2DdTz9s7T for ; Tue, 16 Jul 2019 23:42:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CBB8BC21EF1; Tue, 16 Jul 2019 13:40:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 052D5C21F1F; Tue, 16 Jul 2019 13:38:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 969CCC21E60; Tue, 16 Jul 2019 13:38:12 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 476F2C21E34 for ; Tue, 16 Jul 2019 13:38:12 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id n9so21066718wru.0 for ; Tue, 16 Jul 2019 06:38:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4z9tCoXjS3gKtBPuxFjTO8WO38BSgwlu3AyaNzvZs18=; b=c3d/WuBzsOsmtiSr3l/NkiQs8aRp+w+IqxYqc8twjGtt4vvLrKWEgfgeSOzpi7zpbt rx0MqKdcl1w4jd+F20Rn7vmiQ4bHubZxLCRGlsnJkx911ErCqskOTMZ/SjS2JKrWs72w qGlmSv5hqhe7Esd7J825JCan7U+jT79Fp71SUzzECRqHZxr65cf17EUWWUncbG0tDqc2 wx+IonbH8cDqlk4aUepcXfKbhKPpJEYyv0ecG/B8vcb6yIkPORWJW80cMaUIzLaK352Z jzyLgqw4NLqzmwtqRLGTQ98903DKUkATVTOzuOBLhbCkSQ+URZNXGY4Ncs6dAIRY3Jun 9G5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4z9tCoXjS3gKtBPuxFjTO8WO38BSgwlu3AyaNzvZs18=; b=CXGiZBkPhD+VKoFI6z7P5uXnuyymtGhAMc9y9SqQUqwbVFztEFiW73mEpXmLY1mixV O/dSLTZoFRz01LtnH26YxaKXImTHN6H8iCIDjIExOsCYqWNG9XrAa0FraVCrknPn4Kge +nRS4Hj75LVP58rOQIoI8FQkN7nhdYmioJDHzwMI4kV7YDdv+OE4iuT8lwbv++8noA5X A5W0JJ2QatGtRweo3S8uFA6WFZcfkYvNIhUUaGF2nHro6Uw8OTtAk0RRPlTHRgvQ/eWd qD4pchqiNFTWrRhr/JOYbPinkM5NspsM+qP4wE/J006Ak5sGYKwSyb8chJk9YxZ1KLQF C8Ag== X-Gm-Message-State: APjAAAUeUtYp6SDdO9uof60Mm2V3TE/ZKHo7E60F1bAB+psnoFjQQzlQ K/Qhnpj1iX5um5LcxFTImj11xMoL X-Google-Smtp-Source: APXvYqx5pVpwmETIIOrnh8eMKupYhlCjTzZfPdcibBrydPp+Pmz4AiScZsxBWRodzrmvyIrozY3Zyg== X-Received: by 2002:a5d:5510:: with SMTP id b16mr36238941wrv.267.1563284291567; Tue, 16 Jul 2019 06:38:11 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:11 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:51 +0100 Message-Id: <20190716133803.1174-5-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 04/16] arm: mach-bcm283x: Define mbox address for BCM2838 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- arch/arm/mach-bcm283x/include/mach/mbox.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index e3a893e49c..2d711daaa8 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -38,11 +38,16 @@ /* Raw mailbox HW */ #ifndef CONFIG_BCM2835 +#ifdef CONFIG_BCM2838 +#define BCM2835_MBOX_PHYSADDR 0xfe00b880 +#else #define BCM2835_MBOX_PHYSADDR 0x3f00b880 +#endif #else #define BCM2835_MBOX_PHYSADDR 0x2000b880 #endif + struct bcm2835_mbox_regs { u32 read; u32 rsvd0[5]; From patchwork Tue Jul 16 13:37:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132770 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="APOo2id8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1kg24RJz9sN4 for ; Tue, 16 Jul 2019 23:40:59 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 03A7BC21F20; Tue, 16 Jul 2019 13:40:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id CFF2DC21F24; Tue, 16 Jul 2019 13:38:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A6D39C21E34; Tue, 16 Jul 2019 13:38:13 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 34C79C21E49 for ; Tue, 16 Jul 2019 13:38:13 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id 31so21039153wrm.1 for ; Tue, 16 Jul 2019 06:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h8/9W7Zwgo8NeYeD2dMRztRKBo9Q7ZYB75gjOIA469k=; b=APOo2id8vyQeM/hjghOLje7sAgNl3h7WnICr6wkWDRxq+I63nX6gFA1pAFat0o/kRD mOhaK0IONeh/jKYBRXIc9/l2KTgthIx8gQzjc55KK4eTmc9cH6dWABnY7X4clNxRKxmk 8lwnHuFFvyiTfa6+4VoWrvip92pb7gavW1cDdsIgU9OsZUsghxvmtpqHu+LIjQOBJtW/ n8yaZ+x4gFOYBNBr70Gz9kn/ikCczzbJJiZOC5lWvNUvg7lRsL7yG8AA4o+v8A/ErexX UXunZ9d1KYO29HjEp/6L+wPljS6enYvbW3H6z0tvSKlVSd3a1izYldF8hXupDxLRrqz8 dgAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h8/9W7Zwgo8NeYeD2dMRztRKBo9Q7ZYB75gjOIA469k=; b=oyaIJ+Rk/Si6Q3A150tCXJOlzw+XKzchdqC3OR5zoRXDX3rXwiWTLxumkkmRYYldxf aWwQTOVBf6k/vJO/0D4iB4WvmskBXLa02yq5Hb+tzvjvc1uG2aRqLmPLCyJSbWnr3B7u FiHuPw9cyNYsdc54E0BSqGCdLU6NDdr3qls8+yuGX7V2TnfbKA1PoNHJL3NcZgnd9RQq pJnuPcNFpPF44sdaSzgMqp3WifcnRsbmgmRgAhcjPfYqkPjsuiMyLpB9TbyKMu/yt2PS tmE+6lsp8IEj7o5C3d6gnh8gA06NPGECI25JXi7x4XJAJAintx7KvduQQagO/nFpw1Xm 3VwA== X-Gm-Message-State: APjAAAXZPadRpCdHV+3xq9+6oG8m9aYcQYMfIQH6haeUiGDvButVDkMV Zx38CTGdesqDkVR+nCQ8PKrrwhN6 X-Google-Smtp-Source: APXvYqxJuD5XmywFxGdtnh1yFIOJN8ixmA1SeKxxOpQL9FyIbsq9lvZhOi9N2HpiWJADenKgxQ1zKw== X-Received: by 2002:a5d:62cc:: with SMTP id o12mr30686649wrv.63.1563284292500; Tue, 16 Jul 2019 06:38:12 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.11 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:11 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:52 +0100 Message-Id: <20190716133803.1174-6-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 05/16] rpi: Add rpi_model entry for RaspberryPi 4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- board/raspberrypi/rpi/rpi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 617c892dde..6d6f1ef39a 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -148,6 +148,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { DTB_DIR "bcm2837-rpi-cm3.dtb", false, }, + [0x11] = { + "4 Model B", + DTB_DIR "bcm2711-rpi-4-b.dtb", + true, + }, }; static const struct rpi_model rpi_models_old_scheme[] = { From patchwork Tue Jul 16 13:37:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132779 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="L/XasV8d"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1qS2r2Hz9s7T for ; Tue, 16 Jul 2019 23:45:08 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E8FA8C21F3E; Tue, 16 Jul 2019 13:40:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8A902C21F2B; Tue, 16 Jul 2019 13:39:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B71EC21E47; Tue, 16 Jul 2019 13:38:14 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 29C62C21E34 for ; Tue, 16 Jul 2019 13:38:14 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id v15so18726442wml.0 for ; Tue, 16 Jul 2019 06:38:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bwvPfiUziZgbU+0rGJf3I+vsYCUjxAxekdQpU+8gArk=; b=L/XasV8dzPBuPnHi7pe1mfWTQ5fWKMZpO4ZhRj6p/ArDBKmFLyF/RAc38U4tdQDYwK gy+U0uunzQTAfJGdoMoP+0R+tA06Jt4cemb1S7z3S0DXDKSZCRRwk4SeVqLYDPwE9rbw d1d1pgJ1oKs/XrweooV/3U6xC2qDAjAM4DVwEJwcHDAzLGNfL5/QOWT8ipilNR6yOEXF lVHCUFOT32Rb0iRsKDiCnx0rkc7bhgoebTUhkyPeTTEsTGKHLHKYiqkyhR6Xi/AgjhA5 v5LaYqgRvtqEvzqqY2KC3Ef3JY/7zWwL3u8j8K2nIkaCXOhRHfMZ7aRSYMeGwgsLN/0J RylQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bwvPfiUziZgbU+0rGJf3I+vsYCUjxAxekdQpU+8gArk=; b=nFowBpQE4Oz8k5NdS6LFlYBG6gzOhMKT6eguGQLYZvL0wPv9K74iCJjdyAd6BbHEYV NDYxSaKTHu1Lyjbso2WWH9xvlvVUSKU7VMjyYqyeb4GypHSQHvsHL/ar9hiV27hZ7QUN 4XJLT58Ca2dTF0q3aKk6xq01DXFob7yNdhRLF2FXuJfmuB8VR0R3M3+qL1FzEqz1hSpS Ivm0jaod+mw2swWUfKsO9WG9Q6Av5tEGJuh+7WQVLSqSZJsfZaa6sqmPB+2/2PCvWv+k Emu2GwvTDV/AeWEy7OPchpOMJhFDiimsLlS6lCI6RXPoCVt9owtwTJGzQDqBvieH7uCU qnwg== X-Gm-Message-State: APjAAAVs/OAM29YkF15pnCyMYUqaLuI5oazKqYpegFVlr0AxU2rmhRtH oPUDxIKUKwhu3RQqAhGk6BUetMns X-Google-Smtp-Source: APXvYqxvcYY/fSOfc07YxvPsg7WmY4CUi24Jk5eCAEHZk8ZcI5thmHlNITkke24texxQWNIm4xpqWw== X-Received: by 2002:a05:600c:10ce:: with SMTP id l14mr30117498wmd.118.1563284293358; Tue, 16 Jul 2019 06:38:13 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.12 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:12 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:53 +0100 Message-Id: <20190716133803.1174-7-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 06/16] dt-bindings: Define BCM2838_CLOCK_EMMC2 needed for RaspberryPi 4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan On BCM2838 there is an additional clock. This clock was added in the same bcm2835-cprman driver and is used by the emmc2 dt node. Signed-off-by: Andrei Gherzan --- include/dt-bindings/clock/bcm2835.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/dt-bindings/clock/bcm2835.h b/include/dt-bindings/clock/bcm2835.h index 2cec01f968..457fd4e23c 100644 --- a/include/dt-bindings/clock/bcm2835.h +++ b/include/dt-bindings/clock/bcm2835.h @@ -58,3 +58,5 @@ #define BCM2835_CLOCK_DSI1E 48 #define BCM2835_CLOCK_DSI0P 49 #define BCM2835_CLOCK_DSI1P 50 + +#define BCM2838_CLOCK_EMMC2 51 From patchwork Tue Jul 16 13:37:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132786 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="IlDi8Ltv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1v74MJ8z9sN4 for ; Tue, 16 Jul 2019 23:48:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F33B9C21F48; Tue, 16 Jul 2019 13:41:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 33DF3C21F2F; Tue, 16 Jul 2019 13:39:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C52E5C21E49; Tue, 16 Jul 2019 13:38:15 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by lists.denx.de (Postfix) with ESMTPS id 32F4DC21E49 for ; Tue, 16 Jul 2019 13:38:15 +0000 (UTC) Received: by mail-wm1-f45.google.com with SMTP id 207so18723376wma.1 for ; Tue, 16 Jul 2019 06:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UXYvawa/pLk7g+iXct5m2g3du/UZKgc2r/IJuxf8Q0c=; b=IlDi8LtvMkVdbPoEOLD2LXrRNiHk7V0wjgoU8CjfoaGUajFl4gpnM2TVmOhVqTwzDG jufO3d8ci/1K7vQTbd5SFhYxrD9VIrGtuSl8yRnnSamZz7HQyv/YpSg+s4CoFjcEIiLx iOnc4vM/kU83ia24gajX30kkE3w3KJaZoVv3ehKtb1xKdCiogydyPxtoZfHA55WmFt6r 0Od0Cu501hxDcjv89GO3Osot1QhAwxfNjUYYry6tZ2S4JriWxssvDR8fSrYuAQJcVnE9 PUPpjHXs09xb9C50BdLWIURT3mK2XrgrdSXdys7gJIqQHt0nGFXLNX4U+5tL2QD6kv1c H95A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UXYvawa/pLk7g+iXct5m2g3du/UZKgc2r/IJuxf8Q0c=; b=hvQmlNzrge3oB4TlBRfOe7CtFyz/NTMvzL0koqjlt9g4sRLMt6PlfW+Y4nDCCaUkfJ uUwUjYYj46gFCNKSTJ9BjuxMA/Q6Wt4llJY1xfMM8nBUwdP8jVrBARfeyNK3mS/nStdn 7lo21ORa0o6jX8ZNMx4k2iUq0i3LIZjOd/AMwYdcUj93Kt+FraFByS7cyEGfwuut/9hm wiWQFg+Mx4kxuYbLzO/d50iKQ/txlHMYq0IR4DbIzUD9e/eJRMDBq9LVv9XDM7lCnWzy dmQkF7fMqvEUfWEY6Ol0H+JbXrp06Qld6CGkFQs5rUi4GFBi81LVc4oYQBXAFyadrEtZ 5Rgw== X-Gm-Message-State: APjAAAXU9Dl6Y9V0nXJUONyGD1+JtAv60N1Sl6dKYZsAFVko+ok8Ybb+ L2JJ0a60mr6bDx7weKLX4obY0urN X-Google-Smtp-Source: APXvYqynak+j/qIfDE0PimmOWAHYqz2/L39LkbbfjL0CadivgJQ9XKjtG/c9F4wWJXA1p5GEa1OfgQ== X-Received: by 2002:a05:600c:1007:: with SMTP id c7mr29423493wmc.161.1563284294424; Tue, 16 Jul 2019 06:38:14 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.13 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:13 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:54 +0100 Message-Id: <20190716133803.1174-8-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 07/16] arm: bcm283x: Include definition for additional emmc clock X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan This clock has a different mbox ID[1] so have this included in the relevant header file. [1] https://github.com/raspberrypi/firmware/issues/1179 Signed-off-by: Andrei Gherzan --- arch/arm/mach-bcm283x/include/mach/mbox.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index 2d711daaa8..cad035e8cd 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -239,6 +239,7 @@ struct bcm2835_mbox_tag_set_power_state { #define BCM2835_MBOX_CLOCK_ID_SDRAM 8 #define BCM2835_MBOX_CLOCK_ID_PIXEL 9 #define BCM2835_MBOX_CLOCK_ID_PWM 10 +#define BCM2835_MBOX_CLOCK_ID_EMMC2 12 struct bcm2835_mbox_tag_get_clock_rate { struct bcm2835_mbox_tag_hdr tag_hdr; From patchwork Tue Jul 16 13:37:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132778 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="g6Ac5Mg6"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1pr0VmVz9s7T for ; Tue, 16 Jul 2019 23:44:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A908CC21F1F; Tue, 16 Jul 2019 13:41:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E62B1C21E34; Tue, 16 Jul 2019 13:39:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4DA8EC21E34; Tue, 16 Jul 2019 13:38:16 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id E9D34C21E5B for ; Tue, 16 Jul 2019 13:38:15 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id u25so8382400wmc.4 for ; Tue, 16 Jul 2019 06:38:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jAiRv/c6MBJu4oLlfRe2SD3vcQoCepGe1nkkhOcQXaA=; b=g6Ac5Mg6LAwLzaGPUio4AGncQnMMtH+lQxglbrRBb2uiS2Z8YU7RfWfza8Y28geYyd YMB3bH0N2WfDlneGdiMxbxoZyAmV/UXIQGlC1j1wQNceAorIZHS/FN6ntbNyiKo7Mf47 pYq2RtZlmFNX2h4gB9qpSUtIvsB4ekQ3GDL24wljiC5Cpog+fqjzddI08fcEaHS4FMl+ T7BmwKD5TfUF9f3F0Zq0AvZX6m+SgXxhIpvMDBqRyGz+HoEfFRKSzaaolJGNHcLxxfYn 9sscnVYDC1DEgdMIoAverbdNZO4fJ+VRgc0LtEaDrLGGdk9O0o4FHzimyZRAlVpKryop Fs8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jAiRv/c6MBJu4oLlfRe2SD3vcQoCepGe1nkkhOcQXaA=; b=QhlKegp5MJpwVvHKLryfNTjldAXMEJOU8iDHTI29Jc4JRKJ+7t2Vdhsa/Ju2CRhPzA Wels1/GcNqI0Pq1+x14EheCms6MhZ31x9PpH/MDMZZcXQxBAHGCvLWyzVafR6Bwvtml+ 2CBapqQmyrdfl6Xl8fxtojl/QQXJC9uLv4OMur7B59xtW8LO07Yinu9XCNxeC0CuqJeg cctHgWXfLIPz1U9Lq/Bw1Sq+JqkkDfDzCPkirvgmGXJJfk7k4m8rs6sXwaT8iToBIYFv T+2bY3tx5iYXdlpmhRE4fk/Gwn6O9WHg7urC6ZoEVu9FQzdq050IuSCj0vT994l3dAAk GP+Q== X-Gm-Message-State: APjAAAUaUMHRPiV1ey9SgKD6MNXDtQ15gD606dqEdTHrEMUB8FGSDXHJ 8tTlMcK0zKX/nSjJIxoINuBRBRMa X-Google-Smtp-Source: APXvYqwI7kNjDT4+bKXM1qGQ6wtWlDJiZ2X1vy5/3Vvc09+fbsWdz2L6WYHLtt+x0BSkRz7Br55WJA== X-Received: by 2002:a1c:6504:: with SMTP id z4mr30054879wmb.172.1563284295230; Tue, 16 Jul 2019 06:38:15 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.14 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:14 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:55 +0100 Message-Id: <20190716133803.1174-9-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Matthias Brugger Subject: [U-Boot] [PATCH 08/16] mmc: bcm2835_sdhci: Add support for bcm2711 device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Matthias Brugger The bcm2711 has two emmc controller. The difference is the clocks they use. Add support for the second emmc contoller. Signed-off-by: Matthias Brugger --- drivers/mmc/bcm2835_sdhci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c index 08bddd410e..e68dec3be7 100644 --- a/drivers/mmc/bcm2835_sdhci.c +++ b/drivers/mmc/bcm2835_sdhci.c @@ -178,12 +178,13 @@ static int bcm2835_sdhci_probe(struct udevice *dev) fdt_addr_t base; int emmc_freq; int ret; + int clock_id = (int)dev_get_driver_data(dev); base = devfdt_get_addr(dev); if (base == FDT_ADDR_T_NONE) return -EINVAL; - ret = bcm2835_get_mmc_clock(BCM2835_MBOX_CLOCK_ID_EMMC); + ret = bcm2835_get_mmc_clock(clock_id); if (ret < 0) { debug("%s: Failed to set MMC clock (err=%d)\n", __func__, ret); return ret; @@ -228,7 +229,14 @@ static int bcm2835_sdhci_probe(struct udevice *dev) } static const struct udevice_id bcm2835_sdhci_match[] = { - { .compatible = "brcm,bcm2835-sdhci" }, + { + .compatible = "brcm,bcm2835-sdhci", + .data = BCM2835_MBOX_CLOCK_ID_EMMC + }, + { + .compatible = "brcm,bcm2711-emmc2", + .data = BCM2835_MBOX_CLOCK_ID_EMMC2 + }, { /* sentinel */ } }; From patchwork Tue Jul 16 13:37:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132780 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="V5N7WwW7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1qb39FVz9s7T for ; Tue, 16 Jul 2019 23:45:15 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 22EF6C21F18; Tue, 16 Jul 2019 13:41:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8A0D7C21F3A; Tue, 16 Jul 2019 13:39:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5F457C21E47; Tue, 16 Jul 2019 13:38:17 +0000 (UTC) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by lists.denx.de (Postfix) with ESMTPS id DB1F4C21E49 for ; Tue, 16 Jul 2019 13:38:16 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id y4so21023536wrm.2 for ; Tue, 16 Jul 2019 06:38:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C5zgOyKFUMDByiLMDiywbAi3biX4nfIggZarK4rgH4k=; b=V5N7WwW7/GDfIFXKK6E3jlm0tHNVJ/r2NYcWjtc+BueYY+lGLsfCE5Fx8r81UNCunZ dy/jqcosiFXGMvxCkGJ06lkLK8BL/RHjm3RVvwTDgIlNPyFNbmkas6YiK7r7+IQtcdSr EvocV0YN3wEZsfGpjd06aTzsgfUoXXLxN1LTEO+0EqOoUXHgNDioci9IrM40FTT822Fo 2B3r6FKCFERSG7WWxAXSMkhoBEJn2qSmwtFvRXDAFMhQtkYX7qU+fxLRSJJWXgNSOa0i ueYzSFmUMFV02NRbNW+JTBMOY30evS1Io8v87a5oSxOLM7lHVVgFrV4/sWKAM6oYPmOX jCew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C5zgOyKFUMDByiLMDiywbAi3biX4nfIggZarK4rgH4k=; b=Smj5mL8EbesDBi+zRSB24lRgBvLgowvWRXq4+7IzO2+ynJUSHAVD9ZmN3zy0kKFtVx VzBLipRv8BaVFLpaLNUgFK45xwFGE/niSG8otpUpUPT5nF/fBEvRu3VkHbmonFGtw5EX Y0byDis5UE1ScYnnyKIDnNOlTGGCgiHYY/bb2+3xAZ7GqpaTQgPcsPZvXkLbnIrWcefb 1dn2C7279ynnHjrA8U91HH3rhkST0YVbLLZnLKy8ORR1Bfd3Hobjm1Bq4hCzLTdQi8l5 SsdnrqAG1rRVBweoLLDDEbH7IOygfFOGo9zJeV0lriRpXKjlUhGNdkmTzbMuz9qAM6O6 XI9A== X-Gm-Message-State: APjAAAXW8LzcsEVaG28LhlIpL7CUJdzG7rYowf9iKMhvy6n/G9/d5Wk7 9lR53H2ARTwVcRb4umKsQ4uMjNzd X-Google-Smtp-Source: APXvYqwKYig53f5fND1nu1FVoDMI5sGM38myTCkGz3o5uDMuk41Ws3g7oiNBKp+DfN/rgbHLR0XEzw== X-Received: by 2002:adf:ef8d:: with SMTP id d13mr35035033wro.60.1563284296108; Tue, 16 Jul 2019 06:38:16 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.15 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:15 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:56 +0100 Message-Id: <20190716133803.1174-10-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 09/16] arm: bcm283x: Define device base addresses for bcm2835 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- arch/arm/mach-bcm283x/include/mach/sdhci.h | 4 ++++ arch/arm/mach-bcm283x/include/mach/timer.h | 4 ++++ arch/arm/mach-bcm283x/include/mach/wdog.h | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/arch/arm/mach-bcm283x/include/mach/sdhci.h b/arch/arm/mach-bcm283x/include/mach/sdhci.h index 5cb6ec3340..262b016a1b 100644 --- a/arch/arm/mach-bcm283x/include/mach/sdhci.h +++ b/arch/arm/mach-bcm283x/include/mach/sdhci.h @@ -7,7 +7,11 @@ #define _BCM2835_SDHCI_H_ #ifndef CONFIG_BCM2835 +#ifdef CONFIG_BCM2838 +#define BCM2835_SDHCI_BASE 0xfe300000 +#else #define BCM2835_SDHCI_BASE 0x3f300000 +#endif #else #define BCM2835_SDHCI_BASE 0x20300000 #endif diff --git a/arch/arm/mach-bcm283x/include/mach/timer.h b/arch/arm/mach-bcm283x/include/mach/timer.h index 56b0c356bb..dc3ed98879 100644 --- a/arch/arm/mach-bcm283x/include/mach/timer.h +++ b/arch/arm/mach-bcm283x/include/mach/timer.h @@ -7,7 +7,11 @@ #define _BCM2835_TIMER_H #ifndef CONFIG_BCM2835 +#ifdef CONFIG_BCM2838 +#define BCM2835_TIMER_PHYSADDR 0xfe003000 +#else #define BCM2835_TIMER_PHYSADDR 0x3f003000 +#endif #else #define BCM2835_TIMER_PHYSADDR 0x20003000 #endif diff --git a/arch/arm/mach-bcm283x/include/mach/wdog.h b/arch/arm/mach-bcm283x/include/mach/wdog.h index 99c88e5df7..ef040f385d 100644 --- a/arch/arm/mach-bcm283x/include/mach/wdog.h +++ b/arch/arm/mach-bcm283x/include/mach/wdog.h @@ -7,7 +7,11 @@ #define _BCM2835_WDOG_H #ifndef CONFIG_BCM2835 +#ifdef CONFIG_BCM2838 +#define BCM2835_WDOG_PHYSADDR 0xfe100000 +#else #define BCM2835_WDOG_PHYSADDR 0x3f100000 +#endif #else #define BCM2835_WDOG_PHYSADDR 0x20100000 #endif From patchwork Tue Jul 16 13:37:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132777 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="F6V8u2I1"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1p24yjzz9sNj for ; Tue, 16 Jul 2019 23:43:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0CA18C21E47; Tue, 16 Jul 2019 13:41:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 291A7C21F48; Tue, 16 Jul 2019 13:39:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E5BBC21E60; Tue, 16 Jul 2019 13:38:18 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by lists.denx.de (Postfix) with ESMTPS id BA3EBC21E60 for ; Tue, 16 Jul 2019 13:38:17 +0000 (UTC) Received: by mail-wm1-f52.google.com with SMTP id v15so18726601wml.0 for ; Tue, 16 Jul 2019 06:38:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ddIyo50BU2nRnwKV21dLmjFaL1iHGfGisam8zudNZHo=; b=F6V8u2I1PEhC8jagQDoVhwG0QGStnDJdPglHMbxdVc+eIMILA9kru1pMAcpd4ERc7p gukUJI0tl5CkAd1hATYoBKF/7NoB2E1uCqsMO+wPviwnFjV/8wSLzcqWdmzYmf5olqkE 4zaqxV2EhQLC4QW2BdqDtO5kbfAaEWDrz29xvHNMSOOd6CkMYIIuhr9ufj5v0CF1mSGF X0j6t9dlQH9sLgqUhmUBIOendfziMila2UWm0044SCHbY5xOyxgN+qlKc0U52h8tsri3 9MphNOJ8SR4c6jVWwn9G0ZzMXmVYvHjki3fZtkheujoE4PaKZ+bQsaOuP6bfctGPcsIb 1gAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ddIyo50BU2nRnwKV21dLmjFaL1iHGfGisam8zudNZHo=; b=lU2Oy0asaKQldcgbW/hqb1fzGHreqJRfWo99PIh9hGFmfKzvjtOH1rcUkXISoOhT8j kCT6/95JC/0nAQ4gtElceKf3iu0gDH8sU62LjHpSFUUdqOGUZUwYPGqjwEAEQc4sgswM Ls2saOFE1dgNAcM+EC/0jaUydXKsiFFgupxpTnXNb8rjvYo7HbvU44tghnKSCwknwkf7 MAfgRWEEihmuJ8SKdyeNwg5kUY55fxkTp19KgGdOrRzh/eMqrUor4Q3ywsHwYMuKsBnT iWJ+jkBRRRQFUx3CyYmF5L00XezZKJ1V9SmTa25XQciAqf0y/W7kvpGTXq5JDJUF8lZK JTyQ== X-Gm-Message-State: APjAAAXTDgHIZme4t5ZGh3tnzXBHvRChwdaBpv8pKZzI6dW/gxV5Yo9W wfjgMyJK06kYA/UAkxwzpcJm3GlV X-Google-Smtp-Source: APXvYqxTZ8ivgaUc5pFHtuJejsHgT/1w00kE4KMtNMGvuLfRFWaFc6D/OAYbpLlZ8M2Z5BjPtqrwKQ== X-Received: by 2002:a1c:f418:: with SMTP id z24mr30553522wma.80.1563284296995; Tue, 16 Jul 2019 06:38:16 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:16 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:57 +0100 Message-Id: <20190716133803.1174-11-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:53 +0000 Cc: Fabian Vogt Subject: [U-Boot] [PATCH 10/16] bcm2835 video: Bail out early if querying video information fails X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Fabian Vogt Otherwise there is a crash with newer RPi firmware, see https://github.com/raspberrypi/firmware/issues/1157 --- drivers/video/bcm2835.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c index bc41090aed..4c7962cad8 100644 --- a/drivers/video/bcm2835.c +++ b/drivers/video/bcm2835.c @@ -19,13 +19,15 @@ static int bcm2835_video_probe(struct udevice *dev) debug("bcm2835: Query resolution...\n"); ret = bcm2835_get_video_size(&w, &h); - if (ret) + if (ret || w == 0 || h == 0) return -EIO; debug("bcm2835: Setting up display for %d x %d\n", w, h); ret = bcm2835_set_video_params(&w, &h, 32, BCM2835_MBOX_PIXEL_ORDER_RGB, BCM2835_MBOX_ALPHA_MODE_IGNORED, &fb_base, &fb_size, &pitch); + if(ret) + return -EIO; debug("bcm2835: Final resolution is %d x %d\n", w, h); From patchwork Tue Jul 16 13:37:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132774 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="FVwymkYW"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1nB4PSsz9s7T for ; Tue, 16 Jul 2019 23:43:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 420E7C21F13; Tue, 16 Jul 2019 13:41:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1C287C21F49; Tue, 16 Jul 2019 13:39:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D45BBC21E60; Tue, 16 Jul 2019 13:38:18 +0000 (UTC) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by lists.denx.de (Postfix) with ESMTPS id 97169C21E49 for ; Tue, 16 Jul 2019 13:38:18 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id u25so8382573wmc.4 for ; Tue, 16 Jul 2019 06:38:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FRnqnRi8Sg7Ycg+VP90bS3yOzvJ7u5H8Fm1LXwU6pYA=; b=FVwymkYWNcGkl0Eze1QJy378qF/SeyqBQiGan5j7fLT8gxC7TkNP3sPEinpvzm33zR z1u6zk23PeyS95KtgivPULf4nnCVJTy4EINbV1b0iXBFMqJ4N/RqcRwOFSS+dz6cu9gf 1S+typ05USqar4o429JxFCIRbxG/DM/VXbPyLC6LqMLahzKriKnLMt3iWi4TlM2Ja4NT 5th2xJXrDdOHWZCpolowXIwrZ7hO6kimpjBOrAy0BFwFFvxJEyFubO/p7t9Zuhg+DVC8 knIEVx+Sce6xyJN8m9egWl+qJeJVEXs/fOWL5U4SdGZhylrm4quqK2K1E1NhYEdInY69 RJcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FRnqnRi8Sg7Ycg+VP90bS3yOzvJ7u5H8Fm1LXwU6pYA=; b=G9Re7CwUKYbqkYFizWvwmZ6LztCFyRj4Q7tA3iVA8OJ3GWmiNAuhb9wSZLeq2MQ3qN n/jDUiK+R/Oppokx5C1cBk4jvaaTegM/QQQqdYTNJnkm3LKxt9RkZIbnoNoCMaLniDjf cVCCZYO/uOK+TH9WzjpQjKo1YgawlnGxmji5Qtp3v7XGsMwmj7J2XdIzYZHoYboyxLp1 4lOKKDzUJJuojlJCzNLmGO4SofdPJzE52MEEvkMm/caiBqSazMaGNVEV7TJJzKNMHSlf tmqGyUXe1n6AA1wWQ04E08EQoXWRxMceBDBKlISZLJwK0haDofstmO58VnFfSqSZuF59 4GrQ== X-Gm-Message-State: APjAAAXoctYcH54A5yLNRwATMAwdoaXaJ44ae1rgz727nhuDatokq3yZ MgiVw2oxHxiBsw/LroFtt18m+qCO X-Google-Smtp-Source: APXvYqy/JQNS6JAWgTAqxCOkZ2PLNNxl5fhSZdRFYX1US8tu1haSRg5V8yEpEaGarOB3UvfOcDP5xw== X-Received: by 2002:a7b:c933:: with SMTP id h19mr31914647wml.52.1563284297913; Tue, 16 Jul 2019 06:38:17 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.17 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:17 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:58 +0100 Message-Id: <20190716133803.1174-12-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Fabian Vogt Subject: [U-Boot] [PATCH 11/16] bcm283x mbox: Correctly wait for space to send X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Fabian Vogt For sending, the second mailbox is used, but previously the status register of the first one was read. --- arch/arm/mach-bcm283x/include/mach/mbox.h | 7 +++++-- arch/arm/mach-bcm283x/mbox.c | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h index cad035e8cd..cd78966150 100644 --- a/arch/arm/mach-bcm283x/include/mach/mbox.h +++ b/arch/arm/mach-bcm283x/include/mach/mbox.h @@ -51,9 +51,12 @@ struct bcm2835_mbox_regs { u32 read; u32 rsvd0[5]; - u32 status; - u32 config; + u32 status_r; + u32 config_r; u32 write; + u32 rsvd1[5]; + u32 status_w; + u32 config_w; }; #define BCM2835_MBOX_STATUS_WR_FULL 0x80000000 diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index 1642ebd103..f7483bf423 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -27,7 +27,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) /* Drain any stale responses */ for (;;) { - val = readl(®s->status); + val = readl(®s->status_r); if (val & BCM2835_MBOX_STATUS_RD_EMPTY) break; if (get_timer(0) >= endtime) { @@ -40,7 +40,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) /* Wait for space to send */ for (;;) { - val = readl(®s->status); + val = readl(®s->status_w); if (!(val & BCM2835_MBOX_STATUS_WR_FULL)) break; if (get_timer(0) >= endtime) { @@ -58,7 +58,7 @@ int bcm2835_mbox_call_raw(u32 chan, u32 send, u32 *recv) /* Wait for the response */ for (;;) { - val = readl(®s->status); + val = readl(®s->status_r); if (!(val & BCM2835_MBOX_STATUS_RD_EMPTY)) break; if (get_timer(0) >= endtime) { From patchwork Tue Jul 16 13:37:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132781 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="lT6XqKIm"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1qw3cl0z9s7T for ; Tue, 16 Jul 2019 23:45:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 19980C21F3A; Tue, 16 Jul 2019 13:42:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id EDBE9C21F3C; Tue, 16 Jul 2019 13:39:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D5CF7C21E47; Tue, 16 Jul 2019 13:38:20 +0000 (UTC) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by lists.denx.de (Postfix) with ESMTPS id 7C7C9C21E34 for ; Tue, 16 Jul 2019 13:38:20 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a15so18690656wmj.5 for ; Tue, 16 Jul 2019 06:38:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Mqxobf1hc2cJfykkKgFE11KDbyLCwrJy3PbQWCM3ihY=; b=lT6XqKImVlruMEwUJhUszM1hZ9bWtvxSq9ndmDM3fNLIlRnqTvfZOp4pcuef2chujm 32YSy/z3gOeO5NEhcRGS/whuNfBkFOPB+JOAqcq0ZqNWxjAR2ApqO33w3ykx0VA7Ynf/ 47s3bJA9e0XyNXn5IUrsThDwbuekduS2S+V6nK/s9IMKtDthKjmldZbR5AkzQNbMXCsA 4BgL2VK7az/q5ozgQdJxbOBdeo4yXnGGc9i2sy6lsi9lN4qkTdquPFlqxZcOxNnp5e7j 16ePVH1wcQmkrHhcCgqYP0yizfroAcYcYRXDZ55W0DPHyZC9drcL+TaU5g/0Is494cNy Kmpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Mqxobf1hc2cJfykkKgFE11KDbyLCwrJy3PbQWCM3ihY=; b=hjD5MmOCGxdqlPM4Yqk+3iFs4p3P2wODrc2V3vr65/0FPUdISkHLAHsubOZqdj5BpL QxNXtWEy1iXx4anY5Qsm6wN3DV9IzOjq/825ZMiCYuEp2wCR7tmpoquC1RomAYKn9VRd 6ZQzdu+GEptCVQh9B4lhK+6toeBeO5pcCy7DVCoSRsHaltSuBClK2NFacGDdoxQ8aSc/ BOkxdRfiqZKYxRq4ttHGRcjYJsVOTAxapUIO3JrH6JCGU7oC1YB9ypVBw2mzCT9TMcxw +adydFslvVMnehNIe7xmGSImpRDgNplSb7bVCwdvKel3nhVbEzkmZ3eqDtw3+1d/2EwB TOqQ== X-Gm-Message-State: APjAAAVFWUOQWAHsB0eCoqJIU/TkaYhwrSiUjvn5gWAspeZlbGexTGi9 Gd3Jll7TUhwufnK/b6P3XTyTMkxH X-Google-Smtp-Source: APXvYqwlbvS4eVhS5sXM7V5COdH3jOYieBV+57Xf9VvYGczavR6RKWG3FGlmoe+EzfMjMT6ttTr/dA== X-Received: by 2002:a1c:f018:: with SMTP id a24mr29927150wmb.66.1563284299153; Tue, 16 Jul 2019 06:38:19 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:18 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:37:59 +0100 Message-Id: <20190716133803.1174-13-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 12/16] config: rpi4: Add defconfig for rpi4-32 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- configs/rpi_4_32b_defconfig | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 configs/rpi_4_32b_defconfig diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig new file mode 100644 index 0000000000..9f2b805d0f --- /dev/null +++ b/configs/rpi_4_32b_defconfig @@ -0,0 +1,43 @@ +CONFIG_ARM=y +CONFIG_ARCH_BCM283X=y +CONFIG_SYS_TEXT_BASE=0x00008000 +CONFIG_TARGET_RPI_4_32B=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_DISTRO_DEFAULTS=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_OF_BOARD_SETUP=y +CONFIG_MISC_INIT_R=y +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="U-Boot> " +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_FS_UUID=y +CONFIG_OF_EMBED=y +CONFIG_DEFAULT_DEVICE_TREE="bcm2838-rpi-4-b" +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_DM_KEYBOARD=y +CONFIG_DM_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_BCM2835=y +CONFIG_PHYLIB=y +CONFIG_DM_ETH=y +CONFIG_PINCTRL=y +# CONFIG_PINCTRL_GENERIC is not set +# CONFIG_REQUIRE_SERIAL_CONSOLE is not set +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_DWC2=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_LAN78XX=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_DM_VIDEO=y +CONFIG_SYS_WHITE_ON_BLACK=y +CONFIG_CONSOLE_SCROLL_LINES=10 +CONFIG_PHYS_TO_BUS=y +CONFIG_OF_LIBFDT_OVERLAY=y From patchwork Tue Jul 16 13:38:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132784 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="I8q4RTEq"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1tm4tfQz9s7T for ; Tue, 16 Jul 2019 23:48:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 33912C21F3B; Tue, 16 Jul 2019 13:42:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E7D52C21F22; Tue, 16 Jul 2019 13:39:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0F0DEC21E77; Tue, 16 Jul 2019 13:38:21 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 9E9FDC21E49 for ; Tue, 16 Jul 2019 13:38:21 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id x1so5999008wrr.9 for ; Tue, 16 Jul 2019 06:38:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VKL009nYAhvacdxr6uFt6Sjd+wD33z61DdULiZXdyyY=; b=I8q4RTEqN20EeEeWST35581rolUn/CWKSv2UHGJ2nUD76fY10tZgxHAhPkS3d+hXE0 HznQojT23IGWg6trxweGgJYy0xRE/3wL1BfD6brBWUr11oiJpzE/sVBf0ppt4cXJqLBK R2kT3KhdJFGQebUYRyodxf2iwPDFKDTzXMQsnawnyP4x/wKz8OWEORLrEaLFgkzXHr+s U4/x/dQH1bWH2Nvi5BYfKY5i1m8tq+IgpUU88u0WNNcNnaD/0aaqGKRagnKFdR3Ul/bh ldO9Y3B8qMsMxDycG0I+saTbIGLne1xfy3ftKORY59fZBxBbYOxX6z5WTeVBaH8R7ptR TMBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VKL009nYAhvacdxr6uFt6Sjd+wD33z61DdULiZXdyyY=; b=P5/OJQdZyX61e6EePcIfNe7nplmfnROFCOWovlXtQlOJhUoiQQe/qbxgl2iw4Pcvld rRQhYZi7WSNlHLO7YojaACAIhlAJfq6FJs21cTeTq2Hnt6ZE2t15YeL9GXKtfDvogVu3 4N541wlZoMCWr3halFpRv37www4bT9DSItkvZNwStMBOJJE8t/mThhO/Xjtv9J1yAsCr LGgp6Qg6UJPIMan/oj+5/z3c3KpCHCMc3M+3Pj+/hlln1z9GF+OEnEFKAG+xgMrZRuA+ tFTuDpam6hBJJoq193qmBvKEzc0M8HhiHQ3qY5XLbODKEhrP0JRX6M+JgjPHAuCGTVYE 0Ctg== X-Gm-Message-State: APjAAAXG03gJ248UAqc3RirvbMTvatH51d8aYsNzu3PngbYC6ilfy1a3 eiaR5DKY65D+txUc6Ubcxr33TckH X-Google-Smtp-Source: APXvYqxCd1cgoza4Z6gjq2HMkXLcYyDmtr5wOA4AVcrkvjoCPPeUz0hv9QvIhViAcfG0b7Jr5ErskQ== X-Received: by 2002:a5d:53ca:: with SMTP id a10mr36840924wrw.131.1563284300802; Tue, 16 Jul 2019 06:38:20 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.19 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:20 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:38:00 +0100 Message-Id: <20190716133803.1174-14-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 13/16] dts: bcm2838-rpi-4-b: Use the emmc2 interface for sdhci X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- arch/arm/dts/bcm2838-rpi-4-b.dts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts index 07e9a78e8d..168179c17c 100644 --- a/arch/arm/dts/bcm2838-rpi-4-b.dts +++ b/arch/arm/dts/bcm2838-rpi-4-b.dts @@ -30,21 +30,17 @@ status = "okay"; }; -/* SDHCI is used to control the SDIO for wireless */ &sdhci { - pinctrl-names = "default"; - pinctrl-0 = <&emmc_gpio34>; - status = "okay"; - bus-width = <4>; - non-removable; + status = "disabled"; }; -/* SDHOST is used to drive the SD card */ &sdhost { - pinctrl-names = "default"; - pinctrl-0 = <&sdhost_gpio48>; + status = "disabled"; +}; + +&emmc2 { + compatible = "brcm,bcm2835-sdhci"; status = "okay"; - bus-width = <4>; }; &gpio { From patchwork Tue Jul 16 13:38:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132785 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="iZTgHpdT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1v55RgMz9s7T for ; Tue, 16 Jul 2019 23:48:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6C1C2C21F67; Tue, 16 Jul 2019 13:42:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 9B0A2C21F5B; Tue, 16 Jul 2019 13:39:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33415C21E47; Tue, 16 Jul 2019 13:38:23 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id BFBB9C21E47 for ; Tue, 16 Jul 2019 13:38:22 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z1so20964139wru.13 for ; Tue, 16 Jul 2019 06:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=O4rqCSkGIquD9sLROO4oCPaIAvMNOomS78dZknECSNA=; b=iZTgHpdTpI4iYBwbnG7miL5hLNKs/OfIz3Cb5vKadPb0yPO/hanwVJljlglRYMwYLz 9QlIOnbaSN17y+37DH/p63I44w6sNqW7GUNmh+nznW0iVef3NXsVHRj5CMUJ3RvDdd59 MzuPcj3LetYHv9lZbo3VdPUWECH+M6rGxTjjlIfcp5gLe5RIU6M6pzbUrTELRqySsMCc BBKo3XMoC1SJkk/uYfZOOG3rxwW+gCtO4kGXfEX4BAT5j5qAKZw63gPP2hfLsffrw+Tf a1GLd1VoTh2yBtC/7Iw+UMrEVqGMwrz71Y5dBXuM6kjKLzKlWf4SbfbGLoTCOkm/TnJt kHUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=O4rqCSkGIquD9sLROO4oCPaIAvMNOomS78dZknECSNA=; b=J1uitBFQdr5j+Wzj4Wjmbku9u0qAm7ndZUIsOa/M2bIE0EFyH24XQKn0dJXWUWBgHx OCt5PyZIUnyJuUXa9hskX9f6Bb51EE180+BTwztzZQ89upIb3a6oU5YzRAJnRcxQq+ja 6BkHWLaIPKPL7qYiUOISN4F8d120kHlcJVmccRA3CvMg4bjWgJnTjBbE6LfRoSWMg/0V XZkzb/YN3qDicDkjyhzxJzymCSwLKKmVSqGUaF/wOkMHi1gzrYTOKL5ruUNH6V/VV2v2 DalJgPYty6B+RqqiUqBBoADb24H8tGSfAw1tKzpjQJD1wTM0evdYF9iWm1pKatn2Z8yJ 4vdA== X-Gm-Message-State: APjAAAUdgZ7uH/c12zat+MJ9+5r/ifHRhvTFTfe/6M9eXCWeydelesqK 0J9hNKvHIIhRbqKaxazHb6FQ6Qc9 X-Google-Smtp-Source: APXvYqxRl3TLXAtQ8PnSTqHvflHiHzpEHnQ3fYQ12arcDXI3+WVGm3lrZxVTK/yZ3EBCT9Ki8PI9aQ== X-Received: by 2002:adf:ef8d:: with SMTP id d13mr35035451wro.60.1563284301947; Tue, 16 Jul 2019 06:38:21 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.20 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:21 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:38:01 +0100 Message-Id: <20190716133803.1174-15-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 14/16] rpi: Add memory map for bcm2838 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- board/raspberrypi/rpi/rpi.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 6d6f1ef39a..4242ef35a4 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -249,7 +249,8 @@ static uint32_t rev_type; static const struct rpi_model *model; #ifdef CONFIG_ARM64 -static struct mm_region bcm2837_mem_map[] = { +#ifndef CONFIG_BCM2838 +static struct mm_region bcm283x_mem_map[] = { { .virt = 0x00000000UL, .phys = 0x00000000UL, @@ -268,8 +269,28 @@ static struct mm_region bcm2837_mem_map[] = { 0, } }; - -struct mm_region *mem_map = bcm2837_mem_map; +#else +static struct mm_region bcm283x_mem_map[] = { + { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0xf3000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { + .virt = 0xfe000000UL, + .phys = 0xfe000000UL, + .size = 0x01800000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + /* List terminator */ + 0, + } +}; +#endif +struct mm_region *mem_map = bcm283x_mem_map; #endif int dram_init(void) From patchwork Tue Jul 16 13:38:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132783 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="b2NO+wU/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1sJ5yY4z9sN4 for ; Tue, 16 Jul 2019 23:46:44 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 55636C21EE5; Tue, 16 Jul 2019 13:42:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 92C12C21F4A; Tue, 16 Jul 2019 13:39:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F332FC21E47; Tue, 16 Jul 2019 13:38:23 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id A1E90C21E34 for ; Tue, 16 Jul 2019 13:38:23 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id a15so18690851wmj.5 for ; Tue, 16 Jul 2019 06:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xd0h5cj3Vk3z5KmcuRax3mEr3dCH5hmDv5P3IVIzu78=; b=b2NO+wU/Iyi5anuudXnCoaY5TxctBJiUNAAiAuVyUJnrCEYC69beh4cMj/PpOkaE4h QyYYfh3z97FTW6D7xbmIuWtu7Fmbqlwp9Hk4d2a9/FtYK17XH2NoCyJlSo/jhbwW7dtf UOwuOCKtXUKG2bR7/bHHSn4J/e/dxwJZyk5/R+l7sY5OjS9AW3u5sunJa+S0RSKdOrtA y99Vd4mSePBJgBZ0iBi7xmnGUmn1jwWy6OQ+Rliz5E+83fV8lPkSAr6nndGWh1T2DS0R Khxf3fhWtdI9K3VyDNyOgRi2aZgkFRxQjJak4BMyMFcdb52frWXA66jr+icBwueXiY28 4Ncg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Xd0h5cj3Vk3z5KmcuRax3mEr3dCH5hmDv5P3IVIzu78=; b=hOp9GJISC1/WEbexIOC+pkGYZZtYOn1cXDm6552Yj59YagQpgxHiJCPLU/1x+GIial pT5x4YSPFyfTX0995FlxzaxAAnRzvoCa6KjEPPHzYLOGGqo8W4omWxHSUZHYYfxTP6JH JCz1kif6zbPam2eFJczgdmRIGhjB5PEK23XDbTOt395eiISPDCnP1Rg7UQOOVc/C7EUU YJg79Nli4GA9553xeCL+fUwQP4RKXDc00tnZqR8+t6Zl9rYm71oJgDavV1gevHFAxwXu zBaJ27+lhcV2pYSaQSNt5SXxxKaLZO/YNsEQZZyjOIiju1TuDe6DOtZdGR1rpe+NRziz h67w== X-Gm-Message-State: APjAAAWExzmFdKbSiFHC4rKDhb/y8V3xYmSuQDreAbfS4R1+Ul+oNUyl QI+q7hGxmbwy2j6RMd/v44FN7J8/ X-Google-Smtp-Source: APXvYqxX0UKBDbsgifzTuuMDbwmZtWhI2UY3OG9n0ue+GmA8YNKVUSOGDzh8fMsvftU5269qcCTebQ== X-Received: by 2002:a05:600c:291:: with SMTP id 17mr30152442wmk.32.1563284302865; Tue, 16 Jul 2019 06:38:22 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:22 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:38:02 +0100 Message-Id: <20190716133803.1174-16-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 15/16] configs: rpi4: Remove DWC2 and USB_ETHER configs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan dwc2 is only connected to the usb-c port so we don't have any real benefit in having it enabled in uboot. Also, the GENET interface is connected directly to the SoC so we can drop the USB_ETHER configs. Signed-off-by: Andrei Gherzan --- configs/rpi_4_32b_defconfig | 3 --- configs/rpi_4_defconfig | 3 --- 2 files changed, 6 deletions(-) diff --git a/configs/rpi_4_32b_defconfig b/configs/rpi_4_32b_defconfig index 9f2b805d0f..b71a14735a 100644 --- a/configs/rpi_4_32b_defconfig +++ b/configs/rpi_4_32b_defconfig @@ -31,11 +31,8 @@ CONFIG_PINCTRL=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_USB_DWC2=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y -CONFIG_USB_ETHER_LAN78XX=y -CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 diff --git a/configs/rpi_4_defconfig b/configs/rpi_4_defconfig index 83d1bd0cdb..b27e3f823b 100644 --- a/configs/rpi_4_defconfig +++ b/configs/rpi_4_defconfig @@ -31,11 +31,8 @@ CONFIG_PINCTRL=y # CONFIG_REQUIRE_SERIAL_CONSOLE is not set CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_USB_DWC2=y CONFIG_USB_KEYBOARD=y CONFIG_USB_HOST_ETHER=y -CONFIG_USB_ETHER_LAN78XX=y -CONFIG_USB_ETHER_SMSC95XX=y CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_CONSOLE_SCROLL_LINES=10 From patchwork Tue Jul 16 13:38:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1132782 X-Patchwork-Delegate: matthias.bgg@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gherzan.ro Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=gherzan.ro header.i=@gherzan.ro header.b="VwUcUhUH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 45p1rv2gKxz9s7T for ; Tue, 16 Jul 2019 23:46:23 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 11A12C21F34; Tue, 16 Jul 2019 13:43:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 6027CC21F34; Tue, 16 Jul 2019 13:39:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DB2C6C21E47; Tue, 16 Jul 2019 13:38:24 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id 88675C21E34 for ; Tue, 16 Jul 2019 13:38:24 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id p17so20971809wrf.11 for ; Tue, 16 Jul 2019 06:38:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gherzan.ro; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BVDDky93fEy9MwyT5115RP0HzdTQNcY96sEkPkWRibI=; b=VwUcUhUHFRzyO6lOy9FWarJAPPQijOamdsaBMD1IMhDCzEYpy3iY+E2WhPBnfyAe3P 5up2141I2Sof2HqWRBVnznYi74X5fYnhOMohg9fHqoooQrmY6GB2/pHsDySA0i4Z6iqu JedQbPC2punYzg2zEGuz+5roeqb2zr1tBqfssSibAvuwPMeEqjly8gvp9eEv4lRpsvtY sRy9+7gEO3ZavMdY/iYJqGGMDQE+hzG5KUj8VwbYCIuwjMR8QZD7TumBvqPF2YfTCXPW 4vY4J9jb8oy0AkkL5SKO4ttwGcX+HcoSLKoAYm/+xbQ6opObGZ/KAnCggjPZJa+rASLC LXkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BVDDky93fEy9MwyT5115RP0HzdTQNcY96sEkPkWRibI=; b=BWe2qqsBlw9ymPNJifcSkT1jli11ZKFDH3bvC73sF1rWWz4GySueQ0qKr50tYLK77Q U9wG/idAh+AmimivL/U6oISwb9owQQXvrbpXLyDluDrPZzZ7LZMPy//04IlDx9CMCheZ ZTzVM+LQpx1GyxyVZmgm+jPdQpB46tBDsLV48SAkICR96VF6JYHyY6AfxoiNCcFVWWmV m7SqLKsXVitsGvi+w58w9NqEll/k98HyhmSblmUXxelMCaSigs7oUdLeov6kmbtwZTFH W4o6kgGQVMNO74pJHEFQLR7nJzDvOobdQMLXPWC3A1iMR6sXqmNuHIi1QwNpX4+4sMwB Torw== X-Gm-Message-State: APjAAAX5JWTAVgBw3n13diJNmuBJpRfBdlocl8xJW0ky1l4UhpbJiMml QADlnLOzP3l8qja8wDcGo8ZBcmTr X-Google-Smtp-Source: APXvYqxJoIH/7p7p7eCAIVRonjUgLY+miFBVR/PWg93joXtn5HCmnxSHtt2qUgE4chEKcCPcbi4LGg== X-Received: by 2002:a5d:4a02:: with SMTP id m2mr35830761wrq.78.1563284303834; Tue, 16 Jul 2019 06:38:23 -0700 (PDT) Received: from localhost.localdomain ([212.36.34.46]) by smtp.gmail.com with ESMTPSA id e5sm21450292wro.41.2019.07.16.06.38.22 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 16 Jul 2019 06:38:23 -0700 (PDT) From: andrei@gherzan.ro To: u-boot@lists.denx.de Date: Tue, 16 Jul 2019 14:38:03 +0100 Message-Id: <20190716133803.1174-17-andrei@gherzan.ro> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190716133803.1174-1-andrei@gherzan.ro> References: <20190716133803.1174-1-andrei@gherzan.ro> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 16 Jul 2019 13:38:54 +0000 Cc: Andrei Gherzan Subject: [U-Boot] [PATCH 16/16] dts: bcm2838-rpi-4-b: Use the emmc2/2811 compatible string for SDHCI X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Andrei Gherzan Signed-off-by: Andrei Gherzan --- arch/arm/dts/bcm2838-rpi-4-b.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/bcm2838-rpi-4-b.dts b/arch/arm/dts/bcm2838-rpi-4-b.dts index 168179c17c..b7241be3fd 100644 --- a/arch/arm/dts/bcm2838-rpi-4-b.dts +++ b/arch/arm/dts/bcm2838-rpi-4-b.dts @@ -39,7 +39,7 @@ }; &emmc2 { - compatible = "brcm,bcm2835-sdhci"; + compatible = "brcm,bcm2711-emmc2"; status = "okay"; };