Skip to content

Commit ec351c8

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "A couple of platforms get a lone dts fix each: - SoCFPGA: Fix incorrect I2C property for SCL signal - Renesas: Fix interrupt names for MTU3 channels on RZ/G2L and RZ/V2L. - Juno/Vexpress: remove a dangling symlink - at91: sam9x60 SoC detection compatible strings - nspire: Fix arm primecell compatible string On the NXP i.MX platform, there multiple issues that get addressed: - A couple of ARM DTS fixes for i.MX6SLL usbphy and supported CPU frequency of sk-imx53 board - Add missing pull-up for imx8mn-var-som onboard PHY reset pinmux - A couple of imx8mm-venice fixes from Tim Harvey to diable disp_blk_ctrl - A couple of phycore-imx8mm fixes from Yashwanth Varakala to correct VPU label and gpio-line-names - Fix imx8mp-blk-ctrl driver to register HSIO PLL clock as bus_power_dev child, so that runtime PM can translate into the necessary GPC power domain action On the driver side, there are two fixes for tegra memory controller drivers addressing regressions from the merge window, a couple of minor correctness fixes for SCMI and SMCCC firmware, as well as a build fix for an lcd backlight driver" * tag 'soc-fixes-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (22 commits) backlight: corgi_lcd: fix missing prototype memory: tegra: make icc_set_bw return zero if BWMGR not supported arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels dt-bindings: serial: atmel,at91-usart: update compatible for sam9x60 ARM: dts: at91: sam9x60: fix the SOC detection ARM: dts: nspire: Fix arm primecell compatible string firmware: arm_scmi: Fix chan_free cleanup on SMC firmware: arm_scmi: Drop OF node reference in the transport channel setup soc: imx: imx8mp-blk-ctrl: register HSIO PLL clock as bus_power_dev child ARM: dts: nxp/imx: limit sk-imx53 supported frequencies firmware: arm_scmi: Fix signed error return values handling firmware: smccc: Fix use of uninitialised results structure arm64: dts: freescale: Fix VPU G2 clock arm64: dts: imx8mn-var-som: add missing pull-up for onboard PHY reset pinmux arm64: dts: phycore-imx8mm: Correction in gpio-line-names arm64: dts: phycore-imx8mm: Label typo-fix of VPU ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node arm64: dts: imx8mm-venice-gw7904: disable disp_blk_ctrl arm64: dts: imx8mm-venice-gw7903: disable disp_blk_ctrl arm64: dts: arm: Remove the dangling vexpress-v2m-rs1.dtsi symlink ...
2 parents a4e98a3 + d21afb0 commit ec351c8

File tree

28 files changed

+130
-78
lines changed

28 files changed

+130
-78
lines changed

‎Documentation/devicetree/bindings/serial/atmel,at91-usart.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@ properties:
1616
- enum:
1717
- atmel,at91rm9200-usart
1818
- atmel,at91sam9260-usart
19-
- microchip,sam9x60-usart
2019
- items:
2120
- const: atmel,at91rm9200-dbgu
2221
- const: atmel,at91rm9200-usart
2322
- items:
2423
- const: atmel,at91sam9260-dbgu
2524
- const: atmel,at91sam9260-usart
25+
- items:
26+
- const: microchip,sam9x60-usart
27+
- const: atmel,at91sam9260-usart
2628
- items:
2729
- const: microchip,sam9x60-dbgu
2830
- const: microchip,sam9x60-usart

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
status = "disabled";
173173

174174
uart4: serial@200 {
175-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
175+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
176176
reg = <0x200 0x200>;
177177
interrupts = <13 IRQ_TYPE_LEVEL_HIGH 7>;
178178
dmas = <&dma0
@@ -240,7 +240,7 @@
240240
status = "disabled";
241241

242242
uart5: serial@200 {
243-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
243+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
244244
reg = <0x200 0x200>;
245245
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
246246
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 7>;
@@ -370,7 +370,7 @@
370370
status = "disabled";
371371

372372
uart11: serial@200 {
373-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
373+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
374374
reg = <0x200 0x200>;
375375
interrupts = <32 IRQ_TYPE_LEVEL_HIGH 7>;
376376
dmas = <&dma0
@@ -419,7 +419,7 @@
419419
status = "disabled";
420420

421421
uart12: serial@200 {
422-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
422+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
423423
reg = <0x200 0x200>;
424424
interrupts = <33 IRQ_TYPE_LEVEL_HIGH 7>;
425425
dmas = <&dma0
@@ -576,7 +576,7 @@
576576
status = "disabled";
577577

578578
uart6: serial@200 {
579-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
579+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
580580
reg = <0x200 0x200>;
581581
interrupts = <9 IRQ_TYPE_LEVEL_HIGH 7>;
582582
dmas = <&dma0
@@ -625,7 +625,7 @@
625625
status = "disabled";
626626

627627
uart7: serial@200 {
628-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
628+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
629629
reg = <0x200 0x200>;
630630
interrupts = <10 IRQ_TYPE_LEVEL_HIGH 7>;
631631
dmas = <&dma0
@@ -674,7 +674,7 @@
674674
status = "disabled";
675675

676676
uart8: serial@200 {
677-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
677+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
678678
reg = <0x200 0x200>;
679679
interrupts = <11 IRQ_TYPE_LEVEL_HIGH 7>;
680680
dmas = <&dma0
@@ -723,7 +723,7 @@
723723
status = "disabled";
724724

725725
uart0: serial@200 {
726-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
726+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
727727
reg = <0x200 0x200>;
728728
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 7>;
729729
dmas = <&dma0
@@ -791,7 +791,7 @@
791791
status = "disabled";
792792

793793
uart1: serial@200 {
794-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
794+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
795795
reg = <0x200 0x200>;
796796
interrupts = <6 IRQ_TYPE_LEVEL_HIGH 7>;
797797
dmas = <&dma0
@@ -859,7 +859,7 @@
859859
status = "disabled";
860860

861861
uart2: serial@200 {
862-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
862+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
863863
reg = <0x200 0x200>;
864864
interrupts = <7 IRQ_TYPE_LEVEL_HIGH 7>;
865865
dmas = <&dma0
@@ -927,7 +927,7 @@
927927
status = "disabled";
928928

929929
uart3: serial@200 {
930-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
930+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
931931
reg = <0x200 0x200>;
932932
interrupts = <8 IRQ_TYPE_LEVEL_HIGH 7>;
933933
dmas = <&dma0
@@ -1050,7 +1050,7 @@
10501050
status = "disabled";
10511051

10521052
uart9: serial@200 {
1053-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
1053+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
10541054
reg = <0x200 0x200>;
10551055
interrupts = <15 IRQ_TYPE_LEVEL_HIGH 7>;
10561056
dmas = <&dma0
@@ -1099,7 +1099,7 @@
10991099
status = "disabled";
11001100

11011101
uart10: serial@200 {
1102-
compatible = "microchip,sam9x60-dbgu", "microchip,sam9x60-usart", "atmel,at91sam9260-dbgu", "atmel,at91sam9260-usart";
1102+
compatible = "microchip,sam9x60-usart", "atmel,at91sam9260-usart";
11031103
reg = <0x200 0x200>;
11041104
interrupts = <16 IRQ_TYPE_LEVEL_HIGH 7>;
11051105
dmas = <&dma0

‎arch/arm/boot/dts/nspire/nspire.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
};
162162

163163
watchdog: watchdog@90060000 {
164-
compatible = "arm,amba-primecell";
164+
compatible = "arm,primecell";
165165
reg = <0x90060000 0x1000>;
166166
interrupts = <3>;
167167
};

‎arch/arm/boot/dts/nxp/imx/imx53-sk-imx53.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@
6060
status = "okay";
6161
};
6262

63+
&cpu0 {
64+
/* CPU rated to 800 MHz, not the default 1.2GHz. */
65+
operating-points = <
66+
/* kHz uV */
67+
166666 850000
68+
400000 900000
69+
800000 1050000
70+
>;
71+
};
72+
6373
&ecspi1 {
6474
pinctrl-names = "default";
6575
pinctrl-0 = <&pinctrl_ecspi1>;

‎arch/arm/boot/dts/nxp/imx/imx6sll.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@
552552
reg = <0x020ca000 0x1000>;
553553
interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
554554
clocks = <&clks IMX6SLL_CLK_USBPHY2>;
555-
phy-reg_3p0-supply = <&reg_3p0>;
555+
phy-3p0-supply = <&reg_3p0>;
556556
fsl,anatop = <&anatop>;
557557
};
558558

‎arch/arm/mach-pxa/sharpsl_pm.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,4 @@ void sharpsl_pm_led(int val);
105105
#define MAX1111_ACIN_VOLT 6u
106106
int sharpsl_pm_pxa_read_max1111(int channel);
107107

108-
void corgi_lcd_limit_intensity(int limit);
109108
#endif

‎arch/arm/mach-pxa/spitz_pm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/interrupt.h>
1616
#include <linux/platform_device.h>
1717
#include <linux/apm-emulation.h>
18+
#include <linux/spi/corgi_lcd.h>
1819

1920
#include <asm/irq.h>
2021
#include <asm/mach-types.h>

‎arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
status = "okay";
146146
clock-frequency = <100000>;
147147
i2c-sda-falling-time-ns = <890>; /* hcnt */
148-
i2c-sdl-falling-time-ns = <890>; /* lcnt */
148+
i2c-scl-falling-time-ns = <890>; /* lcnt */
149149

150150
pinctrl-names = "default", "gpio";
151151
pinctrl-0 = <&i2c1_pmx_func>;

‎arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
status = "okay";
142142
clock-frequency = <100000>;
143143
i2c-sda-falling-time-ns = <890>; /* hcnt */
144-
i2c-sdl-falling-time-ns = <890>; /* lcnt */
144+
i2c-scl-falling-time-ns = <890>; /* lcnt */
145145

146146
adc@14 {
147147
compatible = "lltc,ltc2497";

‎arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)