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 B3B20C433FE for ; Mon, 2 May 2022 11:23:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B626683DCA; Mon, 2 May 2022 13:23:08 +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="kI08pkdb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9B5E683B38; Mon, 2 May 2022 13:23:05 +0200 (CEST) Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) (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 5B52283B1B for ; Mon, 2 May 2022 13:23:02 +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=jbx6244@gmail.com Received: by mail-ej1-x62f.google.com with SMTP id n10so9736803ejk.5 for ; Mon, 02 May 2022 04:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k7g+lp7aRTepPFV3hUY5bjFvcjCSNlDjLJNjirXxV20=; b=kI08pkdbPTsxglDNUVXJ4szin6uoHVKTBS71m8H61viylY6J4sYVCCe7xwRHdrwOjL Ii2lCpUjeNAZyTxyyBXYcEVFN6VmbWvTBf4qxRPix44wH++IG4rhu1Hw7IeM6qT0BrxA cHIkuANe9b5ExxVj5i1CEx1NOs43bV27rcixuiojvd1g6wCridEaska1k89ZoeGy85d5 s33ea4TPURcPASQaXYFVC/7/vrjupIxFdI/gS2tEjWzfJZ6pf8YitQKb/WpgBI446UMm SQoYcN4wax9ydNDfegTDsiWY7/NfB4oYZZh6641wa4clKT+oJ1SMwfwZEuSHIpCmGncN XZug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=k7g+lp7aRTepPFV3hUY5bjFvcjCSNlDjLJNjirXxV20=; b=0xTEcIEcv/s73i70a8T+xyEfyyt+TxeG4IYfH2YKMKGzqeLT0nzZ7UGJtyu7YoRs6B 8qoFai3bQE5Jd9GJbjpw7rs460D/X0QVP9Gt/mKW+8hl1tPj/Sj+C4Bk9X5vD9sL8Eb3 5fcJ9pTXLFN0BO7k8zmTqbsgcSSW5+WEpanCJ6QlIIyldb/GBgwg/dxr9Zo0Yi1kQOYh bRPypYnAfrTbfGQCDdgXIbbDzQZlnQC1oTWDEo5nnEVQacRO/HwdQwLw96RckNVD1LBI +cx2SXlT4v7/qWINM8JdHVMh6Jd8NPSZ5Uov5K7Nr6jeP6F8iY0+rVNuksNcxMy3I+u+ U/UQ== X-Gm-Message-State: AOAM530ML2WUwakUIf/tuYO3hDLWCG342NFLvVdrFJCE4Aifu0Qn/lxm nlrCBBtNIFQknjTo+/Mmhio= X-Google-Smtp-Source: ABdhPJxo3xUCHbCqUKTkJM0LkA2gx1K9E9eOeoi4tBQ6K5pSxxgtV7dy2AqcVcJjeSEyQMQrveDzmQ== X-Received: by 2002:a17:906:52ca:b0:6ef:907e:53c8 with SMTP id w10-20020a17090652ca00b006ef907e53c8mr10480064ejn.761.1651490581935; Mon, 02 May 2022 04:23:01 -0700 (PDT) Received: from debian.home (81-204-249-205.fixed.kpn.net. [81.204.249.205]) by smtp.gmail.com with ESMTPSA id d2-20020a170907272200b006f3ef214e1dsm3507742ejl.131.2022.05.02.04.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 04:23:01 -0700 (PDT) From: Johan Jonker To: kever.yang@rock-chips.com Cc: sjg@chromium.org, philipp.tomsich@vrull.eu, u-boot@lists.denx.de Subject: [PATCH v1] arm: dts: rockchip: rk3288: move dma-controller nodes Date: Mon, 2 May 2022 13:22:55 +0200 Message-Id: <20220502112255.12353-1-jbx6244@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 In order to better compare the Linux rk3288.dtsi version with the u-boot version move the dma-controller nodes to the DT root. Signed-off-by: Johan Jonker --- arch/arm/dts/rk3288.dtsi | 76 ++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi index 469df94e..53ee760b 100644 --- a/arch/arm/dts/rk3288.dtsi +++ b/arch/arm/dts/rk3288.dtsi @@ -86,47 +86,6 @@ }; }; - amba { - compatible = "arm,amba-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - - dmac_peri: dma-controller@ff250000 { - compatible = "arm,pl330", "arm,primecell"; - broken-no-flushp; - reg = <0xff250000 0x4000>; - interrupts = , - ; - #dma-cells = <1>; - clocks = <&cru ACLK_DMAC2>; - clock-names = "apb_pclk"; - }; - - dmac_bus_ns: dma-controller@ff600000 { - compatible = "arm,pl330", "arm,primecell"; - broken-no-flushp; - reg = <0xff600000 0x4000>; - interrupts = , - ; - #dma-cells = <1>; - clocks = <&cru ACLK_DMAC1>; - clock-names = "apb_pclk"; - status = "disabled"; - }; - - dmac_bus_s: dma-controller@ffb20000 { - compatible = "arm,pl330", "arm,primecell"; - broken-no-flushp; - reg = <0xffb20000 0x4000>; - interrupts = , - ; - #dma-cells = <1>; - clocks = <&cru ACLK_DMAC1>; - clock-names = "apb_pclk"; - }; - }; - xin24m: oscillator { compatible = "fixed-clock"; clock-frequency = <24000000>; @@ -367,6 +326,18 @@ pinctrl-0 = <&uart4_xfer>; status = "disabled"; }; + + dmac_peri: dma-controller@ff250000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0xff250000 0x4000>; + interrupts = , + ; + #dma-cells = <1>; + broken-no-flushp; + clocks = <&cru ACLK_DMAC2>; + clock-names = "apb_pclk"; + }; + thermal: thermal-zones { #include "rk3288-thermal.dtsi" }; @@ -458,6 +429,18 @@ status = "disabled"; }; + dmac_bus_ns: dma-controller@ff600000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0xff600000 0x4000>; + interrupts = , + ; + #dma-cells = <1>; + broken-no-flushp; + clocks = <&cru ACLK_DMAC1>; + clock-names = "apb_pclk"; + status = "disabled"; + }; + i2c0: i2c@ff650000 { compatible = "rockchip,rk3288-i2c"; reg = <0xff650000 0x1000>; @@ -870,6 +853,17 @@ status = "disabled"; }; + dmac_bus_s: dma-controller@ffb20000 { + compatible = "arm,pl330", "arm,primecell"; + reg = <0xffb20000 0x4000>; + interrupts = , + ; + #dma-cells = <1>; + broken-no-flushp; + clocks = <&cru ACLK_DMAC1>; + clock-names = "apb_pclk"; + }; + efuse: efuse@ffb40000 { compatible = "rockchip,rk3288-efuse"; reg = <0xffb40000 0x10000>; -- 2.20.1