Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6CF65C433EF for ; Sat, 29 Jan 2022 03:01:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4132D81112; Sat, 29 Jan 2022 04:01:37 +0100 (CET) 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="ifP4z1fY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1A26C82146; Sat, 29 Jan 2022 04:01:36 +0100 (CET) Received: from mail-qv1-xf33.google.com (mail-qv1-xf33.google.com [IPv6:2607:f8b0:4864:20::f33]) (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 A8FCC81112 for ; Sat, 29 Jan 2022 04:01:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mr.bossman075@gmail.com Received: by mail-qv1-xf33.google.com with SMTP id s6so7617677qvv.11 for ; Fri, 28 Jan 2022 19:01:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=EGcNKDEIwQPr6ukZnuJGXfL9FNa5/wHl0AB3KjzLemw=; b=ifP4z1fYmTfX+bP6tZ2TQ3qEg6P5ZI3TmunaBaqNTZ380D2xgRp2nKBcnpuWOjFzK3 LSpZGUAvuVkm6eFHcCWz5xoME6TYPouzPJobmQcqljNuR1L7pWt5NFMfh/FRvEEg9OMW nT/VLa3EAVaXPS6viAUN0p1A6b4guKHZzqzyREFXw9D1qwHx1qKVKVqH5KG92D4AYt7b loIQkPgLp9hMT7qmn7AU/OtQHx+duyP4DeMU54wM8u3pqNbeJLmpNA3DdBrALFNeluvu N42KpMrTS3ATcxNrK5IIOHKTUE+V8f6xQzXbbnOffqmWc94lDQKepr29QAySdrHGdxBr 7oYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=EGcNKDEIwQPr6ukZnuJGXfL9FNa5/wHl0AB3KjzLemw=; b=YM7jpwOHy83syhCQcUbb2nepNeWGiqkFDIU1ysLNFyxO56UmSAzKXTb+Dxs/do2s7w kPiUII7f1BaklH/86ckiEbzIiRXhIzz1OrwhuGybMCHydNzK0BsZ5HhF556+OZwmdsx8 MHa8IXUEkcu+f/9KObAnVTtD55aVKF23zzvPsxcZUmuTcd08FpTq7sLnkJKPGd+uXSee avbRx9wZGaUmzDs5pLRoaIwrRcCszTP/3flQTYVkC8q83VC9yiVadsdZKUS0A3YsQ8AM fV3CEiJ3o00okaMCaSEb59TxAFONO1Nbh21E3GE9fkC+bPfH65NRoFJAyLrd/Utd/f2x klzw== X-Gm-Message-State: AOAM532S0G6IJaN9HLAEaZEA3cYnHy4YTuKuv0oBEGtc2w4YiC/wQnlZ yjOiPw4azvuA1EPBC0jc6Wg= X-Google-Smtp-Source: ABdhPJxQ1+391QFQ6DAMYcHKfFUksulUuaQJPb+w3J6qXAesIVdl1EL4m5zjfKhJqlN+U71Sjwe6xA== X-Received: by 2002:a05:6214:226c:: with SMTP id gs12mr9806232qvb.108.1643425291347; Fri, 28 Jan 2022 19:01:31 -0800 (PST) Received: from [10.4.10.38] (146-115-144-188.s4282.c3-0.nwt-cbr1.sbo-nwt.ma.cable.rcncustomer.com. [146.115.144.188]) by smtp.gmail.com with ESMTPSA id w14sm4421813qtc.29.2022.01.28.19.01.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Jan 2022 19:01:30 -0800 (PST) Message-ID: <99cc6909-9846-c176-470c-94411d486a25@gmail.com> Date: Fri, 28 Jan 2022 22:01:29 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH v2 11/12] ARM: dts: suniv: Add device tree files for F1C100s Content-Language: en-US To: Andre Przywara Cc: u-boot@lists.denx.de, jagan@amarulasolutions.com, hdegoede@redhat.com, sjg@chromium.org, icenowy@aosc.io, marek.behun@nic.cz, festevam@denx.de, narmstrong@baylibre.com, tharvey@gateworks.com, christianshewitt@gmail.com, pbrobinson@gmail.com, jernej.skrabec@gmail.com, hs@denx.de, samuel@sholland.org, arnaud.ferraris@gmail.com, giulio.benetti@benettiengineering.com, thirtythreeforty@gmail.com References: <20220126135329.2997430-1-Mr.Bossman075@gmail.com> <20220126135329.2997430-12-Mr.Bossman075@gmail.com> <20220129022500.43c876e9@slackpad.fritz.box> <099c49b2-3413-b8e9-16b9-85987b506b0a@gmail.com> <20220129023658.6e4031dc@slackpad.fritz.box> From: Jesse Taube In-Reply-To: <20220129023658.6e4031dc@slackpad.fritz.box> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.5 at phobos.denx.de X-Virus-Status: Clean On 1/28/22 21:37, Andre Przywara wrote: > On Fri, 28 Jan 2022 21:31:28 -0500 > Jesse Taube wrote: > >> On 1/28/22 21:25, Andre Przywara wrote: >>> On Wed, 26 Jan 2022 08:53:28 -0500 >>> Jesse Taube wrote: >>> >>>> From: Icenowy Zheng >>>> >>>> Add device tree files for suniv and >>>> Lichee Pi Nano it is a board based on F1C100s. >>> >>> As mentioned in the other email, please do a 1:1 copy from the current >>> Linux tree. Yes, this will miss MMC and USB, but I am happy to take a >>> fixup patch on short notice when the respective kernel patches hit some >>> maintainer tree. > Cheers, >> Uh dts wont compile without a mmc node its a bug in another sunxi dts. > > Not sure I follow, it compiles fine in the kernel, doesn't it? arch/arm/dts/suniv-f1c100s-licheepi-nano.dtb: ERROR (path_references): /aliases: Reference to non-existent node or label "mmc0" the alias is in: arch/arm/dts/sunxi-u-boot.dtsi:15 mmc0 = &mmc0; >> Also Icenowy's email chnaged to to .io not .xyz can i change that in this? > > Please no changes compared to Linux, there is no "U-Boot DT", it's > the same hardware, so the same DT, just synced from the definitive > repository (the Linux tree). > Yes, the file split is different here, but that doesn't matter, just > copy the current Linux files. > > Cheers, > Andre > > >>> Andre >>> >>>> >>>> Signed-off-by: Icenowy Zheng >>>> Signed-off-by: Jesse Taube >>>> --- >>>> V1->V2: >>>> * Sync with Linux >>>> * Re-add MMC node >>>> --- >>>> arch/arm/dts/Makefile | 2 + >>>> arch/arm/dts/suniv-f1c100s-licheepi-nano.dts | 29 ++++ >>>> arch/arm/dts/suniv-f1c100s.dtsi | 6 + >>>> arch/arm/dts/suniv.dtsi | 160 +++++++++++++++++++ >>>> 4 files changed, 197 insertions(+) >>>> create mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts >>>> create mode 100644 arch/arm/dts/suniv-f1c100s.dtsi >>>> create mode 100644 arch/arm/dts/suniv.dtsi >>>> >>>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >>>> index 453e2fd1a9..07030deeca 100644 >>>> --- a/arch/arm/dts/Makefile >>>> +++ b/arch/arm/dts/Makefile >>>> @@ -497,6 +497,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \ >>>> stm32h743i-eval.dtb \ >>>> stm32h750i-art-pi.dtb >>>> >>>> +dtb-$(CONFIG_MACH_SUNIV) += \ >>>> + suniv-f1c100s-licheepi-nano.dtb >>>> dtb-$(CONFIG_MACH_SUN4I) += \ >>>> sun4i-a10-a1000.dtb \ >>>> sun4i-a10-ba10-tvbox.dtb \ >>>> diff --git a/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts b/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts >>>> new file mode 100644 >>>> index 0000000000..9e89eec5bd >>>> --- /dev/null >>>> +++ b/arch/arm/dts/suniv-f1c100s-licheepi-nano.dts >>>> @@ -0,0 +1,29 @@ >>>> +// SPDX-License-Identifier: (GPL-2.0+ OR X11) >>>> +/* >>>> + * Copyright 2018 Icenowy Zheng >>>> + */ >>>> + >>>> +/dts-v1/; >>>> +#include "suniv-f1c100s.dtsi" >>>> + >>>> +#include >>>> + >>>> +/ { >>>> + model = "Lichee Pi Nano"; >>>> + compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s", >>>> + "allwinner,suniv"; >>>> + >>>> + aliases { >>>> + serial0 = &uart0; >>>> + }; >>>> + >>>> + chosen { >>>> + stdout-path = "serial0:115200n8"; >>>> + }; >>>> +}; >>>> + >>>> +&uart0 { >>>> + pinctrl-names = "default"; >>>> + pinctrl-0 = <&uart0_pe_pins>; >>>> + status = "okay"; >>>> +}; >>>> diff --git a/arch/arm/dts/suniv-f1c100s.dtsi b/arch/arm/dts/suniv-f1c100s.dtsi >>>> new file mode 100644 >>>> index 0000000000..f084bc8dd1 >>>> --- /dev/null >>>> +++ b/arch/arm/dts/suniv-f1c100s.dtsi >>>> @@ -0,0 +1,6 @@ >>>> +// SPDX-License-Identifier: (GPL-2.0+ OR X11) >>>> +/* >>>> + * Copyright 2018 Icenowy Zheng >>>> + */ >>>> + >>>> +#include "suniv.dtsi" >>>> diff --git a/arch/arm/dts/suniv.dtsi b/arch/arm/dts/suniv.dtsi >>>> new file mode 100644 >>>> index 0000000000..ad2bbb7a12 >>>> --- /dev/null >>>> +++ b/arch/arm/dts/suniv.dtsi >>>> @@ -0,0 +1,160 @@ >>>> +// SPDX-License-Identifier: (GPL-2.0+ OR X11) >>>> +/* >>>> + * Copyright 2018 Icenowy Zheng >>>> + */ >>>> + >>>> +#include >>>> +#include >>>> + >>>> +/ { >>>> + #address-cells = <1>; >>>> + #size-cells = <1>; >>>> + interrupt-parent = <&intc>; >>>> + >>>> + clocks { >>>> + osc24M: clk-24M { >>>> + #clock-cells = <0>; >>>> + compatible = "fixed-clock"; >>>> + clock-frequency = <24000000>; >>>> + clock-output-names = "osc24M"; >>>> + }; >>>> + >>>> + osc32k: clk-32k { >>>> + #clock-cells = <0>; >>>> + compatible = "fixed-clock"; >>>> + clock-frequency = <32768>; >>>> + clock-output-names = "osc32k"; >>>> + }; >>>> + }; >>>> + >>>> + cpus { >>>> + cpu { >>>> + compatible = "arm,arm926ej-s"; >>>> + device_type = "cpu"; >>>> + }; >>>> + }; >>>> + >>>> + soc { >>>> + compatible = "simple-bus"; >>>> + #address-cells = <1>; >>>> + #size-cells = <1>; >>>> + ranges; >>>> + >>>> + sram-controller@1c00000 { >>>> + compatible = "allwinner,suniv-f1c100s-system-control", >>>> + "allwinner,sun4i-a10-sram-controller"; >>>> + reg = <0x01c00000 0x30>; >>>> + #address-cells = <1>; >>>> + #size-cells = <1>; >>>> + ranges; >>>> + >>>> + sram_d: sram@10000 { >>>> + compatible = "mmio-sram"; >>>> + reg = <0x00010000 0x1000>; >>>> + #address-cells = <1>; >>>> + #size-cells = <1>; >>>> + ranges = <0 0x00010000 0x1000>; >>>> + >>>> + otg_sram: sram-section@0 { >>>> + compatible = "allwinner,suniv-f1c100s-sram-d", >>>> + "allwinner,sun4i-a10-sram-d"; >>>> + reg = <0x0000 0x1000>; >>>> + status = "disabled"; >>>> + }; >>>> + }; >>>> + }; >>>> + >>>> + mmc0: mmc@1c0f000 { >>>> + compatible = "allwinner,sun4i-a10-mmc"; >>>> + reg = <0x01c0f000 0x1000>; >>>> + clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>; >>>> + clock-names = "ahb", "mmc"; >>>> + interrupts = <32>; >>>> + resets = <&ccu RST_BUS_MMC0>; >>>> + reset-names = "ahb"; >>>> + status = "disabled"; >>>> + #address-cells = <1>; >>>> + #size-cells = <0>; >>>> + }; >>>> + >>>> + ccu: clock@1c20000 { >>>> + compatible = "allwinner,suniv-ccu"; >>>> + reg = <0x01c20000 0x400>; >>>> + clocks = <&osc24M>, <&osc32k>; >>>> + clock-names = "hosc", "losc"; >>>> + #clock-cells = <1>; >>>> + #reset-cells = <1>; >>>> + }; >>>> + >>>> + intc: interrupt-controller@1c20400 { >>>> + compatible = "allwinner,suniv-ic"; >>>> + reg = <0x01c20400 0x400>; >>>> + interrupt-controller; >>>> + #interrupt-cells = <1>; >>>> + }; >>>> + >>>> + pio: pinctrl@1c20800 { >>>> + compatible = "allwinner,suniv-pinctrl"; >>>> + reg = <0x01c20800 0x400>; >>>> + interrupts = <38>, <39>, <40>; >>>> + clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>; >>>> + clock-names = "apb", "hosc", "losc"; >>>> + gpio-controller; >>>> + interrupt-controller; >>>> + #interrupt-cells = <3>; >>>> + #gpio-cells = <3>; >>>> + >>>> + uart0_pe_pins: uart0-pe-pins { >>>> + pins = "PE0", "PE1"; >>>> + function = "uart0"; >>>> + }; >>>> + }; >>>> + >>>> + timer@1c20c00 { >>>> + compatible = "allwinner,suniv-f1c100s-timer", >>>> + "allwinner,sun4i-a10-timer"; >>>> + reg = <0x01c20c00 0x90>; >>>> + interrupts = <13>; >>>> + clocks = <&osc24M>; >>>> + }; >>>> + >>>> + wdt: watchdog@1c20ca0 { >>>> + compatible = "allwinner,suniv-f1c100s-wdt", >>>> + "allwinner,sun6i-a31-wdt"; >>>> + reg = <0x01c20ca0 0x20>; >>>> + }; >>>> + >>>> + uart0: serial@1c25000 { >>>> + compatible = "snps,dw-apb-uart"; >>>> + reg = <0x01c25000 0x400>; >>>> + interrupts = <1>; >>>> + reg-shift = <2>; >>>> + reg-io-width = <4>; >>>> + clocks = <&ccu CLK_BUS_UART0>; >>>> + resets = <&ccu RST_BUS_UART0>; >>>> + status = "disabled"; >>>> + }; >>>> + >>>> + uart1: serial@1c25400 { >>>> + compatible = "snps,dw-apb-uart"; >>>> + reg = <0x01c25400 0x400>; >>>> + interrupts = <2>; >>>> + reg-shift = <2>; >>>> + reg-io-width = <4>; >>>> + clocks = <&ccu CLK_BUS_UART1>; >>>> + resets = <&ccu RST_BUS_UART1>; >>>> + status = "disabled"; >>>> + }; >>>> + >>>> + uart2: serial@1c25800 { >>>> + compatible = "snps,dw-apb-uart"; >>>> + reg = <0x01c25800 0x400>; >>>> + interrupts = <3>; >>>> + reg-shift = <2>; >>>> + reg-io-width = <4>; >>>> + clocks = <&ccu CLK_BUS_UART2>; >>>> + resets = <&ccu RST_BUS_UART2>; >>>> + status = "disabled"; >>>> + }; >>>> + }; >>>> +}; >>> >