Skip to content

Commit

Permalink
Merge tag 'v6.1.53' into 6.1
Browse files Browse the repository at this point in the history
This is the 6.1.53 stable release
  • Loading branch information
xanmod committed Sep 13, 2023
2 parents 6100027 + 09045da commit 4dc4459
Show file tree
Hide file tree
Showing 704 changed files with 5,848 additions and 3,155 deletions.
6 changes: 3 additions & 3 deletions Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo
Expand Up @@ -5,6 +5,6 @@ Description:
Indicates whether or not this SBE device has experienced a
timeout; i.e. the SBE did not respond within the time allotted
by the driver. A value of 1 indicates that a timeout has
ocurred and no transfers have completed since the timeout. A
value of 0 indicates that no timeout has ocurred, or if one
has, more recent transfers have completed successful.
occurred and no transfers have completed since the timeout. A
value of 0 indicates that no timeout has occurred, or if one
has, more recent transfers have completed successfully.
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-driver-chromeos-acpi
Expand Up @@ -134,4 +134,4 @@ KernelVersion: 5.19
Description:
Returns the verified boot data block shared between the
firmware verification step and the kernel verification step
(binary).
(hex dump).
Expand Up @@ -23,6 +23,7 @@ properties:

connector:
$ref: /schemas/connector/usb-connector.yaml#
unevaluatedProperties: false

ports:
$ref: /schemas/graph.yaml#/properties/ports
Expand Down
4 changes: 2 additions & 2 deletions Documentation/scsi/scsi_mid_low_api.rst
Expand Up @@ -1190,11 +1190,11 @@ Members of interest:
- pointer to scsi_device object that this command is
associated with.
resid
- an LLD should set this signed integer to the requested
- an LLD should set this unsigned integer to the requested
transfer length (i.e. 'request_bufflen') less the number
of bytes that are actually transferred. 'resid' is
preset to 0 so an LLD can ignore it if it cannot detect
underruns (overruns should be rare). If possible an LLD
underruns (overruns should not be reported). An LLD
should set 'resid' prior to invoking 'done'. The most
interesting case is data transfers from a SCSI target
device (e.g. READs) that underrun.
Expand Down
Expand Up @@ -2923,6 +2923,13 @@ This structure contains all loop filter related parameters. See sections
- ``poc_lt_curr[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``
- PocLtCurr as described in section 8.3.2 "Decoding process for reference
picture set": provides the index of the long term references in DPB array.
* - __u8
- ``num_delta_pocs_of_ref_rps_idx``
- When the short_term_ref_pic_set_sps_flag in the slice header is equal to 0,
it is the same as the derived value NumDeltaPocs[RefRpsIdx]. It can be used to parse
the RPS data in slice headers instead of skipping it with @short_term_ref_pic_set_size.
When the value of short_term_ref_pic_set_sps_flag in the slice header is
equal to 1, num_delta_pocs_of_ref_rps_idx shall be set to 0.
* - struct :c:type:`v4l2_hevc_dpb_entry`
- ``dpb[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]``
- The decoded picture buffer, for meta-data about reference frames.
Expand Down
6 changes: 3 additions & 3 deletions Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 1
SUBLEVEL = 52
SUBLEVEL = 53
EXTRAVERSION =
NAME = Curry Ramen

Expand Down Expand Up @@ -1434,7 +1434,7 @@ prepare0: archprepare
# All the preparing..
prepare: prepare0
ifdef CONFIG_RUST
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh
$(Q)$(MAKE) $(build)=rust
endif

Expand Down Expand Up @@ -1960,7 +1960,7 @@ $(DOC_TARGETS):
# "Is Rust available?" target
PHONY += rustavailable
rustavailable:
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh -v && echo "Rust is available!"
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/rust_is_available.sh && echo "Rust is available!"

# Documentation target
#
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/boot/dts/Makefile
Expand Up @@ -331,6 +331,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
kirkwood-iconnect.dtb \
kirkwood-iomega_ix2_200.dtb \
kirkwood-is2.dtb \
kirkwood-km_fixedeth.dtb \
kirkwood-km_kirkwood.dtb \
kirkwood-l-50.dtb \
kirkwood-laplug.dtb \
Expand Down Expand Up @@ -861,7 +862,10 @@ dtb-$(CONFIG_ARCH_OMAP3) += \
am3517-craneboard.dtb \
am3517-evm.dtb \
am3517_mt_ventoux.dtb \
logicpd-torpedo-35xx-devkit.dtb \
logicpd-torpedo-37xx-devkit.dtb \
logicpd-torpedo-37xx-devkit-28.dtb \
logicpd-som-lv-35xx-devkit.dtb \
logicpd-som-lv-37xx-devkit.dtb \
omap3430-sdp.dtb \
omap3-beagle.dtb \
Expand Down Expand Up @@ -1527,6 +1531,8 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
armada-388-helios4.dtb \
armada-388-rd.dtb
dtb-$(CONFIG_MACH_ARMADA_39X) += \
armada-390-db.dtb \
armada-395-gp.dtb \
armada-398-db.dtb
dtb-$(CONFIG_MACH_ARMADA_XP) += \
armada-xp-axpwifiap.dtb \
Expand Down Expand Up @@ -1556,6 +1562,7 @@ dtb-$(CONFIG_MACH_DOVE) += \
dtb-$(CONFIG_ARCH_MEDIATEK) += \
mt2701-evb.dtb \
mt6580-evbp1.dtb \
mt6582-prestigio-pmt5008-3g.dtb \
mt6589-aquaris5.dtb \
mt6589-fairphone-fp1.dtb \
mt6592-evb.dtb \
Expand Down Expand Up @@ -1608,6 +1615,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-intel-s2600wf.dtb \
aspeed-bmc-inspur-fp5280g2.dtb \
aspeed-bmc-inspur-nf5280m6.dtb \
aspeed-bmc-inspur-on5263m5.dtb \
aspeed-bmc-lenovo-hr630.dtb \
aspeed-bmc-lenovo-hr855xg2.dtb \
aspeed-bmc-microsoft-olympus.dtb \
Expand Down
13 changes: 13 additions & 0 deletions arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts
Expand Up @@ -46,3 +46,16 @@
};
};
};

&gmac0 {
phy-mode = "rgmii";
phy-handle = <&bcm54210e>;

mdio {
/delete-node/ switch@1e;

bcm54210e: ethernet-phy@0 {
reg = <0>;
};
};
};
13 changes: 13 additions & 0 deletions arch/arm/boot/dts/bcm47189-luxul-xap-810.dts
Expand Up @@ -83,3 +83,16 @@
};
};
};

&gmac0 {
phy-mode = "rgmii";
phy-handle = <&bcm54210e>;

mdio {
/delete-node/ switch@1e;

bcm54210e: ethernet-phy@0 {
reg = <0>;
};
};
};
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/bcm47189-tenda-ac9.dts
Expand Up @@ -135,8 +135,8 @@
label = "lan4";
};

port@5 {
reg = <5>;
port@8 {
reg = <8>;
label = "cpu";
ethernet = <&gmac0>;
};
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/boot/dts/bcm53573.dtsi
Expand Up @@ -127,6 +127,9 @@

pcie0: pcie@2000 {
reg = <0x00002000 0x1000>;

#address-cells = <3>;
#size-cells = <2>;
};

usb2: usb2@4000 {
Expand Down Expand Up @@ -156,8 +159,6 @@
};

ohci: usb@d000 {
#usb-cells = <0>;

compatible = "generic-ohci";
reg = <0xd000 0x1000>;
interrupt-parent = <&gic>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/boot/dts/bcm947189acdbmr.dts
Expand Up @@ -60,9 +60,9 @@
spi {
compatible = "spi-gpio";
num-chipselects = <1>;
gpio-sck = <&chipcommon 21 0>;
gpio-miso = <&chipcommon 22 0>;
gpio-mosi = <&chipcommon 23 0>;
sck-gpios = <&chipcommon 21 0>;
miso-gpios = <&chipcommon 22 0>;
mosi-gpios = <&chipcommon 23 0>;
cs-gpios = <&chipcommon 24 0>;
#address-cells = <1>;
#size-cells = <0>;
Expand Down
6 changes: 6 additions & 0 deletions arch/arm/boot/dts/imx7s.dtsi
Expand Up @@ -1184,6 +1184,8 @@
<&clks IMX7D_USDHC1_ROOT_CLK>;
clock-names = "ipg", "ahb", "per";
bus-width = <4>;
fsl,tuning-step = <2>;
fsl,tuning-start-tap = <20>;
status = "disabled";
};

Expand All @@ -1196,6 +1198,8 @@
<&clks IMX7D_USDHC2_ROOT_CLK>;
clock-names = "ipg", "ahb", "per";
bus-width = <4>;
fsl,tuning-step = <2>;
fsl,tuning-start-tap = <20>;
status = "disabled";
};

Expand All @@ -1208,6 +1212,8 @@
<&clks IMX7D_USDHC3_ROOT_CLK>;
clock-names = "ipg", "ahb", "per";
bus-width = <4>;
fsl,tuning-step = <2>;
fsl,tuning-start-tap = <20>;
status = "disabled";
};

Expand Down
9 changes: 6 additions & 3 deletions arch/arm/boot/dts/qcom-ipq4019.dtsi
Expand Up @@ -228,9 +228,12 @@
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "hc_irq", "pwr_irq";
bus-width = <8>;
clocks = <&gcc GCC_SDCC1_AHB_CLK>, <&gcc GCC_SDCC1_APPS_CLK>,
<&gcc GCC_DCD_XO_CLK>;
clock-names = "iface", "core", "xo";
clocks = <&gcc GCC_SDCC1_AHB_CLK>,
<&gcc GCC_SDCC1_APPS_CLK>,
<&xo>;
clock-names = "iface",
"core",
"xo";
status = "disabled";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/s3c6410-mini6410.dts
Expand Up @@ -51,7 +51,7 @@

ethernet@18000000 {
compatible = "davicom,dm9000";
reg = <0x18000000 0x2 0x18000004 0x2>;
reg = <0x18000000 0x2>, <0x18000004 0x2>;
interrupt-parent = <&gpn>;
interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
davicom,no-eeprom;
Expand Down
10 changes: 9 additions & 1 deletion arch/arm/boot/dts/s5pv210-smdkv210.dts
Expand Up @@ -41,7 +41,7 @@

ethernet@a8000000 {
compatible = "davicom,dm9000";
reg = <0xA8000000 0x2 0xA8000002 0x2>;
reg = <0xa8000000 0x2>, <0xa8000002 0x2>;
interrupt-parent = <&gph1>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
local-mac-address = [00 00 de ad be ef];
Expand All @@ -55,6 +55,14 @@
default-brightness-level = <6>;
pinctrl-names = "default";
pinctrl-0 = <&pwm3_out>;
power-supply = <&dc5v_reg>;
};

dc5v_reg: regulator-0 {
compatible = "regulator-fixed";
regulator-name = "DC5V";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
};

Expand Down
21 changes: 7 additions & 14 deletions arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi
Expand Up @@ -68,11 +68,6 @@
reg = <0x38000000 0x10000>;
no-map;
};

gpu_reserved: gpu@dc000000 {
reg = <0xdc000000 0x4000000>;
no-map;
};
};

led: gpio_leds {
Expand Down Expand Up @@ -102,9 +97,11 @@
adc1: adc@0 {
pinctrl-names = "default";
pinctrl-0 = <&adc1_in6_pins_a>;
st,min-sample-time-nsecs = <5000>;
st,adc-channels = <6>;
status = "disabled";
channel@6 {
reg = <6>;
st,min-sample-time-ns = <5000>;
};
};

adc2: adc@100 {
Expand Down Expand Up @@ -173,7 +170,7 @@
phy-handle = <&phy0>;
st,eth-ref-clk-sel;

mdio0 {
mdio {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dwmac-mdio";
Expand All @@ -183,10 +180,6 @@
};
};

&gpu {
contiguous-area = <&gpu_reserved>;
};

&hash1 {
status = "okay";
};
Expand Down Expand Up @@ -375,8 +368,8 @@
&m4_rproc {
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
<&vdev0vring1>, <&vdev0buffer>;
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;
mbox-names = "vq0", "vq1", "shutdown";
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>;
mbox-names = "vq0", "vq1", "shutdown", "detach";
interrupt-parent = <&exti>;
interrupts = <68 1>;
interrupt-names = "wdg";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/stm32mp157c-ev1.dts
Expand Up @@ -144,7 +144,7 @@
max-speed = <1000>;
phy-handle = <&phy0>;

mdio0 {
mdio {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dwmac-mdio";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/stm32mp157c-lxa-mc1.dts
Expand Up @@ -112,7 +112,7 @@
phy-handle = <&ethphy>;
status = "okay";

mdio0 {
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
Expand Down
14 changes: 2 additions & 12 deletions arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi
Expand Up @@ -62,11 +62,6 @@
reg = <0x38000000 0x10000>;
no-map;
};

gpu_reserved: gpu@d4000000 {
reg = <0xd4000000 0x4000000>;
no-map;
};
};

led {
Expand All @@ -80,11 +75,6 @@
};
};

&gpu {
contiguous-area = <&gpu_reserved>;
status = "okay";
};

&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
Expand Down Expand Up @@ -240,8 +230,8 @@
&m4_rproc {
memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,
<&vdev0vring1>, <&vdev0buffer>;
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;
mbox-names = "vq0", "vq1", "shutdown";
mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>;
mbox-names = "vq0", "vq1", "shutdown", "detach";
interrupt-parent = <&exti>;
interrupts = <68 1>;
status = "okay";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/stm32mp157c-odyssey.dts
Expand Up @@ -41,7 +41,7 @@
assigned-clock-rates = <125000000>; /* Clock PLL4 to 750Mhz in ATF/U-Boot */
st,eth-clk-sel;

mdio0 {
mdio {
#address-cells = <1>;
#size-cells = <0>;
compatible = "snps,dwmac-mdio";
Expand Down

0 comments on commit 4dc4459

Please sign in to comment.