Skip to content
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.

Sign up for GitHub

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, mraa: Update kernel patches to latest upstream queue #504

Merged
merged 2 commits into from
Nov 14, 2023
Merged

linux-iot2050, mraa: Update kernel patches to latest upstream queue #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f56157
linux-iot2050, mraa: Update kernel patches to latest upstream queue
jan-kiszka Nov 6, 2023
e9bbd26
linux-iot2050: Add two fixes for icssg-prueth
jan-kiszka Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion recipes-app/mraa/files/0001-gpio-Fix-JS-binding-regarding-interrupt-injections.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Jan Kiszka <[email protected]>
1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/api/mraa/gpio.hpp b/api/mraa/gpio.hpp
index 8fc0881..c41d527 100644
index 8fc08816217f..c41d52759376 100644
--- a/api/mraa/gpio.hpp
+++ b/api/mraa/gpio.hpp
@@ -31,10 +31,10 @@
Expand Down
63 changes: 32 additions & 31 deletions recipes-app/mraa/files/0003-iot2050-add-debugfs-pinmux-support.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ Note: In case debugfs mux fails MRAA falls back to mmap mux.

Signed-off-by: Benedikt Niedermayr <[email protected]>
---
src/arm/siemens/iot2050.c | 547 ++++++++++++++++++++++++++++++++++++-
src/arm/siemens/iot2050.c | 548 ++++++++++++++++++++++++++++++++++++-
src/arm/siemens/platform.c | 4 +-
2 files changed, 540 insertions(+), 11 deletions(-)
2 files changed, 541 insertions(+), 11 deletions(-)

diff --git a/src/arm/siemens/iot2050.c b/src/arm/siemens/iot2050.c
index cec25faf0547..c63400d6b692 100644
index cec25faf0547..c741875a2376 100644
--- a/src/arm/siemens/iot2050.c
+++ b/src/arm/siemens/iot2050.c
@@ -24,6 +24,7 @@
Expand All @@ -43,7 +43,7 @@ index cec25faf0547..c63400d6b692 100644
}regmux_info_t;

static void *pinmux_instance = NULL;
@@ -75,30 +79,126 @@ iot2050_get_regmux_by_pinmap(int pinmap)
@@ -75,30 +79,127 @@ iot2050_get_regmux_by_pinmap(int pinmap)
return NULL;
}

Expand Down Expand Up @@ -76,13 +76,14 @@ index cec25faf0547..c63400d6b692 100644
+
+ switch (gpio_mode) {
+ case MRAA_GPIO_PULLUP:
+ snprintf(mux, MRAA_PIN_NAME_SIZE, "%s-%s", group, "pullup");
+ snprintf(mux, MRAA_PIN_NAME_SIZE, "%s-%s-pins", group, "pullup");
+ break;
+ case MRAA_GPIO_PULLDOWN:
+ snprintf(mux, MRAA_PIN_NAME_SIZE, "%s-%s", group, "pulldown");
+ snprintf(mux, MRAA_PIN_NAME_SIZE, "%s-%s-pins", group, "pulldown");
+ break;
+ default:
+ strncpy(mux, group, MRAA_PIN_NAME_SIZE);
+ snprintf(mux, MRAA_PIN_NAME_SIZE, "%s-pins", group);
+ break;
+ }
+
+ syslog(LOG_DEBUG, "iot2050: debugfs: group: %s, function: %s\n", mux, mux);
Expand Down Expand Up @@ -176,7 +177,7 @@ index cec25faf0547..c63400d6b692 100644
}

static mraa_result_t
@@ -172,7 +272,10 @@ iot2050_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode)
@@ -172,7 +273,10 @@ iot2050_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode)
goto failed;
}
if(info) {
Expand All @@ -188,7 +189,7 @@ index cec25faf0547..c63400d6b692 100644
}
break;
case MRAA_GPIO_PULLDOWN:
@@ -181,7 +284,9 @@ iot2050_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode)
@@ -181,7 +285,9 @@ iot2050_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode)
goto failed;
}
if(info) {
Expand All @@ -199,7 +200,7 @@ index cec25faf0547..c63400d6b692 100644
}
break;
case MRAA_GPIO_HIZ:
@@ -191,7 +296,9 @@ iot2050_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode)
@@ -191,7 +297,9 @@ iot2050_gpio_mode_replace(mraa_gpio_context dev, mraa_gpio_mode_t mode)
goto failed;
}
if(info) {
Expand All @@ -210,7 +211,7 @@ index cec25faf0547..c63400d6b692 100644
}
break;
case MRAA_GPIOD_ACTIVE_LOW:
@@ -455,7 +562,7 @@ mraa_siemens_iot2050()
@@ -455,7 +563,7 @@ mraa_siemens_iot2050()
free(b->adv_func);
goto error;
}
Expand All @@ -219,7 +220,7 @@ index cec25faf0547..c63400d6b692 100644
/* IO */
iot2050_setup_pins(b, pin_index, "IO0",
(mraa_pincapabilities_t) {
@@ -477,6 +584,27 @@ mraa_siemens_iot2050()
@@ -477,6 +585,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -247,7 +248,7 @@ index cec25faf0547..c63400d6b692 100644
}
});

@@ -510,6 +638,27 @@ mraa_siemens_iot2050()
@@ -510,6 +639,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -275,7 +276,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 30, d4201_gpio_base+1, d4202_gpio_base+1, NULL, 0);
@@ -542,6 +691,27 @@ mraa_siemens_iot2050()
@@ -542,6 +692,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -303,7 +304,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 31, d4201_gpio_base+2, d4202_gpio_base+2, NULL, 0);
@@ -574,6 +744,27 @@ mraa_siemens_iot2050()
@@ -574,6 +745,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -331,7 +332,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 33, d4201_gpio_base+3, d4202_gpio_base+3, NULL, 0);
@@ -606,6 +797,27 @@ mraa_siemens_iot2050()
@@ -606,6 +798,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
5 /*PWM*/
Expand Down Expand Up @@ -359,7 +360,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, main_gpio0_chip, 33, d4201_gpio_base+4, d4202_gpio_base+4, NULL, 0);
@@ -638,6 +850,27 @@ mraa_siemens_iot2050()
@@ -638,6 +851,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
5 /*PWM*/
Expand Down Expand Up @@ -387,7 +388,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, main_gpio0_chip, 35, d4201_gpio_base+5, d4202_gpio_base+5, NULL, 0);
@@ -670,6 +903,27 @@ mraa_siemens_iot2050()
@@ -670,6 +904,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
5 /*PWM*/
Expand Down Expand Up @@ -415,7 +416,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, main_gpio0_chip, 38, d4201_gpio_base+6, d4202_gpio_base+6, NULL, 0);
@@ -702,6 +956,27 @@ mraa_siemens_iot2050()
@@ -702,6 +957,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
5 /*PWM*/
Expand Down Expand Up @@ -443,7 +444,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, main_gpio0_chip, 43, d4201_gpio_base+7, d4202_gpio_base+7, NULL, 0);
@@ -734,6 +1009,27 @@ mraa_siemens_iot2050()
@@ -734,6 +1010,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
5 /*PWM*/
Expand Down Expand Up @@ -471,7 +472,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, main_gpio0_chip, 48, d4201_gpio_base+8, d4202_gpio_base+8, NULL, 0);
@@ -766,6 +1062,27 @@ mraa_siemens_iot2050()
@@ -766,6 +1063,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
5 /*PWM*/
Expand Down Expand Up @@ -499,7 +500,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, main_gpio0_chip, 51, d4201_gpio_base+9, d4202_gpio_base+9, NULL, 0);
@@ -798,6 +1115,27 @@ mraa_siemens_iot2050()
@@ -798,6 +1116,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
0, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -527,7 +528,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 51, d4201_gpio_base+10, d4202_gpio_base+10, NULL, 0);
@@ -830,6 +1168,27 @@ mraa_siemens_iot2050()
@@ -830,6 +1169,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
0, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -555,7 +556,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 49, d4201_gpio_base+11, d4202_gpio_base+11, NULL, 0);
@@ -862,6 +1221,27 @@ mraa_siemens_iot2050()
@@ -862,6 +1222,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
0, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -583,7 +584,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 50, d4201_gpio_base+12, d4202_gpio_base+12, NULL, 0);
@@ -894,6 +1274,27 @@ mraa_siemens_iot2050()
@@ -894,6 +1275,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
0, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -611,7 +612,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
iot2050_pin_add_gpio(b, pin_index, wkup_gpio0_chip, 48, d4201_gpio_base+13, d4202_gpio_base+13, NULL, 0);
@@ -926,6 +1327,27 @@ mraa_siemens_iot2050()
@@ -926,6 +1328,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -639,7 +640,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
mux_info[0].pin = d4200_gpio_base+8;
@@ -971,6 +1393,27 @@ mraa_siemens_iot2050()
@@ -971,6 +1394,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -667,7 +668,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
mux_info[0].pin = d4200_gpio_base+9;
@@ -1016,6 +1459,27 @@ mraa_siemens_iot2050()
@@ -1016,6 +1460,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -695,7 +696,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
mux_info[0].pin = d4200_gpio_base+10;
@@ -1061,6 +1525,27 @@ mraa_siemens_iot2050()
@@ -1061,6 +1526,27 @@ mraa_siemens_iot2050()
-1, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -723,7 +724,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
mux_info[0].pin = d4200_gpio_base+11;
@@ -1106,6 +1591,27 @@ mraa_siemens_iot2050()
@@ -1106,6 +1592,27 @@ mraa_siemens_iot2050()
0, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down Expand Up @@ -751,7 +752,7 @@ index cec25faf0547..c63400d6b692 100644
}
});
mux_info[0].pin = d4200_gpio_base+12;
@@ -1169,6 +1675,27 @@ mraa_siemens_iot2050()
@@ -1169,6 +1676,27 @@ mraa_siemens_iot2050()
0, /*I2C*/
-1, /*SPI*/
-1 /*PWM*/
Expand Down
48 changes: 48 additions & 0 deletions recipes-kernel/linux/files/patches-6.1/0004-arm64-dts-ti-k3-am65-Drop-bootargs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <[email protected]>
Date: Wed, 19 Apr 2023 09:12:19 -0500
Subject: [PATCH] arm64: dts: ti: k3-am65*: Drop bootargs

Drop bootargs from the dts. earlycon is a debug property that should be
enabled only when debug is desired and not as default - see referenced
link on discussion on this topic.

Cc: Jan Kiszka <[email protected]>
Link: https://lore.kernel.org/linux-arm-kernel/[email protected]/
Suggested-by: Krzysztof Kozlowski <[email protected]>
Acked-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Roger Quadros <[email protected]>
Signed-off-by: Nishanth Menon <[email protected]>
Acked-by: Jan Kiszka <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Vignesh Raghavendra <[email protected]>
[Commit da4159a77659 upstream]
---
arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 1 -
arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 -
2 files changed, 2 deletions(-)

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 180bfb2a9ddf..9c936b7532b5 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -21,7 +21,6 @@ aliases {

chosen {
stdout-path = "serial3:115200n8";
- bootargs = "earlycon=ns16550a,mmio32,0x02810000";
};

reserved-memory {
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 5850582dd4ed..4444bf0fbca4 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -15,7 +15,6 @@ / {

chosen {
stdout-path = "serial2:115200n8";
- bootargs = "earlycon=ns16550a,mmio32,0x02800000";
};

memory@80000000 {
Loading