Skip to content
Snippets Groups Projects
Verified Commit c2a9d851 authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

Merge branch 'hotfix/turris-omnia-mcu-driver-compatible' into hbl

parents 9d88d6e8 042850f7
No related branches found
No related tags found
No related merge requests found
Pipeline #118758 passed
Stage: docker
Stage: build
Hide whitespace changes
Inline Side-by-side
patches/openwrt/a-new-kernel-5.15/0019-mvebu-patches-5.15-Backport-Turris-Omnia-MCU-support.patch
+ 17
− 17
View file @ c2a9d851
......@@ -4,7 +4,7 @@ Date: Tue, 17 Oct 2023 11:17:38 +0200
Subject: [PATCH 2/3] mvebu: patches-5.15: Backport Turris Omnia MCU support
---
...m-add-cznic-turris-omnia-mcu-binding.patch | 107 ++
...-add-cznic-turris-omnia-ctrl-binding.patch | 107 ++
...dd-preliminary-support-for-Turris-Om.patch | 706 ++++++++++
...urris-omnia-mcu-Add-support-for-MCU-.patch | 1234 +++++++++++++++++
...urris-omnia-mcu-Add-support-for-powe.patch | 447 ++++++
......@@ -12,7 +12,7 @@ Subject: [PATCH 2/3] mvebu: patches-5.15: Backport Turris Omnia MCU support
...omnia-Add-MCU-system-controller-node.patch | 60 +
...mnia-Add-GPIO-key-node-for-front-but.patch | 45 +
7 files changed, 2860 insertions(+)
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-mcu-binding.patch
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-ctrl-binding.patch
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-2-platform-cznic-Add-preliminary-support-for-Turris-Om.patch
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-3-platform-cznic-turris-omnia-mcu-Add-support-for-MCU-.patch
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-4-platform-cznic-turris-omnia-mcu-Add-support-for-powe.patch
......@@ -20,41 +20,41 @@ Subject: [PATCH 2/3] mvebu: patches-5.15: Backport Turris Omnia MCU support
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-6-ARM-dts-turris-omnia-Add-MCU-system-controller-node.patch
create mode 100644 target/linux/mvebu/patches-5.15/103-v6.7-7-ARM-dts-turris-omnia-Add-GPIO-key-node-for-front-but.patch
diff --git a/target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-mcu-binding.patch b/target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-mcu-binding.patch
diff --git a/target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-ctrl-binding.patch b/target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-ctrl-binding.patch
new file mode 100644
index 0000000000..4567967830
--- /dev/null
+++ b/target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-mcu-binding.patch
+++ b/target/linux/mvebu/patches-5.15/103-v6.7-1-dt-bindings-arm-add-cznic-turris-omnia-ctrl-binding.patch
@@ -0,0 +1,107 @@
+From 4871568e4a89cd90155b0fbea7878983798619b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <kabel@kernel.org>
+Date: Tue, 22 Aug 2023 13:26:38 +0200
+Subject: [PATCH 09/17] dt-bindings: arm: add cznic,turris-omnia-mcu binding
+Subject: [PATCH 09/17] dt-bindings: arm: add cznic,turris-omnia-ctrl binding
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add binding for cznic,turris-omnia-mcu, the device-tree node
+Add binding for cznic,turris-omnia-ctrl, the device-tree node
+representing the system-controller features provided by the MCU on the
+Turris Omnia router.
+
+Signed-off-by: Marek Behún <kabel@kernel.org>
+---
+ .../bindings/arm/cznic,turris-omnia-mcu.yaml | 67 +++++++++++++++++++
+ ...bindings/arm/cznic,turris-omnia-ctrl.yaml | 67 +++++++++++++++++++
+ MAINTAINERS | 1 +
+ 2 files changed, 68 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/arm/cznic,turris-omnia-mcu.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/cznic,turris-omnia-ctrl.yaml
+
+diff --git a/Documentation/devicetree/bindings/arm/cznic,turris-omnia-mcu.yaml b/Documentation/devicetree/bindings/arm/cznic,turris-omnia-mcu.yaml
+diff --git a/Documentation/devicetree/bindings/arm/cznic,turris-omnia-ctrl.yaml b/Documentation/devicetree/bindings/arm/cznic,turris-omnia-ctrl.yaml
+new file mode 100644
+index 000000000000..ea1fd0117bb8
+--- /dev/null
++++ b/Documentation/devicetree/bindings/arm/cznic,turris-omnia-mcu.yaml
++++ b/Documentation/devicetree/bindings/arm/cznic,turris-omnia-ctrl.yaml
+@@ -0,0 +1,67 @@
++# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
++%YAML 1.2
++---
++$id: http://devicetree.org/schemas/arm/cznic,turris-omnia-mcu.yaml#
++$id: http://devicetree.org/schemas/arm/cznic,turris-omnia-ctrl.yaml#
++$schema: http://devicetree.org/meta-schemas/core.yaml#
++
++title: CZ.NIC's Turris Omnia MCU
......@@ -68,7 +68,7 @@ index 0000000000..4567967830
++
++properties:
++ compatible:
++ const: cznic,turris-omnia-mcu
++ const: cznic,turris-omnia-ctrl
++
++ reg:
++ description: MCU I2C slave address
......@@ -105,7 +105,7 @@ index 0000000000..4567967830
++ #size-cells = <0>;
++
++ system-controller@2a {
++ compatible = "cznic,turris-omnia-mcu";
++ compatible = "cznic,turris-omnia-ctrl";
++ reg = <0x2a>;
++
++ interrupt-parent = <&gpio1>;
......@@ -126,7 +126,7 @@ index 0000000000..4567967830
+ F: Documentation/ABI/testing/debugfs-moxtet
+ F: Documentation/ABI/testing/sysfs-bus-moxtet-devices
+ F: Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
++F: Documentation/devicetree/bindings/arm/cznic,turris-omnia-mcu.yaml
++F: Documentation/devicetree/bindings/arm/cznic,turris-omnia-ctrl.yaml
+ F: Documentation/devicetree/bindings/bus/moxtet.txt
+ F: Documentation/devicetree/bindings/firmware/cznic,turris-mox-rwtm.txt
+ F: Documentation/devicetree/bindings/gpio/gpio-moxtet.txt
......@@ -232,7 +232,7 @@ index 0000000000..cbd97c17ed
++F: Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu
+ F: Documentation/ABI/testing/sysfs-bus-moxtet-devices
+ F: Documentation/ABI/testing/sysfs-firmware-turris-mox-rwtm
+ F: Documentation/devicetree/bindings/arm/cznic,turris-omnia-mcu.yaml
+ F: Documentation/devicetree/bindings/arm/cznic,turris-omnia-ctrl.yaml
+@@ -1907,10 +1908,12 @@ F: drivers/firmware/turris-mox-rwtm.c
+ F: drivers/leds/leds-turris-omnia.c
+ F: drivers/mailbox/armada-37xx-rwtm-mailbox.c
......@@ -553,7 +553,7 @@ index 0000000000..cbd97c17ed
++}
++
++static const struct of_device_id of_omnia_mcu_match[] = {
++ { .compatible = "cznic,turris-omnia-mcu" },
++ { .compatible = "cznic,turris-omnia-ctrl" },
++ {}
++};
++
......@@ -2838,7 +2838,7 @@ index 0000000000..a5dc650f7b
+
+- /* STM32F0 command interface at address 0x2a */
++ mcu: system-controller@2a {
++ compatible = "cznic,turris-omnia-mcu";
++ compatible = "cznic,turris-omnia-ctrl";
++ reg = <0x2a>;
++
++ pinctrl-names = "default";
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment