From: Jun Nie <jun.nie@linaro.org> To: mturquette@baylibre.com, sboyd@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, p.zabel@pengutronix.de, opensource@jilayne.com, swinslow@gmail.com, jun.nie@linaro.org, allison@lohutok.net, yuehaibing@huawei.com, tglx@linutronix.de, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, xuejiancheng@hisilicon.com Subject: [PATCH 3/3] ARM: dts: Update reset for hi3519 and hi3798cv200 Date: Mon, 2 Dec 2019 22:45:24 +0800 [thread overview] Message-ID: <20191202144524.5391-4-jun.nie@linaro.org> (raw) In-Reply-To: <20191202144524.5391-1-jun.nie@linaro.org> Update reset for hi3519 and hi3798cv200 as driver is extended to support configurable reset operation type. Signed-off-by: Jun Nie <jun.nie@linaro.org> --- arch/arm/boot/dts/hi3519.dtsi | 2 +- .../arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 47 +++++++++++-------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/hi3519.dtsi b/arch/arm/boot/dts/hi3519.dtsi index 410409a0ed66..2335c8443d2d 100644 --- a/arch/arm/boot/dts/hi3519.dtsi +++ b/arch/arm/boot/dts/hi3519.dtsi @@ -37,7 +37,7 @@ crg: clock-reset-controller@12010000 { compatible = "hisilicon,hi3519-crg"; #clock-cells = <1>; - #reset-cells = <2>; + #reset-cells = <3>; reg = <0x12010000 0x10000>; }; diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi index 13821a0ff524..0a30aaae6bf2 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi @@ -9,8 +9,10 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/phy/phy.h> +#include <dt-bindings/reset/hisilicon-resets.h> #include <dt-bindings/reset/ti-syscon.h> + / { compatible = "hisilicon,hi3798cv200"; interrupt-parent = <&gic>; @@ -86,7 +88,7 @@ compatible = "hisilicon,hi3798cv200-crg", "syscon", "simple-mfd"; reg = <0x8a22000 0x1000>; #clock-cells = <1>; - #reset-cells = <2>; + #reset-cells = <3>; gmacphyrst: reset-controller { compatible = "ti,syscon-reset"; @@ -103,7 +105,7 @@ compatible = "hisilicon,hi3798cv200-sysctrl", "syscon"; reg = <0x8000000 0x1000>; #clock-cells = <1>; - #reset-cells = <2>; + #reset-cells = <3>; }; perictrl: peripheral-controller@8a20000 { @@ -118,20 +120,22 @@ compatible = "hisilicon,hi3798cv200-usb2-phy"; reg = <0x120 0x4>; clocks = <&crg HISTB_USB2_PHY1_REF_CLK>; - resets = <&crg 0xbc 4>; + resets = <&crg 0xbc 4 HISI_RESET_DEFAULT>; #address-cells = <1>; #size-cells = <0>; usb2_phy1_port0: phy@0 { reg = <0>; #phy-cells = <0>; - resets = <&crg 0xbc 8>; + resets = <&crg 0xbc 8 + HISI_RESET_DEFAULT>; }; usb2_phy1_port1: phy@1 { reg = <1>; #phy-cells = <0>; - resets = <&crg 0xbc 9>; + resets = <&crg 0xbc 9 + HISI_RESET_DEFAULT>; }; }; @@ -139,14 +143,15 @@ compatible = "hisilicon,hi3798cv200-usb2-phy"; reg = <0x124 0x4>; clocks = <&crg HISTB_USB2_PHY2_REF_CLK>; - resets = <&crg 0xbc 6>; + resets = <&crg 0xbc 6 HISI_RESET_DEFAULT>; #address-cells = <1>; #size-cells = <0>; usb2_phy2_port0: phy@0 { reg = <0>; #phy-cells = <0>; - resets = <&crg 0xbc 10>; + resets = <&crg 0xbc 10 + HISI_RESET_DEFAULT>; }; }; @@ -155,7 +160,7 @@ reg = <0x850 0x8>; #phy-cells = <1>; clocks = <&crg HISTB_COMBPHY0_CLK>; - resets = <&crg 0x188 4>; + resets = <&crg 0x188 4 HISI_RESET_DEFAULT>; assigned-clocks = <&crg HISTB_COMBPHY0_CLK>; assigned-clock-rates = <100000000>; hisilicon,fixed-mode = <PHY_TYPE_USB3>; @@ -166,7 +171,7 @@ reg = <0x858 0x8>; #phy-cells = <1>; clocks = <&crg HISTB_COMBPHY1_CLK>; - resets = <&crg 0x188 12>; + resets = <&crg 0x188 12 HISI_RESET_DEFAULT>; assigned-clocks = <&crg HISTB_COMBPHY1_CLK>; assigned-clock-rates = <100000000>; hisilicon,mode-select-bits = <0x0008 11 (0x3 << 11)>; @@ -306,7 +311,7 @@ clocks = <&crg HISTB_SDIO0_CIU_CLK>, <&crg HISTB_SDIO0_BIU_CLK>; clock-names = "ciu", "biu"; - resets = <&crg 0x9c 4>; + resets = <&crg 0x9c 4 HISI_RESET_DEFAULT>; reset-names = "reset"; status = "disabled"; }; @@ -320,7 +325,7 @@ <&crg HISTB_MMC_SAMPLE_CLK>, <&crg HISTB_MMC_DRV_CLK>; clock-names = "ciu", "biu", "ciu-sample", "ciu-drive"; - resets = <&crg 0xa0 4>; + resets = <&crg 0xa0 4 HISI_RESET_DEFAULT>; reset-names = "reset"; status = "disabled"; }; @@ -525,8 +530,8 @@ clocks = <&crg HISTB_ETH0_MAC_CLK>, <&crg HISTB_ETH0_MACIF_CLK>; clock-names = "mac_core", "mac_ifc"; - resets = <&crg 0xcc 8>, - <&crg 0xcc 10>, + resets = <&crg 0xcc 8 HISI_RESET_DEFAULT>, + <&crg 0xcc 10 HISI_RESET_DEFAULT>, <&gmacphyrst 0>; reset-names = "mac_core", "mac_ifc", "phy"; status = "disabled"; @@ -540,8 +545,8 @@ clocks = <&crg HISTB_ETH1_MAC_CLK>, <&crg HISTB_ETH1_MACIF_CLK>; clock-names = "mac_core", "mac_ifc"; - resets = <&crg 0xcc 9>, - <&crg 0xcc 11>, + resets = <&crg 0xcc 9 HISI_RESET_DEFAULT>, + <&crg 0xcc 11 HISI_RESET_DEFAULT>, <&gmacphyrst 1>; reset-names = "mac_core", "mac_ifc", "phy"; status = "disabled"; @@ -578,7 +583,9 @@ <&crg HISTB_PCIE_SYS_CLK>, <&crg HISTB_PCIE_BUS_CLK>; clock-names = "aux", "pipe", "sys", "bus"; - resets = <&crg 0x18c 6>, <&crg 0x18c 5>, <&crg 0x18c 4>; + resets = <&crg 0x18c 6 HISI_RESET_DEFAULT>, + <&crg 0x18c 5 HISI_RESET_DEFAULT>, + <&crg 0x18c 4 HISI_RESET_DEFAULT>; reset-names = "soft", "sys", "bus"; phys = <&combphy1 PHY_TYPE_PCIE>; phy-names = "phy"; @@ -593,7 +600,7 @@ <&crg HISTB_USB2_12M_CLK>, <&crg HISTB_USB2_48M_CLK>; clock-names = "bus", "clk12", "clk48"; - resets = <&crg 0xb8 12>; + resets = <&crg 0xb8 12 HISI_RESET_DEFAULT>; reset-names = "bus"; phys = <&usb2_phy1_port0>; phy-names = "usb"; @@ -608,9 +615,9 @@ <&crg HISTB_USB2_PHY_CLK>, <&crg HISTB_USB2_UTMI_CLK>; clock-names = "bus", "phy", "utmi"; - resets = <&crg 0xb8 12>, - <&crg 0xb8 16>, - <&crg 0xb8 13>; + resets = <&crg 0xb8 12 HISI_RESET_DEFAULT>, + <&crg 0xb8 16 HISI_RESET_DEFAULT>, + <&crg 0xb8 13 HISI_RESET_DEFAULT>; reset-names = "bus", "phy", "utmi"; phys = <&usb2_phy1_port0>; phy-names = "usb"; -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Jun Nie <jun.nie@linaro.org> To: mturquette@baylibre.com, sboyd@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, xuwei5@hisilicon.com, p.zabel@pengutronix.de, opensource@jilayne.com, swinslow@gmail.com, jun.nie@linaro.org, allison@lohutok.net, yuehaibing@huawei.com, tglx@linutronix.de, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, xuejiancheng@hisilicon.com Subject: [PATCH 3/3] ARM: dts: Update reset for hi3519 and hi3798cv200 Date: Mon, 2 Dec 2019 22:45:24 +0800 [thread overview] Message-ID: <20191202144524.5391-4-jun.nie@linaro.org> (raw) In-Reply-To: <20191202144524.5391-1-jun.nie@linaro.org> Update reset for hi3519 and hi3798cv200 as driver is extended to support configurable reset operation type. Signed-off-by: Jun Nie <jun.nie@linaro.org> --- arch/arm/boot/dts/hi3519.dtsi | 2 +- .../arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 47 +++++++++++-------- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/hi3519.dtsi b/arch/arm/boot/dts/hi3519.dtsi index 410409a0ed66..2335c8443d2d 100644 --- a/arch/arm/boot/dts/hi3519.dtsi +++ b/arch/arm/boot/dts/hi3519.dtsi @@ -37,7 +37,7 @@ crg: clock-reset-controller@12010000 { compatible = "hisilicon,hi3519-crg"; #clock-cells = <1>; - #reset-cells = <2>; + #reset-cells = <3>; reg = <0x12010000 0x10000>; }; diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi index 13821a0ff524..0a30aaae6bf2 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi @@ -9,8 +9,10 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/phy/phy.h> +#include <dt-bindings/reset/hisilicon-resets.h> #include <dt-bindings/reset/ti-syscon.h> + / { compatible = "hisilicon,hi3798cv200"; interrupt-parent = <&gic>; @@ -86,7 +88,7 @@ compatible = "hisilicon,hi3798cv200-crg", "syscon", "simple-mfd"; reg = <0x8a22000 0x1000>; #clock-cells = <1>; - #reset-cells = <2>; + #reset-cells = <3>; gmacphyrst: reset-controller { compatible = "ti,syscon-reset"; @@ -103,7 +105,7 @@ compatible = "hisilicon,hi3798cv200-sysctrl", "syscon"; reg = <0x8000000 0x1000>; #clock-cells = <1>; - #reset-cells = <2>; + #reset-cells = <3>; }; perictrl: peripheral-controller@8a20000 { @@ -118,20 +120,22 @@ compatible = "hisilicon,hi3798cv200-usb2-phy"; reg = <0x120 0x4>; clocks = <&crg HISTB_USB2_PHY1_REF_CLK>; - resets = <&crg 0xbc 4>; + resets = <&crg 0xbc 4 HISI_RESET_DEFAULT>; #address-cells = <1>; #size-cells = <0>; usb2_phy1_port0: phy@0 { reg = <0>; #phy-cells = <0>; - resets = <&crg 0xbc 8>; + resets = <&crg 0xbc 8 + HISI_RESET_DEFAULT>; }; usb2_phy1_port1: phy@1 { reg = <1>; #phy-cells = <0>; - resets = <&crg 0xbc 9>; + resets = <&crg 0xbc 9 + HISI_RESET_DEFAULT>; }; }; @@ -139,14 +143,15 @@ compatible = "hisilicon,hi3798cv200-usb2-phy"; reg = <0x124 0x4>; clocks = <&crg HISTB_USB2_PHY2_REF_CLK>; - resets = <&crg 0xbc 6>; + resets = <&crg 0xbc 6 HISI_RESET_DEFAULT>; #address-cells = <1>; #size-cells = <0>; usb2_phy2_port0: phy@0 { reg = <0>; #phy-cells = <0>; - resets = <&crg 0xbc 10>; + resets = <&crg 0xbc 10 + HISI_RESET_DEFAULT>; }; }; @@ -155,7 +160,7 @@ reg = <0x850 0x8>; #phy-cells = <1>; clocks = <&crg HISTB_COMBPHY0_CLK>; - resets = <&crg 0x188 4>; + resets = <&crg 0x188 4 HISI_RESET_DEFAULT>; assigned-clocks = <&crg HISTB_COMBPHY0_CLK>; assigned-clock-rates = <100000000>; hisilicon,fixed-mode = <PHY_TYPE_USB3>; @@ -166,7 +171,7 @@ reg = <0x858 0x8>; #phy-cells = <1>; clocks = <&crg HISTB_COMBPHY1_CLK>; - resets = <&crg 0x188 12>; + resets = <&crg 0x188 12 HISI_RESET_DEFAULT>; assigned-clocks = <&crg HISTB_COMBPHY1_CLK>; assigned-clock-rates = <100000000>; hisilicon,mode-select-bits = <0x0008 11 (0x3 << 11)>; @@ -306,7 +311,7 @@ clocks = <&crg HISTB_SDIO0_CIU_CLK>, <&crg HISTB_SDIO0_BIU_CLK>; clock-names = "ciu", "biu"; - resets = <&crg 0x9c 4>; + resets = <&crg 0x9c 4 HISI_RESET_DEFAULT>; reset-names = "reset"; status = "disabled"; }; @@ -320,7 +325,7 @@ <&crg HISTB_MMC_SAMPLE_CLK>, <&crg HISTB_MMC_DRV_CLK>; clock-names = "ciu", "biu", "ciu-sample", "ciu-drive"; - resets = <&crg 0xa0 4>; + resets = <&crg 0xa0 4 HISI_RESET_DEFAULT>; reset-names = "reset"; status = "disabled"; }; @@ -525,8 +530,8 @@ clocks = <&crg HISTB_ETH0_MAC_CLK>, <&crg HISTB_ETH0_MACIF_CLK>; clock-names = "mac_core", "mac_ifc"; - resets = <&crg 0xcc 8>, - <&crg 0xcc 10>, + resets = <&crg 0xcc 8 HISI_RESET_DEFAULT>, + <&crg 0xcc 10 HISI_RESET_DEFAULT>, <&gmacphyrst 0>; reset-names = "mac_core", "mac_ifc", "phy"; status = "disabled"; @@ -540,8 +545,8 @@ clocks = <&crg HISTB_ETH1_MAC_CLK>, <&crg HISTB_ETH1_MACIF_CLK>; clock-names = "mac_core", "mac_ifc"; - resets = <&crg 0xcc 9>, - <&crg 0xcc 11>, + resets = <&crg 0xcc 9 HISI_RESET_DEFAULT>, + <&crg 0xcc 11 HISI_RESET_DEFAULT>, <&gmacphyrst 1>; reset-names = "mac_core", "mac_ifc", "phy"; status = "disabled"; @@ -578,7 +583,9 @@ <&crg HISTB_PCIE_SYS_CLK>, <&crg HISTB_PCIE_BUS_CLK>; clock-names = "aux", "pipe", "sys", "bus"; - resets = <&crg 0x18c 6>, <&crg 0x18c 5>, <&crg 0x18c 4>; + resets = <&crg 0x18c 6 HISI_RESET_DEFAULT>, + <&crg 0x18c 5 HISI_RESET_DEFAULT>, + <&crg 0x18c 4 HISI_RESET_DEFAULT>; reset-names = "soft", "sys", "bus"; phys = <&combphy1 PHY_TYPE_PCIE>; phy-names = "phy"; @@ -593,7 +600,7 @@ <&crg HISTB_USB2_12M_CLK>, <&crg HISTB_USB2_48M_CLK>; clock-names = "bus", "clk12", "clk48"; - resets = <&crg 0xb8 12>; + resets = <&crg 0xb8 12 HISI_RESET_DEFAULT>; reset-names = "bus"; phys = <&usb2_phy1_port0>; phy-names = "usb"; @@ -608,9 +615,9 @@ <&crg HISTB_USB2_PHY_CLK>, <&crg HISTB_USB2_UTMI_CLK>; clock-names = "bus", "phy", "utmi"; - resets = <&crg 0xb8 12>, - <&crg 0xb8 16>, - <&crg 0xb8 13>; + resets = <&crg 0xb8 12 HISI_RESET_DEFAULT>, + <&crg 0xb8 16 HISI_RESET_DEFAULT>, + <&crg 0xb8 13 HISI_RESET_DEFAULT>; reset-names = "bus", "phy", "utmi"; phys = <&usb2_phy1_port0>; phy-names = "usb"; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-12-02 14:46 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-12-02 14:45 [PATCH 0/3] Extend Hisilicon reset type Jun Nie 2019-12-02 14:45 ` Jun Nie 2019-12-02 14:45 ` [PATCH 1/3] dt-bindings: clock: Update Hisilicon reset doc Jun Nie 2019-12-02 14:45 ` Jun Nie 2019-12-02 17:04 ` Philipp Zabel 2019-12-02 17:04 ` Philipp Zabel 2019-12-03 3:11 ` Jun Nie 2019-12-03 3:11 ` Jun Nie 2019-12-03 14:12 ` Philipp Zabel 2019-12-03 14:12 ` Philipp Zabel 2019-12-02 14:45 ` [PATCH 2/3] reset: hisilicon: Extend reset operation type Jun Nie 2019-12-02 14:45 ` Jun Nie 2019-12-02 17:04 ` Philipp Zabel 2019-12-02 17:04 ` Philipp Zabel 2019-12-03 3:53 ` Jun Nie 2019-12-03 3:53 ` Jun Nie 2019-12-03 14:15 ` Philipp Zabel 2019-12-03 14:15 ` Philipp Zabel 2019-12-04 6:09 ` Jun Nie 2019-12-04 6:09 ` Jun Nie 2019-12-02 14:45 ` Jun Nie [this message] 2019-12-02 14:45 ` [PATCH 3/3] ARM: dts: Update reset for hi3519 and hi3798cv200 Jun Nie
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191202144524.5391-4-jun.nie@linaro.org \ --to=jun.nie@linaro.org \ --cc=allison@lohutok.net \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mturquette@baylibre.com \ --cc=opensource@jilayne.com \ --cc=p.zabel@pengutronix.de \ --cc=robh+dt@kernel.org \ --cc=sboyd@kernel.org \ --cc=swinslow@gmail.com \ --cc=tglx@linutronix.de \ --cc=xuejiancheng@hisilicon.com \ --cc=xuwei5@hisilicon.com \ --cc=yuehaibing@huawei.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.