From patchwork Fri Apr 12 14:15:25 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: 1084766 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="BDE1SW1n"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gg1d6tvwz9sBr for ; Sat, 13 Apr 2019 00:16:37 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A7CFFC21E2B; Fri, 12 Apr 2019 14:15:56 +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 C4A22C21E36; Fri, 12 Apr 2019 14:15:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 38D9CC21CB6; Fri, 12 Apr 2019 14:15:40 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id E7417C21C4A for ; Fri, 12 Apr 2019 14:15:39 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id v14so11235059wmf.2 for ; Fri, 12 Apr 2019 07:15:39 -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=qu0R0v3+UvHz64PSQr8hx7R8pv5QdBPsedXoFWrQMxc=; b=BDE1SW1n1R0qtzZKTRLmePbXKV2a5DiN/xMpWNEUqb8t972z+ADie2CmRNqZB5cw64 lBaSp6x9cWhdD+L1lCfU0jZCTPdGWS1HSjsQuLkEDw/9L+CNBmdyBCyBeSQbVvYXCPKR qAxrzoVcJQFEcnpUMzLes2pOG8i2TO1JLV105pzuqCeNODqvng7NBv9xWlgAZ7vdOoUC FUK2QVVhrR9hgkMcCz0t1v6ACsOFlGLid037xBgF2WWSSKEGZQCjT3HzXAARPdmiDQ5s wfe2LGTGEXMHCR1zv2rO68rFaJx809zC8/a/CYKXOouGIklxot9QpdE3x/GL6oxk0qCh v5JQ== 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=qu0R0v3+UvHz64PSQr8hx7R8pv5QdBPsedXoFWrQMxc=; b=gWciZAOFhqDR6x/xx5NV/bTJ629MwNZRhzk2ufV8eQw3I9n7QPx1zb6tgKYHShgvU8 aTXsgCDSnjXIDO2Vjmn3OwMMOau55SfFeEixh98wYKH3n9rjtEBReiXBiTrZ+RWR8qdh bpQH8kprfcTCjUAic8kzI1NmtVfjy53qiwGQ6iq6UyGEqUAJsjqhAYB2K2rBaKhwexjp jXjC8wL0jD+qmd2GNi63pFqsAWsNKoyaN/OzmrumQiaNfGsXQ5aZNf/iaNUJAheBQZXD CSCfNgzP271pc2qzk76RSJJpIA27hIKP85fTWjfFkcEu24uTBK05gDAspKfNHTcAQ6Cg VSnw== X-Gm-Message-State: APjAAAWVYqbJ7KYL2IVR0NERYzRqy73K2K5bc9ta2lrqvOmLhZNQyDqW pY5FJD4sswcM0L1PSqOm0RY= X-Google-Smtp-Source: APXvYqzuPuDcEPQ4BZ21FVcpqZNAtZ3DiUosoS+X/zxbDKW5JwBS9RcDdh4sQJ7y5zfGJuS68RMFBQ== X-Received: by 2002:a1c:f606:: with SMTP id w6mr10920419wmc.130.1555078539486; Fri, 12 Apr 2019 07:15:39 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id q17sm33889424wrw.70.2019.04.12.07.15.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 07:15:38 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard Date: Fri, 12 Apr 2019 16:15:25 +0200 Message-Id: <20190412141527.6049-2-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412141527.6049-1-peron.clem@gmail.com> References: <20190412141527.6049-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: U-Boot-Denx , linux-sunxi Subject: [U-Boot] [PATCH v2 1/3] arm: dts: h6: sync with dts with Linux sunxi 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 differences between U-Boot and Linux device tree files. Sync only the minor changes. 6ba2e45d57af - arm64: dts: allwinner: h6: move MMC pinctrl to dtsi 54eac67bbe3a - arm64: dts: allwinner: Fix pinctrl node names 31af04cd60d3 - arm64: dts: Remove inconsistent use of 'arm,armv8' compatible string 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 | 16 ++++++++++------ 3 files changed, 10 insertions(+), 12 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..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"; }; @@ -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>; @@ -266,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"; }; From patchwork Fri Apr 12 14:15:26 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: 1084765 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="lJXZfCoA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gg1H6CBcz9sB8 for ; Sat, 13 Apr 2019 00:16:19 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8C303C21E7D; Fri, 12 Apr 2019 14:16:10 +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 462C5C21E47; Fri, 12 Apr 2019 14:15:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2F330C21E77; Fri, 12 Apr 2019 14:15:45 +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 E4AAFC21E15 for ; Fri, 12 Apr 2019 14:15:41 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id w15so11228755wmc.3 for ; Fri, 12 Apr 2019 07:15:41 -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=JXacwsUmpoMfWj6ekRSAX+T6ImEYZW0CglaQ3Ae4RVQ=; b=lJXZfCoA3YrTEjY23IC9lB23LODkEX/kiM9vLVR1neq7CWzTXRvbR2BUQkaVmyqWwF ke2/Kvfkfw6VyuexByUwCxIFxktHtv0om5VcJ/r0tgJzLDHNm3DPtUiF40G44i0NqykV mpOprUtnMNuLz87LZ9ZEfkIRtzd227aa6saxl9LHOV+JYQEcVrfwp7fjK7MzSLbcwE6n 7H8Cqq4VZK2FI+EnVdee+nSFZFgHzMIFoWUJMK10zHvUGdibmURKk1aTJtOZnOKrN14k 3jPH1OiknWj3YlxokQ6O6U5wQtlQFEd8tBfSrEadg5zfjPXYhe2gaieMejQ89LcPJbbD LaLQ== 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=JXacwsUmpoMfWj6ekRSAX+T6ImEYZW0CglaQ3Ae4RVQ=; b=MAhscvhTDhvnS4k8HOOOO+5K/LZrZZ145ecQfjc2GhIUIgGaVqciq4/AOFJN8uQeYl USRpRmJs0/Ghr37TX+dwGYK12tSocoQKA79ocQBF1FLjuqssM9Dsrt2pJiXy/80uo7IS 9sH8AWsjE1BsPQVBkbdl8GxShCCoqjsbbXQfFBWU/rW1O9/i7RIT0sMA73VAUgXqEyP+ bKeVfvLuSFcORJLqNBm592e8sFiB2xEHQTOhinJdMpb6gxCSvueOAB8HcO2E9sAPCCMl 8KXzVLIf2vmPe1EuQ8znii8VIdk7UYFGxSf8RuBeeDqBdFTJo1GCIQ+PPJXf6Yv2ODV/ VGhw== X-Gm-Message-State: APjAAAUO8swWKWOQN53dLCpHdm43f0HBX0wKQ0q8/zVKQgS4w5NvGNAj 5OfU1sfIlsEIANX5UqaJHaM= X-Google-Smtp-Source: APXvYqyigYsMjNb7k4XiKEuPSU9e0Ahrk8Ui7qIJiPShMmcUqJQkQEfWPIuKq5rU3he7gH3gTOTftA== X-Received: by 2002:a7b:c3d7:: with SMTP id t23mr10875172wmj.62.1555078541368; Fri, 12 Apr 2019 07:15:41 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id q17sm33889424wrw.70.2019.04.12.07.15.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 07:15:39 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard Date: Fri, 12 Apr 2019 16:15:26 +0200 Message-Id: <20190412141527.6049-3-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412141527.6049-1-peron.clem@gmail.com> References: <20190412141527.6049-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: U-Boot-Denx , linux-sunxi Subject: [U-Boot] [PATCH v2 2/3] 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 | 184 +++++++++++++++++++++++++ configs/beelink_gs1_defconfig | 15 ++ 3 files changed, 200 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 86a01c2c70..61e7156284 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..54b0882bed --- /dev/null +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts @@ -0,0 +1,184 @@ +// 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; + bus-width = <8>; + 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 Fri Apr 12 14:15:27 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: 1084767 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="P1XMj0Rh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44gg2Y2bs4z9sB8 for ; Sat, 13 Apr 2019 00:17:25 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 08854C21E2F; Fri, 12 Apr 2019 14:16: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=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 CB85FC21E15; Fri, 12 Apr 2019 14:15:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6236BC21D9A; Fri, 12 Apr 2019 14:15:46 +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 51D90C21E74 for ; Fri, 12 Apr 2019 14:15:43 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id y7so12140992wrn.11 for ; Fri, 12 Apr 2019 07:15:43 -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=AZqqA8nPMsuZrqaEKQwHL+9Z26SHPhdnD9KGMKs40Uk=; b=P1XMj0RhZaKRT194ByJvf1cIDcYwxAPkPOrJ21A0/VAcSR3nWl9MqAY41HLwwsXI66 FQqV/guJCYy/1urTjNr1yK1upZfQGS4sPaWxSvGypSkNUeqpO4BSdOCE82hwQPRUxaT/ OorIFLhgl4W/q7NR2M1wM0nrZ+mg+PSJtvqCHBir+qwfyZnW/3SWKWmvUMXGHozOOYhF 9s6j32Ui2VPsJ/z9ZhjtXxPsEtAyC5IyDOF2mAFuTcOGOz4IJA14cqKFpqHCbsbUDd0S HifqiNxVN3gj3OSrHuFRoO26Lydz4hsKlisHvqdp06XIesFe3tyulZtTZHOpfwoodwW2 ZtwA== 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=AZqqA8nPMsuZrqaEKQwHL+9Z26SHPhdnD9KGMKs40Uk=; b=IihYqXofQ/eDoCYjJi3km24glwpGb+mvtzldW6cK6tHbHda8UqV8fWTYwakgkfppMP btR0tsGElQt0CxIbcV9Spqpj+/i9S8jO3zaMfxDgFy8SHTys4qXJ6i6K6bm/LCgp8pUr b6EHIaxMT6yd4nlXsUYP/JmKpLg7Db9NzZldsslDE87uN6t58AgqB83i2lx5AODA/p/M mVtOyHD7lJQumyamjne8IcGz9eFt7bQ3wgCYA1dJtjl/1kOs1bYhGA67PsUTfTiQVcAF 9eknJ8RCI3wQPOxjz2LKSdQR0NjHpvrzsJzr1FJNM+55EMTPZJ62L+bzjmnsB/QZHW1q 19Rw== X-Gm-Message-State: APjAAAXISqHcsIQ5jwgdvIs8p3T11Ji2o8ffDX9TeRTzQbB9o246IC+w 6HoROWQjMwtw2GoDrnyBZjk= X-Google-Smtp-Source: APXvYqzO9C4X+hkXn0c2o+bUD3ICfRiMiWjfpvgSIBdVQft8M77zf7JWdHxNu9Ki3Ckbx5gdh2m+oA== X-Received: by 2002:adf:e78e:: with SMTP id n14mr13275254wrm.14.1555078542781; Fri, 12 Apr 2019 07:15:42 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:1f1:d0f0::df7e:4a05]) by smtp.gmail.com with ESMTPSA id q17sm33889424wrw.70.2019.04.12.07.15.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Apr 2019 07:15:41 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgUMOpcm9u?= To: Jagan Teki , Maxime Ripard Date: Fri, 12 Apr 2019 16:15:27 +0200 Message-Id: <20190412141527.6049-4-peron.clem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190412141527.6049-1-peron.clem@gmail.com> References: <20190412141527.6049-1-peron.clem@gmail.com> MIME-Version: 1.0 Cc: U-Boot-Denx , linux-sunxi Subject: [U-Boot] [PATCH v2 3/3] 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 is broken for some H6 rev. The board is not reseted correctly. 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..1075b5ca54 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 some H6 rev. 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);