Skip to content

Commit 9f57c13

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC fixes from Arnd Bergmann: "There are three small fixes that came up sincie the past week: - an incorrect bit offset in ixp4xx bus driver - a riscv randconfig regression in the thead platform I merged - whitespace fixes for some dts files" * tag 'soc-fixes-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: bus: ixp4xx: fix IXP4XX_EXP_T1_MASK ARM: dts: st: add missing space before { RISC-V: make ARCH_THEAD preclude XIP_KERNEL
2 parents 0b90730 + 6722e46 commit 9f57c13

13 files changed

Lines changed: 24 additions & 23 deletions

‎arch/arm/boot/dts/st/spear1310.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
compatible = "st,spear1310";
1212

1313
ahb {
14-
spics: spics@e0700000{
14+
spics: spics@e0700000 {
1515
compatible = "st,spear-spics-gpio";
1616
reg = <0xe0700000 0x1000>;
1717
st-spics,peripcfg-reg = <0x3b0>;

‎arch/arm/boot/dts/st/spear1340.dtsi‎

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

1313
ahb {
1414

15-
spics: spics@e0700000{
15+
spics: spics@e0700000 {
1616
compatible = "st,spear-spics-gpio";
1717
reg = <0xe0700000 0x1000>;
1818
st-spics,peripcfg-reg = <0x42c>;

‎arch/arm/boot/dts/st/stih407-family.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@
645645
st,lpc-mode = <ST_LPC_MODE_CLKSRC>;
646646
};
647647

648-
spifsm: spifsm@9022000{
648+
spifsm: spifsm@9022000 {
649649
compatible = "st,spi-fsm";
650650
reg = <0x9022000 0x1000>;
651651
reg-names = "spi-fsm";

‎arch/arm/boot/dts/st/stih407-pinctrl.dtsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@
10901090
};
10911091

10921092
i2s_out {
1093-
pinctrl_i2s_8ch_out: i2s_8ch_out{
1093+
pinctrl_i2s_8ch_out: i2s_8ch_out {
10941094
st,pins {
10951095
mclk = <&pio33 5 ALT1 OUT>;
10961096
lrclk = <&pio33 7 ALT1 OUT>;
@@ -1102,7 +1102,7 @@
11021102
};
11031103
};
11041104

1105-
pinctrl_i2s_2ch_out: i2s_2ch_out{
1105+
pinctrl_i2s_2ch_out: i2s_2ch_out {
11061106
st,pins {
11071107
mclk = <&pio33 5 ALT1 OUT>;
11081108
lrclk = <&pio33 7 ALT1 OUT>;
@@ -1113,7 +1113,7 @@
11131113
};
11141114

11151115
i2s_in {
1116-
pinctrl_i2s_8ch_in: i2s_8ch_in{
1116+
pinctrl_i2s_8ch_in: i2s_8ch_in {
11171117
st,pins {
11181118
mclk = <&pio32 5 ALT1 IN>;
11191119
lrclk = <&pio32 7 ALT1 IN>;
@@ -1126,7 +1126,7 @@
11261126
};
11271127
};
11281128

1129-
pinctrl_i2s_2ch_in: i2s_2ch_in{
1129+
pinctrl_i2s_2ch_in: i2s_2ch_in {
11301130
st,pins {
11311131
mclk = <&pio32 5 ALT1 IN>;
11321132
lrclk = <&pio32 7 ALT1 IN>;
@@ -1137,7 +1137,7 @@
11371137
};
11381138

11391139
spdif_out {
1140-
pinctrl_spdif_out: spdif_out{
1140+
pinctrl_spdif_out: spdif_out {
11411141
st,pins {
11421142
spdif_out = <&pio34 7 ALT1 OUT>;
11431143
};

‎arch/arm/boot/dts/st/stm32f429-disco.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
status = "okay";
191191
};
192192

193-
display: display@1{
193+
display: display@1 {
194194
/* Connect panel-ilitek-9341 to ltdc */
195195
compatible = "st,sf-tc240t-9370-t", "ilitek,ili9341";
196196
reg = <1>;

‎arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
#include "stm32f7-pinctrl.dtsi"
88

9-
&pinctrl{
9+
&pinctrl {
1010
compatible = "st,stm32f746-pinctrl";
1111
};

‎arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66

77
#include "stm32f7-pinctrl.dtsi"
88

9-
&pinctrl{
9+
&pinctrl {
1010
compatible = "st,stm32f769-pinctrl";
1111
};

‎arch/arm/boot/dts/st/stm32h7-pinctrl.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
drive-push-pull;
9595
bias-disable;
9696
};
97-
pins2{
97+
pins2 {
9898
pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */
9999
slew-rate = <3>;
100100
drive-open-drain;
@@ -122,7 +122,7 @@
122122
drive-push-pull;
123123
bias-pull-up;
124124
};
125-
pins2{
125+
pins2 {
126126
pinmux = <STM32_PINMUX('B', 8, AF7)>; /* SDMMC1_CKIN */
127127
bias-pull-up;
128128
};
@@ -162,7 +162,7 @@
162162
drive-push-pull;
163163
bias-disable;
164164
};
165-
pins2{
165+
pins2 {
166166
pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC1_CMD */
167167
slew-rate = <3>;
168168
drive-open-drain;

‎arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,7 @@
16591659
drive-push-pull;
16601660
bias-pull-up;
16611661
};
1662-
pins2{
1662+
pins2 {
16631663
pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */
16641664
bias-pull-up;
16651665
};
@@ -1694,7 +1694,7 @@
16941694
drive-push-pull;
16951695
bias-pull-up;
16961696
};
1697-
pins2{
1697+
pins2 {
16981698
pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */
16991699
bias-pull-up;
17001700
};

‎arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,12 +165,12 @@
165165
status = "okay";
166166
};
167167

168-
&iwdg2{
168+
&iwdg2 {
169169
timeout-sec = <32>;
170170
status = "okay";
171171
};
172172

173-
&m4_rproc{
173+
&m4_rproc {
174174
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
175175
<&vdev0vring1>, <&vdev0buffer>;
176176
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;
@@ -184,7 +184,7 @@
184184
status = "okay";
185185
};
186186

187-
&rtc{
187+
&rtc {
188188
status = "okay";
189189
};
190190

0 commit comments

Comments
 (0)