Skip to content

Commit d555d73

Browse files
sgaud-quicsgaud-quic
authored
Merge pull request #319 from svankas/6.18.12-lts
Merge tag 'v6.18.12' into qcom-6.18.y
2 parents 1cefa86 + 14f84d9 commit d555d73

639 files changed

Lines changed: 5812 additions & 2912 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/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

‎Makefile‎

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

@@ -1590,7 +1590,8 @@ MRPROPER_FILES += include/config include/generated \
15901590
certs/x509.genkey \
15911591
vmlinux-gdb.py \
15921592
rpmbuild \
1593-
rust/libmacros.so rust/libmacros.dylib
1593+
rust/libmacros.so rust/libmacros.dylib \
1594+
rust/libpin_init_internal.so rust/libpin_init_internal.dylib
15941595

15951596
# clean - Delete most, but leave enough to build external modules
15961597
#

‎arch/arm/boot/dts/microchip/sama7d65.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@
527527
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
528528
clocks = <&pmc PMC_TYPE_PERIPHERAL 37>;
529529
#address-cells = <1>;
530-
#size-cells = <1>;
530+
#size-cells = <0>;
531531
dmas = <&dma0 AT91_XDMAC_DT_PERID(12)>,
532532
<&dma0 AT91_XDMAC_DT_PERID(11)>;
533533
dma-names = "tx", "rx";
@@ -676,7 +676,7 @@
676676
flx9: flexcom@e2820000 {
677677
compatible = "microchip,sama7d65-flexcom", "atmel,sama5d2-flexcom";
678678
reg = <0xe2820000 0x200>;
679-
ranges = <0x0 0xe281c000 0x800>;
679+
ranges = <0x0 0xe2820000 0x800>;
680680
clocks = <&pmc PMC_TYPE_PERIPHERAL 43>;
681681
#address-cells = <1>;
682682
#size-cells = <1>;

‎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
@@ -5773,8 +5773,12 @@
57735773
clocks = <&rpmhcc RPMH_CXO_CLK>;
57745774
clock-names = "xo";
57755775

5776-
power-domains = <&rpmhpd SC8280XP_NSP>;
5777-
power-domain-names = "nsp";
5776+
power-domains = <&rpmhpd SC8280XP_NSP>,
5777+
<&rpmhpd SC8280XP_CX>,
5778+
<&rpmhpd SC8280XP_MXC>;
5779+
power-domain-names = "nsp",
5780+
"cx",
5781+
"mxc";
57785782

57795783
memory-region = <&pil_nsp0_mem>;
57805784

@@ -5904,8 +5908,12 @@
59045908
clocks = <&rpmhcc RPMH_CXO_CLK>;
59055909
clock-names = "xo";
59065910

5907-
power-domains = <&rpmhpd SC8280XP_NSP>;
5908-
power-domain-names = "nsp";
5911+
power-domains = <&rpmhpd SC8280XP_NSP>,
5912+
<&rpmhpd SC8280XP_CX>,
5913+
<&rpmhpd SC8280XP_MXC>;
5914+
power-domain-names = "nsp",
5915+
"cx",
5916+
"mxc";
59095917

59105918
memory-region = <&pil_nsp1_mem>;
59115919

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4101,8 +4101,6 @@
41014101
usb_1: usb@a600000 {
41024102
compatible = "qcom,sm8550-dwc3", "qcom,snps-dwc3";
41034103
reg = <0x0 0x0a600000 0x0 0xfc100>;
4104-
#address-cells = <1>;
4105-
#size-cells = <0>;
41064104

41074105
clocks = <&gcc GCC_CFG_NOC_USB3_PRIM_AXI_CLK>,
41084106
<&gcc GCC_USB30_PRIM_MASTER_CLK>,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5119,9 +5119,6 @@
51195119

51205120
dma-coherent;
51215121

5122-
#address-cells = <1>;
5123-
#size-cells = <0>;
5124-
51255122
status = "disabled";
51265123

51275124
ports {

‎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.dtsi‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
};
7272

7373
&pcie0 {
74-
max-link-speed = <1>;
7574
num-lanes = <1>;
7675
vpcie3v3-supply = <&vcc3v3_sys>;
7776
};

‎arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
button-up {
4141
label = "Volume Up";
4242
linux,code = <KEY_VOLUMEUP>;
43-
press-threshold-microvolt = <100000>;
43+
press-threshold-microvolt = <2000>;
4444
};
4545

4646
button-down {
4747
label = "Volume Down";
4848
linux,code = <KEY_VOLUMEDOWN>;
49-
press-threshold-microvolt = <600000>;
49+
press-threshold-microvolt = <300000>;
5050
};
5151
};
5252

0 commit comments

Comments
 (0)