Skip to content

Commit e402b08

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "These are the latest bug fixes that have come up in the soc tree. Most of these are fairly minor. Most notably, the majority of changes this time are not for dts files as usual. - Updates to the addresses of the broadcom and aspeed entries in the MAINTAINERS file. - Defconfig updates to address a regression on samsung and a build warning from an unknown Kconfig symbol - Build fixes for the StrongARM and Uniphier platforms - Code fixes for SCMI and FF-A firmware drivers, both of which had a simple bug that resulted in invalid data, and a lesser fix for the optee firmware driver - Multiple fixes for the recently added loongson/loongarch "guts" soc driver - Devicetree fixes for RISC-V on the startfive platform, addressing issues with NOR flash, usb and uart. - Multiple fixes for NXP i.MX8/i.MX9 dts files, fixing problems with clock, gpio, hdmi settings and the Makefile - Bug fixes for i.MX firmware code and the OCOTP soc driver - Multiple fixes for the TI sysc bus driver - Minor dts updates for TI omap dts files, to address boot time warnings and errors" * tag 'soc-fixes-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (35 commits) MAINTAINERS: Fix Florian Fainelli's email address arm64: defconfig: enable syscon-poweroff driver ARM: locomo: fix locomolcd_power declaration soc: loongson: loongson2_guts: Remove unneeded semicolon soc: loongson: loongson2_guts: Convert to devm_platform_ioremap_resource() soc: loongson: loongson_pm2: Populate children syscon nodes dt-bindings: soc: loongson,ls2k-pmc: Allow syscon-reboot/syscon-poweroff as child soc: loongson: loongson_pm2: Drop useless of_device_id compatible dt-bindings: soc: loongson,ls2k-pmc: Use fallbacks for ls2k-pmc compatible soc: loongson: loongson_pm2: Add dependency for INPUT arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y ARM: uniphier: fix cache kernel-doc warnings MAINTAINERS: aspeed: Update Andrew's email address MAINTAINERS: aspeed: Update git tree URL firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND arm64: dts: imx: Add imx8mm-prt8mm.dtb to build arm64: dts: imx8mm-evk: Fix hdmi@3d node soc: imx8m: Enable OCOTP clock for imx8mm before reading registers arm64: dts: imx8mp-beacon-kit: Fix audio_pll2 clock arm64: dts: imx8mp: Fix SDMA2/3 clocks ...
2 parents 3b347e4 + b0b88a5 commit e402b08

File tree

29 files changed

+179
-90
lines changed

29 files changed

+179
-90
lines changed

‎Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,16 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
items:
15-
- enum:
16-
- loongson,ls2k0500-pmc
17-
- loongson,ls2k1000-pmc
18-
- const: syscon
14+
oneOf:
15+
- items:
16+
- const: loongson,ls2k0500-pmc
17+
- const: syscon
18+
- items:
19+
- enum:
20+
- loongson,ls2k1000-pmc
21+
- loongson,ls2k2000-pmc
22+
- const: loongson,ls2k0500-pmc
23+
- const: syscon
1924

2025
reg:
2126
maxItems: 1
@@ -32,6 +37,18 @@ properties:
3237
addition, the PM need according to it to indicate that current
3338
SoC whether support Suspend To RAM.
3439

40+
syscon-poweroff:
41+
$ref: /schemas/power/reset/syscon-poweroff.yaml#
42+
type: object
43+
description:
44+
Node for power off method
45+
46+
syscon-reboot:
47+
$ref: /schemas/power/reset/syscon-reboot.yaml#
48+
type: object
49+
description:
50+
Node for reboot method
51+
3552
required:
3653
- compatible
3754
- reg
@@ -44,9 +61,23 @@ examples:
4461
#include <dt-bindings/interrupt-controller/irq.h>
4562
4663
power-management@1fe27000 {
47-
compatible = "loongson,ls2k1000-pmc", "syscon";
64+
compatible = "loongson,ls2k1000-pmc", "loongson,ls2k0500-pmc", "syscon";
4865
reg = <0x1fe27000 0x58>;
4966
interrupt-parent = <&liointc1>;
5067
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
5168
loongson,suspend-address = <0x0 0x1c000500>;
69+
70+
syscon-reboot {
71+
compatible = "syscon-reboot";
72+
offset = <0x30>;
73+
mask = <0x1>;
74+
};
75+
76+
syscon-poweroff {
77+
compatible = "syscon-poweroff";
78+
regmap = <&pmc>;
79+
offset = <0x14>;
80+
mask = <0x3c00>;
81+
value = <0x3c00>;
82+
};
5283
};

‎MAINTAINERS

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1963,12 +1963,12 @@ F: drivers/irqchip/irq-aspeed-i2c-ic.c
19631963

19641964
ARM/ASPEED MACHINE SUPPORT
19651965
M: Joel Stanley <[email protected]>
1966-
R: Andrew Jeffery <andrew@aj.id.au>
1966+
R: Andrew Jeffery <andrew@codeconstruct.com.au>
19671967
L: [email protected] (moderated for non-subscribers)
19681968
L: [email protected] (moderated for non-subscribers)
19691969
S: Supported
19701970
Q: https://patchwork.ozlabs.org/project/linux-aspeed/list/
1971-
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
1971+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
19721972
F: Documentation/devicetree/bindings/arm/aspeed/
19731973
F: arch/arm/boot/dts/aspeed/
19741974
F: arch/arm/mach-aspeed/
@@ -3058,7 +3058,7 @@ F: Documentation/devicetree/bindings/peci/peci-aspeed.yaml
30583058
F: drivers/peci/controller/peci-aspeed.c
30593059

30603060
ASPEED PINCTRL DRIVERS
3061-
M: Andrew Jeffery <andrew@aj.id.au>
3061+
M: Andrew Jeffery <andrew@codeconstruct.com.au>
30623062
L: [email protected] (moderated for non-subscribers)
30633063
L: [email protected] (moderated for non-subscribers)
30643064
L: [email protected]
@@ -3075,7 +3075,7 @@ F: drivers/irqchip/irq-aspeed-scu-ic.c
30753075
F: include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
30763076

30773077
ASPEED SD/MMC DRIVER
3078-
M: Andrew Jeffery <andrew@aj.id.au>
3078+
M: Andrew Jeffery <andrew@codeconstruct.com.au>
30793079
L: [email protected] (moderated for non-subscribers)
30803080
L: [email protected] (moderated for non-subscribers)
30813081
L: [email protected]
@@ -4082,7 +4082,7 @@ F: drivers/net/wireless/broadcom/brcm80211/
40824082

40834083
BROADCOM BRCMSTB GPIO DRIVER
40844084
M: Doug Berger <[email protected]>
4085-
M: Florian Fainelli <florian.fainelli@broadcom>
4085+
M: Florian Fainelli <florian.fainelli@broadcom.com>
40864086
R: Broadcom internal kernel review list <[email protected]>
40874087
S: Supported
40884088
F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml

‎arch/arm/boot/dts/ti/omap/motorola-mapphone-common.dtsi

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -614,12 +614,12 @@
614614
/* Configure pwm clock source for timers 8 & 9 */
615615
&timer8 {
616616
assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
617-
assigned-clock-parents = <&sys_clkin_ck>;
617+
assigned-clock-parents = <&sys_32k_ck>;
618618
};
619619

620620
&timer9 {
621621
assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
622-
assigned-clock-parents = <&sys_clkin_ck>;
622+
assigned-clock-parents = <&sys_32k_ck>;
623623
};
624624

625625
/*
@@ -640,6 +640,7 @@
640640
&uart3 {
641641
interrupts-extended = <&wakeupgen GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH
642642
&omap4_pmx_core 0x17c>;
643+
overrun-throttle-ms = <500>;
643644
};
644645

645646
&uart4 {

‎arch/arm/boot/dts/ti/omap/omap3-cpu-thermal.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ cpu_thermal: cpu-thermal {
1212
polling-delay = <1000>; /* milliseconds */
1313
coefficients = <0 20000>;
1414

15-
/* sensor ID */
16-
thermal-sensors = <&bandgap 0>;
15+
thermal-sensors = <&bandgap>;
1716

1817
cpu_trips: trips {
1918
cpu_alert0: cpu_alert {

‎arch/arm/boot/dts/ti/omap/omap4-cpu-thermal.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ cpu_thermal: cpu_thermal {
1212
polling-delay-passive = <250>; /* milliseconds */
1313
polling-delay = <1000>; /* milliseconds */
1414

15-
/* sensor ID */
15+
/*
16+
* See 44xx files for single sensor addressing, omap5 and dra7 need
17+
* also sensor ID for addressing.
18+
*/
1619
thermal-sensors = <&bandgap 0>;
1720

1821
cpu_trips: trips {

‎arch/arm/boot/dts/ti/omap/omap443x.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
};
7070

7171
&cpu_thermal {
72+
thermal-sensors = <&bandgap>;
7273
coefficients = <0 20000>;
7374
};
7475

‎arch/arm/boot/dts/ti/omap/omap4460.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
};
8080

8181
&cpu_thermal {
82+
thermal-sensors = <&bandgap>;
8283
coefficients = <348 (-9301)>;
8384
};
8485

‎arch/arm/include/asm/hardware/locomo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ struct locomo_driver {
195195

196196
#define LOCOMO_DRIVER_NAME(_ldev) ((_ldev)->dev.driver->name)
197197

198-
void locomo_lcd_power(struct locomo_dev *, int, unsigned int);
198+
extern void locomolcd_power(int on);
199199

200200
int locomo_driver_register(struct locomo_driver *);
201201
void locomo_driver_unregister(struct locomo_driver *);

‎arch/arm/mach-omap2/pm44xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ static int omap4_pm_suspend(void)
9999
* possible causes.
100100
* http://www.spinics.net/lists/arm-kernel/msg218641.html
101101
*/
102-
pr_warn("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
102+
pr_debug("A possible cause could be an old bootloader - try u-boot >= v2012.07\n");
103103
} else {
104104
pr_info("Successfully put all powerdomains to target state\n");
105105
}
@@ -257,7 +257,7 @@ int __init omap4_pm_init(void)
257257
* http://www.spinics.net/lists/arm-kernel/msg218641.html
258258
*/
259259
if (cpu_is_omap44xx())
260-
pr_warn("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
260+
pr_debug("OMAP4 PM: u-boot >= v2012.07 is required for full PM support\n");
261261

262262
ret = pwrdm_for_each(pwrdms_setup, NULL);
263263
if (ret) {

‎arch/arm/mach-sa1100/include/mach/collie.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#include "hardware.h" /* Gives GPIO_MAX */
1818

19-
extern void locomolcd_power(int on);
20-
2119
#define COLLIE_SCOOP_GPIO_BASE (GPIO_MAX + 1)
2220
#define COLLIE_GPIO_CHARGE_ON (COLLIE_SCOOP_GPIO_BASE + 0)
2321
#define COLLIE_SCP_DIAG_BOOT1 SCOOP_GPCR_PA12

‎arch/arm/mm/cache-uniphier.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@
5858
((op & UNIPHIER_SSCOQM_S_MASK) == UNIPHIER_SSCOQM_S_RANGE)
5959

6060
/**
61-
* uniphier_cache_data - UniPhier outer cache specific data
61+
* struct uniphier_cache_data - UniPhier outer cache specific data
6262
*
6363
* @ctrl_base: virtual base address of control registers
6464
* @rev_base: virtual base address of revision registers
6565
* @op_base: virtual base address of operation registers
66+
* @way_ctrl_base: virtual address of the way control registers for this
67+
* SoC revision
6668
* @way_mask: each bit specifies if the way is present
6769
* @nsets: number of associativity sets
6870
* @line_size: line size in bytes

‎arch/arm64/boot/dts/freescale/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8mm-mx8menlo.dtb
6666
dtb-$(CONFIG_ARCH_MXC) += imx8mm-nitrogen-r2.dtb
6767
dtb-$(CONFIG_ARCH_MXC) += imx8mm-phg.dtb
6868
dtb-$(CONFIG_ARCH_MXC) += imx8mm-phyboard-polis-rdk.dtb
69+
dtb-$(CONFIG_ARCH_MXC) += imx8mm-prt8mm.dtb
6970
dtb-$(CONFIG_ARCH_MXC) += imx8mm-tqma8mqml-mba8mx.dtb
7071
dtb-$(CONFIG_ARCH_MXC) += imx8mm-var-som-symphony.dtb
7172
dtb-$(CONFIG_ARCH_MXC) += imx8mm-venice-gw71xx-0x.dtb

‎arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
port {
2828
hdmi_connector_in: endpoint {
29-
remote-endpoint = <&adv7533_out>;
29+
remote-endpoint = <&adv7535_out>;
3030
};
3131
};
3232
};
@@ -72,6 +72,13 @@
7272
enable-active-high;
7373
};
7474

75+
reg_vddext_3v3: regulator-vddext-3v3 {
76+
compatible = "regulator-fixed";
77+
regulator-name = "VDDEXT_3V3";
78+
regulator-min-microvolt = <3300000>;
79+
regulator-max-microvolt = <3300000>;
80+
};
81+
7582
backlight: backlight {
7683
compatible = "pwm-backlight";
7784
pwms = <&pwm1 0 5000000 0>;
@@ -317,15 +324,16 @@
317324

318325
hdmi@3d {
319326
compatible = "adi,adv7535";
320-
reg = <0x3d>, <0x3c>, <0x3e>, <0x3f>;
321-
reg-names = "main", "cec", "edid", "packet";
327+
reg = <0x3d>;
328+
interrupt-parent = <&gpio1>;
329+
interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
322330
adi,dsi-lanes = <4>;
323-
324-
adi,input-depth = <8>;
325-
adi,input-colorspace = "rgb";
326-
adi,input-clock = "1x";
327-
adi,input-style = <1>;
328-
adi,input-justification = "evenly";
331+
avdd-supply = <&buck5_reg>;
332+
dvdd-supply = <&buck5_reg>;
333+
pvdd-supply = <&buck5_reg>;
334+
a2vdd-supply = <&buck5_reg>;
335+
v3p3-supply = <&reg_vddext_3v3>;
336+
v1p2-supply = <&buck5_reg>;
329337

330338
ports {
331339
#address-cells = <1>;
@@ -334,15 +342,15 @@
334342
port@0 {
335343
reg = <0>;
336344

337-
adv7533_in: endpoint {
345+
adv7535_in: endpoint {
338346
remote-endpoint = <&dsi_out>;
339347
};
340348
};
341349

342350
port@1 {
343351
reg = <1>;
344352

345-
adv7533_out: endpoint {
353+
adv7535_out: endpoint {
346354
remote-endpoint = <&hdmi_connector_in>;
347355
};
348356
};
@@ -448,7 +456,7 @@
448456
reg = <1>;
449457

450458
dsi_out: endpoint {
451-
remote-endpoint = <&adv7533_in>;
459+
remote-endpoint = <&adv7535_in>;
452460
data-lanes = <1 2 3 4>;
453461
};
454462
};

‎arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,10 @@
381381
&sai3 {
382382
pinctrl-names = "default";
383383
pinctrl-0 = <&pinctrl_sai3>;
384-
assigned-clocks = <&clk IMX8MP_CLK_SAI3>;
384+
assigned-clocks = <&clk IMX8MP_CLK_SAI3>,
385+
<&clk IMX8MP_AUDIO_PLL2> ;
385386
assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL2_OUT>;
386-
assigned-clock-rates = <12288000>;
387+
assigned-clock-rates = <12288000>, <361267200>;
387388
fsl,sai-mclk-direction-output;
388389
status = "okay";
389390
};

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -790,6 +790,12 @@
790790
reg = <IMX8MP_POWER_DOMAIN_AUDIOMIX>;
791791
clocks = <&clk IMX8MP_CLK_AUDIO_ROOT>,
792792
<&clk IMX8MP_CLK_AUDIO_AXI>;
793+
assigned-clocks = <&clk IMX8MP_CLK_AUDIO_AHB>,
794+
<&clk IMX8MP_CLK_AUDIO_AXI_SRC>;
795+
assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>,
796+
<&clk IMX8MP_SYS_PLL1_800M>;
797+
assigned-clock-rates = <400000000>,
798+
<600000000>;
793799
};
794800

795801
pgc_gpu2d: power-domain@6 {

‎arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
&gpio1 {
8282
pmic-irq-hog {
8383
gpio-hog;
84-
gpios = <2 GPIO_ACTIVE_LOW>;
84+
gpios = <3 GPIO_ACTIVE_LOW>;
8585
input;
8686
line-name = "PMIC_IRQ#";
8787
};

‎arch/arm64/boot/dts/mediatek/mt8195.dtsi

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2957,7 +2957,7 @@
29572957
clock-names = "merge","merge_async";
29582958
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29592959
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xc000 0x1000>;
2960-
mediatek,merge-mute = <1>;
2960+
mediatek,merge-mute;
29612961
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE0_DL_ASYNC>;
29622962
};
29632963

@@ -2970,7 +2970,7 @@
29702970
clock-names = "merge","merge_async";
29712971
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29722972
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xd000 0x1000>;
2973-
mediatek,merge-mute = <1>;
2973+
mediatek,merge-mute;
29742974
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE1_DL_ASYNC>;
29752975
};
29762976

@@ -2983,7 +2983,7 @@
29832983
clock-names = "merge","merge_async";
29842984
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29852985
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xe000 0x1000>;
2986-
mediatek,merge-mute = <1>;
2986+
mediatek,merge-mute;
29872987
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE2_DL_ASYNC>;
29882988
};
29892989

@@ -2996,7 +2996,7 @@
29962996
clock-names = "merge","merge_async";
29972997
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
29982998
mediatek,gce-client-reg = <&gce0 SUBSYS_1c10XXXX 0xf000 0x1000>;
2999-
mediatek,merge-mute = <1>;
2999+
mediatek,merge-mute;
30003000
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE3_DL_ASYNC>;
30013001
};
30023002

@@ -3009,7 +3009,7 @@
30093009
clock-names = "merge","merge_async";
30103010
power-domains = <&spm MT8195_POWER_DOMAIN_VDOSYS1>;
30113011
mediatek,gce-client-reg = <&gce0 SUBSYS_1c11XXXX 0x0000 0x1000>;
3012-
mediatek,merge-fifo-en = <1>;
3012+
mediatek,merge-fifo-en;
30133013
resets = <&vdosys1 MT8195_VDOSYS1_SW0_RST_B_MERGE4_DL_ASYNC>;
30143014
};
30153015

‎arch/arm64/configs/defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,7 @@ CONFIG_POWER_RESET_MSM=y
636636
CONFIG_POWER_RESET_QCOM_PON=m
637637
CONFIG_POWER_RESET_XGENE=y
638638
CONFIG_POWER_RESET_SYSCON=y
639+
CONFIG_POWER_RESET_SYSCON_POWEROFF=y
639640
CONFIG_SYSCON_REBOOT_MODE=y
640641
CONFIG_NVMEM_REBOOT_MODE=m
641642
CONFIG_BATTERY_SBS=m
@@ -1175,7 +1176,6 @@ CONFIG_COMMON_CLK_S2MPS11=y
11751176
CONFIG_COMMON_CLK_PWM=y
11761177
CONFIG_COMMON_CLK_RS9_PCIE=y
11771178
CONFIG_COMMON_CLK_VC5=y
1178-
CONFIG_COMMON_CLK_NPCM8XX=y
11791179
CONFIG_COMMON_CLK_BD718XX=m
11801180
CONFIG_CLK_RASPBERRYPI=m
11811181
CONFIG_CLK_IMX8MM=y

0 commit comments

Comments
 (0)