From patchwork Tue Nov 22 07:49:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 9440585 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 90D21600BA for ; Tue, 22 Nov 2016 07:54:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F2AF20748 for ; Tue, 22 Nov 2016 07:54:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7081428479; Tue, 22 Nov 2016 07:54:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EC7E82844E for ; Tue, 22 Nov 2016 07:54:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1c95sx-0000Wh-39; Tue, 22 Nov 2016 07:52:59 +0000 Received: from mail-pg0-x232.google.com ([2607:f8b0:400e:c05::232]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1c95rX-0007Gc-81 for linux-arm-kernel@lists.infradead.org; Tue, 22 Nov 2016 07:51:33 +0000 Received: by mail-pg0-x232.google.com with SMTP id p66so5047385pga.2 for ; Mon, 21 Nov 2016 23:51:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aa6wchu8fhIqLVj09bQKYpHElPxCDLxrMo3lXahY/64=; b=KTAjzvFKEZ+E72/9vGm8Yf8BZORj6ucHVK3rCqNiOrLeB/3Xc+BmCMLaksn8sZzrRO h6iTX9nCz5q2qW8AtlZ3EposlEfxY5thvOfJRPIxDst3xE3oMUp1mxKJ+ybwqcYKf59n 5qgbdRN2yJJ+NNIui8DuEKEGhsf//kqZg/Cio= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aa6wchu8fhIqLVj09bQKYpHElPxCDLxrMo3lXahY/64=; b=PYLOLdh29LMt/0abuasD7PO8ChHVlN97acB2IePBWTSBoJWJUa6Tckwz78aJM+W8D2 18X+ihRTZX3TjH097a75pmO9dj+SQNSlXXQrTaZiUa4WlDtpYLyc5GiRe2yWGmwr9VGC AbbksuNwZtbKpNJzIdVnDUbmnCtok413YMfZhowghANzP2r8nfJ31Cgez+siyr/H3JuD QPNSgDigzXlzuhuDwlMofTD0oIKcHTL2EF4Sfc46qele8tdx4ltO3EYZ4KveKwxqVkFX oKs01++z5qyuHviIAua/mFUI/NpoxnqeVBnsHhhxJ9ex6lsL68iPSeIN8l1//V5ouCBY eCQw== X-Gm-Message-State: AKaTC016BSNJi0yHAVgJnhKmTGA5vo4qQMtWMQpiEn14qRFYhuDVWzleH80XxnnPzvTZ/dG0 X-Received: by 10.99.55.30 with SMTP id e30mr41319587pga.75.1479801070234; Mon, 21 Nov 2016 23:51:10 -0800 (PST) Received: from localhost.localdomain ([104.237.91.214]) by smtp.gmail.com with ESMTPSA id d1sm42635008pfb.76.2016.11.21.23.51.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 21 Nov 2016 23:51:09 -0800 (PST) From: Zhangfei Gao To: Philipp Zabel , Rob Herring , haojian.zhuang@linaro.org, xuwei5@hisilicon.com, Chen Feng , Xinliang Liu , Xia Qing , Jiancheng Xue Subject: [PATCH 6/6] arm64: dts: hi6220: update reset node according to reset-hi6220.c Date: Tue, 22 Nov 2016 15:49:21 +0800 Message-Id: <1479800961-6249-7-git-send-email-zhangfei.gao@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1479800961-6249-1-git-send-email-zhangfei.gao@linaro.org> References: <1479800961-6249-1-git-send-email-zhangfei.gao@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161121_235131_459435_1E08A6A3 X-CRM114-Status: UNSURE ( 9.93 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Zhangfei Gao MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Zhangfei Gao --- arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 17839db..7918043 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -246,14 +246,24 @@ compatible = "hisilicon,hi6220-sysctrl", "syscon"; reg = <0x0 0xf7030000 0x0 0x2000>; #clock-cells = <1>; - #reset-cells = <1>; }; media_ctrl: media_ctrl@f4410000 { compatible = "hisilicon,hi6220-mediactrl", "syscon"; reg = <0x0 0xf4410000 0x0 0x1000>; #clock-cells = <1>; + }; + + sys_ctrl_rst: sys_rst_controller { + compatible = "hisilicon,hi6220-reset-sysctrl"; + #reset-cells = <1>; + hisi,rst-syscon = <&sys_ctrl>; + }; + + media_ctrl_rst: media_rst_controller { + compatible = "hisilicon,hi6220-reset-mediactrl"; #reset-cells = <1>; + hisi,rst-syscon = <&media_ctrl>; }; pm_ctrl: pm_ctrl@f7032000 { @@ -771,7 +781,7 @@ interrupts = <0x0 0x48 0x4>; clocks = <&sys_ctrl 2>, <&sys_ctrl 1>; clock-names = "ciu", "biu"; - resets = <&sys_ctrl PERIPH_RSTDIS0_MMC0>; + resets = <&sys_ctrl_rst PERIPH_RSTDIS0_MMC0>; bus-width = <0x8>; vmmc-supply = <&ldo19>; pinctrl-names = "default"; @@ -794,7 +804,7 @@ #size-cells = <0x0>; clocks = <&sys_ctrl 4>, <&sys_ctrl 3>; clock-names = "ciu", "biu"; - resets = <&sys_ctrl PERIPH_RSTDIS0_MMC1>; + resets = <&sys_ctrl_rst PERIPH_RSTDIS0_MMC1>; vqmmc-supply = <&ldo7>; vmmc-supply = <&ldo10>; bus-width = <0x4>; @@ -812,7 +822,7 @@ interrupts = <0x0 0x4a 0x4>; clocks = <&sys_ctrl HI6220_MMC2_CIUCLK>, <&sys_ctrl HI6220_MMC2_CLK>; clock-names = "ciu", "biu"; - resets = <&sys_ctrl PERIPH_RSTDIS0_MMC2>; + resets = <&sys_ctrl_rst PERIPH_RSTDIS0_MMC2>; bus-width = <0x4>; broken-cd; pinctrl-names = "default", "idle"; @@ -867,7 +877,7 @@ reg = <0x0 0xf4100000 0x0 0x7800>; reg-names = "ade_base"; hisilicon,noc-syscon = <&medianoc_ade>; - resets = <&media_ctrl MEDIA_ADE>; + resets = <&media_ctrl_rst MEDIA_ADE>; interrupts = <0 115 4>; /* ldi interrupt */ clocks = <&media_ctrl HI6220_ADE_CORE>,