From patchwork Wed Jul 22 14:18:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Robinson X-Patchwork-Id: 1333904 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YxmqPpvC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BBd0073nfz9sSn for ; Thu, 23 Jul 2020 00:20:00 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F239F820C6; Wed, 22 Jul 2020 16:19:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YxmqPpvC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DF91881F3B; Wed, 22 Jul 2020 16:18:57 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE, T_PDS_OTHER_BAD_TLD,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x343.google.com (mail-wm1-x343.google.com [IPv6:2a00:1450:4864:20::343]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3006A81F19 for ; Wed, 22 Jul 2020 16:18:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pbrobinson@gmail.com Received: by mail-wm1-x343.google.com with SMTP id c80so2107198wme.0 for ; Wed, 22 Jul 2020 07:18:53 -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=J5o9ZWHXa1YuHXy2yVQV8wFq5P8/luPRRhSbkTMafMY=; b=YxmqPpvCmaVTtTUQYJuYlfaFdRec4jmBAEFAkv0YSWJowZiS5kRfs/LWle5VeX8m1r HPh4g2rT/IXmVDRWn3o8S2xtz305pzeWeww4/96v88tztNf7rQf3iqZCnW9E2nVcxJCl zuGfXWXVZDJ5ENPeplIxWpGMYylaebzUy3lHRyGCfbmEG/UsN9KnX/55UZggtbqAK65Y 258rEMznSABSHHfAMs+jjaP2hznDwYXq6SdYZxfeNc9Sgar/zhqVgPuPUgTKwi7QVHly bx+aIByeyCo3Hv44uvQgVCiUA6+7vi1XQn/BX9I0/O4fb3uuycD3EBuiJ7pZ3Jlgx21m 5qAg== 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=J5o9ZWHXa1YuHXy2yVQV8wFq5P8/luPRRhSbkTMafMY=; b=MBWEJCnwoVYKP/eRAes3e7GJuD8D30uiGBCQlX+kBkbnArF6GmTNT4jrv3OMnlYT5G 83d9f6zXUqnghV5JTFnQKIq5UB01x1RvJ8gZ4midwb1gC2yx2EjeuGKp8ni/iFqB+MqF F0w/OmXZXxu8C/nYXPtjOS4q2CklnOVzDibhZVHIBSO+VIzmQThTAtTz2A2yK63CAtBN 33dvlKKESHQVf3uGElMfQYYilIalmBaiHrPHkQHNEPot0Rl1SE0mKOK5Yq/uDB+yTpRX 3ciHmnQK+Vp1lXyjJLqQ2oQdfPzBM65CLHkm6yzmYhj7xAcNU2Bpez4DAXjfOx0VkfOI JMlw== X-Gm-Message-State: AOAM531zprKT9PZ0mQ8YpZVKoFV9Joa6EPsRzploHvS2IMVl2NvnqRNi jX9+/4Vs3AFI9+cwdjqpUn4= X-Google-Smtp-Source: ABdhPJzj0ryR3oArzAp5lE71fvbcE31uWss+7qAPV4wTNYF7Oj4iTpDRFtE7MOGSYIHcoaSKQibRhA== X-Received: by 2002:a7b:c313:: with SMTP id k19mr8933764wmj.67.1595427532736; Wed, 22 Jul 2020 07:18:52 -0700 (PDT) Received: from morpheus.roving-it.com.com (f.c.9.1.f.e.c.d.1.e.0.0.2.b.5.5.1.8.6.2.1.1.b.f.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:fb11:2681:55b2:e1:dcef:19cf]) by smtp.googlemail.com with ESMTPSA id k126sm8112498wme.17.2020.07.22.07.18.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 07:18:51 -0700 (PDT) From: Peter Robinson To: Andre Przywara , Jagan Teki , Maxime Ripard , u-boot@lists.denx.de Cc: Peter Robinson Subject: [PATCH 4/8] arm: dts: sync axp803.dtsi from linux 5.8-rc1 Date: Wed, 22 Jul 2020 15:18:36 +0100 Message-Id: <20200722141840.143379-5-pbrobinson@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200722141840.143379-1-pbrobinson@gmail.com> References: <20200722141840.143379-1-pbrobinson@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Sync the Allwinner axp803 device tree to the latest upstream Linux. Signed-off-by: Peter Robinson --- arch/arm/dts/axp803.dtsi | 82 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/arch/arm/dts/axp803.dtsi b/arch/arm/dts/axp803.dtsi index e5eae8bafc..10e9186a76 100644 --- a/arch/arm/dts/axp803.dtsi +++ b/arch/arm/dts/axp803.dtsi @@ -1,44 +1,5 @@ -/* - * Copyright 2017 Icenowy Zheng - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright 2017 Icenowy Zheng /* * AXP803 Integrated Power Management Chip @@ -49,6 +10,39 @@ interrupt-controller; #interrupt-cells = <1>; + ac_power_supply: ac-power-supply { + compatible = "x-powers,axp803-ac-power-supply", + "x-powers,axp813-ac-power-supply"; + status = "disabled"; + }; + + axp_adc: adc { + compatible = "x-powers,axp803-adc", "x-powers,axp813-adc"; + #io-channel-cells = <1>; + }; + + axp_gpio: gpio { + compatible = "x-powers,axp803-gpio", "x-powers,axp813-gpio"; + gpio-controller; + #gpio-cells = <2>; + + gpio0_ldo: gpio0-ldo { + pins = "GPIO0"; + function = "ldo"; + }; + + gpio1_ldo: gpio1-ldo { + pins = "GPIO1"; + function = "ldo"; + }; + }; + + battery_power_supply: battery-power-supply { + compatible = "x-powers,axp803-battery-power-supply", + "x-powers,axp813-battery-power-supply"; + status = "disabled"; + }; + regulators { /* Default work frequency for buck regulators */ x-powers,dcdc-freq = <3000>; @@ -152,4 +146,10 @@ status = "disabled"; }; }; + + usb_power_supply: usb-power-supply { + compatible = "x-powers,axp803-usb-power-supply", + "x-powers,axp813-usb-power-supply"; + status = "disabled"; + }; };