Andrew Davis <a...@ti.com> writes: > This extra binding is non-standard and now unneeded as we bind the > sysreset driver automatically. This matches what is done in Linux > and allows us to more closely match the DTBs. Remove the binding > and all users. > > Signed-off-by: Andrew Davis <a...@ti.com> > --- > arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi | 7 ----- > .../k3-am625-phyboard-lyra-rdk-u-boot.dtsi | 7 ----- > .../dts/k3-am625-verdin-wifi-dev-u-boot.dtsi | 7 ----- > arch/arm/dts/k3-am62a7-sk-u-boot.dtsi | 4 --- > arch/arm/dts/k3-am62p5-sk-u-boot.dtsi | 5 ---- > arch/arm/dts/k3-am642-evm-u-boot.dtsi | 7 ----- > .../k3-am642-phyboard-electra-rdk-u-boot.dtsi | 4 --- > arch/arm/dts/k3-am642-sk-u-boot.dtsi | 7 ----- > .../dts/k3-am65-iot2050-common-u-boot.dtsi | 4 --- > .../arm/dts/k3-am68-sk-base-board-u-boot.dtsi | 4 --- > arch/arm/dts/k3-am69-sk-u-boot.dtsi | 7 ----- > .../k3-j7200-common-proc-board-u-boot.dtsi | 4 --- > .../dts/k3-j721e-beagleboneai64-u-boot.dtsi | 4 --- > .../k3-j721e-common-proc-board-u-boot.dtsi | 4 --- > arch/arm/dts/k3-j721e-sk-u-boot.dtsi | 4 --- > .../k3-j721s2-common-proc-board-u-boot.dtsi | 4 --- > arch/arm/dts/k3-j784s4-evm-u-boot.dtsi | 7 ----- > .../sysreset/ti,sci-sysreset.txt | 29 ------------------- > 18 files changed, 119 deletions(-) > delete mode 100644 doc/device-tree-bindings/sysreset/ti,sci-sysreset.txt > > diff --git a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi > b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi > index cca0f44b7d8..fb2032068d1 100644 > --- a/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi > +++ b/arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi > @@ -41,13 +41,6 @@ > clock-frequency = <25000000>; > }; > > -&dmsc { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > -}; > - > &sd_pins_default { > /* Force to use SDCD card detect pin */ > pinctrl-single,pins = < > diff --git a/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi > b/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi > index f6138f3058f..94162282068 100644 > --- a/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am625-phyboard-lyra-rdk-u-boot.dtsi > @@ -42,13 +42,6 @@ > bootph-all; > }; > > -&dmsc { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > -}; > - > &fss { > bootph-all; > }; > diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi > b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi > index 28b697b67ae..7fe7ae41543 100644 > --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi > +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-u-boot.dtsi > @@ -85,13 +85,6 @@ > bootph-all; > }; > > -&dmsc { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > -}; > - > &fss { > bootph-all; > }; > diff --git a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi > b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi > index 31b89b41748..c42dec16194 100644 > --- a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi > @@ -119,10 +119,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &vdd_mmc1 { > diff --git a/arch/arm/dts/k3-am62p5-sk-u-boot.dtsi > b/arch/arm/dts/k3-am62p5-sk-u-boot.dtsi > index c166d655390..cf087c6e343 100644 > --- a/arch/arm/dts/k3-am62p5-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am62p5-sk-u-boot.dtsi > @@ -15,9 +15,4 @@ > > &dmsc { > bootph-pre-ram; > - > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-pre-ram; > - }; > }; > diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi > b/arch/arm/dts/k3-am642-evm-u-boot.dtsi > index ee6656774d6..705b3baa81c 100644 > --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi > +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi > @@ -23,13 +23,6 @@ > bootph-all; > }; > > -&dmsc { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > -}; > - > &sdhci0 { > bootph-all; > }; > diff --git a/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi > b/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi > index 5dfc40a843b..4677c35e2d9 100644 > --- a/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am642-phyboard-electra-rdk-u-boot.dtsi > @@ -29,10 +29,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &dmss { > diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi > b/arch/arm/dts/k3-am642-sk-u-boot.dtsi > index 7e6b2981346..6fcb11bd04d 100644 > --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi > @@ -15,13 +15,6 @@ > clock-frequency = <200000000>; > }; > > -&dmsc { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > -}; > - > &sdhci0 { > status = "disabled"; > }; > diff --git a/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi > b/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi > index d53f133cd63..b6d2c816acc 100644 > --- a/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi > +++ b/arch/arm/dts/k3-am65-iot2050-common-u-boot.dtsi > @@ -99,10 +99,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &k3_pds { > diff --git a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > index 4f34347586e..b8fc62f0dd1 100644 > --- a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > +++ b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi > @@ -51,10 +51,6 @@ > > &sms { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &main_pmx0 { > diff --git a/arch/arm/dts/k3-am69-sk-u-boot.dtsi > b/arch/arm/dts/k3-am69-sk-u-boot.dtsi > index bed330e6d4e..4a82d2fd222 100644 > --- a/arch/arm/dts/k3-am69-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-am69-sk-u-boot.dtsi > @@ -23,13 +23,6 @@ > bootph-pre-ram; > }; > > -&sms { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-pre-ram; > - }; > -}; > - > #ifdef CONFIG_TARGET_J784S4_A72_EVM > > #define SPL_AM69_SK_DTB "spl/dts/ti/k3-am69-sk.dtb" > diff --git a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi > b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi > index c9fee0ea99b..485f17c5f06 100644 > --- a/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi > +++ b/arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi > @@ -57,10 +57,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &k3_pds { > diff --git a/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi > b/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi > index 116ee373118..e202ae16644 100644 > --- a/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi > +++ b/arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi > @@ -92,10 +92,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &k3_pds { > diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi > b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi > index 9433f3bafae..aa919b40702 100644 > --- a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi > +++ b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi > @@ -47,10 +47,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &k3_pds { > diff --git a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi > b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi > index 8b205553cdf..8f4f944263e 100644 > --- a/arch/arm/dts/k3-j721e-sk-u-boot.dtsi > +++ b/arch/arm/dts/k3-j721e-sk-u-boot.dtsi > @@ -47,10 +47,6 @@ > > &dmsc { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &k3_pds { > diff --git a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi > b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi > index a3ebf5996ea..19b2d48c7f8 100644 > --- a/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi > +++ b/arch/arm/dts/k3-j721s2-common-proc-board-u-boot.dtsi > @@ -51,10 +51,6 @@ > > &sms { > bootph-all; > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-all; > - }; > }; > > &main_pmx0 { > diff --git a/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi > b/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi > index ac749782bfc..8f0307321e8 100644 > --- a/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi > +++ b/arch/arm/dts/k3-j784s4-evm-u-boot.dtsi > @@ -22,10 +22,3 @@ > "tchanrt", "rflow"; > bootph-pre-ram; > }; > - > -&sms { > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - bootph-pre-ram; > - }; > -}; > diff --git a/doc/device-tree-bindings/sysreset/ti,sci-sysreset.txt > b/doc/device-tree-bindings/sysreset/ti,sci-sysreset.txt > deleted file mode 100644 > index 02704c6487e..00000000000 > --- a/doc/device-tree-bindings/sysreset/ti,sci-sysreset.txt > +++ /dev/null > @@ -1,29 +0,0 @@ > -Texas Instruments TI SCI System Reset Controller > -================================================ > - > -Some TI SoCs contain a system controller (like the SYSFW, etc...) that is > -responsible for controlling the state of the IPs that are present. > -Communication between the host processor running an OS and the system > -controller happens through a protocol known as TI SCI [1]. > - > -[1] http://processors.wiki.ti.com/index.php/TISCI > - > -System Reset Controller Node > -============================ > -The sysreset controller node represents the reset for the overall SoC > -which is managed by the SYSFW. Because this relies on the TI SCI protocol > -to communicate with the SYSFW it must be a child of the sysfw node. > - > -Required Properties: > --------------------- > - - compatible: Must be "ti,sci-sysreset" > - > -Example (AM65x): > ----------------- > - sysfw: sysfw { > - compatible = "ti,am654-system-controller"; > - ... > - k3_sysreset: sysreset-controller { > - compatible = "ti,sci-sysreset"; > - }; > - }; > -- > 2.39.2
Tested-by: Jonathan Humphreys <j-humphr...@ti.com>