mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 05:12:49 +00:00
Code Issues Releases Wiki Activity

SoC fixes for 6.5, part 1

Browse source 
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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmSl1R4ACgkQYKtH/8kJ
 Uie0Sw//XWCdg4Baaz/sbgsqw7zREqKdwvj9T1xIlmp5VBfFrSqMA25oSA/G4r4u
 LqhLiOE79L8pk0UbBWio7ja0htVBQmWq0NFflYEkjSB+1bfYfHaB0zTP6lmMPwBH
 DNzDuJunmttaFuofiFTNsxwRB7hcehWYGqKYnwM+LlGXXcS4qq2ktvAz9gludbZX
 +zxEdwxWyJcw7vbRcYGaJM2QsQxnIweqqtHUidnfOw/qnuz4BMgOk96erD0LHQw2
 VcTKPU/mEGjaHNWvuQQwb+GzU9X5RWzOcRKUL6bNdWp4mjZQ6WmUIn4Wyz4Z640B
 zETkVmpEmxpRIbDeIal10MqQQNgRXERMGa9+8EJ3QDQ2zFyV0oRSOmn01IqFoX90
 xDfgSi/IMG6VRWt0soqSGPc4rtlP7sy/4hskKUAyOZDwmkFUYfUVumosBrRUxGqX
 f4UTjh6fWTqwiatVPxs2Df02AMDPLpn7umRa2K1JPuNNJ2CpKK9KBcaT5MmtGZV0
 ZyZhejIaENCWGwPk0E//y/KbnDCLrk8ngLeEvVweOQrpPWhpNp3TintFa0OYpB/m
 tS3ufUHGwz+7qg400FPkd47fn/j9VOeEEczOzUPFhLn/ZtUOsP1BczXcVZGHXjfF
 Im5o8fYnWmw8SKwogcX0OCO3AHQPqmTb+EeaCHjpU15DlT7QDX0=
 =cc9Z
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-07-06 09:56:53 -07:00
commit 9f57c13f7e
13 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/st/spear1310.dtsi
View file

@ -11,7 +11,7 @@ / {
compatible = "st,spear1310"; compatible = "st,spear1310";
ahb { ahb {
spics: spics@e0700000{ spics: spics@e0700000 {
compatible = "st,spear-spics-gpio"; compatible = "st,spear-spics-gpio";
reg = <0xe0700000 0x1000>; reg = <0xe0700000 0x1000>;
st-spics,peripcfg-reg = <0x3b0>; st-spics,peripcfg-reg = <0x3b0>;

2
arch/arm/boot/dts/st/spear1340.dtsi
View file

@ -12,7 +12,7 @@ / {
ahb { ahb {
spics: spics@e0700000{ spics: spics@e0700000 {
compatible = "st,spear-spics-gpio"; compatible = "st,spear-spics-gpio";
reg = <0xe0700000 0x1000>; reg = <0xe0700000 0x1000>;
st-spics,peripcfg-reg = <0x42c>; st-spics,peripcfg-reg = <0x42c>;

2
arch/arm/boot/dts/st/stih407-family.dtsi
View file

@ -645,7 +645,7 @@ lpc@8788000 {
st,lpc-mode = <ST_LPC_MODE_CLKSRC>; st,lpc-mode = <ST_LPC_MODE_CLKSRC>;
}; };
spifsm: spifsm@9022000{ spifsm: spifsm@9022000 {
compatible = "st,spi-fsm"; compatible = "st,spi-fsm";
reg = <0x9022000 0x1000>; reg = <0x9022000 0x1000>;
reg-names = "spi-fsm"; reg-names = "spi-fsm";

10
arch/arm/boot/dts/st/stih407-pinctrl.dtsi
View file

@ -1090,7 +1090,7 @@ st,pins {
}; };
i2s_out { i2s_out {
pinctrl_i2s_8ch_out: i2s_8ch_out{ pinctrl_i2s_8ch_out: i2s_8ch_out {
st,pins { st,pins {
mclk = <&pio33 5 ALT1 OUT>; mclk = <&pio33 5 ALT1 OUT>;
lrclk = <&pio33 7 ALT1 OUT>; lrclk = <&pio33 7 ALT1 OUT>;
@ -1102,7 +1102,7 @@ st,pins {
}; };
}; };
pinctrl_i2s_2ch_out: i2s_2ch_out{ pinctrl_i2s_2ch_out: i2s_2ch_out {
st,pins { st,pins {
mclk = <&pio33 5 ALT1 OUT>; mclk = <&pio33 5 ALT1 OUT>;
lrclk = <&pio33 7 ALT1 OUT>; lrclk = <&pio33 7 ALT1 OUT>;
@ -1113,7 +1113,7 @@ st,pins {
}; };
i2s_in { i2s_in {
pinctrl_i2s_8ch_in: i2s_8ch_in{ pinctrl_i2s_8ch_in: i2s_8ch_in {
st,pins { st,pins {
mclk = <&pio32 5 ALT1 IN>; mclk = <&pio32 5 ALT1 IN>;
lrclk = <&pio32 7 ALT1 IN>; lrclk = <&pio32 7 ALT1 IN>;
@ -1126,7 +1126,7 @@ st,pins {
}; };
}; };
pinctrl_i2s_2ch_in: i2s_2ch_in{ pinctrl_i2s_2ch_in: i2s_2ch_in {
st,pins { st,pins {
mclk = <&pio32 5 ALT1 IN>; mclk = <&pio32 5 ALT1 IN>;
lrclk = <&pio32 7 ALT1 IN>; lrclk = <&pio32 7 ALT1 IN>;
@ -1137,7 +1137,7 @@ st,pins {
}; };
spdif_out { spdif_out {
pinctrl_spdif_out: spdif_out{ pinctrl_spdif_out: spdif_out {
st,pins { st,pins {
spdif_out = <&pio34 7 ALT1 OUT>; spdif_out = <&pio34 7 ALT1 OUT>;
}; };

2
arch/arm/boot/dts/st/stm32f429-disco.dts
View file

@ -190,7 +190,7 @@ l3gd20: l3gd20@0 {
status = "okay"; status = "okay";
}; };
display: display@1{ display: display@1 {
/* Connect panel-ilitek-9341 to ltdc */ /* Connect panel-ilitek-9341 to ltdc */
compatible = "st,sf-tc240t-9370-t", "ilitek,ili9341"; compatible = "st,sf-tc240t-9370-t", "ilitek,ili9341";
reg = <1>; reg = <1>;

2
arch/arm/boot/dts/st/stm32f746-pinctrl.dtsi
View file

@ -6,6 +6,6 @@
#include "stm32f7-pinctrl.dtsi" #include "stm32f7-pinctrl.dtsi"
&pinctrl{ &pinctrl {
compatible = "st,stm32f746-pinctrl"; compatible = "st,stm32f746-pinctrl";
}; };

2
arch/arm/boot/dts/st/stm32f769-pinctrl.dtsi
View file

@ -6,6 +6,6 @@
#include "stm32f7-pinctrl.dtsi" #include "stm32f7-pinctrl.dtsi"
&pinctrl{ &pinctrl {
compatible = "st,stm32f769-pinctrl"; compatible = "st,stm32f769-pinctrl";
}; };

6
arch/arm/boot/dts/st/stm32h7-pinctrl.dtsi
View file

@ -94,7 +94,7 @@ pins1 {
drive-push-pull; drive-push-pull;
bias-disable; bias-disable;
}; };
pins2{ pins2 {
pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */ pinmux = <STM32_PINMUX('D', 2, AF12)>; /* SDMMC1_CMD */
slew-rate = <3>; slew-rate = <3>;
drive-open-drain; drive-open-drain;
@ -122,7 +122,7 @@ pins1 {
drive-push-pull; drive-push-pull;
bias-pull-up; bias-pull-up;
}; };
pins2{ pins2 {
pinmux = <STM32_PINMUX('B', 8, AF7)>; /* SDMMC1_CKIN */ pinmux = <STM32_PINMUX('B', 8, AF7)>; /* SDMMC1_CKIN */
bias-pull-up; bias-pull-up;
}; };
@ -162,7 +162,7 @@ pins1 {
drive-push-pull; drive-push-pull;
bias-disable; bias-disable;
}; };
pins2{ pins2 {
pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC1_CMD */ pinmux = <STM32_PINMUX('D', 7, AF11)>; /* SDMMC1_CMD */
slew-rate = <3>; slew-rate = <3>;
drive-open-drain; drive-open-drain;

4
arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi
View file

@ -1659,7 +1659,7 @@ pins1 {
drive-push-pull; drive-push-pull;
bias-pull-up; bias-pull-up;
}; };
pins2{ pins2 {
pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */ pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */
bias-pull-up; bias-pull-up;
}; };
@ -1694,7 +1694,7 @@ pins1 {
drive-push-pull; drive-push-pull;
bias-pull-up; bias-pull-up;
}; };
pins2{ pins2 {
pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */ pinmux = <STM32_PINMUX('E', 4, AF8)>; /* SDMMC1_CKIN */
bias-pull-up; bias-pull-up;
}; };

6
arch/arm/boot/dts/st/stm32mp157a-icore-stm32mp1.dtsi
View file

@ -165,12 +165,12 @@ &ipcc {
status = "okay"; status = "okay";
}; };
&iwdg2{ &iwdg2 {
timeout-sec = <32>; timeout-sec = <32>;
status = "okay"; status = "okay";
}; };
&m4_rproc{ &m4_rproc {
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
<&vdev0vring1>, <&vdev0buffer>; <&vdev0vring1>, <&vdev0buffer>;
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;
@ -184,7 +184,7 @@ &rng1 {
status = "okay"; status = "okay";
}; };
&rtc{ &rtc {
status = "okay"; status = "okay";
}; };

6
arch/arm/boot/dts/st/stm32mp157a-microgea-stm32mp1.dtsi
View file

@ -117,12 +117,12 @@ &ipcc {
status = "okay"; status = "okay";
}; };
&iwdg2{ &iwdg2 {
timeout-sec = <32>; timeout-sec = <32>;
status = "okay"; status = "okay";
}; };
&m4_rproc{ &m4_rproc {
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>, memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
<&vdev0vring1>, <&vdev0buffer>; <&vdev0vring1>, <&vdev0buffer>;
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>; mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;
@ -136,7 +136,7 @@ &rng1 {
status = "okay"; status = "okay";
}; };
&rtc{ &rtc {
status = "okay"; status = "okay";
}; };

1
arch/riscv/Kconfig.socs
View file

@ -43,6 +43,7 @@ config ARCH_SUNXI
config ARCH_THEAD config ARCH_THEAD
bool "T-HEAD RISC-V SoCs" bool "T-HEAD RISC-V SoCs"
depends on MMU && !XIP_KERNEL
select ERRATA_THEAD select ERRATA_THEAD
help help
This enables support for the RISC-V based T-HEAD SoCs. This enables support for the RISC-V based T-HEAD SoCs.

2
drivers/bus/intel-ixp4xx-eb.c
View file

@ -33,7 +33,7 @@
#define IXP4XX_EXP_TIMING_STRIDE 0x04 #define IXP4XX_EXP_TIMING_STRIDE 0x04
#define IXP4XX_EXP_CS_EN BIT(31) #define IXP4XX_EXP_CS_EN BIT(31)
#define IXP456_EXP_PAR_EN BIT(30) /* Only on IXP45x and IXP46x */ #define IXP456_EXP_PAR_EN BIT(30) /* Only on IXP45x and IXP46x */
#define IXP4XX_EXP_T1_MASK GENMASK(28, 27) #define IXP4XX_EXP_T1_MASK GENMASK(29, 28)
#define IXP4XX_EXP_T1_SHIFT 28 #define IXP4XX_EXP_T1_SHIFT 28
#define IXP4XX_EXP_T2_MASK GENMASK(27, 26) #define IXP4XX_EXP_T2_MASK GENMASK(27, 26)
#define IXP4XX_EXP_T2_SHIFT 26 #define IXP4XX_EXP_T2_SHIFT 26