diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-05-02 15:08:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-05-02 15:08:02 +0200 |
| commit | 832cf6e176430b948fdb07922091275ea1d209a7 (patch) | |
| tree | 498bca16feedf02e36bd937c54684c488cf4fd50 | |
| parent | 0ea32f50b36fd0372b3232db85d340294d7f0a8a (diff) | |
| parent | 60242b20fe784ef9142050be8b68bd85e94be557 (diff) | |
| download | linux-832cf6e176430b948fdb07922091275ea1d209a7.tar.gz | |
Merge tag 'ti-keystone-dt-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt
Keystone2 device tree updates for v6.10
Generic Cleanups/Fixes:
- Remove custom ti,system-reboot-controller property
* tag 'ti-keystone-dt-for-v6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
dt-bindings: arm: keystone: Remove ti,system-reboot-controller property
ARM: dts: ti: keystone: k2g: Remove ti,system-reboot-controller property
Link: https://lore.kernel.org/r/20240501124309.3cj5b3gjf3cpimut@outsell
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml b/Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml index c24ad0968f3ef1..7f06b108024491 100644 --- a/Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml +++ b/Documentation/devicetree/bindings/arm/keystone/ti,sci.yaml @@ -61,10 +61,6 @@ properties: mboxes: minItems: 2 - ti,system-reboot-controller: - description: Determines If system reboot can be triggered by SoC reboot - type: boolean - ti,host-id: $ref: /schemas/types.yaml#/definitions/uint32 description: | @@ -94,7 +90,6 @@ examples: - | pmmc: system-controller@2921800 { compatible = "ti,k2g-sci"; - ti,system-reboot-controller; mbox-names = "rx", "tx"; mboxes = <&msgmgr 5 2>, <&msgmgr 0 0>; diff --git a/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi b/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi index 790b29ab0fa2cd..dafe485dfe197f 100644 --- a/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi +++ b/arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi @@ -256,11 +256,6 @@ pmmc: system-controller@2921c00 { compatible = "ti,k2g-sci"; - /* - * In case of rare platforms that does not use k2g as - * system master, use /delete-property/ - */ - ti,system-reboot-controller; mbox-names = "rx", "tx"; mboxes = <&msgmgr 5 2>, <&msgmgr 0 0>; |