From mboxrd@z Thu Jan 1 00:00:00 1970 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 D8F3CC433EF for ; Fri, 25 Feb 2022 05:12:41 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E437D83C5B; Fri, 25 Feb 2022 06:12:38 +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="k3R85d0X"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6897B83C59; Fri, 25 Feb 2022 06:12:36 +0100 (CET) Received: from mail-qk1-x72e.google.com (mail-qk1-x72e.google.com [IPv6:2607:f8b0:4864:20::72e]) (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 B098483C5E for ; Fri, 25 Feb 2022 06:12:30 +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=seanga2@gmail.com Received: by mail-qk1-x72e.google.com with SMTP id f21so3656633qke.13 for ; Thu, 24 Feb 2022 21:12:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=pFQYejVKuGaVfY/jWxrJmN+hqLi6KL5Vl8orgma/wRk=; b=k3R85d0XXHxJNo3heRirLxJdNMbXRX7YIYv/cDOGYwFG8om3jdmBJNsvfOVCIRDomW +/kf2HoELAX8a1g45802uht/jQ/X3+GK+Q5w3nZwAQOKqJ8KhN1M/6slwxDilBDtb1mN ApYOtiWBPwhUbqbgLLCHcH//yro+wcp5H3GWZ9ntnLpJpJLCxf7JNztqt+hGjqoAsV6O dUNYSMM9wMp7Wddqs+8F/BRrZ4KfCi7qdkRYb9j1nYmuTM5O/08gjzuLvHai2h1Kk0hX iYloEhJ3V4+eWQ9DbqM5Ewg4le1O1TmP659fjjIqkHJhAdHBP2+Z/9OOUYmsMO/LaD37 ON6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=pFQYejVKuGaVfY/jWxrJmN+hqLi6KL5Vl8orgma/wRk=; b=77Ek0B2zjZoHq6kf3rFawWZBw4wmFoc5QzZpu/VncoE8KmFT5sNT/myNoKWbOWqqoQ sd1dDqLrnmYwIo727y6WXyJ6FN0WEtScpq4EqmDjTKPXyP3saA9Je7mGd3uF8n7idxfY jE5g7E0cLjbL96AoZwWaoQ1wci7QcibUcRlg3qkDy76qvmpCfPXVP+lOHDY5sz7/8DjI tjxsURiWj7vTgHLEr+PD4IKlFsJKN1DXUAcKBSUkGy5MTRqlKOpHvvsbTs0R83jmrCZA l1CO2+GqaNFsaO7Yiy0QJA2DUXG0o4vlq2JewsPwwTh9FGjJhOSxlndP285pdZ2fvAZj WfxA== X-Gm-Message-State: AOAM532+2McDl+qBoXzQV04+17B9vBKmwjsHinikUv6jFQjhrV72Xwve 3j5MXcW7d1DT9n0iwiWgmroqeinOGJ4= X-Google-Smtp-Source: ABdhPJxGjbDjbLg7OfT5CMb/O78HltTpXcoB0Vn2iNkjhhOQUqCM1jyiypcWI0QEZIuChVrh1lJeMw== X-Received: by 2002:ae9:efcd:0:b0:47e:17e9:223a with SMTP id d196-20020ae9efcd000000b0047e17e9223amr3838702qkg.315.1645765948541; Thu, 24 Feb 2022 21:12:28 -0800 (PST) Received: from [192.168.1.201] (pool-108-18-137-133.washdc.fios.verizon.net. [108.18.137.133]) by smtp.googlemail.com with ESMTPSA id t18-20020ac85892000000b002de3a8bf768sm894203qta.52.2022.02.24.21.12.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Feb 2022 21:12:28 -0800 (PST) Subject: Re: [PATCH 1/7] k210: use the board vendor name rather than the marketing name To: Niklas Cassel , Rick Chen , Leo , Lukasz Majewski , Jagan Teki , Simon Glass Cc: "damien.lemoal@opensource.wdc.com" , "u-boot@lists.denx.de" References: <20220215161611.1563067-1-Niklas.Cassel@wdc.com> <20220215161611.1563067-2-Niklas.Cassel@wdc.com> From: Sean Anderson Message-ID: Date: Fri, 25 Feb 2022 00:12:27 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <20220215161611.1563067-2-Niklas.Cassel@wdc.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US 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 2/15/22 11:16 AM, Niklas Cassel wrote: > From: Damien Le Moal > > "kendryte" is the marketing name for the K210 RISC-V SoC produced by > Canaan Inc. Rather than "kendryte,k210", use the usual "canaan,k210" > vendor,SoC compatibility string format in the device tree files and > use the SoC name for file names. > With these changes, the device tree files are more in sync with the > Linux kernel DTS and drivers, making uboot device tree usable by the > kernel. > > Signed-off-by: Damien Le Moal > Signed-off-by: Niklas Cassel > --- > MAINTAINERS | 10 +- > arch/riscv/dts/k210-maix-bit.dts | 3 +- > arch/riscv/dts/k210.dtsi | 98 +++++++++---------- > board/sipeed/maix/maix.c | 2 +- > ...k210-sysctl.txt => canaan,k210-sysctl.txt} | 8 +- > ...e,k210-fpioa.txt => canaan,k210-fpioa.txt} | 12 +-- > .../spi/snps,dw-apb-ssi.txt | 4 +- > drivers/clk/Makefile | 2 +- > drivers/clk/{clk_kendryte.c => clk_k210.c} | 4 +- > drivers/pinctrl/Makefile | 2 +- > .../{pinctrl-kendryte.c => pinctrl-k210.c} | 6 +- > drivers/spi/designware_spi.c | 4 +- > include/configs/sipeed-maix.h | 2 +- > include/{kendryte => k210}/pll.h | 0 > test/dm/k210_pll.c | 2 +- > 15 files changed, 80 insertions(+), 79 deletions(-) > rename doc/device-tree-bindings/mfd/{kendryte,k210-sysctl.txt => canaan,k210-sysctl.txt} (78%) > rename doc/device-tree-bindings/pinctrl/{kendryte,k210-fpioa.txt => canaan,k210-fpioa.txt} (91%) > rename drivers/clk/{clk_kendryte.c => clk_k210.c} (99%) > rename drivers/pinctrl/{pinctrl-kendryte.c => pinctrl-k210.c} (98%) > rename include/{kendryte => k210}/pll.h (100%) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 1c98029754..6347b57d67 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1117,11 +1117,11 @@ F: tools/prelink-riscv.c > RISC-V KENDRYTE Perhaps "CANAAN KENDRYTE K210"? > M: Sean Anderson > S: Maintained > -F: doc/device-tree-bindings/mfd/kendryte,k210-sysctl.txt > -F: doc/device-tree-bindings/pinctrl/kendryte,k210-fpioa.txt > -F: drivers/clk/clk_kendryte.c > -F: drivers/pinctrl/pinctrl-kendryte.c > -F: include/kendryte/ > +F: doc/device-tree-bindings/mfd/canaan,k210-sysctl.txt > +F: doc/device-tree-bindings/pinctrl/canaan,k210-fpioa.txt > +F: drivers/clk/clk_k210.c > +F: drivers/pinctrl/pinctrl-k210.c > +F: include/k210/ > > RNG > M: Sughosh Ganu > diff --git a/arch/riscv/dts/k210-maix-bit.dts b/arch/riscv/dts/k210-maix-bit.dts > index 902dcfd08a..c4bbf6b018 100644 > --- a/arch/riscv/dts/k210-maix-bit.dts > +++ b/arch/riscv/dts/k210-maix-bit.dts > @@ -12,7 +12,8 @@ > > / { > model = "Sipeed Maix Bit 2.0"; > - compatible = "sipeed,maix-bitm", "sipeed,maix-bit", "kendryte,k210"; > + compatible = "sipeed,maix-bitm", "sipeed,maix-bit", > + "canaan,kendryte-k210"; > > chosen { > stdout-path = "serial0:115200"; > diff --git a/arch/riscv/dts/k210.dtsi b/arch/riscv/dts/k210.dtsi > index 8bcd3cebde..7dc2785a3e 100644 > --- a/arch/riscv/dts/k210.dtsi > +++ b/arch/riscv/dts/k210.dtsi > @@ -15,7 +15,7 @@ > */ > #address-cells = <1>; > #size-cells = <1>; > - compatible = "kendryte,k210"; > + compatible = "canaan,kendryte-k210"; > > aliases { > cpu0 = &cpu0; > @@ -46,7 +46,7 @@ > timebase-frequency = <7800000>; > cpu0: cpu@0 { > device_type = "cpu"; > - compatible = "kendryte,k210", "sifive,rocket0", "riscv"; > + compatible = "canaan,k210", "sifive,rocket0", "riscv"; > reg = <0>; > riscv,isa = "rv64imafdgc"; > mmu-type = "sv39"; > @@ -63,7 +63,7 @@ > }; > cpu1: cpu@1 { > device_type = "cpu"; > - compatible = "kendryte,k210", "sifive,rocket0", "riscv"; > + compatible = "canaan,k210", "sifive,rocket0", "riscv"; > reg = <1>; > riscv,isa = "rv64imafdgc"; > mmu-type = "sv39"; > @@ -82,7 +82,7 @@ > > sram: memory@80000000 { > device_type = "memory"; > - compatible = "kendryte,k210-sram"; > + compatible = "canaan,k210-sram"; > reg = <0x80000000 0x400000>, > <0x80400000 0x200000>, > <0x80600000 0x200000>; > @@ -106,12 +106,12 @@ > soc { > #address-cells = <1>; > #size-cells = <1>; > - compatible = "kendryte,k210-soc", "simple-bus"; > + compatible = "canaan,k210-soc", "simple-bus"; > ranges; > interrupt-parent = <&plic0>; > > debug0: debug@0 { > - compatible = "kendryte,k210-debug", "riscv,debug"; > + compatible = "canaan,k210-debug", "riscv,debug"; > reg = <0x0 0x1000>; > }; > > @@ -122,7 +122,7 @@ > > clint0: clint@2000000 { > #interrupt-cells = <1>; > - compatible = "kendryte,k210-clint", "riscv,clint0"; > + compatible = "canaan,k210-clint", "sifive,clint0", "riscv,clint0"; > reg = <0x2000000 0xC000>; > interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>, > <&cpu1_intc 3>, <&cpu1_intc 7>; > @@ -131,7 +131,7 @@ > > plic0: interrupt-controller@C000000 { > #interrupt-cells = <1>; > - compatible = "kendryte,k210-plic", "riscv,plic0"; > + compatible = "canaan,k210-plic", "sifive,plic-1.0.0", "riscv,plic0"; > reg = <0xC000000 0x4000000>; > interrupt-controller; > interrupts-extended = <&cpu0_intc 9>, <&cpu0_intc 11>, > @@ -141,7 +141,7 @@ > }; > > uarths0: serial@38000000 { > - compatible = "kendryte,k210-uarths", "sifive,uart0"; > + compatible = "canaan,k210-uarths", "sifive,uart0"; > reg = <0x38000000 0x1000>; > interrupts = <33>; > clocks = <&sysclk K210_CLK_CPU>; > @@ -151,7 +151,7 @@ > gpio0: gpio-controller@38001000 { > #interrupt-cells = <2>; > #gpio-cells = <2>; > - compatible = "kendryte,k210-gpiohs", "sifive,gpio0"; > + compatible = "canaan,k210-gpiohs", "sifive,gpio0"; > reg = <0x38001000 0x1000>; > interrupt-controller; > interrupts = <34 35 36 37 38 39 40 41 > @@ -164,7 +164,7 @@ > }; > > kpu0: kpu@40800000 { > - compatible = "kendryte,k210-kpu"; > + compatible = "canaan,k210-kpu"; > reg = <0x40800000 0xc00000>; > interrupts = <25>; > clocks = <&sysclk K210_CLK_AI>; > @@ -172,7 +172,7 @@ > }; > > fft0: fft@42000000 { > - compatible = "kendryte,k210-fft"; > + compatible = "canaan,k210-fft"; > reg = <0x42000000 0x400000>; > interrupts = <26>; > clocks = <&sysclk K210_CLK_FFT>; > @@ -181,7 +181,7 @@ > }; > > dmac0: dma-controller@50000000 { > - compatible = "kendryte,k210-dmac", "snps,axi-dma-1.01a"; > + compatible = "canaan,k210-dmac", "snps,axi-dma-1.01a"; > reg = <0x50000000 0x1000>; > interrupts = <27 28 29 30 31 32>; > clocks = <&sysclk K210_CLK_DMA>, <&sysclk K210_CLK_DMA>; > @@ -199,14 +199,14 @@ > apb0: bus@50200000 { > #address-cells = <1>; > #size-cells = <1>; > - compatible = "kendryte,k210-apb", "simple-pm-bus"; > + compatible = "canaan,k210-apb", "simple-pm-bus"; > ranges; > clocks = <&sysclk K210_CLK_APB0>; > > gpio1: gpio-controller@50200000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "kendryte,k210-gpio", > + compatible = "canaan,k210-gpio", > "snps,dw-apb-gpio"; > reg = <0x50200000 0x80>; > clocks = <&sysclk K210_CLK_GPIO>; > @@ -226,7 +226,7 @@ > }; > > uart1: serial@50210000 { > - compatible = "kendryte,k210-uart", > + compatible = "canaan,k210-uart", > "snps,dw-apb-uart"; > reg = <0x50210000 0x100>; > interrupts = <11>; > @@ -242,7 +242,7 @@ > }; > > uart2: serial@50220000 { > - compatible = "kendryte,k210-uart", > + compatible = "canaan,k210-uart", > "snps,dw-apb-uart"; > reg = <0x50220000 0x100>; > interrupts = <12>; > @@ -258,7 +258,7 @@ > }; > > uart3: serial@50230000 { > - compatible = "kendryte,k210-uart", > + compatible = "canaan,k210-uart", > "snps,dw-apb-uart"; > reg = <0x50230000 0x100>; > interrupts = <13>; > @@ -274,7 +274,7 @@ > }; > > spi2: spi@50240000 { > - compatible = "canaan,kendryte-k210-spi", > + compatible = "canaan,k210-spi", > "snps,dw-apb-ssi-4.01", > "snps,dw-apb-ssi"; > spi-slave; > @@ -287,7 +287,7 @@ > }; > > i2s0: i2s@50250000 { > - compatible = "kendryte,k210-i2s", > + compatible = "canaan,k210-i2s", > "snps,designware-i2s"; > reg = <0x50250000 0x200>; > interrupts = <5>; > @@ -298,13 +298,13 @@ > }; > > apu0: sound@520250200 { > - compatible = "kendryte,k210-apu"; > + compatible = "canaan,k210-apu"; > reg = <0x50250200 0x200>; > status = "disabled"; > }; > > i2s1: i2s@50260000 { > - compatible = "kendryte,k210-i2s", > + compatible = "canaan,k210-i2s", > "snps,designware-i2s"; > reg = <0x50260000 0x200>; > interrupts = <6>; > @@ -315,7 +315,7 @@ > }; > > i2s2: i2s@50270000 { > - compatible = "kendryte,k210-i2s", > + compatible = "canaan,k210-i2s", > "snps,designware-i2s"; > reg = <0x50270000 0x200>; > interrupts = <7>; > @@ -326,7 +326,7 @@ > }; > > i2c0: i2c@50280000 { > - compatible = "kendryte,k210-i2c", > + compatible = "canaan,k210-i2c", > "snps,designware-i2c"; > reg = <0x50280000 0x100>; > interrupts = <8>; > @@ -336,7 +336,7 @@ > }; > > i2c1: i2c@50290000 { > - compatible = "kendryte,k210-i2c", > + compatible = "canaan,k210-i2c", > "snps,designware-i2c"; > reg = <0x50290000 0x100>; > interrupts = <9>; > @@ -346,7 +346,7 @@ > }; > > i2c2: i2c@502A0000 { > - compatible = "kendryte,k210-i2c", > + compatible = "canaan,k210-i2c", > "snps,designware-i2c"; > reg = <0x502A0000 0x100>; > interrupts = <10>; > @@ -356,12 +356,12 @@ > }; > > fpioa: pinmux@502B0000 { > - compatible = "kendryte,k210-fpioa"; > + compatible = "canaan,k210-fpioa"; > reg = <0x502B0000 0x100>; > clocks = <&sysclk K210_CLK_FPIOA>; > resets = <&sysrst K210_RST_FPIOA>; > - kendryte,sysctl = <&sysctl>; > - kendryte,power-offset = ; > + canaan,k210-sysctl = <&sysctl>; > + canaan,k210-power-offset = ; > pinctrl-0 = <&fpioa_jtag>; > pinctrl-names = "default"; > status = "disabled"; > @@ -375,7 +375,7 @@ > }; > > sha256: sha256@502C0000 { > - compatible = "kendryte,k210-sha256"; > + compatible = "canaan,k210-sha256"; > reg = <0x502C0000 0x100>; > clocks = <&sysclk K210_CLK_SHA>; > resets = <&sysrst K210_RST_SHA>; > @@ -383,7 +383,7 @@ > }; > > timer0: timer@502D0000 { > - compatible = "kendryte,k210-timer", > + compatible = "canaan,k210-timer", > "snps,dw-apb-timer"; > reg = <0x502D0000 0x100>; > interrupts = <14 15>; > @@ -394,7 +394,7 @@ > }; > > timer1: timer@502E0000 { > - compatible = "kendryte,k210-timer", > + compatible = "canaan,k210-timer", > "snps,dw-apb-timer"; > reg = <0x502E0000 0x100>; > interrupts = <16 17>; > @@ -405,7 +405,7 @@ > }; > > timer2: timer@502F0000 { > - compatible = "kendryte,k210-timer", > + compatible = "canaan,k210-timer", > "snps,dw-apb-timer"; > reg = <0x502F0000 0x100>; > interrupts = <18 19>; > @@ -419,12 +419,12 @@ > apb1: bus@50400000 { > #address-cells = <1>; > #size-cells = <1>; > - compatible = "kendryte,k210-apb", "simple-pm-bus"; > + compatible = "canaan,k210-apb", "simple-pm-bus"; > ranges; > clocks = <&sysclk K210_CLK_APB1>; > > wdt0: watchdog@50400000 { > - compatible = "kendryte,k210-wdt", "snps,dw-wdt"; > + compatible = "canaan,k210-wdt", "snps,dw-wdt"; > reg = <0x50400000 0x100>; > interrupts = <21>; > clocks = <&sysclk K210_CLK_WDT0>; > @@ -432,7 +432,7 @@ > }; > > wdt1: watchdog@50410000 { > - compatible = "kendryte,k210-wdt", "snps,dw-wdt"; > + compatible = "canaan,k210-wdt", "snps,dw-wdt"; > reg = <0x50410000 0x100>; > interrupts = <22>; > clocks = <&sysclk K210_CLK_WDT1>; > @@ -443,7 +443,7 @@ > otp0: nvmem@50420000 { > #address-cells = <1>; > #size-cells = <1>; > - compatible = "kendryte,k210-otp"; > + compatible = "canaan,k210-otp"; > reg = <0x50420000 0x100>, > <0x88000000 0x20000>; > reg-names = "reg", "mem"; > @@ -480,18 +480,18 @@ > }; > > dvp0: camera@50430000 { > - compatible = "kendryte,k210-dvp"; > + compatible = "canaan,k210-dvp"; > reg = <0x50430000 0x100>; > interrupts = <24>; > clocks = <&sysclk K210_CLK_DVP>; > resets = <&sysrst K210_RST_DVP>; > - kendryte,sysctl = <&sysctl>; > - kendryte,misc-offset = ; > + canaan,k210-sysctl = <&sysctl>; > + canaan,k210-misc-offset = ; > status = "disabled"; > }; > > sysctl: syscon@50440000 { > - compatible = "kendryte,k210-sysctl", > + compatible = "canaan,k210-sysctl", > "syscon", "simple-mfd"; > reg = <0x50440000 0x100>; > reg-io-width = <4>; > @@ -499,7 +499,7 @@ > > sysclk: clock-controller { > #clock-cells = <1>; > - compatible = "kendryte,k210-clk"; > + compatible = "canaan,k210-clk"; > clocks = <&in0>; > assigned-clocks = <&sysclk K210_CLK_PLL1>; > assigned-clock-rates = <390000000>; > @@ -507,7 +507,7 @@ > }; > > sysrst: reset-controller { > - compatible = "kendryte,k210-rst", > + compatible = "canaan,k210-rst", > "syscon-reset"; > #reset-cells = <1>; > regmap = <&sysctl>; > @@ -526,7 +526,7 @@ > }; > > aes0: aes@50450000 { > - compatible = "kendryte,k210-aes"; > + compatible = "canaan,k210-aes"; > reg = <0x50450000 0x100>; > clocks = <&sysclk K210_CLK_AES>; > resets = <&sysrst K210_RST_AES>; > @@ -534,7 +534,7 @@ > }; > > rtc: rtc@50460000 { > - compatible = "kendryte,k210-rtc"; > + compatible = "canaan,k210-rtc"; > reg = <0x50460000 0x100>; > clocks = <&in0>; > resets = <&sysrst K210_RST_RTC>; > @@ -546,14 +546,14 @@ > apb2: bus@52000000 { > #address-cells = <1>; > #size-cells = <1>; > - compatible = "kendryte,k210-apb", "simple-pm-bus"; > + compatible = "canaan,k210-apb", "simple-pm-bus"; > ranges; > clocks = <&sysclk K210_CLK_APB2>; > > spi0: spi@52000000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "canaan,kendryte-k210-spi", > + compatible = "canaan,k210-spi", > "snps,dw-apb-ssi-4.01", > "snps,dw-apb-ssi"; > reg = <0x52000000 0x100>; > @@ -570,7 +570,7 @@ > spi1: spi@53000000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "canaan,kendryte-k210-spi", > + compatible = "canaan,k210-spi", > "snps,dw-apb-ssi-4.01", > "snps,dw-apb-ssi"; > reg = <0x53000000 0x100>; > @@ -587,7 +587,7 @@ > spi3: spi@54000000 { > #address-cells = <1>; > #size-cells = <0>; > - compatible = "canaan,kendryte-k210-ssi", > + compatible = "canaan,k210-ssi", > "snps,dwc-ssi-1.01a"; > reg = <0x54000000 0x200>; > interrupts = <4>; > diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c > index 52e4fee2f0..a218278cb3 100644 > --- a/board/sipeed/maix/maix.c > +++ b/board/sipeed/maix/maix.c > @@ -22,7 +22,7 @@ static int sram_init(void) > struct clk clk; > > /* Enable RAM clocks */ > - memory = ofnode_by_compatible(ofnode_null(), "kendryte,k210-sram"); > + memory = ofnode_by_compatible(ofnode_null(), "canaan,k210-sram"); > if (ofnode_equal(memory, ofnode_null())) > return -ENOENT; > > diff --git a/doc/device-tree-bindings/mfd/kendryte,k210-sysctl.txt b/doc/device-tree-bindings/mfd/canaan,k210-sysctl.txt > similarity index 78% > rename from doc/device-tree-bindings/mfd/kendryte,k210-sysctl.txt > rename to doc/device-tree-bindings/mfd/canaan,k210-sysctl.txt > index 5b24abcb62..e48b164fc0 100644 > --- a/doc/device-tree-bindings/mfd/kendryte,k210-sysctl.txt > +++ b/doc/device-tree-bindings/mfd/canaan,k210-sysctl.txt > @@ -6,7 +6,7 @@ be reference by other bindings which need a phandle to the K210 sysctl regmap. > > Required properties: > - compatible: should be > - "kendryte,k210-sysctl", "syscon", "simple-mfd" > + "canaan,k210-sysctl", "syscon", "simple-mfd" > - reg: address and length of the sysctl registers > - reg-io-width: must be <4> > > @@ -15,18 +15,18 @@ Clock sub-node > This node is a binding for the clock tree driver > > Required properties: > -- compatible: should be "kendryte,k210-clk" > +- compatible: should be "canaan,k210-clk" > - clocks: phandle to the "in0" external oscillator > - #clock-cells: must be <1> > > Example: > sysctl: syscon@50440000 { > - compatible = "kendryte,k210-sysctl", "syscon", "simple-mfd"; > + compatible = "canaan,k210-sysctl", "syscon", "simple-mfd"; > reg = <0x50440000 0x100>; > reg-io-width = <4>; > > sysclk: clock-controller { > - compatible = "kendryte,k210-clk"; > + compatible = "canaan,k210-clk"; > clocks = <&in0>; > #clock-cells = <1>; > }; > diff --git a/doc/device-tree-bindings/pinctrl/kendryte,k210-fpioa.txt b/doc/device-tree-bindings/pinctrl/canaan,k210-fpioa.txt > similarity index 91% > rename from doc/device-tree-bindings/pinctrl/kendryte,k210-fpioa.txt > rename to doc/device-tree-bindings/pinctrl/canaan,k210-fpioa.txt > index 73871f5930..deca0cfab7 100644 > --- a/doc/device-tree-bindings/pinctrl/kendryte,k210-fpioa.txt > +++ b/doc/device-tree-bindings/pinctrl/canaan,k210-fpioa.txt > @@ -5,10 +5,10 @@ in Kendryte K210 SoCs. Any of the 256 functions can be mapped to any of the 48 > pins. > > Required properties: > -- compatible: should be "kendryte,k210-fpioa" > +- compatible: should be "canaan,k210-fpioa" > - reg: address and length of the FPIOA registers > -- kendryte,sysctl: phandle to the "sysctl" register map node > -- kendryte,power-offset: offset in the register map of the power bank control > +- canaan,sysctl: phandle to the "sysctl" register map node > +- canaan,k210-power-offset: offset in the register map of the power bank control > register (in bytes) > > Configuration nodes > @@ -54,10 +54,10 @@ Notes on specific properties include: > > Example: > fpioa: pinmux@502B0000 { > - compatible = "kendryte,k210-fpioa"; > + compatible = "canaan,k210-fpioa"; > reg = <0x502B0000 0x100>; > - kendryte,sysctl = <&sysctl>; > - kendryte,power-offset = ; > + canaan,k210-sysctl = <&sysctl>; > + canaan,k210-power-offset = ; > > /* JTAG running at 3.3V and driven at 11 mA */ > fpioa_jtag: jtag { > diff --git a/doc/device-tree-bindings/spi/snps,dw-apb-ssi.txt b/doc/device-tree-bindings/spi/snps,dw-apb-ssi.txt > index 8d2888fbe3..7a0f11c53b 100644 > --- a/doc/device-tree-bindings/spi/snps,dw-apb-ssi.txt > +++ b/doc/device-tree-bindings/spi/snps,dw-apb-ssi.txt > @@ -5,8 +5,8 @@ Required properties: > - compatible : One of > "altr,socfpga-spi", > "altr,socfpga-arria10-spi", > - "canaan,kendryte-k210-spi", > - "canaan,kendryte-k210-ssi", > + "canaan,k210-spi", > + "canaan,k210-ssi", > "intel,stratix10-spi", > "intel,agilex-spi", > "mscc,ocelot-spi", > diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile > index 711ae5bc29..bf7e4904f3 100644 > --- a/drivers/clk/Makefile > +++ b/drivers/clk/Makefile > @@ -28,7 +28,7 @@ obj-$(CONFIG_CLK_BOSTON) += clk_boston.o > obj-$(CONFIG_CLK_EXYNOS) += exynos/ > obj-$(CONFIG_$(SPL_TPL_)CLK_INTEL) += intel/ > obj-$(CONFIG_CLK_HSDK) += clk-hsdk-cgu.o > -obj-$(CONFIG_CLK_K210) += clk_kendryte.o > +obj-$(CONFIG_CLK_K210) += clk_k210.o > obj-$(CONFIG_CLK_MPC83XX) += mpc83xx_clk.o > obj-$(CONFIG_CLK_MPFS) += microchip/ > obj-$(CONFIG_CLK_OCTEON) += clk_octeon.o > diff --git a/drivers/clk/clk_kendryte.c b/drivers/clk/clk_k210.c > similarity index 99% > rename from drivers/clk/clk_kendryte.c > rename to drivers/clk/clk_k210.c > index 97efda5b6f..1961efaa5e 100644 > --- a/drivers/clk/clk_kendryte.c > +++ b/drivers/clk/clk_k210.c > @@ -14,7 +14,7 @@ > #include > #include > #include > -#include > +#include > #include > > DECLARE_GLOBAL_DATA_PTR; > @@ -1271,7 +1271,7 @@ static int k210_clk_probe(struct udevice *dev) > } > > static const struct udevice_id k210_clk_ids[] = { > - { .compatible = "kendryte,k210-clk" }, > + { .compatible = "canaan,k210-clk" }, > { }, > }; > > diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile > index fd736a7f64..df37c32033 100644 > --- a/drivers/pinctrl/Makefile > +++ b/drivers/pinctrl/Makefile > @@ -18,7 +18,7 @@ obj-$(CONFIG_PINCTRL_SANDBOX) += pinctrl-sandbox.o > obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/ > obj-$(CONFIG_PINCTRL_PIC32) += pinctrl_pic32.o > obj-$(CONFIG_PINCTRL_EXYNOS) += exynos/ > -obj-$(CONFIG_PINCTRL_K210) += pinctrl-kendryte.o > +obj-$(CONFIG_PINCTRL_K210) += pinctrl-k210.o > obj-$(CONFIG_PINCTRL_MESON) += meson/ > obj-$(CONFIG_PINCTRL_MTK) += mediatek/ > obj-$(CONFIG_PINCTRL_MSCC) += mscc/ > diff --git a/drivers/pinctrl/pinctrl-kendryte.c b/drivers/pinctrl/pinctrl-k210.c > similarity index 98% > rename from drivers/pinctrl/pinctrl-kendryte.c > rename to drivers/pinctrl/pinctrl-k210.c > index 09d51ca676..bb5153c673 100644 > --- a/drivers/pinctrl/pinctrl-kendryte.c > +++ b/drivers/pinctrl/pinctrl-k210.c > @@ -692,13 +692,13 @@ static int k210_pc_probe(struct udevice *dev) > if (ret && ret != -ENOSYS && ret != -ENOTSUPP) > goto err; > > - priv->sysctl = syscon_regmap_lookup_by_phandle(dev, "kendryte,sysctl"); > + priv->sysctl = syscon_regmap_lookup_by_phandle(dev, "canaan,k210-sysctl"); > if (IS_ERR(priv->sysctl)) { > ret = -ENODEV; > goto err; > } > > - ret = dev_read_u32(dev, "kendryte,power-offset", &priv->power_offset); > + ret = dev_read_u32(dev, "canaan,k210-power-offset", &priv->power_offset); > if (ret) > goto err; > > @@ -726,7 +726,7 @@ err: > } > > static const struct udevice_id k210_pc_ids[] = { > - { .compatible = "kendryte,k210-fpioa" }, > + { .compatible = "canaan,k210-fpioa" }, > { } > }; > > diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c > index fc22f540fe..9200efced9 100644 > --- a/drivers/spi/designware_spi.c > +++ b/drivers/spi/designware_spi.c > @@ -758,8 +758,8 @@ static const struct udevice_id dw_spi_ids[] = { > */ > { .compatible = "altr,socfpga-spi", .data = (ulong)dw_spi_apb_init }, > { .compatible = "altr,socfpga-arria10-spi", .data = (ulong)dw_spi_apb_init }, > - { .compatible = "canaan,kendryte-k210-spi", .data = (ulong)dw_spi_apb_init }, > - { .compatible = "canaan,kendryte-k210-ssi", .data = (ulong)dw_spi_dwc_init }, > + { .compatible = "canaan,k210-spi", .data = (ulong)dw_spi_apb_init }, > + { .compatible = "canaan,k210-ssi", .data = (ulong)dw_spi_dwc_init }, > { .compatible = "intel,stratix10-spi", .data = (ulong)dw_spi_apb_init }, > { .compatible = "intel,agilex-spi", .data = (ulong)dw_spi_apb_init }, > { .compatible = "mscc,ocelot-spi", .data = (ulong)dw_spi_apb_init }, > diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h > index 1f74702ea7..1cc2992c80 100644 > --- a/include/configs/sipeed-maix.h > +++ b/include/configs/sipeed-maix.h > @@ -20,7 +20,7 @@ > "fdt_addr_r=0x80400000\0" \ > "scriptaddr=0x80020000\0" \ > "kernel_addr_r=0x80060000\0" \ > - "fdtfile=kendryte/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ > + "fdtfile=k210/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ > "k210_bootcmd=load mmc 0:1 $loadaddr /uImage && " \ > "load mmc 0:1 $fdt_addr_r /k210.dtb && " \ > "bootm $loadaddr - $fdt_addr_r\0" > diff --git a/include/kendryte/pll.h b/include/k210/pll.h > similarity index 100% > rename from include/kendryte/pll.h > rename to include/k210/pll.h > diff --git a/test/dm/k210_pll.c b/test/dm/k210_pll.c > index f55379f336..a0cc84c396 100644 > --- a/test/dm/k210_pll.c > +++ b/test/dm/k210_pll.c > @@ -7,7 +7,7 @@ > /* For DIV_ROUND_DOWN_ULL, defined in linux/kernel.h */ > #include > #include > -#include > +#include > #include > > static int dm_test_k210_pll_calc_config(u32 rate, u32 rate_in, > Thanks! Reviewed-by: Sean Anderson If you have a chance, doc/board/sipeed/maix.rst should also be updated.