Skip to content

Commit 10d916c

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "There are not a lot of important fixes for the soc tree yet this time, but it's time to upstream what I got so far: - DT Fixes for Arm Juno and ST-Ericsson Ux500 to add missing critical temperature points - A number of fixes for the Arm SCMI firmware, addressing correctness issues in the code, in particular error handling and resource leaks. - One error handling fix for the new i.MX93 power domain driver - Several devicetree fixes for NXP i.MX6/8/9 and Layerscape chips, fixing incorrect or missing DT properties for MDIO controller nodes, CPLD, USB and regulators for various boards, as well as some fixes for DT schema checks. - MAINTAINERS file updates for HiSilicon LPC Bus and Broadcom git URLs" * tag 'soc-fixes-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (26 commits) arm64: dts: juno: Add thermal critical trip points firmware: arm_scmi: Fix deferred_tx_wq release on error paths firmware: arm_scmi: Fix devres allocation device in virtio transport firmware: arm_scmi: Make Rx chan_setup fail on memory errors firmware: arm_scmi: Make tx_prepare time out eventually firmware: arm_scmi: Suppress the driver's bind attributes firmware: arm_scmi: Cleanup the core driver removal callback MAINTAINERS: Update HiSilicon LPC BUS Driver maintainer ARM: dts: ux500: Add trips to battery thermal zones arm64: dts: ls208xa: specify clock frequencies for the MDIO controllers arm64: dts: ls1088a: specify clock frequencies for the MDIO controllers arm64: dts: lx2160a: specify clock frequencies for the MDIO controllers soc: imx: imx93-pd: Fix the error handling path of imx93_pd_probe() arm64: dts: imx93: correct gpio-ranges arm64: dts: imx93: correct s4mu interrupt names dt-bindings: power: gpcv2: add power-domains property arm64: dts: imx8: correct clock order ARM: dts: imx6dl-yapp4: Do not allow PM to switch PU regulator off on Q/QP ARM: dts: imx6qdl-gw59{10,13}: fix user pushbutton GPIO offset arm64: dts: imx8mn: Correct the usb power domain ...
2 parents fde25be + 5449cab commit 10d916c

34 files changed

+267
-82
lines changed

‎Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ properties:
8181

8282
power-supply: true
8383

84+
power-domains:
85+
maxItems: 1
86+
8487
resets:
8588
description: |
8689
A number of phandles to resets that need to be asserted during

‎MAINTAINERS

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3984,7 +3984,7 @@ M: Rafał Miłecki <[email protected]>
39843984
R: Broadcom internal kernel review list <[email protected]>
39853985
L: [email protected] (moderated for non-subscribers)
39863986
S: Maintained
3987-
T: git git://github.com/broadcom/stblinux.git
3987+
T: git https://github.com/broadcom/stblinux.git
39883988
F: Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml
39893989
F: arch/arm64/boot/dts/broadcom/bcmbca/*
39903990
N: bcmbca
@@ -4009,7 +4009,7 @@ R: Broadcom internal kernel review list <[email protected]>
40094009
L: [email protected] (moderated for non-subscribers)
40104010
L: [email protected] (moderated for non-subscribers)
40114011
S: Maintained
4012-
T: git git://github.com/broadcom/stblinux.git
4012+
T: git https://github.com/broadcom/stblinux.git
40134013
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
40144014
F: drivers/pci/controller/pcie-brcmstb.c
40154015
F: drivers/staging/vc04_services
@@ -4023,7 +4023,7 @@ M: Ray Jui <[email protected]>
40234023
M: Scott Branden <[email protected]>
40244024
R: Broadcom internal kernel review list <[email protected]>
40254025
S: Maintained
4026-
T: git git://github.com/broadcom/mach-bcm
4026+
T: git https://github.com/broadcom/mach-bcm
40274027
F: arch/arm/mach-bcm/
40284028
N: bcm281*
40294029
N: bcm113*
@@ -4088,7 +4088,7 @@ M: Florian Fainelli <[email protected]>
40884088
R: Broadcom internal kernel review list <[email protected]>
40894089
L: [email protected] (moderated for non-subscribers)
40904090
S: Maintained
4091-
T: git git://github.com/broadcom/stblinux.git
4091+
T: git https://github.com/broadcom/stblinux.git
40924092
F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml
40934093
F: arch/arm/boot/dts/bcm7*.dts*
40944094
F: arch/arm/include/asm/hardware/cache-b15-rac.h
@@ -4121,7 +4121,7 @@ M: Florian Fainelli <[email protected]>
41214121
R: Broadcom internal kernel review list <[email protected]>
41224122
L: [email protected]
41234123
S: Maintained
4124-
T: git git://github.com/broadcom/stblinux.git
4124+
T: git https://github.com/broadcom/stblinux.git
41254125
F: arch/mips/bmips/*
41264126
F: arch/mips/boot/dts/brcm/bcm*.dts*
41274127
F: arch/mips/include/asm/mach-bmips/*
@@ -4262,7 +4262,7 @@ M: Scott Branden <[email protected]>
42624262
R: Broadcom internal kernel review list <[email protected]>
42634263
L: [email protected] (moderated for non-subscribers)
42644264
S: Maintained
4265-
T: git git://github.com/broadcom/stblinux.git
4265+
T: git https://github.com/broadcom/stblinux.git
42664266
F: arch/arm64/boot/dts/broadcom/northstar2/*
42674267
F: arch/arm64/boot/dts/broadcom/stingray/*
42684268
F: drivers/clk/bcm/clk-ns*
@@ -4332,7 +4332,7 @@ M: Florian Fainelli <[email protected]>
43324332
R: Broadcom internal kernel review list <[email protected]>
43334333
L: [email protected]
43344334
S: Maintained
4335-
T: git git://github.com/broadcom/stblinux.git
4335+
T: git https://github.com/broadcom/stblinux.git
43364336
F: drivers/soc/bcm/bcm63xx/bcm-pmb.c
43374337
F: include/dt-bindings/soc/bcm-pmb.h
43384338

@@ -9217,7 +9217,7 @@ W: https://www.hisilicon.com
92179217
F: drivers/i2c/busses/i2c-hisi.c
92189218

92199219
HISILICON LPC BUS DRIVER
9220-
M: john.garry@huawei.com
9220+
M: Jay Fang <f.fangjian@huawei.com>
92219221
S: Maintained
92229222
W: http://www.hisilicon.com
92239223
F: Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml

‎arch/arm/boot/dts/imx6q-yapp4-crux.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
status = "okay";
3434
};
3535

36+
&reg_pu {
37+
regulator-always-on;
38+
};
39+
3640
&reg_usb_h1_vbus {
3741
status = "okay";
3842
};

‎arch/arm/boot/dts/imx6qdl-gw5910.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
user-pb {
3131
label = "user_pb";
32-
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
32+
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
3333
linux,code = <BTN_0>;
3434
};
3535

‎arch/arm/boot/dts/imx6qdl-gw5913.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
user-pb {
2828
label = "user_pb";
29-
gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;
29+
gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;
3030
linux,code = <BTN_0>;
3131
};
3232

‎arch/arm/boot/dts/imx6qp-yapp4-crux-plus.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
status = "okay";
3434
};
3535

36+
&reg_pu {
37+
regulator-always-on;
38+
};
39+
3640
&reg_usb_h1_vbus {
3741
status = "okay";
3842
};

‎arch/arm/boot/dts/ste-href.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
polling-delay = <0>;
2525
polling-delay-passive = <0>;
2626
thermal-sensors = <&bat_therm>;
27+
28+
trips {
29+
battery-crit-hi {
30+
temperature = <70000>;
31+
hysteresis = <2000>;
32+
type = "critical";
33+
};
34+
};
2735
};
2836
};
2937

‎arch/arm/boot/dts/ste-snowball.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@
2828
polling-delay = <0>;
2929
polling-delay-passive = <0>;
3030
thermal-sensors = <&bat_therm>;
31+
32+
trips {
33+
battery-crit-hi {
34+
temperature = <70000>;
35+
hysteresis = <2000>;
36+
type = "critical";
37+
};
38+
};
3139
};
3240
};
3341

‎arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@
4444
polling-delay = <0>;
4545
polling-delay-passive = <0>;
4646
thermal-sensors = <&bat_therm>;
47+
48+
trips {
49+
battery-crit-hi {
50+
temperature = <70000>;
51+
hysteresis = <2000>;
52+
type = "critical";
53+
};
54+
};
4755
};
4856
};
4957

‎arch/arm/boot/dts/ste-ux500-samsung-codina.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,14 @@
5757
polling-delay = <0>;
5858
polling-delay-passive = <0>;
5959
thermal-sensors = <&bat_therm>;
60+
61+
trips {
62+
battery-crit-hi {
63+
temperature = <70000>;
64+
hysteresis = <2000>;
65+
type = "critical";
66+
};
67+
};
6068
};
6169
};
6270

0 commit comments

Comments
 (0)