Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+24 -23
+1 -1
arch/arm/boot/dts/st/spear1310.dtsi
··· 11 11 compatible = "st,spear1310"; 12 12 13 13 ahb { 14 - spics: spics@e0700000{ 14 + spics: spics@e0700000 { 15 15 compatible = "st,spear-spics-gpio"; 16 16 reg = <0xe0700000 0x1000>; 17 17 st-spics,peripcfg-reg = <0x3b0>;
+1 -1
arch/arm/boot/dts/st/spear1340.dtsi
··· 12 12 13 13 ahb { 14 14 15 - spics: spics@e0700000{ 15 + spics: spics@e0700000 { 16 16 compatible = "st,spear-spics-gpio"; 17 17 reg = <0xe0700000 0x1000>; 18 18 st-spics,peripcfg-reg = <0x42c>;
+1 -1
arch/arm/boot/dts/st/stih407-family.dtsi
··· 645 645 st,lpc-mode = <ST_LPC_MODE_CLKSRC>; 646 646 }; 647 647 648 - spifsm: spifsm@9022000{ 648 + spifsm: spifsm@9022000 { 649 649 compatible = "st,spi-fsm"; 650 650 reg = <0x9022000 0x1000>; 651 651 reg-names = "spi-fsm";
+5 -5
arch/arm/boot/dts/st/stih407-pinctrl.dtsi
··· 1090 1090 }; 1091 1091 1092 1092 i2s_out { 1093 - pinctrl_i2s_8ch_out: i2s_8ch_out{ 1093 + pinctrl_i2s_8ch_out: i2s_8ch_out { 1094 1094 st,pins { 1095 1095 mclk = <&pio33 5 ALT1 OUT>; 1096 1096 lrclk = <&pio33 7 ALT1 OUT>; ··· 1102 1102 }; 1103 1103 }; 1104 1104 1105 - pinctrl_i2s_2ch_out: i2s_2ch_out{ 1105 + pinctrl_i2s_2ch_out: i2s_2ch_out { 1106 1106 st,pins { 1107 1107 mclk = <&pio33 5 ALT1 OUT>; 1108 1108 lrclk = <&pio33 7 ALT1 OUT>; ··· 1113 1113 }; 1114 1114 1115 1115 i2s_in { 1116 - pinctrl_i2s_8ch_in: i2s_8ch_in{ 1116 + pinctrl_i2s_8ch_in: i2s_8ch_in { 1117 1117 st,pins { 1118 1118 mclk = <&pio32 5 ALT1 IN>; 1119 1119 lrclk = <&pio32 7 ALT1 IN>; ··· 1126 1126 }; 1127 1127 }; 1128 1128 1129 - pinctrl_i2s_2ch_in: i2s_2ch_in{ 1129 + pinctrl_i2s_2ch_in: i2s_2ch_in { 1130 1130 st,pins { 1131 1131 mclk = <&pio32 5 ALT1 IN>; 1132 1132 lrclk = <&pio32 7 ALT1 IN>; ··· 1137 1137 }; 1138 1138 1139 1139 spdif_out { 1140 - pinctrl_spdif_out: spdif_out{ 1140 + pinctrl_spdif_out: spdif_out { 1141 1141 st,pins { 1142 1142 spdif_out = <&pio34 7 ALT1 OUT>; 1143 1143 };
+1 -1
arch/arm/boot/dts/st/stm32f429-disco.dts
··· 190 190 status = "okay"; 191 191 }; 192 192 193 - display: display@1{ 193 + display: display@1 { 194 194 /* Connect panel-ilitek-9341 to ltdc */ 195 195 compatible = "st,sf-tc240t-9370-t", "ilitek,ili9341"; 196 196 reg = <1>;
+1 -1
arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi
··· 6 6 7 7 #include "stm32f7-pinctrl.dtsi" 8 8 9 - &pinctrl{ 9 + &pinctrl { 10 10 compatible = "st,stm32f746-pinctrl"; 11 11 };
+1 -1
arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi
··· 6 6 7 7 #include "stm32f7-pinctrl.dtsi" 8 8 9 - &pinctrl{ 9 + &pinctrl { 10 10 compatible = "st,stm32f769-pinctrl"; 11 11 };
+3 -3
arch/arm/boot/dts/st/stm32h7-pinctrl.dtsi
··· 94 94 drive-push-pull; 95 95 bias-disable; 96 96 }; 97 - pins2{ 97 + pins2 { 98 98 pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */ 99 99 slew-rate = <3>; 100 100 drive-open-drain; ··· 122 122 drive-push-pull; 123 123 bias-pull-up; 124 124 }; 125 - pins2{ 125 + pins2 { 126 126 pinmux = <STM32_PINMUX('B', 8, AF7)>; /* SDMMC1_CKIN */ 127 127 bias-pull-up; 128 128 }; ··· 162 162 drive-push-pull; 163 163 bias-disable; 164 164 }; 165 - pins2{ 165 + pins2 { 166 166 pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC1_CMD */ 167 167 slew-rate = <3>; 168 168 drive-open-drain;
+2 -2
arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi
··· 1659 1659 drive-push-pull; 1660 1660 bias-pull-up; 1661 1661 }; 1662 - pins2{ 1662 + pins2 { 1663 1663 pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */ 1664 1664 bias-pull-up; 1665 1665 }; ··· 1694 1694 drive-push-pull; 1695 1695 bias-pull-up; 1696 1696 }; 1697 - pins2{ 1697 + pins2 { 1698 1698 pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */ 1699 1699 bias-pull-up; 1700 1700 };
+3 -3
arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi
··· 165 165 status = "okay"; 166 166 }; 167 167 168 - &iwdg2{ 168 + &iwdg2 { 169 169 timeout-sec = <32>; 170 170 status = "okay"; 171 171 }; 172 172 173 - &m4_rproc{ 173 + &m4_rproc { 174 174 memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, 175 175 <&vdev0vring1>, <&vdev0buffer>; 176 176 mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; ··· 184 184 status = "okay"; 185 185 }; 186 186 187 - &rtc{ 187 + &rtc { 188 188 status = "okay"; 189 189 }; 190 190
+3 -3
arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi
··· 117 117 status = "okay"; 118 118 }; 119 119 120 - &iwdg2{ 120 + &iwdg2 { 121 121 timeout-sec = <32>; 122 122 status = "okay"; 123 123 }; 124 124 125 - &m4_rproc{ 125 + &m4_rproc { 126 126 memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, 127 127 <&vdev0vring1>, <&vdev0buffer>; 128 128 mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; ··· 136 136 status = "okay"; 137 137 }; 138 138 139 - &rtc{ 139 + &rtc { 140 140 status = "okay"; 141 141 }; 142 142
+1
arch/riscv/Kconfig.socs
··· 43 43 44 44 config ARCH_THEAD 45 45 bool "T-HEAD RISC-V SoCs" 46 + depends on MMU && !XIP_KERNEL 46 47 select ERRATA_THEAD 47 48 help 48 49 This enables support for the RISC-V based T-HEAD SoCs.
+1 -1
drivers/bus/intel-ixp4xx-eb.c
··· 33 33 #define IXP4XX_EXP_TIMING_STRIDE 0x04 34 34 #define IXP4XX_EXP_CS_EN BIT(31) 35 35 #define IXP456_EXP_PAR_EN BIT(30) /* Only on IXP45x and IXP46x */ 36 - #define IXP4XX_EXP_T1_MASK GENMASK(28, 27) 36 + #define IXP4XX_EXP_T1_MASK GENMASK(29, 28) 37 37 #define IXP4XX_EXP_T1_SHIFT 28 38 38 #define IXP4XX_EXP_T2_MASK GENMASK(27, 26) 39 39 #define IXP4XX_EXP_T2_SHIFT 26