-
Notifications
You must be signed in to change notification settings - Fork 78
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
linux-iot2050: Update to v6.1.54-cip6[-rt3] #491
Merged
+7,902
−32,293
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
linux-iot2050: Update to v6.1.54-cip6[-rt3]
Move PRUETH driver from module to built-in in order to avoid a probing race condition. CONFIG_FB is no longer auto-selected. Enable it to preserve framebuffer support. CONFIG_PWM needs to be explicitly enabled with the newer kernel. Finally, CONFIG_RT_GROUP_SCHED must be disabled for the RT kernel as it is officially incompatible and breaks requesting RT scheduling policies. Signed-off-by: Diogo Ivo <diogo.ivo@siemens.com> [Jan: add phys_port_name icssg-prueth patch, fix defconfig] Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
commit 0572b2d8e7e59121ab05243d6d39860eac80890e
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
...s-kernel/linux/files/patches-6.1/0001-arm64-dts-ti-iot2050-Add-layout-of-OSPI-flash.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jan Kiszka <jan.kiszka@siemens.com> | ||
Date: Thu, 19 Jan 2023 07:40:40 +0100 | ||
Subject: [PATCH] arm64: dts: ti: iot2050: Add layout of OSPI flash | ||
|
||
Describe the layout of the OSPI flash as the latest firmware uses it. | ||
Specifically the location of the U-Boot envs is important for userspace | ||
in order to access it. | ||
|
||
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> | ||
[Commit 12f0158f3e98 upstream] | ||
--- | ||
.../boot/dts/ti/k3-am65-iot2050-common.dtsi | 46 +++++++++++++++++++ | ||
1 file changed, 46 insertions(+) | ||
|
||
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | ||
index 32b797237581..180bfb2a9ddf 100644 | ||
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | ||
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | ||
@@ -603,6 +603,52 @@ flash@0 { | ||
cdns,tchsh-ns = <60>; | ||
cdns,tslch-ns = <60>; | ||
cdns,read-delay = <2>; | ||
+ | ||
+ partitions { | ||
+ compatible = "fixed-partitions"; | ||
+ #address-cells = <1>; | ||
+ #size-cells = <1>; | ||
+ | ||
+ seboot@0 { | ||
+ label = "seboot"; | ||
+ reg = <0x0 0x180000>; /* 1.5M */ | ||
+ }; | ||
+ | ||
+ tispl@180000 { | ||
+ label = "tispl"; | ||
+ reg = <0x180000 0x200000>; /* 2M */ | ||
+ }; | ||
+ | ||
+ u-boot@380000 { | ||
+ label = "u-boot"; | ||
+ reg = <0x380000 0x300000>; /* 3M */ | ||
+ }; | ||
+ | ||
+ env@680000 { | ||
+ label = "env"; | ||
+ reg = <0x680000 0x20000>; /* 128K */ | ||
+ }; | ||
+ | ||
+ env-backup@6a0000 { | ||
+ label = "env.backup"; | ||
+ reg = <0x6a0000 0x20000>; /* 128K */ | ||
+ }; | ||
+ | ||
+ otpcmd@6c0000 { | ||
+ label = "otpcmd"; | ||
+ reg = <0x6c0000 0x10000>; /* 64K */ | ||
+ }; | ||
+ | ||
+ unused@6d0000 { | ||
+ label = "unused"; | ||
+ reg = <0x6d0000 0x7b0000>; /* 7872K */ | ||
+ }; | ||
+ | ||
+ seboot-backup@e80000 { | ||
+ label = "seboot.backup"; | ||
+ reg = <0xe80000 0x180000>; /* 1.5M */ | ||
+ }; | ||
+ }; | ||
}; | ||
}; | ||
|
28 changes: 28 additions & 0 deletions
28
...l/linux/files/patches-6.1/0002-dt-bindings-arm-ti-Add-binding-for-Siemens-IOT2050-M.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Jan Kiszka <jan.kiszka@siemens.com> | ||
Date: Thu, 19 Jan 2023 07:40:41 +0100 | ||
Subject: [PATCH] dt-bindings: arm: ti: Add binding for Siemens IOT2050 M.2 | ||
variant | ||
|
||
This new variant is derived from the Advanced PG2 board, replacing the | ||
MiniPCI slot with B and E-keyed M.2 slots. | ||
|
||
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> | ||
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | ||
[Commit 31170b8c028f upstream] | ||
--- | ||
Documentation/devicetree/bindings/arm/ti/k3.yaml | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/Documentation/devicetree/bindings/arm/ti/k3.yaml b/Documentation/devicetree/bindings/arm/ti/k3.yaml | ||
index 28b8232e1c5b..d16231bdee6e 100644 | ||
--- a/Documentation/devicetree/bindings/arm/ti/k3.yaml | ||
+++ b/Documentation/devicetree/bindings/arm/ti/k3.yaml | ||
@@ -42,6 +42,7 @@ properties: | ||
items: | ||
- enum: | ||
- siemens,iot2050-advanced | ||
+ - siemens,iot2050-advanced-m2 | ||
- siemens,iot2050-advanced-pg2 | ||
- siemens,iot2050-basic | ||
- siemens,iot2050-basic-pg2 |
166 changes: 166 additions & 0 deletions
166
...ernel/linux/files/patches-6.1/0003-arm64-dts-ti-iot2050-Add-support-for-M.2-variant.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,166 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: chao zeng <chao.zeng@siemens.com> | ||
Date: Thu, 19 Jan 2023 07:40:42 +0100 | ||
Subject: [PATCH] arm64: dts: ti: iot2050: Add support for M.2 variant | ||
|
||
The M.2 variant comes with 2 slots, one B-keyed and another one E-keyed. | ||
They are configured by the firmware during startup. Also the device tree | ||
will be adjusted according to the detect or manually configured | ||
interface mode by the firmware. The kernel only carries a single | ||
configuration as base device tree. It has to be built with a symbols | ||
node so that the firmware can apply overlays for the connector modes. | ||
|
||
Signed-off-by: chao zeng <chao.zeng@siemens.com> | ||
[Jan: refactored to a single DT] | ||
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> | ||
Reviewed-by: Siddharth Vadapalli <s-vadapalli@ti.com> | ||
[Commit 175357d1deed upstream] | ||
--- | ||
arch/arm64/boot/dts/ti/Makefile | 3 + | ||
.../dts/ti/k3-am6548-iot2050-advanced-m2.dts | 121 ++++++++++++++++++ | ||
2 files changed, 124 insertions(+) | ||
create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | ||
|
||
diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile | ||
index 4555a5be2257..efdd3bb1e263 100644 | ||
--- a/arch/arm64/boot/dts/ti/Makefile | ||
+++ b/arch/arm64/boot/dts/ti/Makefile | ||
@@ -10,8 +10,11 @@ dtb-$(CONFIG_ARCH_K3) += k3-am654-base-board.dtb | ||
dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic.dtb | ||
dtb-$(CONFIG_ARCH_K3) += k3-am6528-iot2050-basic-pg2.dtb | ||
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced.dtb | ||
+dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-m2.dtb | ||
dtb-$(CONFIG_ARCH_K3) += k3-am6548-iot2050-advanced-pg2.dtb | ||
|
||
+DTC_FLAGS_k3-am6548-iot2050-advanced-m2 += -@ | ||
+ | ||
dtb-$(CONFIG_ARCH_K3) += k3-j721e-common-proc-board.dtb | ||
dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb | ||
|
||
diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | ||
new file mode 100644 | ||
index 000000000000..9400e35882a6 | ||
--- /dev/null | ||
+++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | ||
@@ -0,0 +1,121 @@ | ||
+// SPDX-License-Identifier: GPL-2.0 | ||
+/* | ||
+ * Copyright (c) Siemens AG, 2018-2023 | ||
+ * | ||
+ * Authors: | ||
+ * Chao Zeng <chao.zeng@siemens.com> | ||
+ * Jan Kiszka <jan.kiszka@siemens.com> | ||
+ * | ||
+ * AM6548-based (quad-core) IOT2050 M.2 variant (based on Advanced Product | ||
+ * Generation 2), 2 GB RAM, 16 GB eMMC, USB-serial converter on connector X30 | ||
+ * | ||
+ * Product homepage: | ||
+ * https://new.siemens.com/global/en/products/automation/pc-based/iot-gateways/simatic-iot2050.html | ||
+ */ | ||
+ | ||
+#include "k3-am6548-iot2050-advanced-common.dtsi" | ||
+#include "k3-am65-iot2050-common-pg2.dtsi" | ||
+ | ||
+/ { | ||
+ compatible = "siemens,iot2050-advanced-m2", "ti,am654"; | ||
+ model = "SIMATIC IOT2050 Advanced M2"; | ||
+}; | ||
+ | ||
+&mcu_r5fss0 { | ||
+ /* lock-step mode not supported on this board */ | ||
+ ti,cluster-mode = <0>; | ||
+}; | ||
+ | ||
+&main_pmx0 { | ||
+ main_m2_enable_pins_default: main-m2-enable-pins-default { | ||
+ pinctrl-single,pins = < | ||
+ AM65X_IOPAD(0x01c4, PIN_INPUT_PULLUP, 7) /* (AH13) GPIO1_17 */ | ||
+ >; | ||
+ }; | ||
+ | ||
+ main_bkey_pcie_reset: main-bkey-pcie-reset { | ||
+ pinctrl-single,pins = < | ||
+ AM65X_IOPAD(0x01bc, PIN_OUTPUT_PULLUP, 7) /* (AG13) GPIO1_15 */ | ||
+ >; | ||
+ }; | ||
+ | ||
+ main_pmx0_m2_config_pins_default: main-pmx0-m2-config-pins-default { | ||
+ pinctrl-single,pins = < | ||
+ AM65X_IOPAD(0x01c8, PIN_INPUT_PULLUP, 7) /* (AE13) GPIO1_18 */ | ||
+ AM65X_IOPAD(0x01cc, PIN_INPUT_PULLUP, 7) /* (AD13) GPIO1_19 */ | ||
+ >; | ||
+ }; | ||
+ | ||
+ main_m2_pcie_mux_control: main-m2-pcie-mux-control { | ||
+ pinctrl-single,pins = < | ||
+ AM65X_IOPAD(0x0148, PIN_INPUT_PULLUP, 7) /* (AG22) GPIO0_82 */ | ||
+ AM65X_IOPAD(0x0160, PIN_INPUT_PULLUP, 7) /* (AE20) GPIO0_88 */ | ||
+ AM65X_IOPAD(0x0164, PIN_INPUT_PULLUP, 7) /* (AF19) GPIO0_89 */ | ||
+ >; | ||
+ }; | ||
+}; | ||
+ | ||
+&main_pmx1 { | ||
+ main_pmx1_m2_config_pins_default: main-pmx1-m2-config-pins-default { | ||
+ pinctrl-single,pins = < | ||
+ AM65X_IOPAD(0x0018, PIN_INPUT_PULLUP, 7) /* (B22) GPIO1_88 */ | ||
+ AM65X_IOPAD(0x001c, PIN_INPUT_PULLUP, 7) /* (C23) GPIO1_89 */ | ||
+ >; | ||
+ }; | ||
+}; | ||
+ | ||
+&main_gpio0 { | ||
+ pinctrl-names = "default"; | ||
+ pinctrl-0 = < | ||
+ &main_m2_pcie_mux_control | ||
+ &arduino_io_d4_to_d9_pins_default | ||
+ >; | ||
+}; | ||
+ | ||
+&main_gpio1 { | ||
+ pinctrl-names = "default"; | ||
+ pinctrl-0 = < | ||
+ &main_m2_enable_pins_default | ||
+ &main_pmx0_m2_config_pins_default | ||
+ &main_pmx1_m2_config_pins_default | ||
+ &cp2102n_reset_pin_default | ||
+ >; | ||
+}; | ||
+ | ||
+/* | ||
+ * Base configuration for B-key slot with PCIe x2, E-key with USB 2.0 only. | ||
+ * Firmware switches to other modes via device tree overlays. | ||
+ */ | ||
+ | ||
+&serdes0 { | ||
+ assigned-clocks = <&k3_clks 153 4>, <&serdes0 AM654_SERDES_CMU_REFCLK>; | ||
+ assigned-clock-parents = <&k3_clks 153 8>, <&k3_clks 153 4>; | ||
+}; | ||
+ | ||
+&pcie0_rc { | ||
+ pinctrl-names = "default"; | ||
+ pinctrl-0 = <&main_bkey_pcie_reset>; | ||
+ | ||
+ num-lanes = <2>; | ||
+ phys = <&serdes0 PHY_TYPE_PCIE 1>, <&serdes1 PHY_TYPE_PCIE 1>; | ||
+ phy-names = "pcie-phy0","pcie-phy1"; | ||
+ reset-gpios = <&main_gpio1 15 GPIO_ACTIVE_HIGH>; | ||
+ status = "okay"; | ||
+}; | ||
+ | ||
+&pcie1_rc { | ||
+ status = "disabled"; | ||
+}; | ||
+ | ||
+&dwc3_0 { | ||
+ assigned-clock-parents = <&k3_clks 151 4>, /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ | ||
+ <&k3_clks 151 9>; /* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */ | ||
+ /delete-property/ phys; | ||
+ /delete-property/ phy-names; | ||
+}; | ||
+ | ||
+&usb0 { | ||
+ maximum-speed = "high-speed"; | ||
+ /delete-property/ snps,dis-u1-entry-quirk; | ||
+ /delete-property/ snps,dis-u2-entry-quirk; | ||
+}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two seems used.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CONFIG_PWM=y
now needed.