Skip to content

Commit 0fbe29e

Browse files
shubhanshumt26shubhanshumt26
committed
Merge tag 'v6.12.74-rt16' into nilrt/master/6.12
v6.12.74-rt16 Signed-off-by: Shubhanshu Mani Tripathi <shubhanshu.mani.tripathi@emerson.com>
2 parents 8a24fcd + 12302ee commit 0fbe29e

589 files changed

Lines changed: 6024 additions & 2742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/devicetree/bindings/power/qcom,rpmpd.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ properties:
5858
- qcom,sm8450-rpmhpd
5959
- qcom,sm8550-rpmhpd
6060
- qcom,sm8650-rpmhpd
61+
- qcom,sm8750-rpmhpd
6162
- qcom,x1e80100-rpmhpd
6263
- items:
6364
- enum:

‎Documentation/driver-api/gpio/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Core
2727
ACPI support
2828
============
2929

30-
.. kernel-doc:: drivers/gpio/gpiolib-acpi.c
30+
.. kernel-doc:: drivers/gpio/gpiolib-acpi-core.c
3131
:export:
3232

3333
Device tree support

‎Documentation/netlink/specs/fou.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ attribute-sets:
3939
-
4040
name: ipproto
4141
type: u8
42+
checks:
43+
min: 1
4244
-
4345
name: type
4446
type: u8

‎Documentation/translations/zh_CN/driver-api/gpio/index.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ ACPI支持
4242

4343
该API在以下内核代码中:
4444

45-
drivers/gpio/gpiolib-acpi.c
45+
drivers/gpio/gpiolib-acpi-core.c
4646

4747
设备树支持
4848
==========

‎MAINTAINERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9680,7 +9680,7 @@ L: linux-acpi@vger.kernel.org
96809680
S: Supported
96819681
T: git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git
96829682
F: Documentation/firmware-guide/acpi/gpio-properties.rst
9683-
F: drivers/gpio/gpiolib-acpi.c
9683+
F: drivers/gpio/gpiolib-acpi-*.c
96849684
F: drivers/gpio/gpiolib-acpi.h
96859685

96869686
GPIO AGGREGATOR

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 12
4-
SUBLEVEL = 66
4+
SUBLEVEL = 74
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm/include/asm/string.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,10 @@ static inline void *memset32(uint32_t *p, uint32_t v, __kernel_size_t n)
4242
extern void *__memset64(uint64_t *, uint32_t low, __kernel_size_t, uint32_t hi);
4343
static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n)
4444
{
45-
return __memset64(p, v, n * 8, v >> 32);
45+
if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))
46+
return __memset64(p, v, n * 8, v >> 32);
47+
else
48+
return __memset64(p, v >> 32, n * 8, v);
4649
}
4750

4851
/*

‎arch/arm64/boot/dts/qcom/sc8280xp.dtsi‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5218,8 +5218,12 @@
52185218
clocks = <&rpmhcc RPMH_CXO_CLK>;
52195219
clock-names = "xo";
52205220

5221-
power-domains = <&rpmhpd SC8280XP_NSP>;
5222-
power-domain-names = "nsp";
5221+
power-domains = <&rpmhpd SC8280XP_NSP>,
5222+
<&rpmhpd SC8280XP_CX>,
5223+
<&rpmhpd SC8280XP_MXC>;
5224+
power-domain-names = "nsp",
5225+
"cx",
5226+
"mxc";
52235227

52245228
memory-region = <&pil_nsp0_mem>;
52255229

@@ -5349,8 +5353,12 @@
53495353
clocks = <&rpmhcc RPMH_CXO_CLK>;
53505354
clock-names = "xo";
53515355

5352-
power-domains = <&rpmhpd SC8280XP_NSP>;
5353-
power-domain-names = "nsp";
5356+
power-domains = <&rpmhpd SC8280XP_NSP>,
5357+
<&rpmhpd SC8280XP_CX>,
5358+
<&rpmhpd SC8280XP_MXC>;
5359+
power-domain-names = "nsp",
5360+
"cx",
5361+
"mxc";
53545362

53555363
memory-region = <&pil_nsp1_mem>;
53565364

‎arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@
424424

425425
&pcie0 {
426426
ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
427-
max-link-speed = <2>;
428427
num-lanes = <2>;
429428
pinctrl-names = "default";
430429
status = "okay";

‎arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
};
7474

7575
&pcie0 {
76-
max-link-speed = <1>;
7776
num-lanes = <1>;
7877
vpcie3v3-supply = <&vcc3v3_sys>;
7978
};

0 commit comments

Comments
 (0)