From patchwork Mon Apr 8 16:49:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 1081250 X-Patchwork-Delegate: jagannadh.teki@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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZmJrMEx+"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dGRG65cLz9sML for ; Tue, 9 Apr 2019 02:42:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8DDB0C21E2C; Mon, 8 Apr 2019 16:41:29 +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=FREEMAIL_FROM, 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 5F2E2C21E26; Mon, 8 Apr 2019 16:41:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ACF70C21DD7; Mon, 8 Apr 2019 16:41: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 63688C21DD4 for ; Mon, 8 Apr 2019 16:41:13 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id r4so17200405wrq.8 for ; Mon, 08 Apr 2019 09:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NNhZsyoWUZAG7RNn3o9HnWcYKfSjiyF9N+F2R3cXdBo=; b=ZmJrMEx+m6wzVIzXbahvJm/O2izLQozFNlDiIhljDnX9jdr/Fl5t5QazbS/kAeBdMV CYImpkW8LX6u6eNJ3Ip1AKNNDqL3n/vgloxakTmFXJqEuoCufiJgjmYtWUSqqE1iISvo C8DI0KEP4KRBT5yoWytRHwfYk2TBmh2M2NNzxeD8vIB7hPmLuvXoj2rwEhcHuxqsmguQ QF/rx/JkzL8razR0ETEf+/U+d2h7lHDNjOD5mO5wXHavswJLQ6LvEYD3j2EioRA/OHqi PpNq360uqmeSSS0OSopzQ2yUZc2Fa+T6rSWlfoE9onyv5xOuI6gOydpm0ysSTyGNVRsC X+Yg== 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=NNhZsyoWUZAG7RNn3o9HnWcYKfSjiyF9N+F2R3cXdBo=; b=W8HJ+ZXSUpmbcSFG/t7eZa/Zr69FGSIqxSG5dY3ZbUfT5oe8rQskzOSf9xCm7v9Udn htRHKL2pn1/ASJhsXIsMe5O/lCGPwzeG28115z+G2HgQkZOoAtRhjBjV+mmGyyCDZbhA ij0xiDMILafL9JOaZAo7NxkqEjmsEuIjA0ucxOgQN1qLzOeqZAZ+kNfHAlIZ2quDxbkL FxKCS4xlgaXT7UG83yToex0hrkijup0fex2u4LzeX8ZXKh3RbK8+xWh0twgNx7/lbIc3 jnPQA5BZSMOelgS9Vpco0QIWC6KdlVEWeeYL1u5K4CxZd0NAvls170XmUFNiPesNkOAa yfQA== X-Gm-Message-State: APjAAAVLJ9g+cdlvOcHlTXMIqA3swv81ue0iOnJnwyZazJJiljcs4h6e cHNUZTMIvBJQeZGCj5lwmtcR1zob X-Google-Smtp-Source: APXvYqwStdODPIC/aAMbduG+WB3W6YkeBryHwJJdB+ZU68bVAw9l8QwIwXqdvLweeyEUMpBnq7BLgw== X-Received: by 2002:adf:b458:: with SMTP id v24mr19367759wrd.46.1554741672865; Mon, 08 Apr 2019 09:41:12 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id r16sm21998817wrx.37.2019.04.08.09.41.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 09:41:12 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard , Albert Aribaud , u-boot@lists.denx.de Date: Mon, 8 Apr 2019 18:49:48 +0200 Message-Id: <20190408164951.1819-2-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408164951.1819-1-peron.clem@gmail.com> References: <20190408164951.1819-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: linux-sunxi@googlegroups.com Subject: [U-Boot] [PATCH 1/4] arm: dts: h6: move MMC pinctrl to soc 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" There is only one muxing avalaible for each MMC controller. Move this pinmux to the SOC dtsi. Signed-off-by: Clément Péron --- arch/arm/dts/sun50i-h6-orangepi.dtsi | 2 -- arch/arm/dts/sun50i-h6-pine-h64.dts | 4 ---- arch/arm/dts/sun50i-h6.dtsi | 4 ++++ 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/sun50i-h6-orangepi.dtsi b/arch/arm/dts/sun50i-h6-orangepi.dtsi index 0612c19cd9..3748dcaa70 100644 --- a/arch/arm/dts/sun50i-h6-orangepi.dtsi +++ b/arch/arm/dts/sun50i-h6-orangepi.dtsi @@ -24,8 +24,6 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_cldo1>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; bus-width = <4>; diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts index ceffc40810..a26314c084 100644 --- a/arch/arm/dts/sun50i-h6-pine-h64.dts +++ b/arch/arm/dts/sun50i-h6-pine-h64.dts @@ -42,16 +42,12 @@ }; &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; vmmc-supply = <®_cldo1>; cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; status = "okay"; }; &mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_pins>; vmmc-supply = <®_cldo1>; vqmmc-supply = <®_bldo2>; non-removable; diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi index cfa5fffcf6..617cea35d1 100644 --- a/arch/arm/dts/sun50i-h6.dtsi +++ b/arch/arm/dts/sun50i-h6.dtsi @@ -158,6 +158,8 @@ resets = <&ccu RST_BUS_MMC0>; reset-names = "ahb"; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; @@ -186,6 +188,8 @@ resets = <&ccu RST_BUS_MMC2>; reset-names = "ahb"; interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>; From patchwork Mon Apr 8 16:49:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 1081252 X-Patchwork-Delegate: jagannadh.teki@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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="elkA35d5"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dGRt4MLkz9sR7 for ; Tue, 9 Apr 2019 02:42:34 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4AC97C21E1D; Mon, 8 Apr 2019 16: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=FREEMAIL_FROM, 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 1C55EC21DD4; Mon, 8 Apr 2019 16:41:21 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 17858C21DD7; Mon, 8 Apr 2019 16:41:16 +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 1B2D3C21DE8 for ; Mon, 8 Apr 2019 16:41:14 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id k17so17178685wrx.10 for ; Mon, 08 Apr 2019 09:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NUggyLz6Gsmt7ITBhKaNRmaa4edYYitdFwfwNInxqD0=; b=elkA35d5MXARh7vgY6q/KceRxJY4tgN0n2R+k3XIvOArs4aeoqdOtCwBdW8Yj73agZ VUWboWBpqfbcY2XfM30jc5re2XuoRyY1VEjw+55fORDLOps0ZQ+knCezUjwZc+nM+qXa sFQLu5bzZFxsEWV0/D0yYtnv8K/+xlZ+LqKzTS+LRHS7ywqLays+7Emoz7acoTzC5Ffb kNpTjGmuYztdQMrw5SA5IfHg8SFzafQcuEQTa7OReBrMjIbhzibBTb70ElY4HLzI4SGi OuCcHgb4vMocRsoa0FWCaULvx5i4jMxpbvTQsR30RlA2lnJardkRroUh22+psGr0jXRl 6YjA== 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=NUggyLz6Gsmt7ITBhKaNRmaa4edYYitdFwfwNInxqD0=; b=efeUGVGCmFFY4eZAGK69S/koAC8x/CFGJKNgcUN7AHzD4rHclJUtFCQL8q/xpvjlOt FJs/oQB5D8o4ZyLWlzM6Sn3LrU34Xw17lul00EiAwdLDxmUfgzxF/lhasM9yW1zqT7tG 72NMfusYEl+tdlxSOgaV8bR3IsTM3hUBfEiAGON3z5MMuKqFH1l/S+9100iFbLCDtd8P S494Y6aBlSWaWk0nq90S835kw3tBrGPJcFeYD/mLTDsCt9/A+wA1P6L0mek1prWQGO4z o0wK3CixTchRTG6nja8jxWXoD5dCfH3GKrQ6uBj6kCDptvWl/xjTz0VUmmOOgAZl7qVy e+Lg== X-Gm-Message-State: APjAAAWmRSxYBMd88tcK0EFDYAf3EvsKG8fMTFY7C96d+sLJgGWtGVM3 Zc4FbmYtvLYX03EMTClGeFQ= X-Google-Smtp-Source: APXvYqwAMHykYSXpTCqPBR2B4DCpKViv3Z5rot/aRtuhA0WuPRZoKAwk2S+Q8qX8TZnC4HF2bIdiQg== X-Received: by 2002:a5d:488d:: with SMTP id g13mr19229154wrq.119.1554741673570; Mon, 08 Apr 2019 09:41:13 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id r16sm21998817wrx.37.2019.04.08.09.41.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 09:41:13 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard , Albert Aribaud , u-boot@lists.denx.de Date: Mon, 8 Apr 2019 18:49:49 +0200 Message-Id: <20190408164951.1819-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408164951.1819-1-peron.clem@gmail.com> References: <20190408164951.1819-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: linux-sunxi@googlegroups.com Subject: [U-Boot] [PATCH 2/4] arm: dts: h6: Add Beelink GS1 initial support 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" Beelink GS1 is an Allwinner H6 based TV box, which support: - Allwinner H6 Quad-core 64-bit ARM Cortex-A53 - GPU Mali-T720 - 2GB LPDDR3 RAM - 16GB eMMC - AXP805 PMIC - 1Gbps GMAC via RTL8211E - USB 2.0 and 3.0 Host - HDMI port - S/PDIF port - 5V/2A DC power supply - Wi-Fi/BT via Fn-Link 6222B-SRB (RTL8222BS) Signed-off-by: Clément Péron --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun50i-h6-beelink-gs1.dts | 183 +++++++++++++++++++++++++ configs/beelink_gs1_defconfig | 15 ++ 3 files changed, 199 insertions(+) create mode 100644 arch/arm/dts/sun50i-h6-beelink-gs1.dts create mode 100644 configs/beelink_gs1_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0e2ffdb87f..4931b7d3cc 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -467,6 +467,7 @@ dtb-$(CONFIG_MACH_SUN50I_H5) += \ sun50i-h5-orangepi-prime.dtb \ sun50i-h5-orangepi-zero-plus2.dtb dtb-$(CONFIG_MACH_SUN50I_H6) += \ + sun50i-h6-beelink-gs1.dtb \ sun50i-h6-orangepi-lite2.dtb \ sun50i-h6-orangepi-one-plus.dtb \ sun50i-h6-pine-h64.dtb diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts new file mode 100644 index 0000000000..c80862375f --- /dev/null +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts @@ -0,0 +1,183 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +/* + * Copyright (C) 2019 Clément Péron + */ + +/dts-v1/; + +#include "sun50i-h6.dtsi" + +#include + +/ { + model = "Beelink GS1"; + compatible = "azw,beelink-gs1", "allwinner,sun50i-h6"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + + power { + label = "beelink:white:power"; + gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */ + default-state = "on"; + }; + }; + + reg_vcc5v: vcc5v { + /* board wide 5V supply directly from the DC jack */ + compatible = "regulator-fixed"; + regulator-name = "vcc-5v"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; +}; + +&mmc0 { + vmmc-supply = <®_cldo1>; + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; + bus-width = <4>; + status = "okay"; +}; + +&mmc2 { + vmmc-supply = <®_cldo1>; + vqmmc-supply = <®_bldo2>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&r_i2c { + status = "okay"; + + axp805: pmic@36 { + compatible = "x-powers,axp805", "x-powers,axp806"; + reg = <0x36>; + interrupt-parent = <&r_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + interrupt-controller; + #interrupt-cells = <1>; + x-powers,self-working-mode; + vina-supply = <®_vcc5v>; + vinb-supply = <®_vcc5v>; + vinc-supply = <®_vcc5v>; + vind-supply = <®_vcc5v>; + vine-supply = <®_vcc5v>; + aldoin-supply = <®_vcc5v>; + bldoin-supply = <®_vcc5v>; + cldoin-supply = <®_vcc5v>; + + regulators { + reg_aldo1: aldo1 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-pl"; + }; + + reg_aldo2: aldo2 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-ac200"; + regulator-enable-ramp-delay = <100000>; + }; + + reg_aldo3: aldo3 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc25-dram"; + }; + + reg_bldo1: bldo1 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc-bias-pll"; + }; + + reg_bldo2: bldo2 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc-efuse-pcie-hdmi-io"; + }; + + reg_bldo3: bldo3 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc-dcxoio"; + }; + + bldo4 { + /* unused */ + }; + + reg_cldo1: cldo1 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-3v3"; + }; + + reg_cldo2: cldo2 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi-1"; + }; + + reg_cldo3: cldo3 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-wifi-2"; + }; + + reg_dcdca: dcdca { + regulator-always-on; + regulator-min-microvolt = <810000>; + regulator-max-microvolt = <1080000>; + regulator-name = "vdd-cpu"; + }; + + reg_dcdcc: dcdcc { + regulator-min-microvolt = <810000>; + regulator-max-microvolt = <1080000>; + regulator-name = "vdd-gpu"; + }; + + reg_dcdcd: dcdcd { + regulator-always-on; + regulator-min-microvolt = <960000>; + regulator-max-microvolt = <960000>; + regulator-name = "vdd-sys"; + }; + + reg_dcdce: dcdce { + regulator-always-on; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + regulator-name = "vcc-dram"; + }; + + sw { + /* unused */ + }; + }; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_ph_pins>; + status = "okay"; +}; diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig new file mode 100644 index 0000000000..ef4dd29549 --- /dev/null +++ b/configs/beelink_gs1_defconfig @@ -0,0 +1,15 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_SPL=y +CONFIG_MACH_SUN50I_H6=y +CONFIG_MMC0_CD_PIN="PF6" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +# CONFIG_PSCI_RESET is not set +CONFIG_NR_DRAM_BANKS=1 +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1" +CONFIG_LED=y +CONFIG_LED_GPIO=y From patchwork Mon Apr 8 16:49:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 1081251 X-Patchwork-Delegate: jagannadh.teki@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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KVeWrrQe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dGRc1yvsz9sML for ; Tue, 9 Apr 2019 02:42:20 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EF8B0C21DF8; Mon, 8 Apr 2019 16: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=FREEMAIL_FROM, 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 D890BC21E45; Mon, 8 Apr 2019 16:41:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2ECDEC21DF9; Mon, 8 Apr 2019 16:41:18 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id B8BDAC21D4A for ; Mon, 8 Apr 2019 16:41:14 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id p10so17255971wrq.1 for ; Mon, 08 Apr 2019 09:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bTU2fh4rAZBBmeKKm7OPZ/dYtPek6yIq9O3bFx4OrfM=; b=KVeWrrQepHPDbO6qTItpuhMB7blI+XrzNyW+Npajf8WvHBEloT0m6Hzc3krLzHAC8e 6uI6UpJ0LrC0pL/uJtjGc8TtVSqkFMnCFXyQhMGNHOO7EYfZ6G2ypqqj8FdbxUXfTSD/ U6y/n6pRmS51B0YGx4Z5xURwDnCIUCSNt8Znb+1Fz9EYHy4+NozfWe/y5z8X9cPcH68u UwR/CTI2Fx/tgcIHEcb5wZ7WF5ujRjOt0iVRqUO4aBgg2sHW2QtXU/N9Wwt5Xln3sBLc Kfns8M8RhlYWCfgYebWSsKBC1Gkt1/TP1MYt21EIR7BZqyi/ovRNJB2iWrSKRKt7r+8t l3Qg== 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=bTU2fh4rAZBBmeKKm7OPZ/dYtPek6yIq9O3bFx4OrfM=; b=OrYbFOtl/LU2uySERlVG9qq4Ks1dsuQ3TTFfgWT5qcg8/NfUhdbV2kPOrvPYf9h+hY t6YBVfQgVHlGmb3pxWZiXLggyB1Dl3rHhSdBoQ9mJNFKx/Y+hP4GXOHNYmWM+c95A17/ moH4rlUVjiWdBzL49ddiW6cj0SBU8l5NF5oELLxajOQbpO0+7L7mK7BXiRjSlnJv16JW 0cKa7l8jb8NHq/TjFvTPPtUaOe9gMgbs/8kc68Swtxdy40azJqOQnGOhV5KRsTKQs038 fYtp7I+wSD3eZNG3rH5MrSQoHawwskdaBuHXJhLpJtasWbzlurGK81C7dTYzq5eHOaIP PH3A== X-Gm-Message-State: APjAAAVmWo0Jn6i3FAawPVfDMW2KnkxdG7oounnCO1EYvwFebOFas3ln TjORxOeq6hYhZ1l4gCSAVcw= X-Google-Smtp-Source: APXvYqxXkG/RYWCJJn6HqoCZaGdSAuuDBayor9IKG06mm5e/4inq1AKgkgl/Eqy09XwH+4FFiOWJ0w== X-Received: by 2002:adf:f984:: with SMTP id f4mr14265437wrr.97.1554741674248; Mon, 08 Apr 2019 09:41:14 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id r16sm21998817wrx.37.2019.04.08.09.41.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 09:41:13 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard , Albert Aribaud , u-boot@lists.denx.de Date: Mon, 8 Apr 2019 18:49:50 +0200 Message-Id: <20190408164951.1819-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408164951.1819-1-peron.clem@gmail.com> References: <20190408164951.1819-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: linux-sunxi@googlegroups.com Subject: [U-Boot] [PATCH 3/4] arm: sunxi: h6: fix reset using r_wdog 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" WDOG in H6 is broken so the reset is actually not working. Use the R_WDOG instead. Signed-off-by: Clément Péron --- arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h | 1 + arch/arm/mach-sunxi/board.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h index 41a9b0fc47..6392cb07b4 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h @@ -60,6 +60,7 @@ #define SUNXI_RTC_BASE 0x07000000 #define SUNXI_R_CPUCFG_BASE 0x07000400 #define SUNXI_PRCM_BASE 0x07010000 +#define SUNXI_R_WDOG_BASE 0x07020400 #define SUNXI_R_PIO_BASE 0x07022000 #define SUNXI_R_UART_BASE 0x07080000 #define SUNXI_R_TWI_BASE 0x07081400 diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index b74eaf2a0e..3f8128fbf4 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -287,9 +287,14 @@ void reset_cpu(ulong addr) writel(WDT_MODE_RESET_EN | WDT_MODE_EN, &wdog->mode); } #elif defined(CONFIG_SUNXI_GEN_SUN6I) || defined(CONFIG_MACH_SUN50I_H6) +#if defined(CONFIG_MACH_SUN50I_H6) + /* WDOG is broken for H6 use the R_WDOG instead */ static const struct sunxi_wdog *wdog = - ((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog; - + (struct sunxi_wdog *)SUNXI_R_WDOG_BASE; +#else + static const struct sunxi_wdog *wdog = + ((struct sunxi_timer_reg *)SUNXI_TIMER_BASE)->wdog; +#endif /* Set the watchdog for its shortest interval (.5s) and wait */ writel(WDT_CFG_RESET, &wdog->cfg); writel(WDT_MODE_EN, &wdog->mode); From patchwork Mon Apr 8 16:49:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= X-Patchwork-Id: 1081253 X-Patchwork-Delegate: jagannadh.teki@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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SCYGByUK"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dGS14VPWz9sML for ; Tue, 9 Apr 2019 02:42:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 224F9C21E39; Mon, 8 Apr 2019 16: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.0 required=5.0 tests=FREEMAIL_FROM, 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 67EA6C21DFA; Mon, 8 Apr 2019 16:41:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0787BC21E30; Mon, 8 Apr 2019 16:41:19 +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 BF2DFC21E15 for ; Mon, 8 Apr 2019 16:41:15 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id p10so17256035wrq.1 for ; Mon, 08 Apr 2019 09:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a2fhmnmIWbWkFHHYhSsDFMMI3O6+aKhrIyD2lRhLSW8=; b=SCYGByUKMEtIn/M5aLSb+MK3bMJWS/X79aQt67n3y2IdkU027RiU1nI+uBbAE0VZQv UEXdEL32qkRjYVNOhVGU1q/8S44mjtVmWX1ehYw1M0H2EV0Yo2sa295QBttYRLRPZm9+ H2DHaFjsi8rLiAUuKuUUE9jjX7c5GpYK7nVJVx1T2/d1b9r2SExY01zyk6EbGG3QPCB4 dKmCB8rMAHxUUMI/wLqwCgYUaWXJB4KOqAAkW84bhi2MiUvfcGkFtUpcyi/FRJexQqPA qaVZZYFrbuybxnm4qCjoEAfjxytSJIUAlyibSQNQBCy/ZR3YWtRuaoxfttHbmEx5jXf9 xuQA== 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=a2fhmnmIWbWkFHHYhSsDFMMI3O6+aKhrIyD2lRhLSW8=; b=k8mN/QHqoCMhXjbe6ateaXalSXywv+O8hzPFHWdAViJO3MNPTwmyZX87pkCp2n8hwQ 7YR0GSvIOQIp7t0RLppVJi9vE5G3lI+4bPJLd1VhbWwQqUWbqUGnfoVwRgbWffnqft9m Mi3r7UD+0/fmjIZrAL3E/5ZfBvEkIBQ9Tg9RqHGGgoi4zYj9iqMoZv2qTdLzhDmvwwhO S4ZhPF2+tJZjhXcYeqU7IERqZCFKUh8Jt9Jg3X/HlFTEPsQxbtiYZzpvL86Uo+Alej4g tdoVgD+wJSyBEeG++IgaDgbC4+yGBVJlJfqmO11tlaboQ/5VzdTG6ckPEm5MfKnATz27 pnMg== X-Gm-Message-State: APjAAAU+pxcSXKkTTPo4QFxyXnmOv2olGAFD3Us9TtDUpvQ7DcQy4247 GT+386yPeuVy1Tc+tWUi+lOtEwcv X-Google-Smtp-Source: APXvYqx4zemLkACt8WoEvoVaWvGueBN4314joo0HLdUduBpwEexNUNyNL+WbppEpK7w1Ul0mHcyPzw== X-Received: by 2002:adf:f14e:: with SMTP id y14mr19467763wro.276.1554741675294; Mon, 08 Apr 2019 09:41:15 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id r16sm21998817wrx.37.2019.04.08.09.41.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 09:41:14 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard , Albert Aribaud , u-boot@lists.denx.de Date: Mon, 8 Apr 2019 18:49:51 +0200 Message-Id: <20190408164951.1819-5-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408164951.1819-1-peron.clem@gmail.com> References: <20190408164951.1819-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: linux-sunxi@googlegroups.com Subject: [U-Boot] [PATCH 4/4] arm: dts: h6: minor sync with linux 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" There are some minor differences between U-Boot and Linux. Sync only the minor changes. Signed-off-by: Clément Péron --- arch/arm/dts/sun50i-h6.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi index 617cea35d1..5f01314703 100644 --- a/arch/arm/dts/sun50i-h6.dtsi +++ b/arch/arm/dts/sun50i-h6.dtsi @@ -19,28 +19,28 @@ #size-cells = <0>; cpu0: cpu@0 { - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <0>; enable-method = "psci"; }; cpu1: cpu@1 { - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <1>; enable-method = "psci"; }; cpu2: cpu@2 { - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <2>; enable-method = "psci"; }; cpu3: cpu@3 { - compatible = "arm,cortex-a53", "arm,armv8"; + compatible = "arm,cortex-a53"; device_type = "cpu"; reg = <3>; enable-method = "psci"; @@ -143,7 +143,7 @@ bias-pull-up; }; - uart0_ph_pins: uart0-ph { + uart0_ph_pins: uart0-ph-pins { pins = "PH0", "PH1"; function = "uart0"; }; @@ -270,7 +270,7 @@ interrupt-controller; #interrupt-cells = <3>; - r_i2c_pins: r-i2c { + r_i2c_pins: r-i2c-pins { pins = "PL0", "PL1"; function = "s_i2c"; };