Skip to content

Commit

Permalink
Merge tag 'v5.15.70' into 5.15
Browse files Browse the repository at this point in the history 
This is the 5.15.70 stable release
  • Loading branch information
@xanmod
xanmod committed Sep 24, 2022
2 parents 30e9112 + 3e98e33 commit a93665e
Show file tree
Hide file tree
Showing 125 changed files with 509 additions and 300 deletions.
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/iio/gyroscope/bosch,bmg160.yaml
View file
Expand Up @@ -24,8 +24,10 @@ properties:

interrupts:
minItems: 1
maxItems: 2
description:
Should be configured with type IRQ_TYPE_EDGE_RISING.
If two interrupts are provided, expected order is INT1 and INT2.

required:
- compatible
Expand Down
1 change: 1 addition & 0 deletions Documentation/input/joydev/joystick.rst
View file
Expand Up @@ -517,6 +517,7 @@ All I-Force devices are supported by the iforce module. This includes:
* AVB Mag Turbo Force
* AVB Top Shot Pegasus
* AVB Top Shot Force Feedback Racing Wheel
* Boeder Force Feedback Wheel
* Logitech WingMan Force
* Logitech WingMan Force Wheel
* Guillemot Race Leader Force Feedback
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 15
SUBLEVEL = 68
SUBLEVEL = 70
EXTRAVERSION =
NAME = Trick or Treat

Expand Down
20 changes: 10 additions & 10 deletions arch/arm/boot/dts/at91-sama7g5ek.dts
View file
Expand Up @@ -169,8 +169,8 @@
regulators {
vdd_3v3: VDD_IO {
regulator-name = "VDD_IO";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <3700000>;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-initial-mode = <2>;
regulator-allowed-modes = <2>, <4>;
regulator-always-on;
Expand All @@ -188,8 +188,8 @@

vddioddr: VDD_DDR {
regulator-name = "VDD_DDR";
regulator-min-microvolt = <1300000>;
regulator-max-microvolt = <1450000>;
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-initial-mode = <2>;
regulator-allowed-modes = <2>, <4>;
regulator-always-on;
Expand All @@ -209,8 +209,8 @@

vddcore: VDD_CORE {
regulator-name = "VDD_CORE";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1850000>;
regulator-min-microvolt = <1150000>;
regulator-max-microvolt = <1150000>;
regulator-initial-mode = <2>;
regulator-allowed-modes = <2>, <4>;
regulator-always-on;
Expand All @@ -228,8 +228,8 @@

vddcpu: VDD_OTHER {
regulator-name = "VDD_OTHER";
regulator-min-microvolt = <1125000>;
regulator-max-microvolt = <1850000>;
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1250000>;
regulator-initial-mode = <2>;
regulator-allowed-modes = <2>, <4>;
regulator-ramp-delay = <3125>;
Expand All @@ -248,8 +248,8 @@

vldo1: LDO1 {
regulator-name = "LDO1";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <3700000>;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-always-on;

regulator-state-standby {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx28-evk.dts
View file
Expand Up @@ -129,7 +129,7 @@
pinctrl-0 = <&spi2_pins_a>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "sst,sst25vf016b", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx28-m28evk.dts
View file
Expand Up @@ -33,7 +33,7 @@
pinctrl-0 = <&spi2_pins_a>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "m25p80", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx28-sps1.dts
View file
Expand Up @@ -51,7 +51,7 @@
pinctrl-0 = <&spi2_pins_a>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "everspin,mr25h256", "mr25h256";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6dl-rex-basic.dts
View file
Expand Up @@ -19,7 +19,7 @@
};

&ecspi3 {
flash: m25p80@0 {
flash: flash@0 {
compatible = "sst,sst25vf016b", "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-ba16.dtsi
View file
Expand Up @@ -142,7 +142,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: n25q032@0 {
flash: flash@0 {
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-bx50v3.dtsi
View file
Expand Up @@ -160,7 +160,7 @@
pinctrl-0 = <&pinctrl_ecspi5>;
status = "okay";

m25_eeprom: m25p80@0 {
m25_eeprom: flash@0 {
compatible = "atmel,at25";
spi-max-frequency = <10000000>;
size = <0x8000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-cm-fx6.dts
View file
Expand Up @@ -260,7 +260,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

m25p80@0 {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts
View file
Expand Up @@ -102,7 +102,7 @@
cs-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "m25p80", "jedec,spi-nor";
spi-max-frequency = <40000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-dms-ba16.dts
View file
Expand Up @@ -47,7 +47,7 @@
pinctrl-0 = <&pinctrl_ecspi5>;
status = "okay";

m25_eeprom: m25p80@0 {
m25_eeprom: flash@0 {
compatible = "atmel,at25256B", "atmel,at25";
spi-max-frequency = <20000000>;
size = <0x8000>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-gw5400-a.dts
View file
Expand Up @@ -137,7 +137,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "sst,w25q256", "jedec,spi-nor";
spi-max-frequency = <30000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-marsboard.dts
View file
Expand Up @@ -100,7 +100,7 @@
cs-gpios = <&gpio2 30 GPIO_ACTIVE_LOW>;
status = "okay";

m25p80@0 {
flash@0 {
compatible = "microchip,sst25vf016b";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6q-rex-pro.dts
View file
Expand Up @@ -19,7 +19,7 @@
};

&ecspi3 {
flash: m25p80@0 {
flash: flash@0 {
compatible = "sst,sst25vf032b", "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-aristainetos.dtsi
View file
Expand Up @@ -96,7 +96,7 @@
pinctrl-0 = <&pinctrl_ecspi4>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q128a11", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi
View file
Expand Up @@ -131,7 +131,7 @@
pinctrl-0 = <&pinctrl_ecspi4>;
status = "okay";

flash: m25p80@1 {
flash: flash@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q128a11", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi
View file
Expand Up @@ -35,7 +35,7 @@
pinctrl-0 = <&pinctrl_ecspi3>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "sst,sst25vf040b", "jedec,spi-nor";
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
View file
Expand Up @@ -248,8 +248,8 @@
status = "okay";

/* default boot source: workaround #1 for errata ERR006282 */
smarc_flash: spi-flash@0 {
compatible = "winbond,w25q16dw", "jedec,spi-nor";
smarc_flash: flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <20000000>;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
View file
Expand Up @@ -179,7 +179,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "microchip,sst25vf016b";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
View file
Expand Up @@ -321,7 +321,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "microchip,sst25vf016b";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
View file
Expand Up @@ -252,7 +252,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "microchip,sst25vf016b";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
View file
Expand Up @@ -237,7 +237,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "sst,sst25vf016b", "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
View file
Expand Up @@ -272,7 +272,7 @@
pinctrl-0 = <&pinctrl_ecspi1 &pinctrl_ecspi1_cs>;
status = "disabled"; /* pin conflict with WEIM NOR */

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p32", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
View file
Expand Up @@ -313,7 +313,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "sst,sst25vf016b", "jedec,spi-nor";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6qdl-sabresd.dtsi
View file
Expand Up @@ -197,7 +197,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p32", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6sl-evk.dts
View file
Expand Up @@ -137,7 +137,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "st,m25p32", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6sx-nitrogen6sx.dts
View file
Expand Up @@ -107,7 +107,7 @@
pinctrl-0 = <&pinctrl_ecspi1>;
status = "okay";

flash: m25p80@0 {
flash: flash@0 {
compatible = "microchip,sst25vf016b";
spi-max-frequency = <20000000>;
reg = <0>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/imx6sx-sdb-reva.dts
View file
Expand Up @@ -123,7 +123,7 @@
pinctrl-0 = <&pinctrl_qspi2>;
status = "okay";

flash0: s25fl128s@0 {
flash0: flash@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
Expand All @@ -133,7 +133,7 @@
spi-tx-bus-width = <4>;
};

flash1: s25fl128s@2 {
flash1: flash@2 {
reg = <2>;
#address-cells = <1>;
#size-cells = <1>;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/imx6sx-sdb.dts
View file
Expand Up @@ -108,7 +108,7 @@
pinctrl-0 = <&pinctrl_qspi2>;
status = "okay";

flash0: n25q256a@0 {
flash0: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor";
Expand All @@ -118,7 +118,7 @@
reg = <0>;
};

flash1: n25q256a@2 {
flash1: flash@2 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6ul-14x14-evk.dtsi
View file
Expand Up @@ -286,7 +286,7 @@
pinctrl-0 = <&pinctrl_qspi>;
status = "okay";

flash0: n25q256a@0 {
flash0: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "micron,n25q256a", "jedec,spi-nor";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6ul-kontron-n6310-som.dtsi
View file
Expand Up @@ -19,7 +19,7 @@
};

&qspi {
spi-flash@0 {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6ul-kontron-n6311-som.dtsi
View file
Expand Up @@ -18,7 +18,7 @@
};

&qspi {
spi-flash@0 {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi
View file
Expand Up @@ -19,7 +19,7 @@
pinctrl-0 = <&pinctrl_ecspi2>;
status = "okay";

spi-flash@0 {
flash@0 {
compatible = "mxicy,mx25v8035f", "jedec,spi-nor";
spi-max-frequency = <50000000>;
reg = <0>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6ull-kontron-n6411-som.dtsi
View file
Expand Up @@ -18,7 +18,7 @@
};

&qspi {
spi-flash@0 {
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
Expand Down

0 comments on commit a93665e

Please sign in to comment.