diff --git a/0000-raspberrypi-kernel.patch b/0000-raspberrypi-kernel.patch index 4923cf8..6a8f7b5 100644 --- a/0000-raspberrypi-kernel.patch +++ b/0000-raspberrypi-kernel.patch @@ -1,7 +1,7 @@ -From 8672e1c59dc796553c4782bb3029284c15e80cfc Mon Sep 17 00:00:00 2001 +From 1ccad414b11e455ad464b4a9e9b3495663f008fb Mon Sep 17 00:00:00 2001 From: Fang Yafen Date: Wed, 20 Oct 2021 00:58:36 +0800 -Subject: [PATCH] apply apply RPi patch of 5.10.74 +Subject: [PATCH] apply RPi patch of 5.10.74 --- .../admin-guide/media/bcm2835-isp.rst | 127 + @@ -506,7 +506,7 @@ Subject: [PATCH] apply apply RPi patch of 5.10.74 drivers/gpu/drm/vc4/vc4_dsi.c | 277 +- drivers/gpu/drm/vc4/vc4_firmware_kms.c | 1992 +++++ drivers/gpu/drm/vc4/vc4_gem.c | 3 +- - drivers/gpu/drm/vc4/vc4_hdmi.c | 1216 ++- + drivers/gpu/drm/vc4/vc4_hdmi.c | 1218 ++- drivers/gpu/drm/vc4/vc4_hdmi.h | 66 +- drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 8 +- drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 27 +- @@ -879,7 +879,7 @@ Subject: [PATCH] apply apply RPi patch of 5.10.74 sound/soc/soc-core.c | 14 +- sound/usb/quirks-table.h | 9 + sound/usb/quirks.c | 6 + - 875 files changed, 170418 insertions(+), 4551 deletions(-) + 875 files changed, 170418 insertions(+), 4553 deletions(-) create mode 100644 Documentation/admin-guide/media/bcm2835-isp.rst create mode 100644 Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml create mode 100644 Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt @@ -1391,7 +1391,7 @@ Subject: [PATCH] apply apply RPi patch of 5.10.74 diff --git a/Documentation/admin-guide/media/bcm2835-isp.rst b/Documentation/admin-guide/media/bcm2835-isp.rst new file mode 100644 -index 0000000000000..e1c19f78435e6 +index 000000000000..e1c19f78435e --- /dev/null +++ b/Documentation/admin-guide/media/bcm2835-isp.rst @@ -0,0 +1,127 @@ @@ -1524,7 +1524,7 @@ index 0000000000000..e1c19f78435e6 + bcm2835_isp_dpc_mode bcm2835_isp_dpc diff --git a/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml new file mode 100644 -index 0000000000000..2047e25700c67 +index 000000000000..2047e25700c6 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/raspberrypi,firmware-clocks.yaml @@ -0,0 +1,32 @@ @@ -1561,7 +1561,7 @@ index 0000000000000..2047e25700c67 + +... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml -index 7ce06f9f9f8ee..6e8ac910bdd8d 100644 +index 7ce06f9f9f8e..6e8ac910bdd8 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2711-hdmi.yaml @@ -53,6 +53,24 @@ properties: @@ -1599,7 +1599,7 @@ index 7ce06f9f9f8ee..6e8ac910bdd8d 100644 examples: - | diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml -index eb44e072b6e59..90ee069ada8d0 100644 +index eb44e072b6e5..90ee069ada8d 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-dsi0.yaml @@ -20,6 +20,7 @@ properties: @@ -1611,7 +1611,7 @@ index eb44e072b6e59..90ee069ada8d0 100644 reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml -index f54b4e4808f07..899d8cfa17312 100644 +index f54b4e4808f0..899d8cfa1731 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-hdmi.yaml @@ -11,24 +11,58 @@ maintainers: @@ -1770,7 +1770,7 @@ index f54b4e4808f07..899d8cfa17312 100644 + ... diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml -index 49a5e041aa493..eac739a812f57 100644 +index 49a5e041aa49..eac739a812f5 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vc4.yaml @@ -21,6 +21,11 @@ properties: @@ -1786,7 +1786,7 @@ index 49a5e041aa493..eac739a812f57 100644 - compatible diff --git a/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml b/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml -index d900cc57b4ec9..4d8a6b615e5bb 100644 +index d900cc57b4ec..4d8a6b615e5b 100644 --- a/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml +++ b/Documentation/devicetree/bindings/display/brcm,bcm2835-vec.yaml @@ -11,7 +11,9 @@ maintainers: @@ -1801,7 +1801,7 @@ index d900cc57b4ec9..4d8a6b615e5bb 100644 reg: maxItems: 1 diff --git a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml -index edb53ab0d9eb2..4d50b22554a4c 100644 +index edb53ab0d9eb..4d50b22554a4 100644 --- a/Documentation/devicetree/bindings/display/panel/panel-simple.yaml +++ b/Documentation/devicetree/bindings/display/panel/panel-simple.yaml @@ -147,6 +147,8 @@ properties: @@ -1815,7 +1815,7 @@ index edb53ab0d9eb2..4d50b22554a4c 100644 # Innolux G070Y2-L01 7" WVGA (800x480) TFT LCD panel diff --git a/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt new file mode 100644 -index 0000000000000..c71f8569a4dc9 +index 000000000000..c71f8569a4dc --- /dev/null +++ b/Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt @@ -0,0 +1,55 @@ @@ -1876,7 +1876,7 @@ index 0000000000000..c71f8569a4dc9 + }; diff --git a/Documentation/devicetree/bindings/media/bcm2835-unicam.txt b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt new file mode 100644 -index 0000000000000..164d0377dcd24 +index 000000000000..164d0377dcd2 --- /dev/null +++ b/Documentation/devicetree/bindings/media/bcm2835-unicam.txt @@ -0,0 +1,85 @@ @@ -1967,7 +1967,7 @@ index 0000000000000..164d0377dcd24 + }; diff --git a/Documentation/devicetree/bindings/media/i2c/imx219.txt b/Documentation/devicetree/bindings/media/i2c/imx219.txt new file mode 100644 -index 0000000000000..a02f1ce1e1204 +index 000000000000..a02f1ce1e120 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx219.txt @@ -0,0 +1,59 @@ @@ -2031,7 +2031,7 @@ index 0000000000000..a02f1ce1e1204 + }; + }; diff --git a/Documentation/devicetree/bindings/media/i2c/imx290.txt b/Documentation/devicetree/bindings/media/i2c/imx290.txt -index a3cc21410f7c6..294e63650d9e3 100644 +index a3cc21410f7c..294e63650d9e 100644 --- a/Documentation/devicetree/bindings/media/i2c/imx290.txt +++ b/Documentation/devicetree/bindings/media/i2c/imx290.txt @@ -1,13 +1,14 @@ @@ -2054,7 +2054,7 @@ index a3cc21410f7c6..294e63650d9e3 100644 - clock-names: Should be "xclk". diff --git a/Documentation/devicetree/bindings/media/i2c/imx378.yaml b/Documentation/devicetree/bindings/media/i2c/imx378.yaml new file mode 100644 -index 0000000000000..f832b4bfab936 +index 000000000000..f832b4bfab93 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx378.yaml @@ -0,0 +1,113 @@ @@ -2173,7 +2173,7 @@ index 0000000000000..f832b4bfab936 +... diff --git a/Documentation/devicetree/bindings/media/i2c/imx477.yaml b/Documentation/devicetree/bindings/media/i2c/imx477.yaml new file mode 100644 -index 0000000000000..0994e13e67f68 +index 000000000000..0994e13e67f6 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx477.yaml @@ -0,0 +1,113 @@ @@ -2292,7 +2292,7 @@ index 0000000000000..0994e13e67f68 +... diff --git a/Documentation/devicetree/bindings/media/i2c/imx519.yaml b/Documentation/devicetree/bindings/media/i2c/imx519.yaml new file mode 100644 -index 0000000000000..717230a21764c +index 000000000000..717230a21764 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/imx519.yaml @@ -0,0 +1,113 @@ @@ -2411,7 +2411,7 @@ index 0000000000000..717230a21764c +... diff --git a/Documentation/devicetree/bindings/media/i2c/irs1125.txt b/Documentation/devicetree/bindings/media/i2c/irs1125.txt new file mode 100644 -index 0000000000000..25a48028c9577 +index 000000000000..25a48028c957 --- /dev/null +++ b/Documentation/devicetree/bindings/media/i2c/irs1125.txt @@ -0,0 +1,48 @@ @@ -2465,7 +2465,7 @@ index 0000000000000..25a48028c9577 + }; diff --git a/Documentation/devicetree/bindings/media/rpivid_hevc.yaml b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml new file mode 100644 -index 0000000000000..ce6b81a103030 +index 000000000000..ce6b81a10303 --- /dev/null +++ b/Documentation/devicetree/bindings/media/rpivid_hevc.yaml @@ -0,0 +1,72 @@ @@ -2543,7 +2543,7 @@ index 0000000000000..ce6b81a103030 +... diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt new file mode 100644 -index 0000000000000..68cc8ebc3392d +index 000000000000..68cc8ebc3392 --- /dev/null +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi-dev.txt @@ -0,0 +1,17 @@ @@ -2566,7 +2566,7 @@ index 0000000000000..68cc8ebc3392d + diff --git a/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt new file mode 100644 -index 0000000000000..b76dc694f1ac0 +index 000000000000..b76dc694f1ac --- /dev/null +++ b/Documentation/devicetree/bindings/misc/brcm,bcm2835-smi.txt @@ -0,0 +1,48 @@ @@ -2619,7 +2619,7 @@ index 0000000000000..b76dc694f1ac0 +}; + diff --git a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt -index 11a679530ae65..104768b85bbc5 100644 +index 11a679530ae6..104768b85bbc 100644 --- a/Documentation/devicetree/bindings/net/microchip,lan78xx.txt +++ b/Documentation/devicetree/bindings/net/microchip,lan78xx.txt @@ -14,6 +14,9 @@ Optional properties of the embedded PHY: @@ -2634,7 +2634,7 @@ index 11a679530ae65..104768b85bbc5 100644 diff --git a/Documentation/devicetree/bindings/nvmem/rmem.yaml b/Documentation/devicetree/bindings/nvmem/rmem.yaml new file mode 100644 -index 0000000000000..29b53871aa02c +index 000000000000..29b53871aa02 --- /dev/null +++ b/Documentation/devicetree/bindings/nvmem/rmem.yaml @@ -0,0 +1,49 @@ @@ -2689,7 +2689,7 @@ index 0000000000000..29b53871aa02c +... diff --git a/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt new file mode 100644 -index 0000000000000..a1a9ad5e70cab +index 000000000000..a1a9ad5e70ca --- /dev/null +++ b/Documentation/devicetree/bindings/pci/brcmstb-pcie.txt @@ -0,0 +1,59 @@ @@ -2753,7 +2753,7 @@ index 0000000000000..a1a9ad5e70cab + linux,pci-domain = <0>; + }; diff --git a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt -index 3e56c1b34a4c9..76dd7b06e26a1 100644 +index 3e56c1b34a4c..76dd7b06e26a 100644 --- a/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt +++ b/Documentation/devicetree/bindings/power/reset/gpio-poweroff.txt @@ -31,6 +31,7 @@ Optional properties: @@ -2765,7 +2765,7 @@ index 3e56c1b34a4c9..76dd7b06e26a1 100644 Examples: diff --git a/Documentation/devicetree/bindings/serial/pl011.yaml b/Documentation/devicetree/bindings/serial/pl011.yaml -index c23c93b400f06..5e1d6483b2a92 100644 +index c23c93b400f0..5e1d6483b2a9 100644 --- a/Documentation/devicetree/bindings/serial/pl011.yaml +++ b/Documentation/devicetree/bindings/serial/pl011.yaml @@ -98,6 +98,12 @@ properties: @@ -2783,7 +2783,7 @@ index c23c93b400f06..5e1d6483b2a92 100644 - reg diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt new file mode 100644 -index 0000000000000..f8d32547195b3 +index 000000000000..f8d32547195b --- /dev/null +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -0,0 +1,463 @@ @@ -3251,7 +3251,7 @@ index 0000000000000..f8d32547195b3 +zte ZTE Corp. +zyxel ZyXEL Communications Corp. diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 2735be1a84709..0d306469abd03 100644 +index 2735be1a8470..0d306469abd0 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -159,6 +159,8 @@ patternProperties: @@ -3265,7 +3265,7 @@ index 2735be1a84709..0d306469abd03 100644 "^bosch,.*": diff --git a/Documentation/devicetree/configfs-overlays.txt b/Documentation/devicetree/configfs-overlays.txt new file mode 100644 -index 0000000000000..5fa43e0643072 +index 000000000000..5fa43e064307 --- /dev/null +++ b/Documentation/devicetree/configfs-overlays.txt @@ -0,0 +1,31 @@ @@ -3302,7 +3302,7 @@ index 0000000000000..5fa43e0643072 +make sense for developers (since it avoids problems with namespaces). diff --git a/Documentation/hwmon/rpi-poe-fan b/Documentation/hwmon/rpi-poe-fan new file mode 100644 -index 0000000000000..9182ab6339933 +index 000000000000..9182ab633993 --- /dev/null +++ b/Documentation/hwmon/rpi-poe-fan @@ -0,0 +1,15 @@ @@ -3322,7 +3322,7 @@ index 0000000000000..9182ab6339933 +the commands to the board over I2C on the ID_EEPROM pins. The driver exposes +the fan to the user space through the hwmon sysfs interface. diff --git a/Documentation/userspace-api/media/drivers/index.rst b/Documentation/userspace-api/media/drivers/index.rst -index 05a82f8c0c993..df39e6ad40e30 100644 +index 05a82f8c0c99..df39e6ad40e3 100644 --- a/Documentation/userspace-api/media/drivers/index.rst +++ b/Documentation/userspace-api/media/drivers/index.rst @@ -33,6 +33,7 @@ For more details see the file COPYING in the source distribution of Linux. @@ -3334,7 +3334,7 @@ index 05a82f8c0c993..df39e6ad40e30 100644 meye-uapi omap3isp-uapi diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst -index b864869b42bc8..3163f501afb48 100644 +index b864869b42bc..3163f501afb4 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst @@ -4111,6 +4111,9 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - @@ -3405,7 +3405,7 @@ index b864869b42bc8..3163f501afb48 100644 Specifies the decoding mode to use. Currently exposes slice-based and frame-based decoding but new modes might be added later on. diff --git a/Documentation/userspace-api/media/v4l/meta-formats.rst b/Documentation/userspace-api/media/v4l/meta-formats.rst -index fff25357fe860..c1dd92a2d617a 100644 +index fff25357fe86..c1dd92a2d617 100644 --- a/Documentation/userspace-api/media/v4l/meta-formats.rst +++ b/Documentation/userspace-api/media/v4l/meta-formats.rst @@ -12,9 +12,11 @@ These formats are used for the :ref:`metadata` interface only. @@ -3421,7 +3421,7 @@ index fff25357fe860..c1dd92a2d617a 100644 pixfmt-meta-vsp1-hgo pixfmt-meta-vsp1-hgt diff --git a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst -index d585909bc4e21..f817c643761bd 100644 +index d585909bc4e2..f817c643761b 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-compressed.rst @@ -200,6 +200,7 @@ Compressed Formats @@ -3434,7 +3434,7 @@ index d585909bc4e21..f817c643761bd 100644 number of macroblocks to decode a full corresponding frame. diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst new file mode 100644 -index 0000000000000..f974774c82527 +index 000000000000..f974774c8252 --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-bcm2835-isp-stats.rst @@ -0,0 +1,41 @@ @@ -3481,7 +3481,7 @@ index 0000000000000..f974774c82527 + diff --git a/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst b/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst new file mode 100644 -index 0000000000000..4a67e204d08a3 +index 000000000000..4a67e204d08a --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-meta-sensor-data.rst @@ -0,0 +1,32 @@ @@ -3519,7 +3519,7 @@ index 0000000000000..4a67e204d08a3 + diff --git a/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst b/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst new file mode 100644 -index 0000000000000..196ca33a5dff8 +index 000000000000..196ca33a5dff --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-nv12-col128.rst @@ -0,0 +1,215 @@ @@ -3739,7 +3739,7 @@ index 0000000000000..196ca33a5dff8 + + diff --git a/Documentation/userspace-api/media/v4l/pixfmt-nv12.rst b/Documentation/userspace-api/media/v4l/pixfmt-nv12.rst -index dd2f38129fe66..359f7ce67114b 100644 +index dd2f38129fe6..359f7ce67114 100644 --- a/Documentation/userspace-api/media/v4l/pixfmt-nv12.rst +++ b/Documentation/userspace-api/media/v4l/pixfmt-nv12.rst @@ -3,9 +3,9 @@ @@ -3772,7 +3772,7 @@ index dd2f38129fe66..359f7ce67114b 100644 diff --git a/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst b/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst new file mode 100644 -index 0000000000000..3704f9180fd77 +index 000000000000..3704f9180fd7 --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-y12p.rst @@ -0,0 +1,45 @@ @@ -3823,7 +3823,7 @@ index 0000000000000..3704f9180fd77 + diff --git a/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst new file mode 100644 -index 0000000000000..27fe14c9a9ebd +index 000000000000..27fe14c9a9eb --- /dev/null +++ b/Documentation/userspace-api/media/v4l/pixfmt-y14p.rst @@ -0,0 +1,54 @@ @@ -3882,7 +3882,7 @@ index 0000000000000..27fe14c9a9ebd + + Y'\ :sub:`02low bits 5--4`\ (bits 1--0) diff --git a/Documentation/userspace-api/media/v4l/subdev-formats.rst b/Documentation/userspace-api/media/v4l/subdev-formats.rst -index eff6727c69d30..8e0ae032411a1 100644 +index eff6727c69d3..8e0ae032411a 100644 --- a/Documentation/userspace-api/media/v4l/subdev-formats.rst +++ b/Documentation/userspace-api/media/v4l/subdev-formats.rst @@ -908,6 +908,43 @@ The following tables list existing packed RGB formats. @@ -4011,7 +4011,7 @@ index eff6727c69d30..8e0ae032411a1 100644 + `_ + diff --git a/Documentation/userspace-api/media/v4l/yuv-formats.rst b/Documentation/userspace-api/media/v4l/yuv-formats.rst -index 4a05a105a9e6c..ba3a5b5993623 100644 +index 4a05a105a9e6..ba3a5b599362 100644 --- a/Documentation/userspace-api/media/v4l/yuv-formats.rst +++ b/Documentation/userspace-api/media/v4l/yuv-formats.rst @@ -28,7 +28,9 @@ to brightness information. @@ -4033,7 +4033,7 @@ index 4a05a105a9e6c..ba3a5b5993623 100644 pixfmt-nv16m pixfmt-nv24 diff --git a/MAINTAINERS b/MAINTAINERS -index a12ecc71e1e78..884bd3d2e6972 100644 +index 20ea04bb5542..93443e0ea919 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3417,6 +3417,29 @@ N: bcm113* @@ -4081,7 +4081,7 @@ index a12ecc71e1e78..884bd3d2e6972 100644 DRM DRIVER FOR GRAIN MEDIA GM12U320 PROJECTORS M: Hans de Goede S: Maintained -@@ -16357,6 +16388,23 @@ S: Maintained +@@ -16369,6 +16400,23 @@ S: Maintained T: git git://linuxtv.org/media_tree.git F: drivers/media/i2c/imx355.c @@ -4106,7 +4106,7 @@ index a12ecc71e1e78..884bd3d2e6972 100644 M: Maxim Levitsky M: Alex Dubov diff --git a/Makefile b/Makefile -index fbd2136f7bf8f..624cb8c91b192 100644 +index fbd2136f7bf8..624cb8c91b19 100644 --- a/Makefile +++ b/Makefile @@ -1354,6 +1354,9 @@ ifneq ($(dtstree),) @@ -4120,7 +4120,7 @@ index fbd2136f7bf8f..624cb8c91b192 100644 dtbs: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index ce66ffd5a1bbc..12cd8bf582e1b 100644 +index ce66ffd5a1bb..12cd8bf582e1 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1,4 +1,21 @@ @@ -4169,7 +4169,7 @@ index ce66ffd5a1bbc..12cd8bf582e1b 100644 +endif diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts new file mode 100644 -index 0000000000000..e42cba84ab0e0 +index 000000000000..e42cba84ab0e --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-b-plus.dts @@ -0,0 +1,129 @@ @@ -4304,7 +4304,7 @@ index 0000000000000..e42cba84ab0e0 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts new file mode 100644 -index 0000000000000..4ea1e68f5e298 +index 000000000000..4ea1e68f5e29 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-b-rev1.dts @@ -0,0 +1,132 @@ @@ -4442,7 +4442,7 @@ index 0000000000000..4ea1e68f5e298 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-b.dts b/arch/arm/boot/dts/bcm2708-rpi-b.dts new file mode 100644 -index 0000000000000..a152c1c8e648d +index 000000000000..a152c1c8e648 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-b.dts @@ -0,0 +1,119 @@ @@ -4567,7 +4567,7 @@ index 0000000000000..a152c1c8e648d +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi new file mode 100644 -index 0000000000000..a18f80af97d32 +index 000000000000..a18f80af97d3 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-bt.dtsi @@ -0,0 +1,26 @@ @@ -4599,7 +4599,7 @@ index 0000000000000..a18f80af97d32 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dts b/arch/arm/boot/dts/bcm2708-rpi-cm.dts new file mode 100644 -index 0000000000000..f61e3418425a9 +index 000000000000..f61e3418425a --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dts @@ -0,0 +1,112 @@ @@ -4717,7 +4717,7 @@ index 0000000000000..f61e3418425a9 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi new file mode 100644 -index 0000000000000..d5572b2d21033 +index 000000000000..d5572b2d2103 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-cm.dtsi @@ -0,0 +1,18 @@ @@ -4741,7 +4741,7 @@ index 0000000000000..d5572b2d21033 +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts new file mode 100644 -index 0000000000000..75a5b41514f9f +index 000000000000..75a5b41514f9 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-zero-w.dts @@ -0,0 +1,169 @@ @@ -4916,7 +4916,7 @@ index 0000000000000..75a5b41514f9f +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi-zero.dts b/arch/arm/boot/dts/bcm2708-rpi-zero.dts new file mode 100644 -index 0000000000000..84591bd7d423e +index 000000000000..84591bd7d423 --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi-zero.dts @@ -0,0 +1,123 @@ @@ -5045,7 +5045,7 @@ index 0000000000000..84591bd7d423e +}; diff --git a/arch/arm/boot/dts/bcm2708-rpi.dtsi b/arch/arm/boot/dts/bcm2708-rpi.dtsi new file mode 100644 -index 0000000000000..e2458b15d64ab +index 000000000000..e2458b15d64a --- /dev/null +++ b/arch/arm/boot/dts/bcm2708-rpi.dtsi @@ -0,0 +1,36 @@ @@ -5087,7 +5087,7 @@ index 0000000000000..e2458b15d64ab +}; diff --git a/arch/arm/boot/dts/bcm2708.dtsi b/arch/arm/boot/dts/bcm2708.dtsi new file mode 100644 -index 0000000000000..36ec4989403f5 +index 000000000000..36ec4989403f --- /dev/null +++ b/arch/arm/boot/dts/bcm2708.dtsi @@ -0,0 +1,12 @@ @@ -5105,7 +5105,7 @@ index 0000000000000..36ec4989403f5 +}; diff --git a/arch/arm/boot/dts/bcm2709-rpi-2-b.dts b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts new file mode 100644 -index 0000000000000..e1381d2b3a2c6 +index 000000000000..e1381d2b3a2c --- /dev/null +++ b/arch/arm/boot/dts/bcm2709-rpi-2-b.dts @@ -0,0 +1,129 @@ @@ -5240,7 +5240,7 @@ index 0000000000000..e1381d2b3a2c6 +}; diff --git a/arch/arm/boot/dts/bcm2709-rpi.dtsi b/arch/arm/boot/dts/bcm2709-rpi.dtsi new file mode 100644 -index 0000000000000..babfa41cd9f78 +index 000000000000..babfa41cd9f7 --- /dev/null +++ b/arch/arm/boot/dts/bcm2709-rpi.dtsi @@ -0,0 +1,5 @@ @@ -5251,7 +5251,7 @@ index 0000000000000..babfa41cd9f78 +}; diff --git a/arch/arm/boot/dts/bcm2709.dtsi b/arch/arm/boot/dts/bcm2709.dtsi new file mode 100644 -index 0000000000000..68eafc1b281a5 +index 000000000000..68eafc1b281a --- /dev/null +++ b/arch/arm/boot/dts/bcm2709.dtsi @@ -0,0 +1,22 @@ @@ -5279,7 +5279,7 @@ index 0000000000000..68eafc1b281a5 +}; diff --git a/arch/arm/boot/dts/bcm270x-rpi.dtsi b/arch/arm/boot/dts/bcm270x-rpi.dtsi new file mode 100644 -index 0000000000000..57e7d5f60d3e9 +index 000000000000..57e7d5f60d3e --- /dev/null +++ b/arch/arm/boot/dts/bcm270x-rpi.dtsi @@ -0,0 +1,155 @@ @@ -5440,7 +5440,7 @@ index 0000000000000..57e7d5f60d3e9 +}; diff --git a/arch/arm/boot/dts/bcm270x.dtsi b/arch/arm/boot/dts/bcm270x.dtsi new file mode 100644 -index 0000000000000..badcf341ecd2f +index 000000000000..badcf341ecd2 --- /dev/null +++ b/arch/arm/boot/dts/bcm270x.dtsi @@ -0,0 +1,217 @@ @@ -5663,7 +5663,7 @@ index 0000000000000..badcf341ecd2f +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-2-b.dts b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts new file mode 100644 -index 0000000000000..ae9db1b1be1b2 +index 000000000000..ae9db1b1be1b --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-2-b.dts @@ -0,0 +1,129 @@ @@ -5798,7 +5798,7 @@ index 0000000000000..ae9db1b1be1b2 +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts new file mode 100644 -index 0000000000000..7e12c05cc28bd +index 000000000000..7e12c05cc28b --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -0,0 +1,201 @@ @@ -6005,7 +6005,7 @@ index 0000000000000..7e12c05cc28bd +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts new file mode 100644 -index 0000000000000..d40722ddc286c +index 000000000000..d40722ddc286 --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -0,0 +1,203 @@ @@ -6214,7 +6214,7 @@ index 0000000000000..d40722ddc286c +}; diff --git a/arch/arm/boot/dts/bcm2710-rpi-cm3.dts b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts new file mode 100644 -index 0000000000000..c386a855cdc3b +index 000000000000..c386a855cdc3 --- /dev/null +++ b/arch/arm/boot/dts/bcm2710-rpi-cm3.dts @@ -0,0 +1,148 @@ @@ -6368,7 +6368,7 @@ index 0000000000000..c386a855cdc3b +}; diff --git a/arch/arm/boot/dts/bcm2710.dtsi b/arch/arm/boot/dts/bcm2710.dtsi new file mode 100644 -index 0000000000000..e7e5c913f1d1c +index 000000000000..e7e5c913f1d1 --- /dev/null +++ b/arch/arm/boot/dts/bcm2710.dtsi @@ -0,0 +1,25 @@ @@ -6398,7 +6398,7 @@ index 0000000000000..e7e5c913f1d1c + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 5395e8c2484e0..e0d1128c94394 100644 +index 5395e8c2484e..e0d1128c9439 100644 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts @@ -2,7 +2,6 @@ @@ -6761,7 +6761,7 @@ index 5395e8c2484e0..e0d1128c94394 100644 +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi-400.dts b/arch/arm/boot/dts/bcm2711-rpi-400.dts new file mode 100644 -index 0000000000000..c25a97465d2ba +index 000000000000..c25a97465d2b --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts @@ -0,0 +1,636 @@ @@ -7403,7 +7403,7 @@ index 0000000000000..c25a97465d2ba +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts new file mode 100644 -index 0000000000000..1dcbb2173f5d7 +index 000000000000..1dcbb2173f5d --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts @@ -0,0 +1,659 @@ @@ -8068,7 +8068,7 @@ index 0000000000000..1dcbb2173f5d7 +}; diff --git a/arch/arm/boot/dts/bcm2711-rpi.dtsi b/arch/arm/boot/dts/bcm2711-rpi.dtsi new file mode 100644 -index 0000000000000..ebf73b789b4af +index 000000000000..ebf73b789b4a --- /dev/null +++ b/arch/arm/boot/dts/bcm2711-rpi.dtsi @@ -0,0 +1,205 @@ @@ -8278,7 +8278,7 @@ index 0000000000000..ebf73b789b4af + status = "disabled"; +}; diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi -index 3d040f6e2a20f..2933cf91c27d2 100644 +index 3d040f6e2a20..2933cf91c27d 100644 --- a/arch/arm/boot/dts/bcm2711.dtsi +++ b/arch/arm/boot/dts/bcm2711.dtsi @@ -300,6 +300,14 @@ pixelvalve3: pixelvalve@7ec12000 { @@ -8446,7 +8446,7 @@ index 3d040f6e2a20f..2933cf91c27d2 100644 -}; diff --git a/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi new file mode 100644 -index 0000000000000..6b9b79f74cf36 +index 000000000000..6b9b79f74cf3 --- /dev/null +++ b/arch/arm/boot/dts/bcm271x-rpi-bt.dtsi @@ -0,0 +1,26 @@ @@ -8477,7 +8477,7 @@ index 0000000000000..6b9b79f74cf36 + }; +}; diff --git a/arch/arm/boot/dts/bcm2835-common.dtsi b/arch/arm/boot/dts/bcm2835-common.dtsi -index 4119271c979d6..06d8c3882cb7e 100644 +index 4119271c979d..06d8c3882cb7 100644 --- a/arch/arm/boot/dts/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/bcm2835-common.dtsi @@ -106,6 +106,14 @@ i2c2: i2c@7e805000 { @@ -8512,7 +8512,7 @@ index 4119271c979d6..06d8c3882cb7e 100644 status = "disabled"; }; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts -index 40b9405f1a8e4..d2384d8e8555f 100644 +index 40b9405f1a8e..d2384d8e8555 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a-plus.dts @@ -126,3 +126,8 @@ &uart0 { @@ -8525,7 +8525,7 @@ index 40b9405f1a8e4..d2384d8e8555f 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-a.dts b/arch/arm/boot/dts/bcm2835-rpi-a.dts -index 11edb581dbaf0..4ceca674b7526 100644 +index 11edb581dbaf..4ceca674b752 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-a.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-a.dts @@ -121,3 +121,10 @@ &uart0 { @@ -8540,7 +8540,7 @@ index 11edb581dbaf0..4ceca674b7526 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts -index 1b435c64bd9c1..8f2d10d82fa15 100644 +index 1b435c64bd9c..8f2d10d82fa1 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-plus.dts @@ -128,3 +128,8 @@ &uart0 { @@ -8553,7 +8553,7 @@ index 1b435c64bd9c1..8f2d10d82fa15 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts -index a23c25c00eea7..547c88a3ae9fe 100644 +index a23c25c00eea..547c88a3ae9f 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts @@ -121,3 +121,10 @@ &uart0 { @@ -8568,7 +8568,7 @@ index a23c25c00eea7..547c88a3ae9fe 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-b.dts b/arch/arm/boot/dts/bcm2835-rpi-b.dts -index 1b63d6b19750b..073fc99ef8a2b 100644 +index 1b63d6b19750..073fc99ef8a2 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-b.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-b.dts @@ -116,3 +116,10 @@ &uart0 { @@ -8583,7 +8583,7 @@ index 1b63d6b19750b..073fc99ef8a2b 100644 + pinctrl-1 = <&i2c0_gpio0>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts -index a75c882e65751..95564c93a6452 100644 +index a75c882e6575..95564c93a645 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-cm1-io1.dts @@ -95,3 +95,8 @@ &uart0 { @@ -8596,7 +8596,7 @@ index a75c882e65751..95564c93a6452 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts -index 33b2b77aa47db..3ea5c7e6be54f 100644 +index 33b2b77aa47d..3ea5c7e6be54 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero-w.dts @@ -149,3 +149,8 @@ &uart1 { @@ -8609,7 +8609,7 @@ index 33b2b77aa47db..3ea5c7e6be54f 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi-zero.dts b/arch/arm/boot/dts/bcm2835-rpi-zero.dts -index 6f9b3a908f287..a0eabab12c994 100644 +index 6f9b3a908f28..a0eabab12c99 100644 --- a/arch/arm/boot/dts/bcm2835-rpi-zero.dts +++ b/arch/arm/boot/dts/bcm2835-rpi-zero.dts @@ -117,3 +117,8 @@ &uart0 { @@ -8622,7 +8622,7 @@ index 6f9b3a908f287..a0eabab12c994 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi -index 87ddcad760834..edc55bba5ff4b 100644 +index 87ddcad76083..edc55bba5ff4 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -19,6 +19,11 @@ firmware: firmware { @@ -8670,7 +8670,7 @@ index 87ddcad760834..edc55bba5ff4b 100644 power-domains = <&power RPI_POWER_DOMAIN_VEC>; status = "okay"; diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi -index 0549686134ea6..2ea891228ea07 100644 +index 0549686134ea..2ea891228ea0 100644 --- a/arch/arm/boot/dts/bcm2835.dtsi +++ b/arch/arm/boot/dts/bcm2835.dtsi @@ -19,7 +19,7 @@ cpu@0 { @@ -8683,7 +8683,7 @@ index 0549686134ea6..2ea891228ea07 100644 arm-pmu { diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts -index d8af8eeac7b6f..bf22b74359d8a 100644 +index d8af8eeac7b6..bf22b74359d8 100644 --- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts +++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts @@ -128,3 +128,8 @@ &uart0 { @@ -8696,7 +8696,7 @@ index d8af8eeac7b6f..bf22b74359d8a 100644 + pinctrl-1 = <&i2c0_gpio28>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts -index 77099a7871b03..9529c04756730 100644 +index 77099a7871b0..9529c0475673 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts @@ -178,3 +178,8 @@ &uart1 { @@ -8709,7 +8709,7 @@ index 77099a7871b03..9529c04756730 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts -index 61010266ca9a3..40cb269aed0fd 100644 +index 61010266ca9a..40cb269aed0f 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts @@ -181,3 +181,8 @@ &uart1 { @@ -8722,7 +8722,7 @@ index 61010266ca9a3..40cb269aed0fd 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -index dd4a486040971..8f16b6b3fe08b 100644 +index dd4a48604097..8f16b6b3fe08 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -174,3 +174,8 @@ &sdhost { @@ -8735,7 +8735,7 @@ index dd4a486040971..8f16b6b3fe08b 100644 + pinctrl-1 = <&i2c0_gpio44>; +}; diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts -index 588d9411ceb61..dde209ade51b9 100644 +index 588d9411ceb6..dde209ade51b 100644 --- a/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts +++ b/arch/arm/boot/dts/bcm2837-rpi-cm3-io3.dts @@ -94,3 +94,8 @@ &uart0 { @@ -8749,7 +8749,7 @@ index 588d9411ceb61..dde209ade51b9 100644 +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi b/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi new file mode 100644 -index 0000000000000..55237d03ed949 +index 000000000000..55237d03ed94 --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-cam1-regulator.dtsi @@ -0,0 +1,10 @@ @@ -8765,7 +8765,7 @@ index 0000000000000..55237d03ed949 +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi new file mode 100644 -index 0000000000000..6e4ce8622b477 +index 000000000000..6e4ce8622b47 --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi0-2lane.dtsi @@ -0,0 +1,4 @@ @@ -8775,7 +8775,7 @@ index 0000000000000..6e4ce8622b477 +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi new file mode 100644 -index 0000000000000..6938f4daacdc2 +index 000000000000..6938f4daacdc --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1,4 @@ @@ -8785,7 +8785,7 @@ index 0000000000000..6938f4daacdc2 +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi new file mode 100644 -index 0000000000000..b37037437beed +index 000000000000..b37037437bee --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-csi1-4lane.dtsi @@ -0,0 +1,4 @@ @@ -8795,7 +8795,7 @@ index 0000000000000..b37037437beed +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi new file mode 100644 -index 0000000000000..38f0074bce3ff +index 000000000000..38f0074bce3f --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_28.dtsi @@ -0,0 +1,4 @@ @@ -8805,7 +8805,7 @@ index 0000000000000..38f0074bce3ff +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi new file mode 100644 -index 0000000000000..119946d878dbf +index 000000000000..119946d878db --- /dev/null +++ b/arch/arm/boot/dts/bcm283x-rpi-i2c0mux_0_44.dtsi @@ -0,0 +1,4 @@ @@ -8815,7 +8815,7 @@ index 0000000000000..119946d878dbf +}; diff --git a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi b/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi deleted file mode 100644 -index 0ff0e9e253272..0000000000000 +index 0ff0e9e25327..000000000000 --- a/arch/arm/boot/dts/bcm283x-rpi-usb-peripheral.dtsi +++ /dev/null @@ -1,7 +0,0 @@ @@ -8827,7 +8827,7 @@ index 0ff0e9e253272..0000000000000 - g-tx-fifo-size = <256 256 512 512 512 768 768>; -}; diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi -index 0f3be55201a5b..06d04cde52b9a 100644 +index 0f3be55201a5..06d04cde52b9 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -334,7 +334,7 @@ spi: spi@7e204000 { @@ -8887,7 +8887,7 @@ index 0f3be55201a5b..06d04cde52b9a 100644 reg = <0x7e980000 0x10000>; diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile new file mode 100644 -index 0000000000000..b36c618b01d08 +index 000000000000..b36c618b01d0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/Makefile @@ -0,0 +1,252 @@ @@ -9145,7 +9145,7 @@ index 0000000000000..b36c618b01d08 +clean-files := *.dtbo diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README new file mode 100644 -index 0000000000000..5064d8eb20402 +index 000000000000..5064d8eb2040 --- /dev/null +++ b/arch/arm/boot/dts/overlays/README @@ -0,0 +1,3576 @@ @@ -12727,7 +12727,7 @@ index 0000000000000..5064d8eb20402 +http://www.raspberrypi.org/documentation/configuration/device-tree.md diff --git a/arch/arm/boot/dts/overlays/act-led-overlay.dts b/arch/arm/boot/dts/overlays/act-led-overlay.dts new file mode 100644 -index 0000000000000..2f4bbb407f896 +index 000000000000..2f4bbb407f89 --- /dev/null +++ b/arch/arm/boot/dts/overlays/act-led-overlay.dts @@ -0,0 +1,27 @@ @@ -12760,7 +12760,7 @@ index 0000000000000..2f4bbb407f896 +}; diff --git a/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts new file mode 100644 -index 0000000000000..bf186811ec5dc +index 000000000000..bf186811ec5d --- /dev/null +++ b/arch/arm/boot/dts/overlays/adafruit-st7735r-overlay.dts @@ -0,0 +1,83 @@ @@ -12849,7 +12849,7 @@ index 0000000000000..bf186811ec5dc +}; diff --git a/arch/arm/boot/dts/overlays/adafruit18-overlay.dts b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts new file mode 100644 -index 0000000000000..e1ce94a8cd3e2 +index 000000000000..e1ce94a8cd3e --- /dev/null +++ b/arch/arm/boot/dts/overlays/adafruit18-overlay.dts @@ -0,0 +1,55 @@ @@ -12910,7 +12910,7 @@ index 0000000000000..e1ce94a8cd3e2 +}; diff --git a/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts new file mode 100644 -index 0000000000000..298488e191565 +index 000000000000..298488e19156 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adau1977-adc-overlay.dts @@ -0,0 +1,40 @@ @@ -12956,7 +12956,7 @@ index 0000000000000..298488e191565 +}; diff --git a/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts new file mode 100644 -index 0000000000000..5fed769d25260 +index 000000000000..5fed769d2526 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adau7002-simple-overlay.dts @@ -0,0 +1,52 @@ @@ -13014,7 +13014,7 @@ index 0000000000000..5fed769d25260 +}; diff --git a/arch/arm/boot/dts/overlays/ads1015-overlay.dts b/arch/arm/boot/dts/overlays/ads1015-overlay.dts new file mode 100644 -index 0000000000000..dc1764613a8b0 +index 000000000000..dc1764613a8b --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads1015-overlay.dts @@ -0,0 +1,98 @@ @@ -13118,7 +13118,7 @@ index 0000000000000..dc1764613a8b0 +}; diff --git a/arch/arm/boot/dts/overlays/ads1115-overlay.dts b/arch/arm/boot/dts/overlays/ads1115-overlay.dts new file mode 100644 -index 0000000000000..e44ced704ee2d +index 000000000000..e44ced704ee2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads1115-overlay.dts @@ -0,0 +1,103 @@ @@ -13227,7 +13227,7 @@ index 0000000000000..e44ced704ee2d +}; diff --git a/arch/arm/boot/dts/overlays/ads7846-overlay.dts b/arch/arm/boot/dts/overlays/ads7846-overlay.dts new file mode 100644 -index 0000000000000..1c5c9b6bb6ffd +index 000000000000..1c5c9b6bb6ff --- /dev/null +++ b/arch/arm/boot/dts/overlays/ads7846-overlay.dts @@ -0,0 +1,89 @@ @@ -13322,7 +13322,7 @@ index 0000000000000..1c5c9b6bb6ffd +}; diff --git a/arch/arm/boot/dts/overlays/adv7282m-overlay.dts b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts new file mode 100644 -index 0000000000000..5d85dfd0595c9 +index 000000000000..5d85dfd0595c --- /dev/null +++ b/arch/arm/boot/dts/overlays/adv7282m-overlay.dts @@ -0,0 +1,65 @@ @@ -13393,7 +13393,7 @@ index 0000000000000..5d85dfd0595c9 +}; diff --git a/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts new file mode 100644 -index 0000000000000..ea392e886984b +index 000000000000..ea392e886984 --- /dev/null +++ b/arch/arm/boot/dts/overlays/adv728x-m-overlay.dts @@ -0,0 +1,37 @@ @@ -13436,7 +13436,7 @@ index 0000000000000..ea392e886984b +}; diff --git a/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts new file mode 100644 -index 0000000000000..82f9b3734fb12 +index 000000000000..82f9b3734fb1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/akkordion-iqdacplus-overlay.dts @@ -0,0 +1,49 @@ @@ -13491,7 +13491,7 @@ index 0000000000000..82f9b3734fb12 +}; diff --git a/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts new file mode 100644 -index 0000000000000..873cb2fab52ba +index 000000000000..873cb2fab52b --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-boss-dac-pcm512x-audio-overlay.dts @@ -0,0 +1,59 @@ @@ -13556,7 +13556,7 @@ index 0000000000000..873cb2fab52ba +}; diff --git a/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts new file mode 100644 -index 0000000000000..a6adfb495eb90 +index 000000000000..a6adfb495eb9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-boss2-dac-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -13619,7 +13619,7 @@ index 0000000000000..a6adfb495eb90 + diff --git a/arch/arm/boot/dts/overlays/allo-digione-overlay.dts b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts new file mode 100644 -index 0000000000000..ea018ace34d4f +index 000000000000..ea018ace34d4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-digione-overlay.dts @@ -0,0 +1,44 @@ @@ -13669,7 +13669,7 @@ index 0000000000000..ea018ace34d4f +}; diff --git a/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts new file mode 100644 -index 0000000000000..b25fd681f09f3 +index 000000000000..b25fd681f09f --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-katana-dac-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -13732,7 +13732,7 @@ index 0000000000000..b25fd681f09f3 + diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts new file mode 100644 -index 0000000000000..bfc66da6295a8 +index 000000000000..bfc66da6295a --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-pcm512x-audio-overlay.dts @@ -0,0 +1,54 @@ @@ -13792,7 +13792,7 @@ index 0000000000000..bfc66da6295a8 +}; diff --git a/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts new file mode 100644 -index 0000000000000..d47a35def4f76 +index 000000000000..d47a35def4f7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/allo-piano-dac-plus-pcm512x-audio-overlay.dts @@ -0,0 +1,57 @@ @@ -13855,7 +13855,7 @@ index 0000000000000..d47a35def4f76 +}; diff --git a/arch/arm/boot/dts/overlays/anyspi-overlay.dts b/arch/arm/boot/dts/overlays/anyspi-overlay.dts new file mode 100755 -index 0000000000000..87523dcca318c +index 000000000000..87523dcca318 --- /dev/null +++ b/arch/arm/boot/dts/overlays/anyspi-overlay.dts @@ -0,0 +1,205 @@ @@ -14066,7 +14066,7 @@ index 0000000000000..87523dcca318c +}; diff --git a/arch/arm/boot/dts/overlays/apds9960-overlay.dts b/arch/arm/boot/dts/overlays/apds9960-overlay.dts new file mode 100644 -index 0000000000000..c216932278ab7 +index 000000000000..c216932278ab --- /dev/null +++ b/arch/arm/boot/dts/overlays/apds9960-overlay.dts @@ -0,0 +1,57 @@ @@ -14129,7 +14129,7 @@ index 0000000000000..c216932278ab7 + diff --git a/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts new file mode 100644 -index 0000000000000..4769296ec9d6f +index 000000000000..4769296ec9d6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/applepi-dac-overlay.dts @@ -0,0 +1,57 @@ @@ -14192,7 +14192,7 @@ index 0000000000000..4769296ec9d6f +*/ diff --git a/arch/arm/boot/dts/overlays/at86rf233-overlay.dts b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts new file mode 100644 -index 0000000000000..5a3f4571ee789 +index 000000000000..5a3f4571ee78 --- /dev/null +++ b/arch/arm/boot/dts/overlays/at86rf233-overlay.dts @@ -0,0 +1,57 @@ @@ -14255,7 +14255,7 @@ index 0000000000000..5a3f4571ee789 +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts new file mode 100644 -index 0000000000000..57a66eac8e9b2 +index 000000000000..57a66eac8e9b --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts @@ -0,0 +1,60 @@ @@ -14321,7 +14321,7 @@ index 0000000000000..57a66eac8e9b2 +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts new file mode 100644 -index 0000000000000..63e05cf9665d6 +index 000000000000..63e05cf9665d --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-isolated-soundcard-overlay.dts @@ -0,0 +1,55 @@ @@ -14382,7 +14382,7 @@ index 0000000000000..63e05cf9665d6 +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts new file mode 100644 -index 0000000000000..fb4a4678a17ab +index 000000000000..fb4a4678a17a --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts @@ -0,0 +1,71 @@ @@ -14459,7 +14459,7 @@ index 0000000000000..fb4a4678a17ab +}; diff --git a/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts new file mode 100644 -index 0000000000000..68f4427d86c35 +index 000000000000..68f4427d86c3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audioinjector-wm8731-audio-overlay.dts @@ -0,0 +1,39 @@ @@ -14504,7 +14504,7 @@ index 0000000000000..68f4427d86c35 +}; diff --git a/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts new file mode 100644 -index 0000000000000..81af26374d920 +index 000000000000..81af26374d92 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audiosense-pi-overlay.dts @@ -0,0 +1,82 @@ @@ -14592,7 +14592,7 @@ index 0000000000000..81af26374d920 +}; diff --git a/arch/arm/boot/dts/overlays/audremap-overlay.dts b/arch/arm/boot/dts/overlays/audremap-overlay.dts new file mode 100644 -index 0000000000000..7324890ead869 +index 000000000000..7324890ead86 --- /dev/null +++ b/arch/arm/boot/dts/overlays/audremap-overlay.dts @@ -0,0 +1,42 @@ @@ -14640,7 +14640,7 @@ index 0000000000000..7324890ead869 +}; diff --git a/arch/arm/boot/dts/overlays/balena-fin-overlay.dts b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts new file mode 100644 -index 0000000000000..e7ead7cdf5f5e +index 000000000000..e7ead7cdf5f5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/balena-fin-overlay.dts @@ -0,0 +1,125 @@ @@ -14771,7 +14771,7 @@ index 0000000000000..e7ead7cdf5f5e +}; diff --git a/arch/arm/boot/dts/overlays/cap1106-overlay.dts b/arch/arm/boot/dts/overlays/cap1106-overlay.dts new file mode 100644 -index 0000000000000..0a585e725f842 +index 000000000000..0a585e725f84 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cap1106-overlay.dts @@ -0,0 +1,52 @@ @@ -14829,7 +14829,7 @@ index 0000000000000..0a585e725f842 +}; diff --git a/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts new file mode 100644 -index 0000000000000..09c7417b47076 +index 000000000000..09c7417b4707 --- /dev/null +++ b/arch/arm/boot/dts/overlays/chipdip-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -14881,7 +14881,7 @@ index 0000000000000..09c7417b47076 +}; diff --git a/arch/arm/boot/dts/overlays/cma-overlay.dts b/arch/arm/boot/dts/overlays/cma-overlay.dts new file mode 100644 -index 0000000000000..1d87c599f909d +index 000000000000..1d87c599f909 --- /dev/null +++ b/arch/arm/boot/dts/overlays/cma-overlay.dts @@ -0,0 +1,36 @@ @@ -14923,7 +14923,7 @@ index 0000000000000..1d87c599f909d +}; diff --git a/arch/arm/boot/dts/overlays/dht11-overlay.dts b/arch/arm/boot/dts/overlays/dht11-overlay.dts new file mode 100644 -index 0000000000000..6feeeb402493e +index 000000000000..6feeeb402493 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dht11-overlay.dts @@ -0,0 +1,41 @@ @@ -14970,7 +14970,7 @@ index 0000000000000..6feeeb402493e +}; diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts new file mode 100644 -index 0000000000000..d863e5c167cc9 +index 000000000000..d863e5c167cc --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-overlay.dts @@ -0,0 +1,39 @@ @@ -15015,7 +15015,7 @@ index 0000000000000..d863e5c167cc9 +}; diff --git a/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts new file mode 100644 -index 0000000000000..dfb8922a654bb +index 000000000000..dfb8922a654b --- /dev/null +++ b/arch/arm/boot/dts/overlays/dionaudio-loco-v2-overlay.dts @@ -0,0 +1,49 @@ @@ -15070,7 +15070,7 @@ index 0000000000000..dfb8922a654bb +}; diff --git a/arch/arm/boot/dts/overlays/disable-bt-overlay.dts b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts new file mode 100644 -index 0000000000000..d5a66e5d76a94 +index 000000000000..d5a66e5d76a9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-bt-overlay.dts @@ -0,0 +1,64 @@ @@ -15140,7 +15140,7 @@ index 0000000000000..d5a66e5d76a94 +}; diff --git a/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts new file mode 100644 -index 0000000000000..75e0464639000 +index 000000000000..75e046463900 --- /dev/null +++ b/arch/arm/boot/dts/overlays/disable-wifi-overlay.dts @@ -0,0 +1,20 @@ @@ -15166,7 +15166,7 @@ index 0000000000000..75e0464639000 +}; diff --git a/arch/arm/boot/dts/overlays/dpi18-overlay.dts b/arch/arm/boot/dts/overlays/dpi18-overlay.dts new file mode 100644 -index 0000000000000..4abe5be744db7 +index 000000000000..4abe5be744db --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi18-overlay.dts @@ -0,0 +1,39 @@ @@ -15211,7 +15211,7 @@ index 0000000000000..4abe5be744db7 +}; diff --git a/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts new file mode 100644 -index 0000000000000..50c88a1ed299b +index 000000000000..50c88a1ed299 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi18cpadhi-overlay.dts @@ -0,0 +1,26 @@ @@ -15243,7 +15243,7 @@ index 0000000000000..50c88a1ed299b +}; diff --git a/arch/arm/boot/dts/overlays/dpi24-overlay.dts b/arch/arm/boot/dts/overlays/dpi24-overlay.dts new file mode 100644 -index 0000000000000..44335cc812770 +index 000000000000..44335cc81277 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dpi24-overlay.dts @@ -0,0 +1,39 @@ @@ -15288,7 +15288,7 @@ index 0000000000000..44335cc812770 +}; diff --git a/arch/arm/boot/dts/overlays/draws-overlay.dts b/arch/arm/boot/dts/overlays/draws-overlay.dts new file mode 100644 -index 0000000000000..d18187d7f3437 +index 000000000000..d18187d7f343 --- /dev/null +++ b/arch/arm/boot/dts/overlays/draws-overlay.dts @@ -0,0 +1,208 @@ @@ -15502,7 +15502,7 @@ index 0000000000000..d18187d7f3437 +}; diff --git a/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts new file mode 100644 -index 0000000000000..78c5e9f850484 +index 000000000000..78c5e9f85048 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dwc-otg-overlay.dts @@ -0,0 +1,14 @@ @@ -15522,7 +15522,7 @@ index 0000000000000..78c5e9f850484 +}; diff --git a/arch/arm/boot/dts/overlays/dwc2-overlay.dts b/arch/arm/boot/dts/overlays/dwc2-overlay.dts new file mode 100644 -index 0000000000000..0d83e344ad973 +index 000000000000..0d83e344ad97 --- /dev/null +++ b/arch/arm/boot/dts/overlays/dwc2-overlay.dts @@ -0,0 +1,26 @@ @@ -15554,7 +15554,7 @@ index 0000000000000..0d83e344ad973 +}; diff --git a/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts new file mode 100644 -index 0000000000000..f82b4d0e50479 +index 000000000000..f82b4d0e5047 --- /dev/null +++ b/arch/arm/boot/dts/overlays/edt-ft5406-overlay.dts @@ -0,0 +1,10 @@ @@ -15570,7 +15570,7 @@ index 0000000000000..f82b4d0e50479 +#include "edt-ft5406.dtsi" diff --git a/arch/arm/boot/dts/overlays/edt-ft5406.dtsi b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi new file mode 100644 -index 0000000000000..0473ff17f19fa +index 000000000000..0473ff17f19f --- /dev/null +++ b/arch/arm/boot/dts/overlays/edt-ft5406.dtsi @@ -0,0 +1,55 @@ @@ -15631,7 +15631,7 @@ index 0000000000000..0473ff17f19fa +}; diff --git a/arch/arm/boot/dts/overlays/enc28j60-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts new file mode 100644 -index 0000000000000..7af5c2e607ea0 +index 000000000000..7af5c2e607ea --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-overlay.dts @@ -0,0 +1,53 @@ @@ -15690,7 +15690,7 @@ index 0000000000000..7af5c2e607ea0 +}; diff --git a/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts new file mode 100644 -index 0000000000000..17cb5b8fa4852 +index 000000000000..17cb5b8fa485 --- /dev/null +++ b/arch/arm/boot/dts/overlays/enc28j60-spi2-overlay.dts @@ -0,0 +1,47 @@ @@ -15743,7 +15743,7 @@ index 0000000000000..17cb5b8fa4852 +}; diff --git a/arch/arm/boot/dts/overlays/exc3000-overlay.dts b/arch/arm/boot/dts/overlays/exc3000-overlay.dts new file mode 100644 -index 0000000000000..6f087fb206618 +index 000000000000..6f087fb20661 --- /dev/null +++ b/arch/arm/boot/dts/overlays/exc3000-overlay.dts @@ -0,0 +1,48 @@ @@ -15797,7 +15797,7 @@ index 0000000000000..6f087fb206618 +}; diff --git a/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts new file mode 100644 -index 0000000000000..743f14ae5768d +index 000000000000..743f14ae5768 --- /dev/null +++ b/arch/arm/boot/dts/overlays/fe-pi-audio-overlay.dts @@ -0,0 +1,70 @@ @@ -15873,7 +15873,7 @@ index 0000000000000..743f14ae5768d +}; diff --git a/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts new file mode 100644 -index 0000000000000..e9944f5cd2581 +index 000000000000..e9944f5cd258 --- /dev/null +++ b/arch/arm/boot/dts/overlays/fsm-demo-overlay.dts @@ -0,0 +1,104 @@ @@ -15983,7 +15983,7 @@ index 0000000000000..e9944f5cd2581 +}; diff --git a/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts new file mode 100644 -index 0000000000000..7509e00679c82 +index 000000000000..7509e00679c8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ghost-amp-overlay.dts @@ -0,0 +1,145 @@ @@ -16134,7 +16134,7 @@ index 0000000000000..7509e00679c82 +}; diff --git a/arch/arm/boot/dts/overlays/goodix-overlay.dts b/arch/arm/boot/dts/overlays/goodix-overlay.dts new file mode 100644 -index 0000000000000..8571527de49a6 +index 000000000000..8571527de49a --- /dev/null +++ b/arch/arm/boot/dts/overlays/goodix-overlay.dts @@ -0,0 +1,46 @@ @@ -16186,7 +16186,7 @@ index 0000000000000..8571527de49a6 +}; diff --git a/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts new file mode 100644 -index 0000000000000..e443be1f9a0e7 +index 000000000000..e443be1f9a0e --- /dev/null +++ b/arch/arm/boot/dts/overlays/googlevoicehat-soundcard-overlay.dts @@ -0,0 +1,49 @@ @@ -16241,7 +16241,7 @@ index 0000000000000..e443be1f9a0e7 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts new file mode 100644 -index 0000000000000..77a7bbb41e3bd +index 000000000000..77a7bbb41e3b --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-fan-overlay.dts @@ -0,0 +1,79 @@ @@ -16326,7 +16326,7 @@ index 0000000000000..77a7bbb41e3bd +}; diff --git a/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts new file mode 100644 -index 0000000000000..162b6ce07dc91 +index 000000000000..162b6ce07dc9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-ir-overlay.dts @@ -0,0 +1,49 @@ @@ -16381,7 +16381,7 @@ index 0000000000000..162b6ce07dc91 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts new file mode 100644 -index 0000000000000..3625431b75604 +index 000000000000..3625431b7560 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-ir-tx-overlay.dts @@ -0,0 +1,36 @@ @@ -16423,7 +16423,7 @@ index 0000000000000..3625431b75604 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-key-overlay.dts b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts new file mode 100644 -index 0000000000000..2e7253d1d0abf +index 000000000000..2e7253d1d0ab --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-key-overlay.dts @@ -0,0 +1,48 @@ @@ -16477,7 +16477,7 @@ index 0000000000000..2e7253d1d0abf +}; diff --git a/arch/arm/boot/dts/overlays/gpio-led-overlay.dts b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts new file mode 100755 -index 0000000000000..d8e9d53f1b619 +index 000000000000..d8e9d53f1b61 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-led-overlay.dts @@ -0,0 +1,97 @@ @@ -16580,7 +16580,7 @@ index 0000000000000..d8e9d53f1b619 + diff --git a/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts new file mode 100755 -index 0000000000000..96cbe80820b72 +index 000000000000..96cbe80820b7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-no-bank0-irq-overlay.dts @@ -0,0 +1,14 @@ @@ -16600,7 +16600,7 @@ index 0000000000000..96cbe80820b72 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts new file mode 100644 -index 0000000000000..55f9bff3a8f62 +index 000000000000..55f9bff3a8f6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-no-irq-overlay.dts @@ -0,0 +1,14 @@ @@ -16620,7 +16620,7 @@ index 0000000000000..55f9bff3a8f62 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts new file mode 100644 -index 0000000000000..416aa2bc797a3 +index 000000000000..416aa2bc797a --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-poweroff-overlay.dts @@ -0,0 +1,37 @@ @@ -16663,7 +16663,7 @@ index 0000000000000..416aa2bc797a3 +}; diff --git a/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts new file mode 100644 -index 0000000000000..da148064aedd1 +index 000000000000..da148064aedd --- /dev/null +++ b/arch/arm/boot/dts/overlays/gpio-shutdown-overlay.dts @@ -0,0 +1,86 @@ @@ -16755,7 +16755,7 @@ index 0000000000000..da148064aedd1 +}; diff --git a/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts new file mode 100644 -index 0000000000000..ee726669ff511 +index 000000000000..ee726669ff51 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hd44780-lcd-overlay.dts @@ -0,0 +1,46 @@ @@ -16807,7 +16807,7 @@ index 0000000000000..ee726669ff511 +}; diff --git a/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts new file mode 100644 -index 0000000000000..50b9a2665c80b +index 000000000000..50b9a2665c80 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hdmi-backlight-hwhack-gpio-overlay.dts @@ -0,0 +1,47 @@ @@ -16860,7 +16860,7 @@ index 0000000000000..50b9a2665c80b +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts new file mode 100644 -index 0000000000000..142518ab348b1 +index 000000000000..142518ab348b --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp-overlay.dts @@ -0,0 +1,39 @@ @@ -16905,7 +16905,7 @@ index 0000000000000..142518ab348b1 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts new file mode 100644 -index 0000000000000..ebdef55d61109 +index 000000000000..ebdef55d6110 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-amp100-overlay.dts @@ -0,0 +1,64 @@ @@ -16975,7 +16975,7 @@ index 0000000000000..ebdef55d61109 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts new file mode 100644 -index 0000000000000..ea8a6c8f36c0a +index 000000000000..ea8a6c8f36c0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dac-overlay.dts @@ -0,0 +1,34 @@ @@ -17015,7 +17015,7 @@ index 0000000000000..ea8a6c8f36c0a +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts new file mode 100644 -index 0000000000000..ff19015ba6561 +index 000000000000..ff19015ba656 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplus-overlay.dts @@ -0,0 +1,65 @@ @@ -17086,7 +17086,7 @@ index 0000000000000..ff19015ba6561 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts new file mode 100644 -index 0000000000000..540563dec10f2 +index 000000000000..540563dec10f --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts @@ -0,0 +1,72 @@ @@ -17164,7 +17164,7 @@ index 0000000000000..540563dec10f2 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts new file mode 100644 -index 0000000000000..561cd84bbb79c +index 000000000000..561cd84bbb79 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadcpro-overlay.dts @@ -0,0 +1,70 @@ @@ -17240,7 +17240,7 @@ index 0000000000000..561cd84bbb79c +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts new file mode 100644 -index 0000000000000..63432e8b983fe +index 000000000000..63432e8b983f --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusdsp-overlay.dts @@ -0,0 +1,34 @@ @@ -17280,7 +17280,7 @@ index 0000000000000..63432e8b983fe +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts new file mode 100644 -index 0000000000000..c5583e010339e +index 000000000000..c5583e010339 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplushd-overlay.dts @@ -0,0 +1,106 @@ @@ -17392,7 +17392,7 @@ index 0000000000000..c5583e010339e +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts new file mode 100644 -index 0000000000000..a2309a50e8d86 +index 000000000000..a2309a50e8d8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-overlay.dts @@ -0,0 +1,41 @@ @@ -17439,7 +17439,7 @@ index 0000000000000..a2309a50e8d86 +}; diff --git a/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts new file mode 100644 -index 0000000000000..83de602e76ba1 +index 000000000000..83de602e76ba --- /dev/null +++ b/arch/arm/boot/dts/overlays/hifiberry-digi-pro-overlay.dts @@ -0,0 +1,43 @@ @@ -17488,7 +17488,7 @@ index 0000000000000..83de602e76ba1 +}; diff --git a/arch/arm/boot/dts/overlays/highperi-overlay.dts b/arch/arm/boot/dts/overlays/highperi-overlay.dts new file mode 100644 -index 0000000000000..46cb76c2d34ff +index 000000000000..46cb76c2d34f --- /dev/null +++ b/arch/arm/boot/dts/overlays/highperi-overlay.dts @@ -0,0 +1,63 @@ @@ -17557,7 +17557,7 @@ index 0000000000000..46cb76c2d34ff +}; diff --git a/arch/arm/boot/dts/overlays/hy28a-overlay.dts b/arch/arm/boot/dts/overlays/hy28a-overlay.dts new file mode 100644 -index 0000000000000..5843a5e9c86a4 +index 000000000000..5843a5e9c86a --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28a-overlay.dts @@ -0,0 +1,93 @@ @@ -17656,7 +17656,7 @@ index 0000000000000..5843a5e9c86a4 +}; diff --git a/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts new file mode 100644 -index 0000000000000..95bfb1eadc208 +index 000000000000..95bfb1eadc20 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28b-2017-overlay.dts @@ -0,0 +1,152 @@ @@ -17814,7 +17814,7 @@ index 0000000000000..95bfb1eadc208 +}; diff --git a/arch/arm/boot/dts/overlays/hy28b-overlay.dts b/arch/arm/boot/dts/overlays/hy28b-overlay.dts new file mode 100644 -index 0000000000000..9edd0848d5550 +index 000000000000..9edd0848d555 --- /dev/null +++ b/arch/arm/boot/dts/overlays/hy28b-overlay.dts @@ -0,0 +1,148 @@ @@ -17968,7 +17968,7 @@ index 0000000000000..9edd0848d5550 +}; diff --git a/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts new file mode 100644 -index 0000000000000..0c4cff354674b +index 000000000000..0c4cff354674 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i-sabre-q2m-overlay.dts @@ -0,0 +1,39 @@ @@ -18013,7 +18013,7 @@ index 0000000000000..0c4cff354674b +}; diff --git a/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts new file mode 100644 -index 0000000000000..8204b6b3aef83 +index 000000000000..8204b6b3aef8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-bcm2708-overlay.dts @@ -0,0 +1,13 @@ @@ -18032,7 +18032,7 @@ index 0000000000000..8204b6b3aef83 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts new file mode 100644 -index 0000000000000..63231b5d7c0c1 +index 000000000000..63231b5d7c0c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-gpio-overlay.dts @@ -0,0 +1,47 @@ @@ -18085,7 +18085,7 @@ index 0000000000000..63231b5d7c0c1 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts new file mode 100644 -index 0000000000000..112aed91ecb24 +index 000000000000..112aed91ecb2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-mux-overlay.dts @@ -0,0 +1,139 @@ @@ -18230,7 +18230,7 @@ index 0000000000000..112aed91ecb24 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts new file mode 100644 -index 0000000000000..9bb16465a50e7 +index 000000000000..9bb16465a50e --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-pwm-pca9685a-overlay.dts @@ -0,0 +1,26 @@ @@ -18262,7 +18262,7 @@ index 0000000000000..9bb16465a50e7 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi new file mode 100644 -index 0000000000000..7f749fc2d8023 +index 000000000000..7f749fc2d802 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-common.dtsi @@ -0,0 +1,323 @@ @@ -18591,7 +18591,7 @@ index 0000000000000..7f749fc2d8023 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts new file mode 100644 -index 0000000000000..c83480c1c3279 +index 000000000000..c83480c1c327 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -0,0 +1,31 @@ @@ -18628,7 +18628,7 @@ index 0000000000000..c83480c1c3279 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts new file mode 100644 -index 0000000000000..1eae9e1a5c967 +index 000000000000..1eae9e1a5c96 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -0,0 +1,34 @@ @@ -18668,7 +18668,7 @@ index 0000000000000..1eae9e1a5c967 +}; diff --git a/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts new file mode 100755 -index 0000000000000..b05b0fa919426 +index 000000000000..b05b0fa91942 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c-sensor-overlay.dts @@ -0,0 +1,320 @@ @@ -18994,7 +18994,7 @@ index 0000000000000..b05b0fa919426 +}; diff --git a/arch/arm/boot/dts/overlays/i2c0-overlay.dts b/arch/arm/boot/dts/overlays/i2c0-overlay.dts new file mode 100644 -index 0000000000000..46bf1bf2dc5cb +index 000000000000..46bf1bf2dc5c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c0-overlay.dts @@ -0,0 +1,83 @@ @@ -19083,7 +19083,7 @@ index 0000000000000..46bf1bf2dc5cb +}; diff --git a/arch/arm/boot/dts/overlays/i2c1-overlay.dts b/arch/arm/boot/dts/overlays/i2c1-overlay.dts new file mode 100644 -index 0000000000000..addaed73e6656 +index 000000000000..addaed73e665 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c1-overlay.dts @@ -0,0 +1,44 @@ @@ -19133,7 +19133,7 @@ index 0000000000000..addaed73e6656 +}; diff --git a/arch/arm/boot/dts/overlays/i2c3-overlay.dts b/arch/arm/boot/dts/overlays/i2c3-overlay.dts new file mode 100644 -index 0000000000000..e24a1df21f991 +index 000000000000..e24a1df21f99 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c3-overlay.dts @@ -0,0 +1,36 @@ @@ -19175,7 +19175,7 @@ index 0000000000000..e24a1df21f991 +}; diff --git a/arch/arm/boot/dts/overlays/i2c4-overlay.dts b/arch/arm/boot/dts/overlays/i2c4-overlay.dts new file mode 100644 -index 0000000000000..14c7f4d1da4c7 +index 000000000000..14c7f4d1da4c --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c4-overlay.dts @@ -0,0 +1,36 @@ @@ -19217,7 +19217,7 @@ index 0000000000000..14c7f4d1da4c7 +}; diff --git a/arch/arm/boot/dts/overlays/i2c5-overlay.dts b/arch/arm/boot/dts/overlays/i2c5-overlay.dts new file mode 100644 -index 0000000000000..7953621112ded +index 000000000000..7953621112de --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c5-overlay.dts @@ -0,0 +1,36 @@ @@ -19259,7 +19259,7 @@ index 0000000000000..7953621112ded +}; diff --git a/arch/arm/boot/dts/overlays/i2c6-overlay.dts b/arch/arm/boot/dts/overlays/i2c6-overlay.dts new file mode 100644 -index 0000000000000..555305a7ee1fd +index 000000000000..555305a7ee1f --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2c6-overlay.dts @@ -0,0 +1,36 @@ @@ -19301,7 +19301,7 @@ index 0000000000000..555305a7ee1fd +}; diff --git a/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts new file mode 100644 -index 0000000000000..cf43094c6ff45 +index 000000000000..cf43094c6ff4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/i2s-gpio28-31-overlay.dts @@ -0,0 +1,18 @@ @@ -19325,7 +19325,7 @@ index 0000000000000..cf43094c6ff45 +}; diff --git a/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts new file mode 100644 -index 0000000000000..551aba591d263 +index 000000000000..551aba591d26 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ilitek251x-overlay.dts @@ -0,0 +1,45 @@ @@ -19376,7 +19376,7 @@ index 0000000000000..551aba591d263 +}; diff --git a/arch/arm/boot/dts/overlays/imx219-overlay.dts b/arch/arm/boot/dts/overlays/imx219-overlay.dts new file mode 100644 -index 0000000000000..0c065bf09f54f +index 000000000000..0c065bf09f54 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx219-overlay.dts @@ -0,0 +1,115 @@ @@ -19497,7 +19497,7 @@ index 0000000000000..0c065bf09f54f +}; diff --git a/arch/arm/boot/dts/overlays/imx290-overlay.dts b/arch/arm/boot/dts/overlays/imx290-overlay.dts new file mode 100644 -index 0000000000000..e536aa7f9e338 +index 000000000000..e536aa7f9e33 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290-overlay.dts @@ -0,0 +1,32 @@ @@ -19535,7 +19535,7 @@ index 0000000000000..e536aa7f9e338 +}; diff --git a/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi new file mode 100644 -index 0000000000000..d4a5ed6dbbcfa +index 000000000000..d4a5ed6dbbcf --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx290_327-overlay.dtsi @@ -0,0 +1,144 @@ @@ -19685,7 +19685,7 @@ index 0000000000000..d4a5ed6dbbcfa +}; diff --git a/arch/arm/boot/dts/overlays/imx378-overlay.dts b/arch/arm/boot/dts/overlays/imx378-overlay.dts new file mode 100644 -index 0000000000000..74c7288d12f57 +index 000000000000..74c7288d12f5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx378-overlay.dts @@ -0,0 +1,10 @@ @@ -19701,7 +19701,7 @@ index 0000000000000..74c7288d12f57 +}; diff --git a/arch/arm/boot/dts/overlays/imx477-overlay.dts b/arch/arm/boot/dts/overlays/imx477-overlay.dts new file mode 100644 -index 0000000000000..ca315d120e6b0 +index 000000000000..ca315d120e6b --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx477-overlay.dts @@ -0,0 +1,10 @@ @@ -19717,7 +19717,7 @@ index 0000000000000..ca315d120e6b0 +}; diff --git a/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi new file mode 100644 -index 0000000000000..bb9a9acdbbd76 +index 000000000000..bb9a9acdbbd7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx477_378-overlay.dtsi @@ -0,0 +1,110 @@ @@ -19833,7 +19833,7 @@ index 0000000000000..bb9a9acdbbd76 +}; diff --git a/arch/arm/boot/dts/overlays/imx519-overlay.dts b/arch/arm/boot/dts/overlays/imx519-overlay.dts new file mode 100644 -index 0000000000000..693c267af1f0d +index 000000000000..693c267af1f0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/imx519-overlay.dts @@ -0,0 +1,115 @@ @@ -19954,7 +19954,7 @@ index 0000000000000..693c267af1f0d +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts new file mode 100644 -index 0000000000000..9110f5d342988 +index 000000000000..9110f5d34298 --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-codec-overlay.dts @@ -0,0 +1,42 @@ @@ -20002,7 +20002,7 @@ index 0000000000000..9110f5d342988 +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts new file mode 100644 -index 0000000000000..24073cadd0eff +index 000000000000..24073cadd0ef --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -20054,7 +20054,7 @@ index 0000000000000..24073cadd0eff +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts new file mode 100644 -index 0000000000000..7c70b25e58d75 +index 000000000000..7c70b25e58d7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-dacplus-overlay.dts @@ -0,0 +1,49 @@ @@ -20109,7 +20109,7 @@ index 0000000000000..7c70b25e58d75 +}; diff --git a/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts new file mode 100644 -index 0000000000000..ee54095c869be +index 000000000000..ee54095c869b --- /dev/null +++ b/arch/arm/boot/dts/overlays/iqaudio-digi-wm8804-audio-overlay.dts @@ -0,0 +1,47 @@ @@ -20162,7 +20162,7 @@ index 0000000000000..ee54095c869be +}; diff --git a/arch/arm/boot/dts/overlays/irs1125-overlay.dts b/arch/arm/boot/dts/overlays/irs1125-overlay.dts new file mode 100644 -index 0000000000000..e926e18e71fce +index 000000000000..e926e18e71fc --- /dev/null +++ b/arch/arm/boot/dts/overlays/irs1125-overlay.dts @@ -0,0 +1,85 @@ @@ -20253,7 +20253,7 @@ index 0000000000000..e926e18e71fce +}; diff --git a/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts new file mode 100644 -index 0000000000000..585c7dbcdf7f5 +index 000000000000..585c7dbcdf7f --- /dev/null +++ b/arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts @@ -0,0 +1,309 @@ @@ -20568,7 +20568,7 @@ index 0000000000000..585c7dbcdf7f5 + diff --git a/arch/arm/boot/dts/overlays/justboom-both-overlay.dts b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts new file mode 100644 -index 0000000000000..9c42670631c0e +index 000000000000..9c42670631c0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-both-overlay.dts @@ -0,0 +1,65 @@ @@ -20639,7 +20639,7 @@ index 0000000000000..9c42670631c0e +}; diff --git a/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts new file mode 100644 -index 0000000000000..d00515dca4193 +index 000000000000..d00515dca419 --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-dac-overlay.dts @@ -0,0 +1,46 @@ @@ -20691,7 +20691,7 @@ index 0000000000000..d00515dca4193 +}; diff --git a/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts new file mode 100644 -index 0000000000000..e73336029c544 +index 000000000000..e73336029c54 --- /dev/null +++ b/arch/arm/boot/dts/overlays/justboom-digi-overlay.dts @@ -0,0 +1,41 @@ @@ -20738,7 +20738,7 @@ index 0000000000000..e73336029c544 +}; diff --git a/arch/arm/boot/dts/overlays/ltc294x-overlay.dts b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts new file mode 100644 -index 0000000000000..6d971f3649ca5 +index 000000000000..6d971f3649ca --- /dev/null +++ b/arch/arm/boot/dts/overlays/ltc294x-overlay.dts @@ -0,0 +1,86 @@ @@ -20830,7 +20830,7 @@ index 0000000000000..6d971f3649ca5 +}; diff --git a/arch/arm/boot/dts/overlays/max98357a-overlay.dts b/arch/arm/boot/dts/overlays/max98357a-overlay.dts new file mode 100644 -index 0000000000000..9e2afb05b7cb5 +index 000000000000..9e2afb05b7cb --- /dev/null +++ b/arch/arm/boot/dts/overlays/max98357a-overlay.dts @@ -0,0 +1,84 @@ @@ -20920,7 +20920,7 @@ index 0000000000000..9e2afb05b7cb5 +}; diff --git a/arch/arm/boot/dts/overlays/maxtherm-overlay.dts b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts new file mode 100644 -index 0000000000000..9964e246c14f6 +index 000000000000..9964e246c14f --- /dev/null +++ b/arch/arm/boot/dts/overlays/maxtherm-overlay.dts @@ -0,0 +1,186 @@ @@ -21112,7 +21112,7 @@ index 0000000000000..9964e246c14f6 +}; diff --git a/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts new file mode 100644 -index 0000000000000..840dd9b31db41 +index 000000000000..840dd9b31db4 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mbed-dac-overlay.dts @@ -0,0 +1,64 @@ @@ -21182,7 +21182,7 @@ index 0000000000000..840dd9b31db41 +}; diff --git a/arch/arm/boot/dts/overlays/mcp23017-overlay.dts b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts new file mode 100644 -index 0000000000000..c546d8ba7e6d2 +index 000000000000..c546d8ba7e6d --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp23017-overlay.dts @@ -0,0 +1,69 @@ @@ -21257,7 +21257,7 @@ index 0000000000000..c546d8ba7e6d2 + diff --git a/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts new file mode 100644 -index 0000000000000..484d64b225fb8 +index 000000000000..484d64b225fb --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp23s17-overlay.dts @@ -0,0 +1,732 @@ @@ -21995,7 +21995,7 @@ index 0000000000000..484d64b225fb8 + diff --git a/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts new file mode 100755 -index 0000000000000..46f143d809cc8 +index 000000000000..46f143d809cc --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-can0-overlay.dts @@ -0,0 +1,73 @@ @@ -22074,7 +22074,7 @@ index 0000000000000..46f143d809cc8 +}; diff --git a/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts new file mode 100644 -index 0000000000000..0a8dd576818e9 +index 000000000000..0a8dd576818e --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-can1-overlay.dts @@ -0,0 +1,73 @@ @@ -22153,7 +22153,7 @@ index 0000000000000..0a8dd576818e9 +}; diff --git a/arch/arm/boot/dts/overlays/mcp2515-overlay.dts b/arch/arm/boot/dts/overlays/mcp2515-overlay.dts new file mode 100644 -index 0000000000000..cda1fb0b11992 +index 000000000000..cda1fb0b1199 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp2515-overlay.dts @@ -0,0 +1,156 @@ @@ -22315,7 +22315,7 @@ index 0000000000000..cda1fb0b11992 +}; diff --git a/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts new file mode 100644 -index 0000000000000..65c861bbd3401 +index 000000000000..65c861bbd340 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp251xfd-overlay.dts @@ -0,0 +1,226 @@ @@ -22547,7 +22547,7 @@ index 0000000000000..65c861bbd3401 +}; diff --git a/arch/arm/boot/dts/overlays/mcp3008-overlay.dts b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts new file mode 100755 -index 0000000000000..957fdb9310af4 +index 000000000000..957fdb9310af --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3008-overlay.dts @@ -0,0 +1,205 @@ @@ -22758,7 +22758,7 @@ index 0000000000000..957fdb9310af4 +}; diff --git a/arch/arm/boot/dts/overlays/mcp3202-overlay.dts b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts new file mode 100755 -index 0000000000000..8e4e9f60f285f +index 000000000000..8e4e9f60f285 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp3202-overlay.dts @@ -0,0 +1,205 @@ @@ -22969,7 +22969,7 @@ index 0000000000000..8e4e9f60f285f +}; diff --git a/arch/arm/boot/dts/overlays/mcp342x-overlay.dts b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts new file mode 100644 -index 0000000000000..714eca5a4b5e0 +index 000000000000..714eca5a4b5e --- /dev/null +++ b/arch/arm/boot/dts/overlays/mcp342x-overlay.dts @@ -0,0 +1,164 @@ @@ -23139,7 +23139,7 @@ index 0000000000000..714eca5a4b5e0 + diff --git a/arch/arm/boot/dts/overlays/media-center-overlay.dts b/arch/arm/boot/dts/overlays/media-center-overlay.dts new file mode 100644 -index 0000000000000..1b56963f4f16b +index 000000000000..1b56963f4f16 --- /dev/null +++ b/arch/arm/boot/dts/overlays/media-center-overlay.dts @@ -0,0 +1,134 @@ @@ -23279,7 +23279,7 @@ index 0000000000000..1b56963f4f16b +}; diff --git a/arch/arm/boot/dts/overlays/merus-amp-overlay.dts b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts new file mode 100644 -index 0000000000000..4501fbdc253da +index 000000000000..4501fbdc253d --- /dev/null +++ b/arch/arm/boot/dts/overlays/merus-amp-overlay.dts @@ -0,0 +1,60 @@ @@ -23345,7 +23345,7 @@ index 0000000000000..4501fbdc253da +}; diff --git a/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts new file mode 100644 -index 0000000000000..f7e44d29e1010 +index 000000000000..f7e44d29e101 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart0-overlay.dts @@ -0,0 +1,36 @@ @@ -23387,7 +23387,7 @@ index 0000000000000..f7e44d29e1010 +}; diff --git a/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts new file mode 100644 -index 0000000000000..e0bc410acbff3 +index 000000000000..e0bc410acbff --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart1-overlay.dts @@ -0,0 +1,43 @@ @@ -23436,7 +23436,7 @@ index 0000000000000..e0bc410acbff3 +}; diff --git a/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts new file mode 100644 -index 0000000000000..66f3092e9a748 +index 000000000000..66f3092e9a74 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart2-overlay.dts @@ -0,0 +1,37 @@ @@ -23479,7 +23479,7 @@ index 0000000000000..66f3092e9a748 + diff --git a/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts new file mode 100644 -index 0000000000000..55c6cb94f9632 +index 000000000000..55c6cb94f963 --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart3-overlay.dts @@ -0,0 +1,38 @@ @@ -23523,7 +23523,7 @@ index 0000000000000..55c6cb94f9632 + diff --git a/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts new file mode 100644 -index 0000000000000..5819df1a6b2e2 +index 000000000000..5819df1a6b2e --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart4-overlay.dts @@ -0,0 +1,38 @@ @@ -23567,7 +23567,7 @@ index 0000000000000..5819df1a6b2e2 + diff --git a/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts new file mode 100644 -index 0000000000000..a1d37f7103ffe +index 000000000000..a1d37f7103ff --- /dev/null +++ b/arch/arm/boot/dts/overlays/midi-uart5-overlay.dts @@ -0,0 +1,38 @@ @@ -23611,7 +23611,7 @@ index 0000000000000..a1d37f7103ffe + diff --git a/arch/arm/boot/dts/overlays/minipitft13-overlay.dts b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts new file mode 100644 -index 0000000000000..b1a0a2a41f722 +index 000000000000..b1a0a2a41f72 --- /dev/null +++ b/arch/arm/boot/dts/overlays/minipitft13-overlay.dts @@ -0,0 +1,70 @@ @@ -23687,7 +23687,7 @@ index 0000000000000..b1a0a2a41f722 +}; diff --git a/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts new file mode 100644 -index 0000000000000..da49f14a09401 +index 000000000000..da49f14a0940 --- /dev/null +++ b/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts @@ -0,0 +1,93 @@ @@ -23786,7 +23786,7 @@ index 0000000000000..da49f14a09401 +}; diff --git a/arch/arm/boot/dts/overlays/mlx90640-overlay.dts b/arch/arm/boot/dts/overlays/mlx90640-overlay.dts new file mode 100644 -index 0000000000000..a2655ed825859 +index 000000000000..a2655ed82585 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mlx90640-overlay.dts @@ -0,0 +1,22 @@ @@ -23814,7 +23814,7 @@ index 0000000000000..a2655ed825859 +}; diff --git a/arch/arm/boot/dts/overlays/mmc-overlay.dts b/arch/arm/boot/dts/overlays/mmc-overlay.dts new file mode 100644 -index 0000000000000..c1a2f691aa1e7 +index 000000000000..c1a2f691aa1e --- /dev/null +++ b/arch/arm/boot/dts/overlays/mmc-overlay.dts @@ -0,0 +1,46 @@ @@ -23866,7 +23866,7 @@ index 0000000000000..c1a2f691aa1e7 +}; diff --git a/arch/arm/boot/dts/overlays/mpu6050-overlay.dts b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts new file mode 100644 -index 0000000000000..1b4c065356874 +index 000000000000..1b4c06535687 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mpu6050-overlay.dts @@ -0,0 +1,29 @@ @@ -23901,7 +23901,7 @@ index 0000000000000..1b4c065356874 +}; diff --git a/arch/arm/boot/dts/overlays/mz61581-overlay.dts b/arch/arm/boot/dts/overlays/mz61581-overlay.dts new file mode 100644 -index 0000000000000..6e00e8b2ddf2a +index 000000000000..6e00e8b2ddf2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/mz61581-overlay.dts @@ -0,0 +1,117 @@ @@ -24024,7 +24024,7 @@ index 0000000000000..6e00e8b2ddf2a +}; diff --git a/arch/arm/boot/dts/overlays/ov5647-overlay.dts b/arch/arm/boot/dts/overlays/ov5647-overlay.dts new file mode 100644 -index 0000000000000..d7ed4703c9b0b +index 000000000000..d7ed4703c9b0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov5647-overlay.dts @@ -0,0 +1,94 @@ @@ -24124,7 +24124,7 @@ index 0000000000000..d7ed4703c9b0b +}; diff --git a/arch/arm/boot/dts/overlays/ov7251-overlay.dts b/arch/arm/boot/dts/overlays/ov7251-overlay.dts new file mode 100644 -index 0000000000000..09dbeda39d064 +index 000000000000..09dbeda39d06 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov7251-overlay.dts @@ -0,0 +1,113 @@ @@ -24243,7 +24243,7 @@ index 0000000000000..09dbeda39d064 +}; diff --git a/arch/arm/boot/dts/overlays/ov9281-overlay.dts b/arch/arm/boot/dts/overlays/ov9281-overlay.dts new file mode 100644 -index 0000000000000..277236c033584 +index 000000000000..277236c03358 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ov9281-overlay.dts @@ -0,0 +1,113 @@ @@ -24362,7 +24362,7 @@ index 0000000000000..277236c033584 +}; diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts new file mode 100644 -index 0000000000000..bc6e3bce22c72 +index 000000000000..bc6e3bce22c7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -0,0 +1,158 @@ @@ -24526,7 +24526,7 @@ index 0000000000000..bc6e3bce22c72 +}; diff --git a/arch/arm/boot/dts/overlays/papirus-overlay.dts b/arch/arm/boot/dts/overlays/papirus-overlay.dts new file mode 100644 -index 0000000000000..7b6bcfd49c86e +index 000000000000..7b6bcfd49c86 --- /dev/null +++ b/arch/arm/boot/dts/overlays/papirus-overlay.dts @@ -0,0 +1,89 @@ @@ -24621,7 +24621,7 @@ index 0000000000000..7b6bcfd49c86e +}; diff --git a/arch/arm/boot/dts/overlays/pca953x-overlay.dts b/arch/arm/boot/dts/overlays/pca953x-overlay.dts new file mode 100644 -index 0000000000000..8b6ee44665cee +index 000000000000..8b6ee44665ce --- /dev/null +++ b/arch/arm/boot/dts/overlays/pca953x-overlay.dts @@ -0,0 +1,240 @@ @@ -24867,7 +24867,7 @@ index 0000000000000..8b6ee44665cee +}; diff --git a/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts new file mode 100644 -index 0000000000000..cca3e83721b74 +index 000000000000..cca3e83721b7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pcie-32bit-dma-overlay.dts @@ -0,0 +1,18 @@ @@ -24891,7 +24891,7 @@ index 0000000000000..cca3e83721b74 +}; diff --git a/arch/arm/boot/dts/overlays/pibell-overlay.dts b/arch/arm/boot/dts/overlays/pibell-overlay.dts new file mode 100644 -index 0000000000000..9333a9b09772f +index 000000000000..9333a9b09772 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pibell-overlay.dts @@ -0,0 +1,81 @@ @@ -24978,7 +24978,7 @@ index 0000000000000..9333a9b09772f +}; diff --git a/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts new file mode 100644 -index 0000000000000..532a858683d6f +index 000000000000..532a858683d6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifacedigital-overlay.dts @@ -0,0 +1,144 @@ @@ -25128,7 +25128,7 @@ index 0000000000000..532a858683d6f +}; diff --git a/arch/arm/boot/dts/overlays/pifi-40-overlay.dts b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts new file mode 100644 -index 0000000000000..51a20e54977fe +index 000000000000..51a20e54977f --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-40-overlay.dts @@ -0,0 +1,50 @@ @@ -25184,7 +25184,7 @@ index 0000000000000..51a20e54977fe +}; diff --git a/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts new file mode 100644 -index 0000000000000..67f50db7861ac +index 000000000000..67f50db7861a --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-dac-hd-overlay.dts @@ -0,0 +1,49 @@ @@ -25239,7 +25239,7 @@ index 0000000000000..67f50db7861ac +}; diff --git a/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts new file mode 100644 -index 0000000000000..645ea74cb435c +index 000000000000..645ea74cb435 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-dac-zero-overlay.dts @@ -0,0 +1,49 @@ @@ -25294,7 +25294,7 @@ index 0000000000000..645ea74cb435c +}; diff --git a/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts new file mode 100644 -index 0000000000000..963597d611b58 +index 000000000000..963597d611b5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pifi-mini-210-overlay.dts @@ -0,0 +1,42 @@ @@ -25342,7 +25342,7 @@ index 0000000000000..963597d611b58 +}; diff --git a/arch/arm/boot/dts/overlays/piglow-overlay.dts b/arch/arm/boot/dts/overlays/piglow-overlay.dts new file mode 100644 -index 0000000000000..075bceef158c8 +index 000000000000..075bceef158c --- /dev/null +++ b/arch/arm/boot/dts/overlays/piglow-overlay.dts @@ -0,0 +1,97 @@ @@ -25445,7 +25445,7 @@ index 0000000000000..075bceef158c8 +}; diff --git a/arch/arm/boot/dts/overlays/piscreen-overlay.dts b/arch/arm/boot/dts/overlays/piscreen-overlay.dts new file mode 100644 -index 0000000000000..1ac75a248fab5 +index 000000000000..1ac75a248fab --- /dev/null +++ b/arch/arm/boot/dts/overlays/piscreen-overlay.dts @@ -0,0 +1,102 @@ @@ -25553,7 +25553,7 @@ index 0000000000000..1ac75a248fab5 +}; diff --git a/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts new file mode 100644 -index 0000000000000..9d2b51101969e +index 000000000000..9d2b51101969 --- /dev/null +++ b/arch/arm/boot/dts/overlays/piscreen2r-overlay.dts @@ -0,0 +1,106 @@ @@ -25665,7 +25665,7 @@ index 0000000000000..9d2b51101969e + diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts new file mode 100644 -index 0000000000000..49efb2b768fbc +index 000000000000..49efb2b768fb --- /dev/null +++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts @@ -0,0 +1,120 @@ @@ -25791,7 +25791,7 @@ index 0000000000000..49efb2b768fbc +}; diff --git a/arch/arm/boot/dts/overlays/pitft22-overlay.dts b/arch/arm/boot/dts/overlays/pitft22-overlay.dts new file mode 100644 -index 0000000000000..589ad13795b18 +index 000000000000..589ad13795b1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft22-overlay.dts @@ -0,0 +1,69 @@ @@ -25866,7 +25866,7 @@ index 0000000000000..589ad13795b18 +}; diff --git a/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts new file mode 100644 -index 0000000000000..33901ee1db7a7 +index 000000000000..33901ee1db7a --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft28-capacitive-overlay.dts @@ -0,0 +1,91 @@ @@ -25963,7 +25963,7 @@ index 0000000000000..33901ee1db7a7 +}; diff --git a/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts new file mode 100644 -index 0000000000000..4a4a3f44c29d5 +index 000000000000..4a4a3f44c29d --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft28-resistive-overlay.dts @@ -0,0 +1,119 @@ @@ -26088,7 +26088,7 @@ index 0000000000000..4a4a3f44c29d5 +}; diff --git a/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts new file mode 100644 -index 0000000000000..37629f18a7400 +index 000000000000..37629f18a740 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pitft35-resistive-overlay.dts @@ -0,0 +1,119 @@ @@ -26213,7 +26213,7 @@ index 0000000000000..37629f18a7400 +}; diff --git a/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts new file mode 100644 -index 0000000000000..524a1c1d36700 +index 000000000000..524a1c1d3670 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pps-gpio-overlay.dts @@ -0,0 +1,38 @@ @@ -26257,7 +26257,7 @@ index 0000000000000..524a1c1d36700 +}; diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts new file mode 100644 -index 0000000000000..4ddbbfa040658 +index 000000000000..4ddbbfa04065 --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts @@ -0,0 +1,49 @@ @@ -26312,7 +26312,7 @@ index 0000000000000..4ddbbfa040658 +}; diff --git a/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts new file mode 100644 -index 0000000000000..119caf746b3b3 +index 000000000000..119caf746b3b --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-ir-tx-overlay.dts @@ -0,0 +1,40 @@ @@ -26358,7 +26358,7 @@ index 0000000000000..119caf746b3b3 +}; diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts new file mode 100644 -index 0000000000000..92876ab3bc8c5 +index 000000000000..92876ab3bc8c --- /dev/null +++ b/arch/arm/boot/dts/overlays/pwm-overlay.dts @@ -0,0 +1,45 @@ @@ -26409,7 +26409,7 @@ index 0000000000000..92876ab3bc8c5 +}; diff --git a/arch/arm/boot/dts/overlays/qca7000-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-overlay.dts new file mode 100644 -index 0000000000000..f695f36024fae +index 000000000000..f695f36024fa --- /dev/null +++ b/arch/arm/boot/dts/overlays/qca7000-overlay.dts @@ -0,0 +1,55 @@ @@ -26470,7 +26470,7 @@ index 0000000000000..f695f36024fae +}; diff --git a/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts new file mode 100644 -index 0000000000000..5dee70853289f +index 000000000000..5dee70853289 --- /dev/null +++ b/arch/arm/boot/dts/overlays/qca7000-uart0-overlay.dts @@ -0,0 +1,46 @@ @@ -26522,7 +26522,7 @@ index 0000000000000..5dee70853289f +}; diff --git a/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts new file mode 100644 -index 0000000000000..ea1d952734e9f +index 000000000000..ea1d952734e9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rotary-encoder-overlay.dts @@ -0,0 +1,59 @@ @@ -26587,7 +26587,7 @@ index 0000000000000..ea1d952734e9f +}; diff --git a/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts new file mode 100644 -index 0000000000000..cac5e44c6ec54 +index 000000000000..cac5e44c6ec5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-backlight-overlay.dts @@ -0,0 +1,21 @@ @@ -26614,7 +26614,7 @@ index 0000000000000..cac5e44c6ec54 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts new file mode 100644 -index 0000000000000..ed0c2745399f6 +index 000000000000..ed0c2745399f --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-cirrus-wm5102-overlay.dts @@ -0,0 +1,172 @@ @@ -26792,7 +26792,7 @@ index 0000000000000..ed0c2745399f6 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts new file mode 100644 -index 0000000000000..07a915342702f +index 000000000000..07a915342702 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-dac-overlay.dts @@ -0,0 +1,34 @@ @@ -26832,7 +26832,7 @@ index 0000000000000..07a915342702f +}; diff --git a/arch/arm/boot/dts/overlays/rpi-display-overlay.dts b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts new file mode 100644 -index 0000000000000..de87432ff2bea +index 000000000000..de87432ff2be --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-display-overlay.dts @@ -0,0 +1,91 @@ @@ -26929,7 +26929,7 @@ index 0000000000000..de87432ff2bea +}; diff --git a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts new file mode 100644 -index 0000000000000..8483c4f4b2eb2 +index 000000000000..8483c4f4b2eb --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts @@ -0,0 +1,25 @@ @@ -26960,7 +26960,7 @@ index 0000000000000..8483c4f4b2eb2 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts new file mode 100644 -index 0000000000000..af812132a8f7e +index 000000000000..af812132a8f7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-poe-overlay.dts @@ -0,0 +1,95 @@ @@ -27061,7 +27061,7 @@ index 0000000000000..af812132a8f7e +}; diff --git a/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts new file mode 100644 -index 0000000000000..5b12d02c37077 +index 000000000000..5b12d02c3707 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-poe-plus-overlay.dts @@ -0,0 +1,23 @@ @@ -27090,7 +27090,7 @@ index 0000000000000..5b12d02c37077 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts new file mode 100644 -index 0000000000000..9cda044a0f62a +index 000000000000..9cda044a0f62 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-proto-overlay.dts @@ -0,0 +1,39 @@ @@ -27135,7 +27135,7 @@ index 0000000000000..9cda044a0f62a +}; diff --git a/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts new file mode 100644 -index 0000000000000..89d8d2ea6b2e7 +index 000000000000..89d8d2ea6b2e --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-sense-overlay.dts @@ -0,0 +1,47 @@ @@ -27188,7 +27188,7 @@ index 0000000000000..89d8d2ea6b2e7 +}; diff --git a/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts new file mode 100644 -index 0000000000000..3c97a545d8207 +index 000000000000..3c97a545d820 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpi-tv-overlay.dts @@ -0,0 +1,34 @@ @@ -27228,7 +27228,7 @@ index 0000000000000..3c97a545d8207 +}; diff --git a/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts new file mode 100644 -index 0000000000000..bdd1c0e5a915d +index 000000000000..bdd1c0e5a915 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rpivid-v4l2-overlay.dts @@ -0,0 +1,50 @@ @@ -27284,7 +27284,7 @@ index 0000000000000..bdd1c0e5a915d +}; diff --git a/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts new file mode 100644 -index 0000000000000..87e9a326eff1f +index 000000000000..87e9a326eff1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/rra-digidac1-wm8741-audio-overlay.dts @@ -0,0 +1,49 @@ @@ -27339,7 +27339,7 @@ index 0000000000000..87e9a326eff1f +}; diff --git a/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts new file mode 100644 -index 0000000000000..c51f1c030a557 +index 000000000000..c51f1c030a55 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sainsmart18-overlay.dts @@ -0,0 +1,52 @@ @@ -27397,7 +27397,7 @@ index 0000000000000..c51f1c030a557 +}; diff --git a/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts new file mode 100644 -index 0000000000000..04d74d62897b9 +index 000000000000..04d74d62897b --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is750-i2c-overlay.dts @@ -0,0 +1,43 @@ @@ -27446,7 +27446,7 @@ index 0000000000000..04d74d62897b9 +}; diff --git a/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts new file mode 100644 -index 0000000000000..da05e981314c4 +index 000000000000..da05e981314c --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-i2c-overlay.dts @@ -0,0 +1,43 @@ @@ -27495,7 +27495,7 @@ index 0000000000000..da05e981314c4 +}; diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts new file mode 100644 -index 0000000000000..a49a04722b996 +index 000000000000..a49a04722b99 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-spi0-overlay.dts @@ -0,0 +1,49 @@ @@ -27550,7 +27550,7 @@ index 0000000000000..a49a04722b996 +}; diff --git a/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts new file mode 100644 -index 0000000000000..730c6e8cd6142 +index 000000000000..730c6e8cd614 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sc16is752-spi1-overlay.dts @@ -0,0 +1,67 @@ @@ -27623,7 +27623,7 @@ index 0000000000000..730c6e8cd6142 +}; diff --git a/arch/arm/boot/dts/overlays/sdhost-overlay.dts b/arch/arm/boot/dts/overlays/sdhost-overlay.dts new file mode 100644 -index 0000000000000..0b72b4eeac887 +index 000000000000..0b72b4eeac88 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdhost-overlay.dts @@ -0,0 +1,38 @@ @@ -27667,7 +27667,7 @@ index 0000000000000..0b72b4eeac887 +}; diff --git a/arch/arm/boot/dts/overlays/sdio-overlay.dts b/arch/arm/boot/dts/overlays/sdio-overlay.dts new file mode 100644 -index 0000000000000..873e490563797 +index 000000000000..873e49056379 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sdio-overlay.dts @@ -0,0 +1,77 @@ @@ -27750,7 +27750,7 @@ index 0000000000000..873e490563797 +}; diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts new file mode 100644 -index 0000000000000..210d027a073ee +index 000000000000..210d027a073e --- /dev/null +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v1-overlay.dts @@ -0,0 +1,138 @@ @@ -27894,7 +27894,7 @@ index 0000000000000..210d027a073ee +}; diff --git a/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts new file mode 100644 -index 0000000000000..e843d0b197450 +index 000000000000..e843d0b19745 --- /dev/null +++ b/arch/arm/boot/dts/overlays/seeed-can-fd-hat-v2-overlay.dts @@ -0,0 +1,117 @@ @@ -28017,7 +28017,7 @@ index 0000000000000..e843d0b197450 +}; diff --git a/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts new file mode 100644 -index 0000000000000..57a0cc9b17410 +index 000000000000..57a0cc9b1741 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sh1106-spi-overlay.dts @@ -0,0 +1,84 @@ @@ -28107,7 +28107,7 @@ index 0000000000000..57a0cc9b17410 +}; diff --git a/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts new file mode 100644 -index 0000000000000..90495f0941fbb +index 000000000000..90495f0941fb --- /dev/null +++ b/arch/arm/boot/dts/overlays/si446x-spi0-overlay.dts @@ -0,0 +1,53 @@ @@ -28166,7 +28166,7 @@ index 0000000000000..90495f0941fbb +}; diff --git a/arch/arm/boot/dts/overlays/smi-dev-overlay.dts b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts new file mode 100644 -index 0000000000000..bafab6c92506d +index 000000000000..bafab6c92506 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-dev-overlay.dts @@ -0,0 +1,20 @@ @@ -28192,7 +28192,7 @@ index 0000000000000..bafab6c92506d +}; diff --git a/arch/arm/boot/dts/overlays/smi-nand-overlay.dts b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts new file mode 100644 -index 0000000000000..ae1e50329d660 +index 000000000000..ae1e50329d66 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-nand-overlay.dts @@ -0,0 +1,66 @@ @@ -28264,7 +28264,7 @@ index 0000000000000..ae1e50329d660 +}; diff --git a/arch/arm/boot/dts/overlays/smi-overlay.dts b/arch/arm/boot/dts/overlays/smi-overlay.dts new file mode 100644 -index 0000000000000..bb8c7830df23f +index 000000000000..bb8c7830df23 --- /dev/null +++ b/arch/arm/boot/dts/overlays/smi-overlay.dts @@ -0,0 +1,37 @@ @@ -28307,7 +28307,7 @@ index 0000000000000..bb8c7830df23f +}; diff --git a/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts new file mode 100644 -index 0000000000000..a132b8637c313 +index 000000000000..a132b8637c31 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-gpio35-39-overlay.dts @@ -0,0 +1,31 @@ @@ -28344,7 +28344,7 @@ index 0000000000000..a132b8637c313 +}; diff --git a/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts new file mode 100644 -index 0000000000000..9ebcaf1b5ea07 +index 000000000000..9ebcaf1b5ea0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-gpio40-45-overlay.dts @@ -0,0 +1,36 @@ @@ -28386,7 +28386,7 @@ index 0000000000000..9ebcaf1b5ea07 +}; diff --git a/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts new file mode 100644 -index 0000000000000..51b7fec281c0b +index 000000000000..51b7fec281c0 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi-rtc-overlay.dts @@ -0,0 +1,75 @@ @@ -28467,7 +28467,7 @@ index 0000000000000..51b7fec281c0b +}; diff --git a/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts new file mode 100644 -index 0000000000000..e6eb66e2076aa +index 000000000000..e6eb66e2076a --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-1cs-overlay.dts @@ -0,0 +1,42 @@ @@ -28515,7 +28515,7 @@ index 0000000000000..e6eb66e2076aa +}; diff --git a/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts new file mode 100644 -index 0000000000000..df6519537c3a8 +index 000000000000..df6519537c3a --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi0-2cs-overlay.dts @@ -0,0 +1,37 @@ @@ -28558,7 +28558,7 @@ index 0000000000000..df6519537c3a8 +}; diff --git a/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts new file mode 100644 -index 0000000000000..ea2794bc5fd5d +index 000000000000..ea2794bc5fd5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-1cs-overlay.dts @@ -0,0 +1,57 @@ @@ -28621,7 +28621,7 @@ index 0000000000000..ea2794bc5fd5d +}; diff --git a/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts new file mode 100644 -index 0000000000000..dab34ee79ae28 +index 000000000000..dab34ee79ae2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-2cs-overlay.dts @@ -0,0 +1,69 @@ @@ -28696,7 +28696,7 @@ index 0000000000000..dab34ee79ae28 +}; diff --git a/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts new file mode 100644 -index 0000000000000..bc7e7d04324bd +index 000000000000..bc7e7d04324b --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi1-3cs-overlay.dts @@ -0,0 +1,81 @@ @@ -28783,7 +28783,7 @@ index 0000000000000..bc7e7d04324bd +}; diff --git a/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts new file mode 100644 -index 0000000000000..2a29750462af8 +index 000000000000..2a29750462af --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-1cs-overlay.dts @@ -0,0 +1,57 @@ @@ -28846,7 +28846,7 @@ index 0000000000000..2a29750462af8 +}; diff --git a/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts new file mode 100644 -index 0000000000000..642678fc9ddd5 +index 000000000000..642678fc9ddd --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-2cs-overlay.dts @@ -0,0 +1,69 @@ @@ -28921,7 +28921,7 @@ index 0000000000000..642678fc9ddd5 +}; diff --git a/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts new file mode 100644 -index 0000000000000..28d40c6c3c379 +index 000000000000..28d40c6c3c37 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi2-3cs-overlay.dts @@ -0,0 +1,81 @@ @@ -29008,7 +29008,7 @@ index 0000000000000..28d40c6c3c379 +}; diff --git a/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts new file mode 100644 -index 0000000000000..335af8637051b +index 000000000000..335af8637051 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -29058,7 +29058,7 @@ index 0000000000000..335af8637051b +}; diff --git a/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts new file mode 100644 -index 0000000000000..ce65da27f7670 +index 000000000000..ce65da27f767 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi3-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -29120,7 +29120,7 @@ index 0000000000000..ce65da27f7670 +}; diff --git a/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts new file mode 100644 -index 0000000000000..85d70b40352b1 +index 000000000000..85d70b40352b --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi4-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -29170,7 +29170,7 @@ index 0000000000000..85d70b40352b1 +}; diff --git a/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts new file mode 100644 -index 0000000000000..8bc2215a6a7e9 +index 000000000000..8bc2215a6a7e --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi4-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -29232,7 +29232,7 @@ index 0000000000000..8bc2215a6a7e9 +}; diff --git a/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts new file mode 100644 -index 0000000000000..c0f8cb8510eee +index 000000000000..c0f8cb8510ee --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -29282,7 +29282,7 @@ index 0000000000000..c0f8cb8510eee +}; diff --git a/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts new file mode 100644 -index 0000000000000..7758b9c00b4e9 +index 000000000000..7758b9c00b4e --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi5-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -29344,7 +29344,7 @@ index 0000000000000..7758b9c00b4e9 +}; diff --git a/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts new file mode 100644 -index 0000000000000..8c8a953eca01f +index 000000000000..8c8a953eca01 --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi6-1cs-overlay.dts @@ -0,0 +1,44 @@ @@ -29394,7 +29394,7 @@ index 0000000000000..8c8a953eca01f +}; diff --git a/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts new file mode 100644 -index 0000000000000..2ff897f21aedb +index 000000000000..2ff897f21aed --- /dev/null +++ b/arch/arm/boot/dts/overlays/spi6-2cs-overlay.dts @@ -0,0 +1,56 @@ @@ -29456,7 +29456,7 @@ index 0000000000000..2ff897f21aedb +}; diff --git a/arch/arm/boot/dts/overlays/ssd1306-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts new file mode 100644 -index 0000000000000..84cf10e489d3c +index 000000000000..84cf10e489d3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1306-overlay.dts @@ -0,0 +1,36 @@ @@ -29498,7 +29498,7 @@ index 0000000000000..84cf10e489d3c +}; diff --git a/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts new file mode 100644 -index 0000000000000..ffc90c7cecf66 +index 000000000000..ffc90c7cecf6 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1306-spi-overlay.dts @@ -0,0 +1,84 @@ @@ -29588,7 +29588,7 @@ index 0000000000000..ffc90c7cecf66 +}; diff --git a/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts new file mode 100644 -index 0000000000000..9fd5ebf2fedae +index 000000000000..9fd5ebf2feda --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1331-spi-overlay.dts @@ -0,0 +1,83 @@ @@ -29677,7 +29677,7 @@ index 0000000000000..9fd5ebf2fedae +}; diff --git a/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts new file mode 100644 -index 0000000000000..ffc872c60648f +index 000000000000..ffc872c60648 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ssd1351-spi-overlay.dts @@ -0,0 +1,83 @@ @@ -29766,7 +29766,7 @@ index 0000000000000..ffc872c60648f +}; diff --git a/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts new file mode 100755 -index 0000000000000..bad61535981e9 +index 000000000000..bad61535981e --- /dev/null +++ b/arch/arm/boot/dts/overlays/superaudioboard-overlay.dts @@ -0,0 +1,73 @@ @@ -29845,7 +29845,7 @@ index 0000000000000..bad61535981e9 +}; diff --git a/arch/arm/boot/dts/overlays/sx150x-overlay.dts b/arch/arm/boot/dts/overlays/sx150x-overlay.dts new file mode 100644 -index 0000000000000..1d1069345da21 +index 000000000000..1d1069345da2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/sx150x-overlay.dts @@ -0,0 +1,1706 @@ @@ -31557,7 +31557,7 @@ index 0000000000000..1d1069345da21 + diff --git a/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts new file mode 100644 -index 0000000000000..047695bb0c715 +index 000000000000..047695bb0c71 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-audio-overlay.dts @@ -0,0 +1,52 @@ @@ -31615,7 +31615,7 @@ index 0000000000000..047695bb0c715 +}; diff --git a/arch/arm/boot/dts/overlays/tc358743-overlay.dts b/arch/arm/boot/dts/overlays/tc358743-overlay.dts new file mode 100644 -index 0000000000000..a1f8af36d2e74 +index 000000000000..a1f8af36d2e7 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tc358743-overlay.dts @@ -0,0 +1,107 @@ @@ -31728,7 +31728,7 @@ index 0000000000000..a1f8af36d2e74 +}; diff --git a/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts new file mode 100644 -index 0000000000000..a102b09e3ab56 +index 000000000000..a102b09e3ab5 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tinylcd35-overlay.dts @@ -0,0 +1,222 @@ @@ -31956,7 +31956,7 @@ index 0000000000000..a102b09e3ab56 +}; diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts new file mode 100644 -index 0000000000000..e69188503ca33 +index 000000000000..e69188503ca3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/tpm-slb9670-overlay.dts @@ -0,0 +1,44 @@ @@ -32006,7 +32006,7 @@ index 0000000000000..e69188503ca33 +}; diff --git a/arch/arm/boot/dts/overlays/uart0-overlay.dts b/arch/arm/boot/dts/overlays/uart0-overlay.dts new file mode 100755 -index 0000000000000..73d563bbaabfa +index 000000000000..73d563bbaabf --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart0-overlay.dts @@ -0,0 +1,32 @@ @@ -32044,7 +32044,7 @@ index 0000000000000..73d563bbaabfa +}; diff --git a/arch/arm/boot/dts/overlays/uart1-overlay.dts b/arch/arm/boot/dts/overlays/uart1-overlay.dts new file mode 100644 -index 0000000000000..986d725a26529 +index 000000000000..986d725a2652 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart1-overlay.dts @@ -0,0 +1,38 @@ @@ -32088,7 +32088,7 @@ index 0000000000000..986d725a26529 +}; diff --git a/arch/arm/boot/dts/overlays/uart2-overlay.dts b/arch/arm/boot/dts/overlays/uart2-overlay.dts new file mode 100644 -index 0000000000000..9face240aca1f +index 000000000000..9face240aca1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart2-overlay.dts @@ -0,0 +1,27 @@ @@ -32121,7 +32121,7 @@ index 0000000000000..9face240aca1f +}; diff --git a/arch/arm/boot/dts/overlays/uart3-overlay.dts b/arch/arm/boot/dts/overlays/uart3-overlay.dts new file mode 100644 -index 0000000000000..ae9f9fe5ea1db +index 000000000000..ae9f9fe5ea1d --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart3-overlay.dts @@ -0,0 +1,27 @@ @@ -32154,7 +32154,7 @@ index 0000000000000..ae9f9fe5ea1db +}; diff --git a/arch/arm/boot/dts/overlays/uart4-overlay.dts b/arch/arm/boot/dts/overlays/uart4-overlay.dts new file mode 100644 -index 0000000000000..ac004ffbadbf8 +index 000000000000..ac004ffbadbf --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart4-overlay.dts @@ -0,0 +1,27 @@ @@ -32187,7 +32187,7 @@ index 0000000000000..ac004ffbadbf8 +}; diff --git a/arch/arm/boot/dts/overlays/uart5-overlay.dts b/arch/arm/boot/dts/overlays/uart5-overlay.dts new file mode 100644 -index 0000000000000..04eaf376effe6 +index 000000000000..04eaf376effe --- /dev/null +++ b/arch/arm/boot/dts/overlays/uart5-overlay.dts @@ -0,0 +1,27 @@ @@ -32220,7 +32220,7 @@ index 0000000000000..04eaf376effe6 +}; diff --git a/arch/arm/boot/dts/overlays/udrc-overlay.dts b/arch/arm/boot/dts/overlays/udrc-overlay.dts new file mode 100644 -index 0000000000000..ae7c37996894a +index 000000000000..ae7c37996894 --- /dev/null +++ b/arch/arm/boot/dts/overlays/udrc-overlay.dts @@ -0,0 +1,128 @@ @@ -32354,7 +32354,7 @@ index 0000000000000..ae7c37996894a +}; diff --git a/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts new file mode 100644 -index 0000000000000..fc8d9b118068f +index 000000000000..fc8d9b118068 --- /dev/null +++ b/arch/arm/boot/dts/overlays/ugreen-dabboard-overlay.dts @@ -0,0 +1,49 @@ @@ -32409,7 +32409,7 @@ index 0000000000000..fc8d9b118068f +}; diff --git a/arch/arm/boot/dts/overlays/upstream-overlay.dts b/arch/arm/boot/dts/overlays/upstream-overlay.dts new file mode 100644 -index 0000000000000..7c4071a7cb270 +index 000000000000..7c4071a7cb27 --- /dev/null +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts @@ -0,0 +1,101 @@ @@ -32516,7 +32516,7 @@ index 0000000000000..7c4071a7cb270 +}; diff --git a/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts new file mode 100644 -index 0000000000000..f4328634542ed +index 000000000000..f4328634542e --- /dev/null +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts @@ -0,0 +1,137 @@ @@ -32659,7 +32659,7 @@ index 0000000000000..f4328634542ed +}; diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts new file mode 100644 -index 0000000000000..ca344492bed86 +index 000000000000..ca344492bed8 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-overlay.dts @@ -0,0 +1,40 @@ @@ -32705,7 +32705,7 @@ index 0000000000000..ca344492bed86 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts new file mode 100644 -index 0000000000000..7792ead0cbb31 +index 000000000000..7792ead0cbb3 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-fkms-v3d-pi4-overlay.dts @@ -0,0 +1,44 @@ @@ -32755,7 +32755,7 @@ index 0000000000000..7792ead0cbb31 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts new file mode 100644 -index 0000000000000..f7181c9828bfe +index 000000000000..f7181c9828bf --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dpi-at056tn53v1-overlay.dts @@ -0,0 +1,44 @@ @@ -32805,7 +32805,7 @@ index 0000000000000..f7181c9828bfe +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts new file mode 100644 -index 0000000000000..ecd3bef3d65ab +index 000000000000..ecd3bef3d65a --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-7inch-overlay.dts @@ -0,0 +1,118 @@ @@ -32929,7 +32929,7 @@ index 0000000000000..ecd3bef3d65ab +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts new file mode 100644 -index 0000000000000..d7b8f67138041 +index 000000000000..d7b8f6713804 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-overlay.dts @@ -0,0 +1,69 @@ @@ -33004,7 +33004,7 @@ index 0000000000000..d7b8f67138041 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts new file mode 100644 -index 0000000000000..5dcd0f2243e22 +index 000000000000..5dcd0f2243e2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-dsi-lt070me05000-v2-overlay.dts @@ -0,0 +1,64 @@ @@ -33074,7 +33074,7 @@ index 0000000000000..5dcd0f2243e22 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts new file mode 100644 -index 0000000000000..b03394844abd9 +index 000000000000..b03394844abd --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-kippah-7inch-overlay.dts @@ -0,0 +1,43 @@ @@ -33123,7 +33123,7 @@ index 0000000000000..b03394844abd9 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts new file mode 100644 -index 0000000000000..5a4efdeed6633 +index 000000000000..5a4efdeed663 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts @@ -0,0 +1,123 @@ @@ -33252,7 +33252,7 @@ index 0000000000000..5a4efdeed6633 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts new file mode 100644 -index 0000000000000..4285e12a4e538 +index 000000000000..4285e12a4e53 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-v3d-pi4-overlay.dts @@ -0,0 +1,197 @@ @@ -33455,7 +33455,7 @@ index 0000000000000..4285e12a4e538 +}; diff --git a/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts new file mode 100644 -index 0000000000000..6e787099e8616 +index 000000000000..6e787099e861 --- /dev/null +++ b/arch/arm/boot/dts/overlays/vc4-kms-vga666-overlay.dts @@ -0,0 +1,100 @@ @@ -33561,7 +33561,7 @@ index 0000000000000..6e787099e8616 +}; diff --git a/arch/arm/boot/dts/overlays/vga666-overlay.dts b/arch/arm/boot/dts/overlays/vga666-overlay.dts new file mode 100644 -index 0000000000000..a4968d180a5d0 +index 000000000000..a4968d180a5d --- /dev/null +++ b/arch/arm/boot/dts/overlays/vga666-overlay.dts @@ -0,0 +1,30 @@ @@ -33597,7 +33597,7 @@ index 0000000000000..a4968d180a5d0 +}; diff --git a/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts new file mode 100644 -index 0000000000000..f44e325bc1f2e +index 000000000000..f44e325bc1f2 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-overlay.dts @@ -0,0 +1,40 @@ @@ -33643,7 +33643,7 @@ index 0000000000000..f44e325bc1f2e +}; diff --git a/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts new file mode 100644 -index 0000000000000..953c6a1aeab97 +index 000000000000..953c6a1aeab9 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w1-gpio-pullup-overlay.dts @@ -0,0 +1,42 @@ @@ -33691,7 +33691,7 @@ index 0000000000000..953c6a1aeab97 +}; diff --git a/arch/arm/boot/dts/overlays/w5500-overlay.dts b/arch/arm/boot/dts/overlays/w5500-overlay.dts new file mode 100644 -index 0000000000000..4d3e662967530 +index 000000000000..4d3e66296753 --- /dev/null +++ b/arch/arm/boot/dts/overlays/w5500-overlay.dts @@ -0,0 +1,63 @@ @@ -33760,7 +33760,7 @@ index 0000000000000..4d3e662967530 +}; diff --git a/arch/arm/boot/dts/overlays/wittypi-overlay.dts b/arch/arm/boot/dts/overlays/wittypi-overlay.dts new file mode 100644 -index 0000000000000..71ce806186deb +index 000000000000..71ce806186de --- /dev/null +++ b/arch/arm/boot/dts/overlays/wittypi-overlay.dts @@ -0,0 +1,44 @@ @@ -33810,7 +33810,7 @@ index 0000000000000..71ce806186deb +}; diff --git a/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts new file mode 100644 -index 0000000000000..289fa4dacdf1f +index 000000000000..289fa4dacdf1 --- /dev/null +++ b/arch/arm/boot/dts/overlays/wm8960-soundcard-overlay.dts @@ -0,0 +1,82 @@ @@ -33898,7 +33898,7 @@ index 0000000000000..289fa4dacdf1f +}; diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig new file mode 100644 -index 0000000000000..7b4c28badf910 +index 000000000000..7b4c28badf91 --- /dev/null +++ b/arch/arm/configs/bcm2709_defconfig @@ -0,0 +1,1510 @@ @@ -35414,7 +35414,7 @@ index 0000000000000..7b4c28badf910 +# CONFIG_UPROBE_EVENTS is not set diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig new file mode 100644 -index 0000000000000..a4543d42fc55c +index 000000000000..a4543d42fc55 --- /dev/null +++ b/arch/arm/configs/bcm2711_defconfig @@ -0,0 +1,1550 @@ @@ -36970,7 +36970,7 @@ index 0000000000000..a4543d42fc55c +# CONFIG_UPROBE_EVENTS is not set diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig new file mode 100644 -index 0000000000000..5f1bd057138d5 +index 000000000000..5f1bd057138d --- /dev/null +++ b/arch/arm/configs/bcmrpi_defconfig @@ -0,0 +1,1523 @@ @@ -38498,7 +38498,7 @@ index 0000000000000..5f1bd057138d5 +CONFIG_BLK_DEV_IO_TRACE=y +# CONFIG_UPROBE_EVENTS is not set diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index a611b0c1e540f..ea2715c9f923b 100644 +index a611b0c1e540..ea2715c9f923 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -1089,6 +1089,7 @@ CONFIG_ROCKCHIP_EFUSE=m @@ -38510,7 +38510,7 @@ index a611b0c1e540f..ea2715c9f923b 100644 CONFIG_FSI_MASTER_GPIO=m CONFIG_FSI_MASTER_HUB=m diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h -index 2e24e765e6d3a..3c285a257e890 100644 +index 2e24e765e6d3..3c285a257e89 100644 --- a/arch/arm/include/asm/cacheflush.h +++ b/arch/arm/include/asm/cacheflush.h @@ -91,6 +91,21 @@ @@ -38563,7 +38563,7 @@ index 2e24e765e6d3a..3c285a257e890 100644 #endif diff --git a/arch/arm/include/asm/glue-cache.h b/arch/arm/include/asm/glue-cache.h -index 724f8dac1e5b1..aa74173092dd8 100644 +index 724f8dac1e5b..aa74173092dd 100644 --- a/arch/arm/include/asm/glue-cache.h +++ b/arch/arm/include/asm/glue-cache.h @@ -155,6 +155,8 @@ static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { } @@ -38576,7 +38576,7 @@ index 724f8dac1e5b1..aa74173092dd8 100644 #endif diff --git a/arch/arm/include/asm/irqflags.h b/arch/arm/include/asm/irqflags.h -index aeec7f24eb75b..a3b186608c609 100644 +index aeec7f24eb75..a3b186608c60 100644 --- a/arch/arm/include/asm/irqflags.h +++ b/arch/arm/include/asm/irqflags.h @@ -163,13 +163,23 @@ static inline unsigned long arch_local_save_flags(void) @@ -38607,7 +38607,7 @@ index aeec7f24eb75b..a3b186608c609 100644 : "r" (flags) : "memory", "cc"); diff --git a/arch/arm/include/asm/string.h b/arch/arm/include/asm/string.h -index 6c607c68f3ad7..ba7fc0bc9a15d 100644 +index 6c607c68f3ad..ba7fc0bc9a15 100644 --- a/arch/arm/include/asm/string.h +++ b/arch/arm/include/asm/string.h @@ -65,4 +65,9 @@ static inline void *memset64(uint64_t *p, uint64_t v, __kernel_size_t n) @@ -38621,7 +38621,7 @@ index 6c607c68f3ad7..ba7fc0bc9a15d 100644 + #endif diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h -index 476d1a15e6697..7ff524ed07d68 100644 +index 476d1a15e669..7ff524ed07d6 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -507,6 +507,9 @@ do { \ @@ -38635,7 +38635,7 @@ index 476d1a15e6697..7ff524ed07d68 100644 raw_copy_from_user(void *to, const void __user *from, unsigned long n) { diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c -index 91e37dfe0396a..6f2cc69784433 100644 +index 91e37dfe0396..6f2cc6978443 100644 --- a/arch/arm/kernel/fiq.c +++ b/arch/arm/kernel/fiq.c @@ -63,6 +63,8 @@ @@ -38657,7 +38657,7 @@ index 91e37dfe0396a..6f2cc69784433 100644 } diff --git a/arch/arm/kernel/fiqasm.S b/arch/arm/kernel/fiqasm.S -index 8dd26e1a9bd69..eef484756af21 100644 +index 8dd26e1a9bd6..eef484756af2 100644 --- a/arch/arm/kernel/fiqasm.S +++ b/arch/arm/kernel/fiqasm.S @@ -47,3 +47,7 @@ ENTRY(__get_fiq_regs) @@ -38669,7 +38669,7 @@ index 8dd26e1a9bd69..eef484756af21 100644 + mov pc, r8 +ENDPROC(__FIQ_Branch) diff --git a/arch/arm/kernel/reboot.c b/arch/arm/kernel/reboot.c -index 0ce388f154226..63373adab4757 100644 +index 0ce388f15422..63373adab475 100644 --- a/arch/arm/kernel/reboot.c +++ b/arch/arm/kernel/reboot.c @@ -102,9 +102,7 @@ void machine_shutdown(void) @@ -38684,7 +38684,7 @@ index 0ce388f154226..63373adab4757 100644 /* diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c -index d7ae50b32c7b2..fd6e4580d6214 100644 +index d7ae50b32c7b..fd6e4580d621 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -1257,6 +1257,8 @@ static int c_show(struct seq_file *m, void *v) @@ -38712,7 +38712,7 @@ index d7ae50b32c7b2..fd6e4580d6214 100644 } diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile -index 6d2ba454f25b6..8271cde92dec7 100644 +index 6d2ba454f25b..8271cde92dec 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -7,8 +7,8 @@ @@ -38745,7 +38745,7 @@ index 6d2ba454f25b6..8271cde92dec7 100644 diff --git a/arch/arm/lib/arm-mem.h b/arch/arm/lib/arm-mem.h new file mode 100644 -index 0000000000000..5d4bda19ad207 +index 000000000000..5d4bda19ad20 --- /dev/null +++ b/arch/arm/lib/arm-mem.h @@ -0,0 +1,159 @@ @@ -38909,7 +38909,7 @@ index 0000000000000..5d4bda19ad207 +92: +.endm diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S -index f8016e3db65d7..ab7bf28dbec08 100644 +index f8016e3db65d..ab7bf28dbec0 100644 --- a/arch/arm/lib/copy_from_user.S +++ b/arch/arm/lib/copy_from_user.S @@ -107,7 +107,8 @@ @@ -38932,7 +38932,7 @@ index f8016e3db65d7..ab7bf28dbec08 100644 .align 0 diff --git a/arch/arm/lib/exports_rpi.c b/arch/arm/lib/exports_rpi.c new file mode 100644 -index 0000000000000..1f826047db754 +index 000000000000..1f826047db75 --- /dev/null +++ b/arch/arm/lib/exports_rpi.c @@ -0,0 +1,37 @@ @@ -38975,7 +38975,7 @@ index 0000000000000..1f826047db754 +EXPORT_SYMBOL(memcmp); diff --git a/arch/arm/lib/memcmp_rpi.S b/arch/arm/lib/memcmp_rpi.S new file mode 100644 -index 0000000000000..bf6e4edfc9d3b +index 000000000000..bf6e4edfc9d3 --- /dev/null +++ b/arch/arm/lib/memcmp_rpi.S @@ -0,0 +1,285 @@ @@ -39266,7 +39266,7 @@ index 0000000000000..bf6e4edfc9d3b +ENDPROC(memcmp) diff --git a/arch/arm/lib/memcpy_rpi.S b/arch/arm/lib/memcpy_rpi.S new file mode 100644 -index 0000000000000..30f8a9089a835 +index 000000000000..30f8a9089a83 --- /dev/null +++ b/arch/arm/lib/memcpy_rpi.S @@ -0,0 +1,61 @@ @@ -39333,7 +39333,7 @@ index 0000000000000..30f8a9089a835 +ENDPROC(mmiocpy) diff --git a/arch/arm/lib/memcpymove.h b/arch/arm/lib/memcpymove.h new file mode 100644 -index 0000000000000..d8be5849c8609 +index 000000000000..d8be5849c860 --- /dev/null +++ b/arch/arm/lib/memcpymove.h @@ -0,0 +1,506 @@ @@ -39845,7 +39845,7 @@ index 0000000000000..d8be5849c8609 +.endm diff --git a/arch/arm/lib/memmove_rpi.S b/arch/arm/lib/memmove_rpi.S new file mode 100644 -index 0000000000000..8b0760c0904c5 +index 000000000000..8b0760c0904c --- /dev/null +++ b/arch/arm/lib/memmove_rpi.S @@ -0,0 +1,61 @@ @@ -39912,7 +39912,7 @@ index 0000000000000..8b0760c0904c5 +ENDPROC(memmove) diff --git a/arch/arm/lib/memset_rpi.S b/arch/arm/lib/memset_rpi.S new file mode 100644 -index 0000000000000..e8469cecabc15 +index 000000000000..e8469cecabc1 --- /dev/null +++ b/arch/arm/lib/memset_rpi.S @@ -0,0 +1,128 @@ @@ -40045,7 +40045,7 @@ index 0000000000000..e8469cecabc15 +ENDPROC(memset) +ENDPROC(mmioset) diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c -index 106f83a5ea6d2..b483e5713039d 100644 +index 106f83a5ea6d..b483e5713039 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -19,6 +19,14 @@ @@ -40221,7 +40221,7 @@ index 106f83a5ea6d2..b483e5713039d 100644 static unsigned long noinline __clear_user_memset(void __user *addr, unsigned long n) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig -index ae790908fc74a..822125c5707a8 100644 +index ae790908fc74..822125c5707a 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -161,9 +161,12 @@ config ARCH_BCM2835 @@ -40252,7 +40252,7 @@ index ae790908fc74a..822125c5707a8 100644 bool "Broadcom BCM63xx DSL SoC" depends on ARCH_MULTI_V7 diff --git a/arch/arm/mach-bcm/board_bcm2835.c b/arch/arm/mach-bcm/board_bcm2835.c -index bfc556f767203..91a758c61f484 100644 +index bfc556f76720..91a758c61f48 100644 --- a/arch/arm/mach-bcm/board_bcm2835.c +++ b/arch/arm/mach-bcm/board_bcm2835.c @@ -5,13 +5,103 @@ @@ -40386,7 +40386,7 @@ index bfc556f767203..91a758c61f484 100644 + .smp = smp_ops(bcm2836_smp_ops), +MACHINE_END diff --git a/arch/arm/mm/cache-v6.S b/arch/arm/mm/cache-v6.S -index f0f65eb073e48..8680118015219 100644 +index f0f65eb073e4..868011801521 100644 --- a/arch/arm/mm/cache-v6.S +++ b/arch/arm/mm/cache-v6.S @@ -198,7 +198,7 @@ ENTRY(v6_flush_kern_dcache_area) @@ -40408,7 +40408,7 @@ index f0f65eb073e48..8680118015219 100644 1: #ifdef CONFIG_DMA_CACHE_RWFO diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S -index dc8f152f35566..536df5db66e43 100644 +index dc8f152f3556..536df5db66e4 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -363,7 +363,8 @@ ENDPROC(v7_flush_kern_dcache_area) @@ -40432,7 +40432,7 @@ index dc8f152f35566..536df5db66e43 100644 sub r3, r2, #1 bic r0, r0, r3 diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S -index e2c743aa2eb2b..726c103fe5551 100644 +index e2c743aa2eb2..726c103fe555 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -334,6 +334,8 @@ ENTRY(\name\()_cache_fns) @@ -40445,7 +40445,7 @@ index e2c743aa2eb2b..726c103fe5551 100644 .size \name\()_cache_fns, . - \name\()_cache_fns .endm diff --git a/arch/arm/mm/proc-syms.c b/arch/arm/mm/proc-syms.c -index e21249548e9fb..33e4a9b8f1ba3 100644 +index e21249548e9f..33e4a9b8f1ba 100644 --- a/arch/arm/mm/proc-syms.c +++ b/arch/arm/mm/proc-syms.c @@ -27,6 +27,9 @@ EXPORT_SYMBOL(__cpuc_flush_user_all); @@ -40459,7 +40459,7 @@ index e21249548e9fb..33e4a9b8f1ba3 100644 EXPORT_SYMBOL(cpu_cache); #endif diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S -index a0618f3e6836b..b3a2fce22eac3 100644 +index a0618f3e6836..b3a2fce22eac 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -70,10 +70,19 @@ ENDPROC(cpu_v6_reset) @@ -40486,7 +40486,7 @@ index a0618f3e6836b..b3a2fce22eac3 100644 ENTRY(cpu_v6_dcache_clean_area) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S -index a59ddfd7a179d..5820720e53637 100644 +index a59ddfd7a179..5820720e5363 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -303,7 +303,11 @@ __v7_ca17mp_setup: @@ -40514,7 +40514,7 @@ index a59ddfd7a179d..5820720e53637 100644 ldmia r12, {r1-r6, lr} diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c -index 2cb355c1b5b71..1e2dcf81aefad 100644 +index 2cb355c1b5b7..1e2dcf81aefa 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c @@ -176,8 +176,11 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) @@ -40592,7 +40592,7 @@ index 2cb355c1b5b71..1e2dcf81aefad 100644 /* * Save the userland NEON/VFP state. Under UP, diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms -index dd6b7466fe28a..2a7abe568db7d 100644 +index dd6b7466fe28..2a7abe568db7 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -39,6 +39,7 @@ config ARCH_BCM2835 @@ -40604,7 +40604,7 @@ index dd6b7466fe28a..2a7abe568db7d 100644 This enables support for the Broadcom BCM2837 and BCM2711 SoC. These SoCs are used in the Raspberry Pi 3 and 4 devices. diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile -index 9b1170658d600..cc6c25629057d 100644 +index 9b1170658d60..cc6c25629057 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -30,3 +30,5 @@ subdir-y += ti @@ -40614,7 +40614,7 @@ index 9b1170658d600..cc6c25629057d 100644 + +subdir-y += overlays diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile -index cb7de8d99223d..69809bf2f45df 100644 +index cb7de8d99223..69809bf2f45d 100644 --- a/arch/arm64/boot/dts/broadcom/Makefile +++ b/arch/arm64/boot/dts/broadcom/Makefile @@ -1,9 +1,20 @@ @@ -40642,34 +40642,34 @@ index cb7de8d99223d..69809bf2f45df 100644 +endif diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts new file mode 100644 -index 0000000000000..36ecea71f0ef9 +index 000000000000..36ecea71f0ef --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-2-b.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2710-rpi-2-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts new file mode 100644 -index 0000000000000..22fc6a82f2a96 +index 000000000000..22fc6a82f2a9 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b-plus.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b-plus.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts new file mode 100644 -index 0000000000000..4cacc5b72ae3c +index 000000000000..4cacc5b72ae3 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-3-b.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2710-rpi-3-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts new file mode 100644 -index 0000000000000..e1e13784cff63 +index 000000000000..e1e13784cff6 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2710-rpi-cm3.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2710-rpi-cm3.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts -index d24c53682e449..bf69a4b0b172a 100644 +index d24c53682e44..bf69a4b0b172 100644 --- a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-4-b.dts @@ -1,2 +1 @@ @@ -40678,21 +40678,21 @@ index d24c53682e449..bf69a4b0b172a 100644 +#include "../../../../arm/boot/dts/bcm2711-rpi-4-b.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts new file mode 100644 -index 0000000000000..90c2b5a195d48 +index 000000000000..90c2b5a195d4 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-400.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2711-rpi-400.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts new file mode 100644 -index 0000000000000..8064a58155f1b +index 000000000000..8064a58155f1 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts @@ -0,0 +1 @@ +#include "../../../../arm/boot/dts/bcm2711-rpi-cm4.dts" diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi new file mode 120000 -index 0000000000000..e5c400284467a +index 000000000000..e5c400284467 --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-csi1-2lane.dtsi @@ -0,0 +1 @@ @@ -40700,7 +40700,7 @@ index 0000000000000..e5c400284467a \ No newline at end of file diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi new file mode 120000 -index 0000000000000..fc4c05bbe7fd5 +index 000000000000..fc4c05bbe7fd --- /dev/null +++ b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-lan7515.dtsi @@ -0,0 +1 @@ @@ -40708,7 +40708,7 @@ index 0000000000000..fc4c05bbe7fd5 \ No newline at end of file diff --git a/arch/arm64/boot/dts/overlays b/arch/arm64/boot/dts/overlays new file mode 120000 -index 0000000000000..ded08646b6f66 +index 000000000000..ded08646b6f6 --- /dev/null +++ b/arch/arm64/boot/dts/overlays @@ -0,0 +1 @@ @@ -40716,7 +40716,7 @@ index 0000000000000..ded08646b6f66 \ No newline at end of file diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig new file mode 100644 -index 0000000000000..88fa0a35d8027 +index 000000000000..88fa0a35d802 --- /dev/null +++ b/arch/arm64/configs/bcm2711_defconfig @@ -0,0 +1,1556 @@ @@ -42278,7 +42278,7 @@ index 0000000000000..88fa0a35d8027 +# CONFIG_UPROBE_EVENTS is not set diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig new file mode 100644 -index 0000000000000..00352da730098 +index 000000000000..00352da73009 --- /dev/null +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -0,0 +1,1402 @@ @@ -43685,7 +43685,7 @@ index 0000000000000..00352da730098 +CONFIG_SCHED_TRACER=y +CONFIG_BLK_DEV_IO_TRACE=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index 5e7d86cf5dfa4..73caaa8ceb961 100644 +index 5e7d86cf5dfa..73caaa8ceb96 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1027,6 +1027,7 @@ CONFIG_ROCKCHIP_EFUSE=y @@ -43697,7 +43697,7 @@ index 5e7d86cf5dfa4..73caaa8ceb961 100644 CONFIG_FPGA_MGR_STRATIX10_SOC=m CONFIG_FPGA_BRIDGE=m diff --git a/arch/arm64/crypto/aes-cipher-glue.c b/arch/arm64/crypto/aes-cipher-glue.c -index 8caf6dfefce88..2c5772889bdfe 100644 +index 8caf6dfefce8..2c5772889bdf 100644 --- a/arch/arm64/crypto/aes-cipher-glue.c +++ b/arch/arm64/crypto/aes-cipher-glue.c @@ -9,6 +9,16 @@ @@ -43718,7 +43718,7 @@ index 8caf6dfefce88..2c5772889bdfe 100644 asmlinkage void __aes_arm64_decrypt(u32 *rk, u8 *out, const u8 *in, int rounds); diff --git a/arch/arm64/crypto/aes-glue.c b/arch/arm64/crypto/aes-glue.c -index 3de1dc918ad49..d6a1f5d13af0a 100644 +index 3de1dc918ad4..d6a1f5d13af0 100644 --- a/arch/arm64/crypto/aes-glue.c +++ b/arch/arm64/crypto/aes-glue.c @@ -55,17 +55,17 @@ MODULE_DESCRIPTION("AES-ECB/CBC/CTR/XTS using ARMv8 Crypto Extensions"); @@ -43742,7 +43742,7 @@ index 3de1dc918ad49..d6a1f5d13af0a 100644 MODULE_AUTHOR("Ard Biesheuvel "); MODULE_LICENSE("GPL v2"); diff --git a/arch/arm64/crypto/aes-neonbs-glue.c b/arch/arm64/crypto/aes-neonbs-glue.c -index fb507d5699229..cc52829d426a8 100644 +index fb507d569922..cc52829d426a 100644 --- a/arch/arm64/crypto/aes-neonbs-glue.c +++ b/arch/arm64/crypto/aes-neonbs-glue.c @@ -18,11 +18,6 @@ @@ -43758,7 +43758,7 @@ index fb507d5699229..cc52829d426a8 100644 asmlinkage void aesbs_ecb_encrypt(u8 out[], u8 const in[], u8 const rk[], diff --git a/arch/arm64/kernel/armv8_deprecated.c b/arch/arm64/kernel/armv8_deprecated.c -index 7e88057269d5c..989ea8fe49d00 100644 +index 7e88057269d5..989ea8fe49d0 100644 --- a/arch/arm64/kernel/armv8_deprecated.c +++ b/arch/arm64/kernel/armv8_deprecated.c @@ -182,10 +182,15 @@ static void __init register_insn_emulation(struct insn_emulation_ops *ops) @@ -43778,7 +43778,7 @@ index 7e88057269d5c..989ea8fe49d00 100644 case INSN_OBSOLETE: insn->current_mode = INSN_UNDEF; diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 1b5ee494488a0..a0ce6bd927137 100644 +index 1b5ee494488a..a0ce6bd92713 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -17,6 +17,7 @@ @@ -43828,7 +43828,7 @@ index 1b5ee494488a0..a0ce6bd927137 100644 } diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c -index 996729e78105a..6d179e4557214 100644 +index 996729e78105..6d179e455721 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c @@ -343,7 +343,8 @@ static void h5_handle_internal_rx(struct hci_uart *hu) @@ -43842,7 +43842,7 @@ index 996729e78105a..6d179e4557214 100644 if (H5_HDR_LEN(hdr) > 2) h5->tx_win = (data[2] & 0x07); diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 4f451477281b3..ea3b070168825 100644 +index 4f451477281b..ea3b07016882 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -5,6 +5,8 @@ @@ -43855,7 +43855,7 @@ index 4f451477281b3..ea3b070168825 100644 config TTY_PRINTK diff --git a/drivers/char/Makefile b/drivers/char/Makefile -index 71d76fd62692f..3ad819383e9d9 100644 +index 71d76fd62692..3ad819383e9d 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -47,4 +47,5 @@ obj-$(CONFIG_PS3_FLASH) += ps3flash.o @@ -43866,7 +43866,7 @@ index 71d76fd62692f..3ad819383e9d9 100644 obj-$(CONFIG_PIN_MEMORY_DEV) += pin_memory.o diff --git a/drivers/char/broadcom/Kconfig b/drivers/char/broadcom/Kconfig new file mode 100644 -index 0000000000000..e555e841b8db3 +index 000000000000..e555e841b8db --- /dev/null +++ b/drivers/char/broadcom/Kconfig @@ -0,0 +1,49 @@ @@ -43921,7 +43921,7 @@ index 0000000000000..e555e841b8db3 + Raspberry Pi RPiVid video decoder hardware. diff --git a/drivers/char/broadcom/Makefile b/drivers/char/broadcom/Makefile new file mode 100644 -index 0000000000000..a302fb3ff91a3 +index 000000000000..a302fb3ff91a --- /dev/null +++ b/drivers/char/broadcom/Makefile @@ -0,0 +1,5 @@ @@ -43932,7 +43932,7 @@ index 0000000000000..a302fb3ff91a3 +obj-$(CONFIG_RPIVID_MEM) += rpivid-mem.o diff --git a/drivers/char/broadcom/bcm2835-gpiomem.c b/drivers/char/broadcom/bcm2835-gpiomem.c new file mode 100644 -index 0000000000000..f5e7f1ba8fb6f +index 000000000000..f5e7f1ba8fb6 --- /dev/null +++ b/drivers/char/broadcom/bcm2835-gpiomem.c @@ -0,0 +1,258 @@ @@ -44196,7 +44196,7 @@ index 0000000000000..f5e7f1ba8fb6f +MODULE_AUTHOR("Luke Wren "); diff --git a/drivers/char/broadcom/bcm2835_smi_dev.c b/drivers/char/broadcom/bcm2835_smi_dev.c new file mode 100644 -index 0000000000000..34976fa4ed591 +index 000000000000..34976fa4ed59 --- /dev/null +++ b/drivers/char/broadcom/bcm2835_smi_dev.c @@ -0,0 +1,409 @@ @@ -44611,7 +44611,7 @@ index 0000000000000..34976fa4ed591 +MODULE_AUTHOR("Luke Wren "); diff --git a/drivers/char/broadcom/rpivid-mem.c b/drivers/char/broadcom/rpivid-mem.c new file mode 100644 -index 0000000000000..9f38083f4cb65 +index 000000000000..9f38083f4cb6 --- /dev/null +++ b/drivers/char/broadcom/rpivid-mem.c @@ -0,0 +1,270 @@ @@ -44887,7 +44887,7 @@ index 0000000000000..9f38083f4cb65 +MODULE_AUTHOR("Jonathan Bell "); diff --git a/drivers/char/broadcom/vc_mem.c b/drivers/char/broadcom/vc_mem.c new file mode 100644 -index 0000000000000..195b61a4387c0 +index 000000000000..195b61a4387c --- /dev/null +++ b/drivers/char/broadcom/vc_mem.c @@ -0,0 +1,373 @@ @@ -45266,7 +45266,7 @@ index 0000000000000..195b61a4387c0 +module_param(mem_base, uint, 0644); diff --git a/drivers/char/broadcom/vcio.c b/drivers/char/broadcom/vcio.c new file mode 100644 -index 0000000000000..ac314617229ce +index 000000000000..ac314617229c --- /dev/null +++ b/drivers/char/broadcom/vcio.c @@ -0,0 +1,186 @@ @@ -45457,7 +45457,7 @@ index 0000000000000..ac314617229ce +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:rpi-vcio"); diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 72676f6e23649..65b9851974292 100644 +index 72676f6e2364..65b985197429 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -104,7 +104,7 @@ config HW_RANDOM_IPROC_RNG200 @@ -45470,7 +45470,7 @@ index 72676f6e23649..65b9851974292 100644 To compile this driver as a module, choose M here: the module will be called iproc-rng200 diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c -index 1a7c43b43c6b0..ee47667d07101 100644 +index 1a7c43b43c6b..ee47667d0710 100644 --- a/drivers/char/hw_random/bcm2835-rng.c +++ b/drivers/char/hw_random/bcm2835-rng.c @@ -102,8 +102,10 @@ static int bcm2835_rng_init(struct hwrng *rng) @@ -45487,7 +45487,7 @@ index 1a7c43b43c6b0..ee47667d07101 100644 return ret; } diff --git a/drivers/char/hw_random/iproc-rng200.c b/drivers/char/hw_random/iproc-rng200.c -index 01583faf9893e..2a92ea6580961 100644 +index 01583faf9893..2a92ea658096 100644 --- a/drivers/char/hw_random/iproc-rng200.c +++ b/drivers/char/hw_random/iproc-rng200.c @@ -29,6 +29,7 @@ @@ -45609,7 +45609,7 @@ index 01583faf9893e..2a92ea6580961 100644 ret = devm_hwrng_register(dev, &priv->rng); if (ret) { diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig -index c715d4681a0b8..32f8921307bd2 100644 +index c715d4681a0b..32f8921307bd 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -86,6 +86,12 @@ config COMMON_CLK_HI655X @@ -45626,7 +45626,7 @@ index c715d4681a0b8..32f8921307bd2 100644 tristate "Clock driver controlled via SCMI interface" depends on ARM_SCMI_PROTOCOL || COMPILE_TEST diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile -index da8fcf147eb13..f78099e1d9e7f 100644 +index da8fcf147eb1..f78099e1d9e7 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -18,6 +18,7 @@ endif @@ -45647,7 +45647,7 @@ index da8fcf147eb13..f78099e1d9e7f 100644 obj-$(CONFIG_COMMON_CLK_MAX9485) += clk-max9485.o obj-$(CONFIG_ARCH_MILBEAUT_M10V) += clk-milbeaut.o diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 1ac803e14fa3e..39fabced602a5 100644 +index 1ac803e14fa3..39fabced602a 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c @@ -35,6 +35,7 @@ @@ -46003,7 +46003,7 @@ index 1ac803e14fa3e..39fabced602a5 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("BCM2835 clock driver"); diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c -index f89b9cfc43099..94ce38a2d5aab 100644 +index f89b9cfc4309..94ce38a2d5aa 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c @@ -97,7 +97,7 @@ static int raspberrypi_clock_property(struct rpi_firmware *firmware, @@ -46025,7 +46025,7 @@ index f89b9cfc43099..94ce38a2d5aab 100644 clks->id); diff --git a/drivers/clk/clk-allo-dac.c b/drivers/clk/clk-allo-dac.c new file mode 100644 -index 0000000000000..a9844cb9454bd +index 000000000000..a9844cb9454b --- /dev/null +++ b/drivers/clk/clk-allo-dac.c @@ -0,0 +1,161 @@ @@ -46192,7 +46192,7 @@ index 0000000000000..a9844cb9454bd +MODULE_ALIAS("platform:clk-allo-dac"); diff --git a/drivers/clk/clk-hifiberry-dachd.c b/drivers/clk/clk-hifiberry-dachd.c new file mode 100644 -index 0000000000000..ec528a0aef36e +index 000000000000..ec528a0aef36 --- /dev/null +++ b/drivers/clk/clk-hifiberry-dachd.c @@ -0,0 +1,333 @@ @@ -46531,7 +46531,7 @@ index 0000000000000..ec528a0aef36e +MODULE_ALIAS("platform:clk-hifiberry-dachd"); diff --git a/drivers/clk/clk-hifiberry-dacpro.c b/drivers/clk/clk-hifiberry-dacpro.c new file mode 100644 -index 0000000000000..9e26344658236 +index 000000000000..9e2634465823 --- /dev/null +++ b/drivers/clk/clk-hifiberry-dacpro.c @@ -0,0 +1,160 @@ @@ -46696,7 +46696,7 @@ index 0000000000000..9e26344658236 +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:clk-hifiberry-dacpro"); diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 61c78714c0957..f4695bac4cecc 100644 +index 61c78714c095..f4695bac4cec 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -77,12 +77,14 @@ struct clk_core { @@ -46928,7 +46928,7 @@ index 61c78714c0957..f4695bac4cecc 100644 /* * Don't call clk_hw_create_clk() here because that would pin the diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index f28bb2334e747..8fbac86be34c2 100644 +index f28bb2334e74..8fbac86be34c 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -652,6 +652,10 @@ config UNIPHIER_XDMAC @@ -46943,7 +46943,7 @@ index f28bb2334e747..8fbac86be34c2 100644 tristate "APM X-Gene DMA support" depends on ARCH_XGENE || COMPILE_TEST diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index 948a8da05f8b6..e543c69fa6b52 100644 +index 948a8da05f8b..e543c69fa6b5 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_AT_XDMAC) += at_xdmac.o @@ -46956,7 +46956,7 @@ index 948a8da05f8b6..e543c69fa6b52 100644 obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o diff --git a/drivers/dma/bcm2708-dmaengine.c b/drivers/dma/bcm2708-dmaengine.c new file mode 100644 -index 0000000000000..075da9aadf6d6 +index 000000000000..075da9aadf6d --- /dev/null +++ b/drivers/dma/bcm2708-dmaengine.c @@ -0,0 +1,281 @@ @@ -47242,7 +47242,7 @@ index 0000000000000..075da9aadf6d6 + +MODULE_LICENSE("GPL"); diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c -index 630dfbb01a40e..94a1b40b16455 100644 +index 630dfbb01a40..94a1b40b1645 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -25,6 +25,7 @@ @@ -48148,7 +48148,7 @@ index 630dfbb01a40e..94a1b40b16455 100644 MODULE_ALIAS("platform:bcm2835-dma"); MODULE_DESCRIPTION("BCM2835 DMA engine driver"); diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c -index 1d965c1252cac..849e63bb426d4 100644 +index 1d965c1252ca..849e63bb426d 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c @@ -12,6 +12,7 @@ @@ -48372,7 +48372,7 @@ index 1d965c1252cac..849e63bb426d4 100644 MODULE_AUTHOR("Eric Anholt "); MODULE_DESCRIPTION("Raspberry Pi firmware driver"); diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index d1300fc003ed7..d4f77fa37d40f 100644 +index d1300fc003ed..d4f77fa37d40 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -193,6 +193,12 @@ config GPIO_BCM_XGS_IPROC @@ -48420,7 +48420,7 @@ index d1300fc003ed7..d4f77fa37d40f 100644 tristate "Janz VMOD-TTL Digital IO Module" depends on MFD_JANZ_CMODIO diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile -index 09dada80ac34c..71dda8a5625da 100644 +index 09dada80ac34..71dda8a5625d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_GPIO_ASPEED_SGPIO) += gpio-aspeed-sgpio.o @@ -48449,7 +48449,7 @@ index 09dada80ac34c..71dda8a5625da 100644 obj-$(CONFIG_GPIO_RC5T583) += gpio-rc5t583.o diff --git a/drivers/gpio/gpio-bcm-virt.c b/drivers/gpio/gpio-bcm-virt.c new file mode 100644 -index 0000000000000..55c40190e88a7 +index 000000000000..55c40190e88a --- /dev/null +++ b/drivers/gpio/gpio-bcm-virt.c @@ -0,0 +1,214 @@ @@ -48669,7 +48669,7 @@ index 0000000000000..55c40190e88a7 +MODULE_ALIAS("platform:brcmvirt-gpio"); diff --git a/drivers/gpio/gpio-fsm.c b/drivers/gpio/gpio-fsm.c new file mode 100644 -index 0000000000000..3a348f1c65144 +index 000000000000..3a348f1c6514 --- /dev/null +++ b/drivers/gpio/gpio-fsm.c @@ -0,0 +1,1210 @@ @@ -49885,7 +49885,7 @@ index 0000000000000..3a348f1c65144 +MODULE_ALIAS("platform:gpio-fsm"); diff --git a/drivers/gpio/gpio-pwm.c b/drivers/gpio/gpio-pwm.c new file mode 100644 -index 0000000000000..89f5d6b353aba +index 000000000000..89f5d6b353ab --- /dev/null +++ b/drivers/gpio/gpio-pwm.c @@ -0,0 +1,144 @@ @@ -50034,7 +50034,7 @@ index 0000000000000..89f5d6b353aba +MODULE_AUTHOR("Dave Stevenson "); +MODULE_DESCRIPTION("PWM GPIO driver"); diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c -index af5bb8fedfea7..2bd26c985246d 100644 +index af5bb8fedfea..2bd26c985246 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -51,6 +51,8 @@ @@ -50069,7 +50069,7 @@ index af5bb8fedfea7..2bd26c985246d 100644 "%s: tried to flag a GPIO set as output for IRQ\n", __func__); diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig -index ca868271f4c43..74872b157233f 100644 +index ca868271f4c4..74872b157233 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -392,6 +392,8 @@ source "drivers/gpu/drm/tidss/Kconfig" @@ -50082,7 +50082,7 @@ index ca868271f4c43..74872b157233f 100644 menuconfig DRM_LEGACY diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile -index 81569009f8848..78dd8e12525da 100644 +index 81569009f884..78dd8e12525d 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -124,3 +124,4 @@ obj-$(CONFIG_DRM_ASPEED_GFX) += aspeed/ @@ -50091,7 +50091,7 @@ index 81569009f8848..78dd8e12525da 100644 obj-y += xlnx/ +obj-y += gud/ diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index bc9df3f216f56..282ee57afe04a 100644 +index bc9df3f216f5..282ee57afe04 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -4988,7 +4988,6 @@ static void dm_disable_vblank(struct drm_crtc *crtc) @@ -50193,7 +50193,7 @@ index bc9df3f216f56..282ee57afe04a 100644 if (!scaling_changed && !abm_changed && !hdr_changed) continue; diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c -index 955a055bd9800..4eccd24757b3c 100644 +index 955a055bd980..4eccd24757b3 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c @@ -24,6 +24,7 @@ @@ -50217,7 +50217,7 @@ index 955a055bd9800..4eccd24757b3c 100644 struct amdgpu_device *adev = drm_to_adev(dev); struct amdgpu_crtc *acrtc = to_amdgpu_crtc(connector_state->crtc); diff --git a/drivers/gpu/drm/arc/arcpgu_crtc.c b/drivers/gpu/drm/arc/arcpgu_crtc.c -index be7c29cec318d..042d7b54a6dea 100644 +index be7c29cec318..042d7b54a6de 100644 --- a/drivers/gpu/drm/arc/arcpgu_crtc.c +++ b/drivers/gpu/drm/arc/arcpgu_crtc.c @@ -116,7 +116,7 @@ static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -50239,7 +50239,7 @@ index be7c29cec318d..042d7b54a6dea 100644 struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc); diff --git a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c -index f33418d6e1a08..00472e15ba0b4 100644 +index f33418d6e1a0..00472e15ba0b 100644 --- a/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +++ b/drivers/gpu/drm/arm/display/komeda/komeda_crtc.c @@ -74,16 +74,18 @@ static void komeda_crtc_update_clock_ratio(struct komeda_crtc_state *kcrtc_st) @@ -50310,7 +50310,7 @@ index f33418d6e1a08..00472e15ba0b4 100644 .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c -index af67fefed38dc..a3234bfb09173 100644 +index af67fefed38d..a3234bfb0917 100644 --- a/drivers/gpu/drm/arm/hdlcd_crtc.c +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -168,7 +168,7 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -50341,7 +50341,7 @@ index af67fefed38dc..a3234bfb09173 100644 struct drm_pending_vblank_event *event = crtc->state->event; diff --git a/drivers/gpu/drm/arm/malidp_crtc.c b/drivers/gpu/drm/arm/malidp_crtc.c -index 587d94798f5c2..494075ddbef68 100644 +index 587d94798f5c..494075ddbef6 100644 --- a/drivers/gpu/drm/arm/malidp_crtc.c +++ b/drivers/gpu/drm/arm/malidp_crtc.c @@ -46,7 +46,7 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc, @@ -50429,7 +50429,7 @@ index 587d94798f5c2..494075ddbef68 100644 .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c -index a887b6a5f8bd7..f10a063b338ce 100644 +index a887b6a5f8bd..f10a063b338c 100644 --- a/drivers/gpu/drm/armada/armada_crtc.c +++ b/drivers/gpu/drm/armada/armada_crtc.c @@ -413,21 +413,23 @@ static void armada_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -50503,7 +50503,7 @@ index a887b6a5f8bd7..f10a063b338ce 100644 .page_flip = drm_atomic_helper_page_flip, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, diff --git a/drivers/gpu/drm/ast/ast_mode.c b/drivers/gpu/drm/ast/ast_mode.c -index a3c2f76668abe..5697eba6c56be 100644 +index a3c2f76668ab..5697eba6c56b 100644 --- a/drivers/gpu/drm/ast/ast_mode.c +++ b/drivers/gpu/drm/ast/ast_mode.c @@ -751,24 +751,26 @@ static void ast_crtc_dpms(struct drm_crtc *crtc, int mode) @@ -50568,7 +50568,7 @@ index a3c2f76668abe..5697eba6c56be 100644 .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c -index ce246b96330b7..c8471bd4abbb8 100644 +index ce246b96330b..c8471bd4abbb 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c @@ -165,7 +165,7 @@ atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c, @@ -50627,7 +50627,7 @@ index ce246b96330b7..c8471bd4abbb8 100644 int atmel_hlcdc_crtc_create(struct drm_device *dev) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 0c79a9ba48bb6..4c4fb4b52b7d1 100644 +index 0c79a9ba48bb..4c4fb4b52b7d 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -2395,21 +2395,6 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) @@ -50672,7 +50672,7 @@ index 0c79a9ba48bb6..4c4fb4b52b7d1 100644 drm_connector_attach_encoder(connector, hdmi->bridge.encoder); diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 8a871e5c3e26b..95addc0070aca 100644 +index 8a871e5c3e26..95addc0070ac 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -122,7 +122,8 @@ static int handle_conflicting_encoders(struct drm_atomic_state *state, @@ -50889,7 +50889,7 @@ index 8a871e5c3e26b..95addc0070aca 100644 * drm_atomic_helper_bridge_propagate_bus_fmt() - Propagate output format to * the input end of a bridge diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_mgmt.c -index 138ff34b31db5..8c225fb7441d5 100644 +index 138ff34b31db..8c225fb7441d 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -22,6 +22,7 @@ @@ -51046,7 +51046,7 @@ index 138ff34b31db5..8c225fb7441d5 100644 out: DRM_MODESET_LOCK_ALL_END(dev, ctx, ret); diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c -index 717c4e7271b04..c0beaa2ea6ee0 100644 +index 717c4e7271b0..c0beaa2ea6ee 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -94,6 +94,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] = { @@ -51134,7 +51134,7 @@ index 717c4e7271b04..c0beaa2ea6ee0 100644 * drm_connector_set_vrr_capable_property - sets the variable refresh rate * capable property for a connector diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c -index 722c7ebe4e889..bdc7c605f43e4 100644 +index 722c7ebe4e88..bdc7c605f43e 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c @@ -286,6 +286,9 @@ const struct drm_format_info *__drm_format_info(u32 format) @@ -51148,7 +51148,7 @@ index 722c7ebe4e889..bdc7c605f43e4 100644 unsigned int i; diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_framebuffer.c -index 2f5b0c2bb0fe3..89ced6af9c5cb 100644 +index 2f5b0c2bb0fe..89ced6af9c5c 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -217,12 +217,16 @@ static int framebuffer_check(struct drm_device *dev, @@ -51175,7 +51175,7 @@ index 2f5b0c2bb0fe3..89ced6af9c5cb 100644 if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c -index e5432dcf69996..f8eb1061a55f4 100644 +index e5432dcf6999..f8eb1061a55f 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -794,6 +794,84 @@ void drm_kms_helper_poll_fini(struct drm_device *dev) @@ -51313,7 +51313,7 @@ index e5432dcf69996..f8eb1061a55f4 100644 drm_connector_list_iter_end(&conn_iter); mutex_unlock(&dev->mode_config.mutex); diff --git a/drivers/gpu/drm/drm_simple_kms_helper.c b/drivers/gpu/drm/drm_simple_kms_helper.c -index 74946690aba4e..743e57c1b44f3 100644 +index 74946690aba4..743e57c1b44f 100644 --- a/drivers/gpu/drm/drm_simple_kms_helper.c +++ b/drivers/gpu/drm/drm_simple_kms_helper.c @@ -86,20 +86,22 @@ drm_simple_kms_crtc_mode_valid(struct drm_crtc *crtc, @@ -51354,7 +51354,7 @@ index 74946690aba4e..743e57c1b44f3 100644 struct drm_simple_display_pipe *pipe; diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c -index 1c03485676efa..4153f302de7c4 100644 +index 1c03485676ef..4153f302de7c 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -19,7 +19,7 @@ @@ -51413,7 +51413,7 @@ index 1c03485676efa..4153f302de7c4 100644 struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c -index b9ca81a6f80fb..2af60d98f48f9 100644 +index b9ca81a6f80f..2af60d98f48f 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c @@ -21,7 +21,7 @@ @@ -51448,7 +51448,7 @@ index b9ca81a6f80fb..2af60d98f48f9 100644 struct fsl_dcu_drm_device *fsl_dev = dev->dev_private; diff --git a/drivers/gpu/drm/gud/Kconfig b/drivers/gpu/drm/gud/Kconfig new file mode 100644 -index 0000000000000..1c8601bf4d91e +index 000000000000..1c8601bf4d91 --- /dev/null +++ b/drivers/gpu/drm/gud/Kconfig @@ -0,0 +1,14 @@ @@ -51468,7 +51468,7 @@ index 0000000000000..1c8601bf4d91e + If M is selected the module will be called gud. diff --git a/drivers/gpu/drm/gud/Makefile b/drivers/gpu/drm/gud/Makefile new file mode 100644 -index 0000000000000..68a1c622cf332 +index 000000000000..68a1c622cf33 --- /dev/null +++ b/drivers/gpu/drm/gud/Makefile @@ -0,0 +1,4 @@ @@ -51478,7 +51478,7 @@ index 0000000000000..68a1c622cf332 +obj-$(CONFIG_DRM_GUD) += gud.o diff --git a/drivers/gpu/drm/gud/gud_connector.c b/drivers/gpu/drm/gud/gud_connector.c new file mode 100644 -index 0000000000000..ae051133e0507 +index 000000000000..ae051133e050 --- /dev/null +++ b/drivers/gpu/drm/gud/gud_connector.c @@ -0,0 +1,729 @@ @@ -52213,7 +52213,7 @@ index 0000000000000..ae051133e0507 +} diff --git a/drivers/gpu/drm/gud/gud_drv.c b/drivers/gpu/drm/gud/gud_drv.c new file mode 100644 -index 0000000000000..3afad229bb78e +index 000000000000..3afad229bb78 --- /dev/null +++ b/drivers/gpu/drm/gud/gud_drv.c @@ -0,0 +1,696 @@ @@ -52915,7 +52915,7 @@ index 0000000000000..3afad229bb78e +MODULE_LICENSE("Dual MIT/GPL"); diff --git a/drivers/gpu/drm/gud/gud_internal.h b/drivers/gpu/drm/gud/gud_internal.h new file mode 100644 -index 0000000000000..2a388e27d5d7b +index 000000000000..2a388e27d5d7 --- /dev/null +++ b/drivers/gpu/drm/gud/gud_internal.h @@ -0,0 +1,156 @@ @@ -53077,7 +53077,7 @@ index 0000000000000..2a388e27d5d7b +#endif diff --git a/drivers/gpu/drm/gud/gud_pipe.c b/drivers/gpu/drm/gud/gud_pipe.c new file mode 100644 -index 0000000000000..d04e777ccb376 +index 000000000000..d04e777ccb37 --- /dev/null +++ b/drivers/gpu/drm/gud/gud_pipe.c @@ -0,0 +1,601 @@ @@ -53683,7 +53683,7 @@ index 0000000000000..d04e777ccb376 + drm_dev_exit(idx); +} diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c -index 4d57ec688f827..567f578740bd2 100644 +index 4d57ec688f82..567f578740bd 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -172,7 +172,7 @@ static void hibmc_crtc_dpms(struct drm_crtc *crtc, int dpms) @@ -53723,7 +53723,7 @@ index 4d57ec688f827..567f578740bd2 100644 { unsigned long flags; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c -index e1108c1735ad0..d84d41f3e78f5 100644 +index e1108c1735ad..d84d41f3e78f 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c @@ -436,7 +436,7 @@ static void ade_dump_regs(void __iomem *base) { } @@ -53763,7 +53763,7 @@ index e1108c1735ad0..d84d41f3e78f5 100644 { struct kirin_crtc *kcrtc = to_kirin_crtc(crtc); diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c b/drivers/gpu/drm/i915/display/intel_atomic.c -index 86be032bcf965..b18417a393af1 100644 +index 86be032bcf96..b18417a393af 100644 --- a/drivers/gpu/drm/i915/display/intel_atomic.c +++ b/drivers/gpu/drm/i915/display/intel_atomic.c @@ -109,16 +109,6 @@ int intel_digital_connector_atomic_set_property(struct drm_connector *connector, @@ -53794,7 +53794,7 @@ index 86be032bcf965..b18417a393af1 100644 return 0; diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c -index 406e96785c763..d1f8c7f3d1970 100644 +index 406e96785c76..d1f8c7f3d197 100644 --- a/drivers/gpu/drm/i915/display/intel_connector.c +++ b/drivers/gpu/drm/i915/display/intel_connector.c @@ -297,6 +297,5 @@ intel_attach_colorspace_property(struct drm_connector *connector) @@ -53806,7 +53806,7 @@ index 406e96785c763..d1f8c7f3d1970 100644 + drm_connector_attach_colorspace_property(connector); } diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c -index 45c2556d63955..32f440223bd10 100644 +index 45c2556d6395..32f440223bd1 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -16562,7 +16562,6 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, @@ -53818,7 +53818,7 @@ index 45c2556d63955..32f440223bd10 100644 .destroy = intel_crtc_destroy, \ .page_flip = drm_atomic_helper_page_flip, \ diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c -index ecaa538b2d357..3e5558def1c56 100644 +index ecaa538b2d35..3e5558def1c5 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -23,6 +23,7 @@ @@ -53846,7 +53846,7 @@ index ecaa538b2d357..3e5558def1c56 100644 return &intel_dp->mst_encoders[crtc->pipe]->base.base; } diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c -index 1d616da4f1657..bf4da68260b9e 100644 +index 1d616da4f165..bf4da68260b9 100644 --- a/drivers/gpu/drm/i915/display/intel_hdmi.c +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c @@ -2971,8 +2971,7 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *c @@ -53860,7 +53860,7 @@ index 1d616da4f1657..bf4da68260b9e 100644 if (!HAS_GMCH(dev_priv)) drm_connector_attach_max_bpc_property(connector, 8, 12); diff --git a/drivers/gpu/drm/imx/dcss/dcss-crtc.c b/drivers/gpu/drm/imx/dcss/dcss-crtc.c -index 36abff0890b28..31267c00782fc 100644 +index 36abff0890b2..31267c00782f 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-crtc.c +++ b/drivers/gpu/drm/imx/dcss/dcss-crtc.c @@ -3,6 +3,7 @@ @@ -53912,7 +53912,7 @@ index 36abff0890b28..31267c00782fc 100644 base); struct dcss_dev *dcss = dcss_crtc->base.dev->dev_private; diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c -index d412fc265395e..7ebd99ee32407 100644 +index d412fc265395..7ebd99ee3240 100644 --- a/drivers/gpu/drm/imx/ipuv3-crtc.c +++ b/drivers/gpu/drm/imx/ipuv3-crtc.c @@ -47,7 +47,7 @@ static inline struct ipu_crtc *to_ipu_crtc(struct drm_crtc *crtc) @@ -53968,7 +53968,7 @@ index d412fc265395e..7ebd99ee32407 100644 spin_lock_irq(&crtc->dev->event_lock); if (crtc->state->event) { diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c -index b6bb5fc7d183e..0f52e5f4aa2f5 100644 +index b6bb5fc7d183..0f52e5f4aa2f 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -112,7 +112,7 @@ static inline struct ingenic_drm *drm_crtc_get_priv(struct drm_crtc *crtc) @@ -54068,7 +54068,7 @@ index b6bb5fc7d183e..0f52e5f4aa2f5 100644 static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = { diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c -index dfd5ed15a7f4a..3d698cd106265 100644 +index dfd5ed15a7f4..3d698cd10626 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -517,7 +517,7 @@ void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane, @@ -54131,7 +54131,7 @@ index dfd5ed15a7f4a..3d698cd106265 100644 .disable_vblank = mtk_drm_crtc_disable_vblank, }; diff --git a/drivers/gpu/drm/meson/meson_crtc.c b/drivers/gpu/drm/meson/meson_crtc.c -index 2854272dc2d9b..d70616da8ce2f 100644 +index 2854272dc2d9..d70616da8ce2 100644 --- a/drivers/gpu/drm/meson/meson_crtc.c +++ b/drivers/gpu/drm/meson/meson_crtc.c @@ -82,7 +82,7 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { @@ -54189,7 +54189,7 @@ index 2854272dc2d9b..d70616da8ce2f 100644 struct meson_crtc *meson_crtc = to_meson_crtc(crtc); struct meson_drm *priv = meson_crtc->priv; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c -index f56414a06ec41..5bc1ead269d3a 100644 +index f56414a06ec4..5bc1ead269d3 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -11,6 +11,7 @@ @@ -54307,7 +54307,7 @@ index f56414a06ec41..5bc1ead269d3a 100644 DPU_ERROR("crtc%d failed performance check %d\n", crtc->base.id, rc); diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c -index a0253297bc769..34e3186e236de 100644 +index a0253297bc76..34e3186e236d 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c @@ -264,7 +264,7 @@ static void mdp4_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -54355,7 +54355,7 @@ index a0253297bc769..34e3186e236de 100644 struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); struct drm_device *dev = crtc->dev; diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c -index 7d7668998501a..baf9f1d550c6c 100644 +index 7d7668998501..baf9f1d550c6 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c @@ -7,6 +7,7 @@ @@ -54448,7 +54448,7 @@ index 7d7668998501a..baf9f1d550c6c 100644 struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc); struct mdp5_crtc_state *mdp5_cstate = to_mdp5_crtc_state(crtc->state); diff --git a/drivers/gpu/drm/mxsfb/mxsfb_kms.c b/drivers/gpu/drm/mxsfb/mxsfb_kms.c -index b535621f4f78d..d2f747d3695a0 100644 +index b535621f4f78..d2f747d3695a 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_kms.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_kms.c @@ -310,21 +310,23 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb) @@ -54499,7 +54499,7 @@ index b535621f4f78d..d2f747d3695a0 100644 struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev); struct drm_device *drm = mxsfb->drm; diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c -index c2d34c91e840c..afd2736f040d0 100644 +index c2d34c91e840..afd2736f040d 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -32,6 +32,7 @@ @@ -54523,7 +54523,7 @@ index c2d34c91e840c..afd2736f040d0 100644 struct drm_crtc *crtc = connector_state->crtc; diff --git a/drivers/gpu/drm/nouveau/dispnv50/head.c b/drivers/gpu/drm/nouveau/dispnv50/head.c -index 61826cac3061a..5f4edb5a77e41 100644 +index 61826cac3061..5f4edb5a77e4 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/head.c +++ b/drivers/gpu/drm/nouveau/dispnv50/head.c @@ -30,6 +30,7 @@ @@ -54568,7 +54568,7 @@ index 61826cac3061a..5f4edb5a77e41 100644 .set_config = drm_atomic_helper_set_config, .page_flip = drm_atomic_helper_page_flip, diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c -index 328a4a74f534e..84101e27cfb7d 100644 +index 328a4a74f534..84101e27cfb7 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -436,7 +436,7 @@ static void omap_crtc_arm_event(struct drm_crtc *crtc) @@ -54644,7 +54644,7 @@ index 328a4a74f534e..84101e27cfb7d 100644 .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .atomic_set_property = omap_crtc_atomic_set_property, diff --git a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c -index 733010b5e4f53..7fb4d98e166d5 100644 +index 733010b5e4f5..7fb4d98e166d 100644 --- a/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c +++ b/drivers/gpu/drm/panel/panel-jdi-lt070me05000.c @@ -205,11 +205,11 @@ static int jdi_panel_unprepare(struct drm_panel *panel) @@ -54695,7 +54695,7 @@ index 733010b5e4f53..7fb4d98e166d5 100644 return ret; } diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c -index bbdd086be7f59..3f0c11fa60a50 100644 +index bbdd086be7f5..3f0c11fa60a5 100644 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c @@ -219,7 +219,35 @@ static struct rpi_touchscreen *panel_to_ts(struct drm_panel *panel) @@ -54789,7 +54789,7 @@ index bbdd086be7f59..3f0c11fa60a50 100644 .get_modes = rpi_touchscreen_get_modes, }; diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 204674fccd646..8becb0e318140 100644 +index 204674fccd64..8becb0e31814 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c @@ -2093,6 +2093,38 @@ static const struct panel_desc innolux_at043tn24 = { @@ -54884,7 +54884,7 @@ index 204674fccd646..8becb0e318140 100644 .compatible = "rocktech,rk070er9427", .data = &rocktech_rk070er9427, diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c -index f22a1b776f4ba..5c9e28fdb6ad9 100644 +index f22a1b776f4b..5c9e28fdb6ad 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -373,7 +373,7 @@ static void qxl_crtc_update_monitors_config(struct drm_crtc *crtc, @@ -54913,7 +54913,7 @@ index f22a1b776f4ba..5c9e28fdb6ad9 100644 qxl_crtc_update_monitors_config(crtc, "disable"); } diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c -index 1b9738e44909d..675ac27eb2402 100644 +index 1b9738e44909..675ac27eb240 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -682,20 +682,23 @@ static void rcar_du_crtc_stop(struct rcar_du_crtc *rcrtc) @@ -54992,7 +54992,7 @@ index 1b9738e44909d..675ac27eb2402 100644 /* ----------------------------------------------------------------------------- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c -index 0f23144491e40..5a108247ace4f 100644 +index 0f23144491e4..5a108247ace4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -693,7 +693,7 @@ static void rockchip_drm_set_win_enabled(struct drm_crtc *crtc, bool enabled) @@ -55061,7 +55061,7 @@ index 0f23144491e40..5a108247ace4f 100644 static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) diff --git a/drivers/gpu/drm/sti/sti_crtc.c b/drivers/gpu/drm/sti/sti_crtc.c -index 6f37c104c46f9..409795786f039 100644 +index 6f37c104c46f..409795786f03 100644 --- a/drivers/gpu/drm/sti/sti_crtc.c +++ b/drivers/gpu/drm/sti/sti_crtc.c @@ -23,7 +23,7 @@ @@ -55092,7 +55092,7 @@ index 6f37c104c46f9..409795786f039 100644 struct drm_device *drm_dev = crtc->dev; struct sti_mixer *mixer = to_sti_mixer(crtc); diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c -index 62488ac149238..6f3b523e16e8c 100644 +index 62488ac14923..6f3b523e16e8 100644 --- a/drivers/gpu/drm/stm/ltdc.c +++ b/drivers/gpu/drm/stm/ltdc.c @@ -420,7 +420,7 @@ static void ltdc_crtc_update_clut(struct drm_crtc *crtc) @@ -55131,7 +55131,7 @@ index 62488ac149238..6f3b523e16e8c 100644 /* diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c -index 3a153648b3698..45d9eb552d869 100644 +index 3a153648b369..45d9eb552d86 100644 --- a/drivers/gpu/drm/sun4i/sun4i_crtc.c +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c @@ -15,6 +15,7 @@ @@ -55199,7 +55199,7 @@ index 3a153648b3698..45d9eb552d869 100644 struct drm_encoder *encoder = sun4i_crtc_get_encoder(crtc); struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc); diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c -index ceb86338c0039..1e486da92ac31 100644 +index ceb86338c003..1e486da92ac3 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -1748,7 +1748,7 @@ static int tegra_dc_wait_idle(struct tegra_dc *dc, unsigned long timeout) @@ -55265,7 +55265,7 @@ index ceb86338c0039..1e486da92ac31 100644 value = tegra_dc_readl(dc, DC_CMD_STATE_CONTROL); } diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c -index 3c5744a91d4a0..2218da3b3ca34 100644 +index 3c5744a91d4a..2218da3b3ca3 100644 --- a/drivers/gpu/drm/tidss/tidss_crtc.c +++ b/drivers/gpu/drm/tidss/tidss_crtc.c @@ -85,8 +85,10 @@ void tidss_crtc_error_irq(struct drm_crtc *crtc, u64 irqstatus) @@ -55336,7 +55336,7 @@ index 3c5744a91d4a0..2218da3b3ca34 100644 struct tidss_crtc *tcrtc = to_tidss_crtc(crtc); struct drm_device *ddev = crtc->dev; diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c -index 0aaa4a26b5db5..c7c1fcc03b325 100644 +index 0aaa4a26b5db..c7c1fcc03b32 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c @@ -484,7 +484,7 @@ static void tilcdc_crtc_enable(struct drm_crtc *crtc) @@ -55388,7 +55388,7 @@ index 0aaa4a26b5db5..c7c1fcc03b325 100644 return -EINVAL; } diff --git a/drivers/gpu/drm/v3d/Kconfig b/drivers/gpu/drm/v3d/Kconfig -index 9a5c44606337e..b0e0486979642 100644 +index 9a5c44606337..b0e048697964 100644 --- a/drivers/gpu/drm/v3d/Kconfig +++ b/drivers/gpu/drm/v3d/Kconfig @@ -1,7 +1,7 @@ @@ -55401,7 +55401,7 @@ index 9a5c44606337e..b0e0486979642 100644 depends on COMMON_CLK depends on MMU diff --git a/drivers/gpu/drm/v3d/v3d_debugfs.c b/drivers/gpu/drm/v3d/v3d_debugfs.c -index e76b24bb88285..b7b296bb87d06 100644 +index e76b24bb8828..b7b296bb87d0 100644 --- a/drivers/gpu/drm/v3d/v3d_debugfs.c +++ b/drivers/gpu/drm/v3d/v3d_debugfs.c @@ -4,7 +4,6 @@ @@ -55457,7 +55457,7 @@ index e76b24bb88285..b7b296bb87d06 100644 return 0; } diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c -index 9f7c261938312..3237f47a47927 100644 +index 9f7c26193831..3237f47a4792 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -70,7 +70,7 @@ static int v3d_runtime_resume(struct device *dev) @@ -55565,7 +55565,7 @@ index 9f7c261938312..3237f47a47927 100644 }; diff --git a/drivers/gpu/drm/v3d/v3d_drv.h b/drivers/gpu/drm/v3d/v3d_drv.h -index 8a390738d65ba..1372e913e7650 100644 +index 8a390738d65b..1372e913e765 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.h +++ b/drivers/gpu/drm/v3d/v3d_drv.h @@ -51,6 +51,12 @@ struct v3d_dev { @@ -55582,7 +55582,7 @@ index 8a390738d65ba..1372e913e7650 100644 /* Virtual and DMA addresses of the single shared page table. */ diff --git a/drivers/gpu/drm/v3d/v3d_gem.c b/drivers/gpu/drm/v3d/v3d_gem.c -index 182c586525eb8..b4fb899a94096 100644 +index 182c586525eb..b4fb899a9409 100644 --- a/drivers/gpu/drm/v3d/v3d_gem.c +++ b/drivers/gpu/drm/v3d/v3d_gem.c @@ -4,6 +4,7 @@ @@ -55699,7 +55699,7 @@ index 182c586525eb8..b4fb899a94096 100644 * treat 0 as special, such as the occlusion query counters * where 0 means "disabled". diff --git a/drivers/gpu/drm/v3d/v3d_irq.c b/drivers/gpu/drm/v3d/v3d_irq.c -index c88686489b888..0f7a23f051df8 100644 +index c88686489b88..0f7a23f051df 100644 --- a/drivers/gpu/drm/v3d/v3d_irq.c +++ b/drivers/gpu/drm/v3d/v3d_irq.c @@ -177,11 +177,9 @@ v3d_hub_irq(int irq, void *arg) @@ -55742,7 +55742,7 @@ index c88686489b888..0f7a23f051df8 100644 return irq1; if (irq1 > 0) { diff --git a/drivers/gpu/drm/v3d/v3d_mmu.c b/drivers/gpu/drm/v3d/v3d_mmu.c -index 5a453532901f1..618503f2f2f1d 100644 +index 5a453532901f..618503f2f2f1 100644 --- a/drivers/gpu/drm/v3d/v3d_mmu.c +++ b/drivers/gpu/drm/v3d/v3d_mmu.c @@ -18,6 +18,8 @@ @@ -55755,7 +55755,7 @@ index 5a453532901f1..618503f2f2f1d 100644 #include "v3d_regs.h" diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c b/drivers/gpu/drm/vboxvideo/vbox_mode.c -index 4fcc0a542b8a6..322bf7133ba12 100644 +index 4fcc0a542b8a..322bf7133ba1 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c @@ -213,17 +213,17 @@ static void vbox_crtc_set_base_and_mode(struct drm_crtc *crtc, @@ -55780,7 +55780,7 @@ index 4fcc0a542b8a6..322bf7133ba12 100644 } diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig -index 118e8a426b1ab..345a5570a3da7 100644 +index 118e8a426b1a..345a5570a3da 100644 --- a/drivers/gpu/drm/vc4/Kconfig +++ b/drivers/gpu/drm/vc4/Kconfig @@ -12,6 +12,7 @@ config DRM_VC4 @@ -55792,7 +55792,7 @@ index 118e8a426b1ab..345a5570a3da7 100644 help Choose this option if you have a system that has a Broadcom diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile -index d0163e18e9caa..8281a044834f0 100644 +index d0163e18e9ca..8281a044834f 100644 --- a/drivers/gpu/drm/vc4/Makefile +++ b/drivers/gpu/drm/vc4/Makefile @@ -9,6 +9,7 @@ vc4-y := \ @@ -55804,7 +55804,7 @@ index d0163e18e9caa..8281a044834f0 100644 vc4_gem.o \ vc4_hdmi.o \ diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index f4ccca922e44a..59e10c37b740c 100644 +index f4ccca922e44..59e10c37b740 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -279,19 +279,15 @@ static u32 vc4_crtc_get_fifo_full_level_bits(struct vc4_crtc *vc4_crtc, @@ -56213,7 +56213,7 @@ index f4ccca922e44a..59e10c37b740c 100644 .disable_vblank = vc4_disable_vblank, .get_vblank_timestamp = drm_crtc_vblank_helper_get_vblank_timestamp, diff --git a/drivers/gpu/drm/vc4/vc4_debugfs.c b/drivers/gpu/drm/vc4/vc4_debugfs.c -index 4fbbf980a299f..a95d88fea8d23 100644 +index 4fbbf980a299..a95d88fea8d2 100644 --- a/drivers/gpu/drm/vc4/vc4_debugfs.c +++ b/drivers/gpu/drm/vc4/vc4_debugfs.c @@ -7,6 +7,7 @@ @@ -56238,7 +56238,7 @@ index 4fbbf980a299f..a95d88fea8d23 100644 list_for_each_entry(entry, &vc4->debugfs_list, link) { drm_debugfs_create_files(&entry->info, 1, diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c -index a90f2545baee0..dde2c60147484 100644 +index a90f2545baee..dde2c6014748 100644 --- a/drivers/gpu/drm/vc4/vc4_dpi.c +++ b/drivers/gpu/drm/vc4/vc4_dpi.c @@ -165,10 +165,20 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) @@ -56274,7 +56274,7 @@ index a90f2545baee0..dde2c60147484 100644 if (mode->flags & DRM_MODE_FLAG_NHSYNC) diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c -index 839610f8092af..dec3620bc7c58 100644 +index 839610f8092a..dec3620bc7c5 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -36,6 +36,8 @@ @@ -56410,7 +56410,7 @@ index 839610f8092af..dec3620bc7c58 100644 }; diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index 9809c3a856c67..7c749e08cb0c4 100644 +index 9809c3a856c6..7c749e08cb0c 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h @@ -74,12 +74,16 @@ struct vc4_perfmon { @@ -56512,7 +56512,7 @@ index 9809c3a856c67..7c749e08cb0c4 100644 void vc4_hvs_unmask_underrun(struct drm_device *dev, int channel); void vc4_hvs_mask_underrun(struct drm_device *dev, int channel); diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c -index eaf276978ee7f..1c6939c9c2326 100644 +index eaf276978ee7..1c6939c9c232 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -181,8 +181,50 @@ @@ -57091,7 +57091,7 @@ index eaf276978ee7f..1c6939c9c2326 100644 static const struct component_ops vc4_dsi_ops = { diff --git a/drivers/gpu/drm/vc4/vc4_firmware_kms.c b/drivers/gpu/drm/vc4/vc4_firmware_kms.c new file mode 100644 -index 0000000000000..d6d50b5f64dd0 +index 000000000000..d6d50b5f64dd --- /dev/null +++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c @@ -0,0 +1,1992 @@ @@ -59088,7 +59088,7 @@ index 0000000000000..d6d50b5f64dd0 + }, +}; diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c -index b641252939d87..445d3bab89e0a 100644 +index b641252939d8..445d3bab89e0 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -1026,7 +1026,6 @@ int vc4_queue_seqno_cb(struct drm_device *dev, @@ -59109,7 +59109,7 @@ index b641252939d87..445d3bab89e0a 100644 /* Scheduled when any job has been completed, this walks the list of diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c -index c58b8840090ab..f1adaa9dc5f34 100644 +index ee293f061f0a..f1adaa9dc5f3 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -35,6 +35,7 @@ @@ -60178,7 +60178,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 /* The B frame identifier should match the value used by alsa-lib (8) */ audio_packet_config = -@@ -1024,122 +1418,33 @@ static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream, +@@ -1024,124 +1418,33 @@ static int vc4_hdmi_audio_hw_params(struct snd_pcm_substream *substream, VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS | VC4_SET_FIELD(0x8, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER); @@ -60242,7 +60242,9 @@ index c58b8840090ab..f1adaa9dc5f34 100644 - HDMI_WRITE(HDMI_MAI_CTL, - VC4_SET_FIELD(vc4_hdmi->audio.channels, - VC4_HD_MAI_CTL_CHNUM) | -- VC4_HD_MAI_CTL_ENABLE); +- VC4_HD_MAI_CTL_WHOLSMP | +- VC4_HD_MAI_CTL_CHALIGN | +- VC4_HD_MAI_CTL_ENABLE); - break; - case SNDRV_PCM_TRIGGER_STOP: - HDMI_WRITE(HDMI_MAI_CTL, @@ -60311,7 +60313,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 static const struct snd_soc_dapm_widget vc4_hdmi_audio_widgets[] = { SND_SOC_DAPM_OUTPUT("TX"), }; -@@ -1150,8 +1455,6 @@ static const struct snd_soc_dapm_route vc4_hdmi_audio_routes[] = { +@@ -1152,8 +1455,6 @@ static const struct snd_soc_dapm_route vc4_hdmi_audio_routes[] = { static const struct snd_soc_component_driver vc4_hdmi_audio_component_drv = { .name = "vc4-hdmi-codec-dai-component", @@ -60320,7 +60322,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 .dapm_widgets = vc4_hdmi_audio_widgets, .num_dapm_widgets = ARRAY_SIZE(vc4_hdmi_audio_widgets), .dapm_routes = vc4_hdmi_audio_routes, -@@ -1162,28 +1465,6 @@ static const struct snd_soc_component_driver vc4_hdmi_audio_component_drv = { +@@ -1164,28 +1465,6 @@ static const struct snd_soc_component_driver vc4_hdmi_audio_component_drv = { .non_legacy_dai_naming = 1, }; @@ -60349,7 +60351,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 static const struct snd_soc_component_driver vc4_hdmi_audio_cpu_dai_comp = { .name = "vc4-hdmi-cpu-dai-component", }; -@@ -1210,7 +1491,6 @@ static struct snd_soc_dai_driver vc4_hdmi_audio_cpu_dai_drv = { +@@ -1212,7 +1491,6 @@ static struct snd_soc_dai_driver vc4_hdmi_audio_cpu_dai_drv = { SNDRV_PCM_RATE_192000, .formats = SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE, }, @@ -60357,7 +60359,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 }; static const struct snd_dmaengine_pcm_config pcm_conf = { -@@ -1218,6 +1498,31 @@ static const struct snd_dmaengine_pcm_config pcm_conf = { +@@ -1220,6 +1498,31 @@ static const struct snd_dmaengine_pcm_config pcm_conf = { .prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config, }; @@ -60389,7 +60391,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) { const struct vc4_hdmi_register *mai_data = -@@ -1225,13 +1530,16 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) +@@ -1227,13 +1530,16 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) struct snd_soc_dai_link *dai_link = &vc4_hdmi->audio.link; struct snd_soc_card *card = &vc4_hdmi->audio.card; struct device *dev = &vc4_hdmi->pdev->dev; @@ -60408,7 +60410,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 return 0; } -@@ -1271,12 +1579,13 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) +@@ -1273,12 +1579,13 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) return ret; } @@ -60428,7 +60430,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 } dai_link->cpus = &vc4_hdmi->audio.cpu; -@@ -1289,9 +1598,9 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) +@@ -1291,9 +1598,9 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) dai_link->name = "MAI"; dai_link->stream_name = "MAI PCM"; @@ -60440,7 +60442,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 dai_link->platforms->name = dev_name(dev); card->dai_link = dai_link; -@@ -1317,16 +1626,77 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) +@@ -1319,16 +1626,77 @@ static int vc4_hdmi_audio_init(struct vc4_hdmi *vc4_hdmi) } @@ -60524,7 +60526,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 cec_transmit_done(vc4_hdmi->cec_adap, CEC_TX_STATUS_OK, 0, 0, 0, 0); } else { -@@ -1340,6 +1710,19 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) +@@ -1342,6 +1710,19 @@ static irqreturn_t vc4_cec_irq_handler_thread(int irq, void *priv) return IRQ_HANDLED; } @@ -60544,7 +60546,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) { struct drm_device *dev = vc4_hdmi->connector.dev; -@@ -1364,76 +1747,125 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) +@@ -1366,76 +1747,125 @@ static void vc4_cec_read_msg(struct vc4_hdmi *vc4_hdmi, u32 cntrl1) } } @@ -60712,7 +60714,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 static int vc4_hdmi_cec_adap_log_addr(struct cec_adapter *adap, u8 log_addr) { struct vc4_hdmi *vc4_hdmi = cec_get_drvdata(adap); -@@ -1485,11 +1917,14 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1487,11 +1917,14 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) { struct cec_connector_info conn_info; struct platform_device *pdev = vc4_hdmi->pdev; @@ -60728,7 +60730,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops, vc4_hdmi, "vc4", -@@ -1502,8 +1937,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1504,8 +1937,6 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector); cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info); @@ -60737,7 +60739,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 value = HDMI_READ(HDMI_CEC_CNTRL_1); /* Set the logical address to Unregistered */ value |= VC4_HDMI_CEC_ADDR_MASK; -@@ -1511,19 +1944,47 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1513,19 +1944,47 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) vc4_hdmi_cec_update_clk_div(vc4_hdmi); @@ -60792,7 +60794,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 err_delete_cec_adap: cec_delete_adapter(vc4_hdmi->cec_adap); -@@ -1532,6 +1993,15 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) +@@ -1534,6 +1993,15 @@ static int vc4_hdmi_cec_init(struct vc4_hdmi *vc4_hdmi) static void vc4_hdmi_cec_exit(struct vc4_hdmi *vc4_hdmi) { @@ -60808,7 +60810,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 cec_unregister_adapter(vc4_hdmi->cec_adap); } #else -@@ -1616,6 +2086,7 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1618,6 +2086,7 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) return PTR_ERR(vc4_hdmi->hsm_clock); } vc4_hdmi->audio_clock = vc4_hdmi->hsm_clock; @@ -60816,7 +60818,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 return 0; } -@@ -1625,6 +2096,7 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1627,6 +2096,7 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) struct platform_device *pdev = vc4_hdmi->pdev; struct device *dev = &pdev->dev; struct resource *res; @@ -60824,7 +60826,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hdmi"); if (!res) -@@ -1709,12 +2181,50 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) +@@ -1711,12 +2181,50 @@ static int vc5_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi) return PTR_ERR(vc4_hdmi->audio_clock); } @@ -60875,7 +60877,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 return 0; } -@@ -1755,6 +2265,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1757,6 +2265,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) vc4_hdmi = devm_kzalloc(dev, sizeof(*vc4_hdmi), GFP_KERNEL); if (!vc4_hdmi) return -ENOMEM; @@ -60883,7 +60885,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 dev_set_drvdata(dev, vc4_hdmi); encoder = &vc4_hdmi->encoder.base.base; -@@ -1804,6 +2315,52 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1806,6 +2315,52 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) vc4_hdmi->disable_wifi_frequencies = of_property_read_bool(dev->of_node, "wifi-2.4ghz-coexistence"); @@ -60936,7 +60938,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 if (vc4_hdmi->variant->reset) vc4_hdmi->variant->reset(vc4_hdmi); -@@ -1815,8 +2372,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1817,8 +2372,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) clk_prepare_enable(vc4_hdmi->pixel_bvb_clock); } @@ -60945,7 +60947,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS); drm_encoder_helper_add(encoder, &vc4_hdmi_encoder_helper_funcs); -@@ -1824,10 +2379,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1826,10 +2379,14 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) if (ret) goto err_destroy_encoder; @@ -60961,7 +60963,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 ret = vc4_hdmi_audio_init(vc4_hdmi); if (ret) goto err_free_cec; -@@ -1836,14 +2395,19 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) +@@ -1838,14 +2395,19 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) vc4_hdmi_debugfs_regs, vc4_hdmi); @@ -60981,7 +60983,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 pm_runtime_disable(dev); err_put_ddc: put_device(&vc4_hdmi->ddc->dev); -@@ -1881,6 +2445,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, +@@ -1883,6 +2445,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, kfree(vc4_hdmi->hd_regset.regs); vc4_hdmi_cec_exit(vc4_hdmi); @@ -60989,7 +60991,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 vc4_hdmi_connector_destroy(&vc4_hdmi->connector); drm_encoder_cleanup(&vc4_hdmi->encoder.base.base); -@@ -1910,7 +2475,6 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1912,7 +2475,6 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .debugfs_name = "hdmi_regs", .card_name = "vc4-hdmi", .max_pixel_clock = 162000000, @@ -60997,7 +60999,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 .registers = vc4_hdmi_fields, .num_registers = ARRAY_SIZE(vc4_hdmi_fields), -@@ -1922,14 +2486,16 @@ static const struct vc4_hdmi_variant bcm2835_variant = { +@@ -1924,14 +2486,16 @@ static const struct vc4_hdmi_variant bcm2835_variant = { .phy_disable = vc4_hdmi_phy_disable, .phy_rng_enable = vc4_hdmi_phy_rng_enable, .phy_rng_disable = vc4_hdmi_phy_rng_disable, @@ -61015,7 +61017,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 .registers = vc5_hdmi_hdmi0_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi0_fields), .phy_lane_mapping = { -@@ -1939,6 +2505,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1941,6 +2505,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { PHY_LANE_CK, }, .unsupported_odd_h_timings = true, @@ -61023,7 +61025,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 .init_resources = vc5_hdmi_init_resources, .csc_setup = vc5_hdmi_csc_setup, -@@ -1948,14 +2515,16 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { +@@ -1950,14 +2515,16 @@ static const struct vc4_hdmi_variant bcm2711_hdmi0_variant = { .phy_disable = vc5_hdmi_phy_disable, .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, @@ -61041,7 +61043,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 .registers = vc5_hdmi_hdmi1_fields, .num_registers = ARRAY_SIZE(vc5_hdmi_hdmi1_fields), .phy_lane_mapping = { -@@ -1965,6 +2534,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1967,6 +2534,7 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { PHY_LANE_2, }, .unsupported_odd_h_timings = true, @@ -61049,7 +61051,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 .init_resources = vc5_hdmi_init_resources, .csc_setup = vc5_hdmi_csc_setup, -@@ -1974,7 +2544,9 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { +@@ -1976,7 +2544,9 @@ static const struct vc4_hdmi_variant bcm2711_hdmi1_variant = { .phy_disable = vc5_hdmi_phy_disable, .phy_rng_enable = vc5_hdmi_phy_rng_enable, .phy_rng_disable = vc5_hdmi_phy_rng_disable, @@ -61060,7 +61062,7 @@ index c58b8840090ab..f1adaa9dc5f34 100644 static const struct of_device_id vc4_hdmi_dt_match[] = { diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h -index 0526a9cf608a3..49fc91962fe45 100644 +index 0526a9cf608a..49fc91962fe4 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h @@ -21,10 +21,9 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) @@ -61221,7 +61223,7 @@ index 0526a9cf608a3..49fc91962fe45 100644 void vc5_hdmi_phy_rng_enable(struct vc4_hdmi *vc4_hdmi); void vc5_hdmi_phy_rng_disable(struct vc4_hdmi *vc4_hdmi); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c -index 057796b54c51a..36535480f8e2b 100644 +index 057796b54c51..36535480f8e2 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c @@ -127,7 +127,8 @@ @@ -61250,7 +61252,7 @@ index 057796b54c51a..36535480f8e2b 100644 unsigned char word_sel; u8 vco_sel, vco_div; diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h -index 6c0dfbbe1a7ef..23930a8fa3769 100644 +index 6c0dfbbe1a7e..23930a8fa376 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h @@ -1,6 +1,8 @@ @@ -61367,7 +61369,7 @@ index 6c0dfbbe1a7ef..23930a8fa3769 100644 dev_warn(&hdmi->pdev->dev, "Invalid register ID %u\n", reg); diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c -index ad691571d759f..6049923422d08 100644 +index ad691571d759..6049923422d0 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -95,6 +95,45 @@ static int vc4_hvs_debugfs_underrun(struct seq_file *m, void *data) @@ -61492,7 +61494,7 @@ index ad691571d759f..6049923422d08 100644 return 0; } diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index ba310c0ab5f69..fb2465964d463 100644 +index ba310c0ab5f6..fb2465964d46 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -40,6 +40,9 @@ static struct vc4_ctm_state *to_vc4_ctm_state(struct drm_private_state *priv) @@ -61813,7 +61815,7 @@ index ba310c0ab5f69..fb2465964d463 100644 ret = vc4_ctm_obj_init(vc4); if (ret) diff --git a/drivers/gpu/drm/vc4/vc4_perfmon.c b/drivers/gpu/drm/vc4/vc4_perfmon.c -index f4aa75efd16b0..18abc06335c11 100644 +index f4aa75efd16b..18abc06335c1 100644 --- a/drivers/gpu/drm/vc4/vc4_perfmon.c +++ b/drivers/gpu/drm/vc4/vc4_perfmon.c @@ -77,7 +77,7 @@ struct vc4_perfmon *vc4_perfmon_find(struct vc4_file *vc4file, int id) @@ -61826,7 +61828,7 @@ index f4aa75efd16b0..18abc06335c11 100644 static int vc4_perfmon_idr_del(int id, void *elem, void *data) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index af4b8944a6032..7947cf47b6e13 100644 +index af4b8944a603..7947cf47b6e1 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -33,6 +33,7 @@ static const struct hvs_format { @@ -62188,7 +62190,7 @@ index af4b8944a6032..7947cf47b6e13 100644 } diff --git a/drivers/gpu/drm/vc4/vc4_regs.h b/drivers/gpu/drm/vc4/vc4_regs.h -index be2c32a519b31..7538b84a6dcaa 100644 +index be2c32a519b3..7538b84a6dca 100644 --- a/drivers/gpu/drm/vc4/vc4_regs.h +++ b/drivers/gpu/drm/vc4/vc4_regs.h @@ -516,6 +516,36 @@ @@ -62270,7 +62272,7 @@ index be2c32a519b31..7538b84a6dcaa 100644 #define SCALER_TPZ0_VERT_RECALC BIT(31) #define SCALER_TPZ0_SCALE_MASK VC4_MASK(28, 8) diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c -index d13502ae973dd..2fc7f4b5fa098 100644 +index d13502ae973d..2fc7f4b5fa09 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -13,6 +13,7 @@ @@ -62347,7 +62349,7 @@ index d13502ae973dd..2fc7f4b5fa098 100644 /* * Make sure we issue a vblank event after disabling the CRTC if diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c -index bd5b8eb58b180..596b59ff6c9ad 100644 +index bd5b8eb58b18..596b59ff6c9a 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c @@ -45,6 +45,7 @@ @@ -62788,7 +62790,7 @@ index bd5b8eb58b180..596b59ff6c9ad 100644 + "\t\t\tNTSC otherwise"); diff --git a/drivers/gpu/drm/vc4/vc_image_types.h b/drivers/gpu/drm/vc4/vc_image_types.h new file mode 100644 -index 0000000000000..e8d2b4b162f7c +index 000000000000..e8d2b4b162f7 --- /dev/null +++ b/drivers/gpu/drm/vc4/vc_image_types.h @@ -0,0 +1,175 @@ @@ -62968,7 +62970,7 @@ index 0000000000000..e8d2b4b162f7c + VC_IMAGE_YUVINFO_CSC_REC_2020 = 9, +}; diff --git a/drivers/gpu/drm/virtio/virtgpu_display.c b/drivers/gpu/drm/virtio/virtgpu_display.c -index f84b7e61311bc..4bf74836bd53f 100644 +index f84b7e61311b..4bf74836bd53 100644 --- a/drivers/gpu/drm/virtio/virtgpu_display.c +++ b/drivers/gpu/drm/virtio/virtgpu_display.c @@ -95,12 +95,12 @@ static void virtio_gpu_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -63003,7 +63005,7 @@ index f84b7e61311bc..4bf74836bd53f 100644 struct virtio_gpu_output *output = drm_crtc_to_virtio_gpu_output(crtc); diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms_crtc.c -index 1ae5cd47d9546..758d8a98d96b3 100644 +index 1ae5cd47d954..758d8a98d96b 100644 --- a/drivers/gpu/drm/vkms/vkms_crtc.c +++ b/drivers/gpu/drm/vkms/vkms_crtc.c @@ -169,9 +169,11 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = { @@ -63080,7 +63082,7 @@ index 1ae5cd47d9546..758d8a98d96b3 100644 struct vkms_output *vkms_output = drm_crtc_to_vkms_output(crtc); diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c -index 094fa4aa061d0..c0a53a2cbbf1c 100644 +index 094fa4aa061d..c0a53a2cbbf1 100644 --- a/drivers/gpu/drm/vkms/vkms_writeback.c +++ b/drivers/gpu/drm/vkms/vkms_writeback.c @@ -1,6 +1,8 @@ @@ -63114,7 +63116,7 @@ index 094fa4aa061d0..c0a53a2cbbf1c 100644 static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = { diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c -index 312ed0881a99b..bc67f2b930e1f 100644 +index 312ed0881a99..bc67f2b930e1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c @@ -522,8 +522,10 @@ int vmw_du_cursor_plane_atomic_check(struct drm_plane *plane, @@ -63146,7 +63148,7 @@ index 312ed0881a99b..bc67f2b930e1f 100644 struct drm_pending_vblank_event *event = crtc->state->event; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h -index 3ee03227607c6..03f3694015cec 100644 +index 3ee03227607c..03f3694015ce 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.h @@ -473,11 +473,11 @@ void vmw_du_plane_unpin_surf(struct vmw_plane_state *vps, @@ -63165,7 +63167,7 @@ index 3ee03227607c6..03f3694015cec 100644 struct drm_crtc_state *vmw_du_crtc_duplicate_state(struct drm_crtc *crtc); void vmw_du_crtc_destroy_state(struct drm_crtc *crtc, diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c -index c4017c7a24db6..9d1de5b5cc6a7 100644 +index c4017c7a24db..9d1de5b5cc6a 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c @@ -214,7 +214,7 @@ static void vmw_ldu_crtc_mode_set_nofb(struct drm_crtc *crtc) @@ -63187,7 +63189,7 @@ index c4017c7a24db6..9d1de5b5cc6a7 100644 } diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c -index 4bf0f5ec4fc2d..dfa55fb80b073 100644 +index 4bf0f5ec4fc2..dfa55fb80b07 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c @@ -279,7 +279,7 @@ static void vmw_sou_crtc_helper_prepare(struct drm_crtc *crtc) @@ -63209,7 +63211,7 @@ index 4bf0f5ec4fc2d..dfa55fb80b073 100644 struct vmw_private *dev_priv; struct vmw_screen_object_unit *sou; diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c -index cf3aafd00837c..5b04ec047ef36 100644 +index cf3aafd00837..5b04ec047ef3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c @@ -408,12 +408,12 @@ static void vmw_stdu_crtc_helper_prepare(struct drm_crtc *crtc) @@ -63228,7 +63230,7 @@ index cf3aafd00837c..5b04ec047ef36 100644 struct vmw_private *dev_priv; struct vmw_screen_target_display_unit *stdu; diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c -index 8cd8af35cfaac..6c95271f13b69 100644 +index 205c72a249b7..d85909af1800 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_disp.c +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -1441,7 +1441,7 @@ static int zynqmp_disp_crtc_setup_clock(struct drm_crtc *crtc, @@ -63240,7 +63242,7 @@ index 8cd8af35cfaac..6c95271f13b69 100644 { struct zynqmp_disp *disp = crtc_to_disp(crtc); struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode; -@@ -1472,8 +1472,10 @@ zynqmp_disp_crtc_atomic_enable(struct drm_crtc *crtc, +@@ -1473,8 +1473,10 @@ zynqmp_disp_crtc_atomic_enable(struct drm_crtc *crtc, static void zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc, @@ -63252,7 +63254,7 @@ index 8cd8af35cfaac..6c95271f13b69 100644 struct zynqmp_disp *disp = crtc_to_disp(crtc); struct drm_plane_state *old_plane_state; -@@ -1503,21 +1505,21 @@ zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc, +@@ -1504,21 +1506,21 @@ zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc, } static int zynqmp_disp_crtc_atomic_check(struct drm_crtc *crtc, @@ -63279,7 +63281,7 @@ index 8cd8af35cfaac..6c95271f13b69 100644 if (crtc->state->event) { struct drm_pending_vblank_event *event; diff --git a/drivers/gpu/drm/zte/zx_vou.c b/drivers/gpu/drm/zte/zx_vou.c -index 5259ff2825f94..904f62f3bfc17 100644 +index 5259ff2825f9..904f62f3bfc1 100644 --- a/drivers/gpu/drm/zte/zx_vou.c +++ b/drivers/gpu/drm/zte/zx_vou.c @@ -350,7 +350,7 @@ static inline void vou_chn_set_update(struct zx_crtc *zcrtc) @@ -63310,7 +63312,7 @@ index 5259ff2825f94..904f62f3bfc17 100644 struct drm_pending_vblank_event *event = crtc->state->event; diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 136b58a91c04c..fae50dbda6aa5 100644 +index 136b58a91c04..fae50dbda6aa 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -221,6 +221,9 @@ @@ -63334,7 +63336,7 @@ index 136b58a91c04c..fae50dbda6aa5 100644 #define USB_DEVICE_ID_XIN_MO_DUAL_ARCADE 0x05e1 #define USB_DEVICE_ID_THT_2P_ARCADE 0x75e1 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index be53c723c729d..9f9d5778114e4 100644 +index be53c723c729..9f9d5778114e 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -41,6 +41,7 @@ static const struct hid_device_id hid_quirks[] = { @@ -63354,7 +63356,7 @@ index be53c723c729d..9f9d5778114e4 100644 { 0 } }; diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c -index 8d4ac4b9fb9da..5ab69fc58d1b3 100644 +index 8d4ac4b9fb9d..5ab69fc58d1b 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -45,7 +45,7 @@ @@ -63386,7 +63388,7 @@ index 8d4ac4b9fb9da..5ab69fc58d1b3 100644 ret = -ENOMEM; if (usb_endpoint_dir_in(endpoint)) { diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig -index a850e4f0e0bde..ecf08982c352c 100644 +index a850e4f0e0bd..ecf08982c352 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -1489,6 +1489,17 @@ config SENSORS_RASPBERRYPI_HWMON @@ -63408,7 +63410,7 @@ index a850e4f0e0bde..ecf08982c352c 100644 tristate "Kontron sl28cpld hardware monitoring driver" depends on MFD_SL28CPLD || COMPILE_TEST diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile -index 9db2903b61e5b..dc68c9788a5ea 100644 +index 9db2903b61e5..dc68c9788a5e 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -157,6 +157,7 @@ obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o @@ -63420,7 +63422,7 @@ index 9db2903b61e5b..dc68c9788a5ea 100644 obj-$(CONFIG_SENSORS_SCH56XX_COMMON)+= sch56xx-common.o obj-$(CONFIG_SENSORS_SCH5627) += sch5627.o diff --git a/drivers/hwmon/raspberrypi-hwmon.c b/drivers/hwmon/raspberrypi-hwmon.c -index d3a64a35f7a9a..db3b03438dd05 100644 +index d3a64a35f7a9..db3b03438dd0 100644 --- a/drivers/hwmon/raspberrypi-hwmon.c +++ b/drivers/hwmon/raspberrypi-hwmon.c @@ -15,6 +15,36 @@ @@ -63480,7 +63482,7 @@ index d3a64a35f7a9a..db3b03438dd05 100644 } diff --git a/drivers/hwmon/rpi-poe-fan.c b/drivers/hwmon/rpi-poe-fan.c new file mode 100644 -index 0000000000000..8483b6ce1db83 +index 000000000000..8483b6ce1db8 --- /dev/null +++ b/drivers/hwmon/rpi-poe-fan.c @@ -0,0 +1,451 @@ @@ -63936,7 +63938,7 @@ index 0000000000000..8483b6ce1db83 +MODULE_DESCRIPTION("Raspberry Pi PoE HAT fan driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index 14d45b453a615..4c3010089b7f9 100644 +index 14d45b453a61..4c3010089b7f 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -9,6 +9,25 @@ menu "I2C Hardware Bus support" @@ -63966,7 +63968,7 @@ index 14d45b453a615..4c3010089b7f9 100644 tristate "ALI 1535" depends on PCI diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index f36a05632f856..fe09307c1945a 100644 +index f36a05632f85..fe09307c1945 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -3,6 +3,8 @@ @@ -63980,7 +63982,7 @@ index f36a05632f856..fe09307c1945a 100644 diff --git a/drivers/i2c/busses/i2c-bcm2708.c b/drivers/i2c/busses/i2c-bcm2708.c new file mode 100644 -index 0000000000000..962f2e5c7455d +index 000000000000..962f2e5c7455 --- /dev/null +++ b/drivers/i2c/busses/i2c-bcm2708.c @@ -0,0 +1,512 @@ @@ -64497,7 +64499,7 @@ index 0000000000000..962f2e5c7455d +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:" DRV_NAME); diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c -index 37443edbf7546..5b2589b6b9cc8 100644 +index 37443edbf754..5b2589b6b9cc 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -51,6 +51,18 @@ @@ -64677,7 +64679,7 @@ index 37443edbf7546..5b2589b6b9cc8 100644 if (i2c_dev->msg_err & BCM2835_I2C_S_ERR) return -EREMOTEIO; diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c -index a4a6825c87583..cfbcf3952ddc9 100644 +index a4a6825c8758..cfbcf3952ddc 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c @@ -445,7 +445,9 @@ static int i2c_gpio_probe(struct platform_device *pdev) @@ -64692,7 +64694,7 @@ index a4a6825c87583..cfbcf3952ddc9 100644 if (ret) return ret; diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig -index b080f0cfb068f..7457dd54fee94 100644 +index b080f0cfb068..7457dd54fee9 100644 --- a/drivers/input/joystick/Kconfig +++ b/drivers/input/joystick/Kconfig @@ -382,4 +382,12 @@ config JOYSTICK_FSIA6B @@ -64709,7 +64711,7 @@ index b080f0cfb068f..7457dd54fee94 100644 + endif diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile -index 58232b3057d30..f5b39db324b32 100644 +index 58232b3057d3..f5b39db324b3 100644 --- a/drivers/input/joystick/Makefile +++ b/drivers/input/joystick/Makefile @@ -37,4 +37,4 @@ obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o @@ -64720,7 +64722,7 @@ index 58232b3057d30..f5b39db324b32 100644 +obj-$(CONFIG_JOYSTICK_RPISENSE) += rpisense-js.o diff --git a/drivers/input/joystick/rpisense-js.c b/drivers/input/joystick/rpisense-js.c new file mode 100644 -index 0000000000000..6a416769065d2 +index 000000000000..6a416769065d --- /dev/null +++ b/drivers/input/joystick/rpisense-js.c @@ -0,0 +1,153 @@ @@ -64878,7 +64880,7 @@ index 0000000000000..6a416769065d2 +MODULE_AUTHOR("Serge Schneider "); +MODULE_LICENSE("GPL"); diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c -index 6ff81d48da86b..d4060bc89ce9c 100644 +index 6ff81d48da86..d4060bc89ce9 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c @@ -69,6 +69,8 @@ @@ -64973,7 +64975,7 @@ index 6ff81d48da86b..d4060bc89ce9c 100644 return 0; diff --git a/drivers/irqchip/irq-bcm2835.c b/drivers/irqchip/irq-bcm2835.c -index a1e004af23e78..0e6c0811dc1ef 100644 +index a1e004af23e7..0e6c0811dc1e 100644 --- a/drivers/irqchip/irq-bcm2835.c +++ b/drivers/irqchip/irq-bcm2835.c @@ -43,9 +43,12 @@ @@ -65154,7 +65156,7 @@ index a1e004af23e78..0e6c0811dc1ef 100644 } diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c -index cbc7c740e4dc3..0b2af88b69a04 100644 +index cbc7c740e4dc..0b2af88b69a0 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -22,6 +22,9 @@ struct bcm2836_arm_irqchip_intc { @@ -65214,7 +65216,7 @@ index cbc7c740e4dc3..0b2af88b69a04 100644 intc.domain = irq_domain_add_linear(node, LAST_IRQ + 1, diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c -index 93f5b1b60fdec..d0d05d663eea4 100644 +index 93f5b1b60fde..d0d05d663eea 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c @@ -46,8 +46,15 @@ static void gpio_led_set(struct led_classdev *led_cdev, @@ -65257,7 +65259,7 @@ index 93f5b1b60fdec..d0d05d663eea4 100644 state = gpiod_get_value_cansleep(led_dat->gpiod); if (state < 0) diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig -index ce9429ca6ddea..d45aba3e1d13b 100644 +index ce9429ca6dde..d45aba3e1d13 100644 --- a/drivers/leds/trigger/Kconfig +++ b/drivers/leds/trigger/Kconfig @@ -114,6 +114,13 @@ config LEDS_TRIGGER_CAMERA @@ -65291,7 +65293,7 @@ index ce9429ca6ddea..d45aba3e1d13b 100644 + endif # LEDS_TRIGGERS diff --git a/drivers/leds/trigger/Makefile b/drivers/leds/trigger/Makefile -index 733a83e2a7183..1083b35cbe8b6 100644 +index 733a83e2a718..1083b35cbe8b 100644 --- a/drivers/leds/trigger/Makefile +++ b/drivers/leds/trigger/Makefile @@ -11,7 +11,9 @@ obj-$(CONFIG_LEDS_TRIGGER_ACTIVITY) += ledtrig-activity.o @@ -65306,7 +65308,7 @@ index 733a83e2a7183..1083b35cbe8b6 100644 +obj-$(CONFIG_LEDS_TRIGGER_ACTPWR) += ledtrig-actpwr.o diff --git a/drivers/leds/trigger/ledtrig-actpwr.c b/drivers/leds/trigger/ledtrig-actpwr.c new file mode 100644 -index 0000000000000..1a52107ceb03b +index 000000000000..1a52107ceb03 --- /dev/null +++ b/drivers/leds/trigger/ledtrig-actpwr.c @@ -0,0 +1,190 @@ @@ -65502,7 +65504,7 @@ index 0000000000000..1a52107ceb03b +MODULE_LICENSE("GPL v2"); diff --git a/drivers/leds/trigger/ledtrig-input.c b/drivers/leds/trigger/ledtrig-input.c new file mode 100644 -index 0000000000000..8a974a3556564 +index 000000000000..8a974a355656 --- /dev/null +++ b/drivers/leds/trigger/ledtrig-input.c @@ -0,0 +1,55 @@ @@ -65562,7 +65564,7 @@ index 0000000000000..8a974a3556564 +MODULE_DESCRIPTION("Set LED GPIO to Input \"trigger\""); +MODULE_LICENSE("GPL"); diff --git a/drivers/mailbox/bcm2835-mailbox.c b/drivers/mailbox/bcm2835-mailbox.c -index 39761d1905459..9766d8b50778a 100644 +index 39761d190545..9766d8b50778 100644 --- a/drivers/mailbox/bcm2835-mailbox.c +++ b/drivers/mailbox/bcm2835-mailbox.c @@ -45,12 +45,15 @@ @@ -65611,7 +65613,7 @@ index 39761d1905459..9766d8b50778a 100644 MODULE_AUTHOR("Lubomir Rintel "); MODULE_DESCRIPTION("BCM2835 mailbox IPC driver"); diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c -index 3e7d4b20ab34f..0b821a5b2db84 100644 +index 3e7d4b20ab34..0b821a5b2db8 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -82,12 +82,9 @@ static void msg_submit(struct mbox_chan *chan) @@ -65644,7 +65646,7 @@ index 3e7d4b20ab34f..0b821a5b2db84 100644 } diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c -index 72350343a56a6..3c6a74b296833 100644 +index 72350343a56a..3c6a74b29683 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -2140,12 +2140,12 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, @@ -65686,7 +65688,7 @@ index 72350343a56a6..3c6a74b296833 100644 if (ret < 0) { dprintk(q, 3, "buffer %d, plane %d failed to export (%d)\n", diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig -index 878f66ef2719f..4c97729be2220 100644 +index 878f66ef2719..4c97729be222 100644 --- a/drivers/media/i2c/Kconfig +++ b/drivers/media/i2c/Kconfig @@ -801,6 +801,17 @@ config VIDEO_IMX290 @@ -65763,7 +65765,7 @@ index 878f66ef2719f..4c97729be2220 100644 tristate "ST VS6624 sensor support" depends on VIDEO_V4L2 && I2C diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile -index f0a77473979d8..944aea27f362d 100644 +index f0a77473979d..944aea27f362 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -81,9 +81,11 @@ obj-$(CONFIG_VIDEO_OV7670) += ov7670.o @@ -65790,7 +65792,7 @@ index f0a77473979d8..944aea27f362d 100644 rdacm20-camera_module-objs := rdacm20.o max9271.o obj-$(CONFIG_VIDEO_RDACM20) += rdacm20-camera_module.o diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c -index 4498d14d34291..4103690a71dfb 100644 +index 4498d14d3429..4103690a71df 100644 --- a/drivers/media/i2c/adv7180.c +++ b/drivers/media/i2c/adv7180.c @@ -1248,6 +1248,7 @@ static const struct adv7180_chip_info adv7282_m_info = { @@ -65829,7 +65831,7 @@ index 4498d14d34291..4103690a71dfb 100644 mutex_unlock(&state->mutex); diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c -index 4771d0ef2c46f..79faa8cce94ea 100644 +index 4771d0ef2c46..79faa8cce94e 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -118,6 +118,16 @@ @@ -66152,7 +66154,7 @@ index 4771d0ef2c46f..79faa8cce94ea 100644 dev_err(dev, "failed to init entity pads: %d\n", ret); goto error_handler_free; diff --git a/drivers/media/i2c/imx290.c b/drivers/media/i2c/imx290.c -index adcddf3204f75..a26106c41cc67 100644 +index adcddf3204f7..a26106c41cc6 100644 --- a/drivers/media/i2c/imx290.c +++ b/drivers/media/i2c/imx290.c @@ -1,6 +1,12 @@ @@ -67139,7 +67141,7 @@ index adcddf3204f75..a26106c41cc67 100644 static struct i2c_driver imx290_i2c_driver = { diff --git a/drivers/media/i2c/imx477.c b/drivers/media/i2c/imx477.c new file mode 100644 -index 0000000000000..05cb530d331eb +index 000000000000..05cb530d331e --- /dev/null +++ b/drivers/media/i2c/imx477.c @@ -0,0 +1,2284 @@ @@ -69429,7 +69431,7 @@ index 0000000000000..05cb530d331eb +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/imx519.c b/drivers/media/i2c/imx519.c new file mode 100644 -index 0000000000000..4e98704a68341 +index 000000000000..4e98704a6834 --- /dev/null +++ b/drivers/media/i2c/imx519.c @@ -0,0 +1,2091 @@ @@ -71526,7 +71528,7 @@ index 0000000000000..4e98704a68341 +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/irs1125.c b/drivers/media/i2c/irs1125.c new file mode 100644 -index 0000000000000..30c3d26403865 +index 000000000000..30c3d2640386 --- /dev/null +++ b/drivers/media/i2c/irs1125.c @@ -0,0 +1,1200 @@ @@ -72732,7 +72734,7 @@ index 0000000000000..30c3d26403865 + diff --git a/drivers/media/i2c/irs1125.h b/drivers/media/i2c/irs1125.h new file mode 100644 -index 0000000000000..96d676123d5ed +index 000000000000..96d676123d5e --- /dev/null +++ b/drivers/media/i2c/irs1125.h @@ -0,0 +1,95 @@ @@ -72832,7 +72834,7 @@ index 0000000000000..96d676123d5ed +#endif /* IRS1125 */ + diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c -index e7d2e5b4ad4b9..98a5329d68fbb 100644 +index e7d2e5b4ad4b..98a5329d68fb 100644 --- a/drivers/media/i2c/ov5647.c +++ b/drivers/media/i2c/ov5647.c @@ -21,6 +21,7 @@ @@ -74314,7 +74316,7 @@ index e7d2e5b4ad4b9..98a5329d68fbb 100644 mutex_destroy(&ov5647->lock); diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c -index 0c10203f822b1..2c554626319d9 100644 +index 0c10203f822b..2c554626319d 100644 --- a/drivers/media/i2c/ov7251.c +++ b/drivers/media/i2c/ov7251.c @@ -1253,6 +1253,7 @@ static const struct v4l2_subdev_ops ov7251_subdev_ops = { @@ -74352,7 +74354,7 @@ index 0c10203f822b1..2c554626319d9 100644 ov7251->pad.flags = MEDIA_PAD_FL_SOURCE; diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c new file mode 100644 -index 0000000000000..a6ffcdd47b215 +index 000000000000..a6ffcdd47b21 --- /dev/null +++ b/drivers/media/i2c/ov9281.c @@ -0,0 +1,1289 @@ @@ -75646,7 +75648,7 @@ index 0000000000000..a6ffcdd47b215 +MODULE_DESCRIPTION("OmniVision ov9281 sensor driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/media/i2c/tc358743.c b/drivers/media/i2c/tc358743.c -index f21da11caf224..ce64c25c1511a 100644 +index f21da11caf22..ce64c25c1511 100644 --- a/drivers/media/i2c/tc358743.c +++ b/drivers/media/i2c/tc358743.c @@ -110,7 +110,7 @@ static inline struct tc358743_state *to_state(struct v4l2_subdev *sd) @@ -75905,7 +75907,7 @@ index f21da11caf224..ce64c25c1511a 100644 client->addr << 1); return -ENODEV; diff --git a/drivers/media/mc/mc-request.c b/drivers/media/mc/mc-request.c -index c0782fd96c591..88a167fc830e2 100644 +index c0782fd96c59..88a167fc830e 100644 --- a/drivers/media/mc/mc-request.c +++ b/drivers/media/mc/mc-request.c @@ -504,3 +504,38 @@ void media_request_object_complete(struct media_request_object *obj) @@ -75948,7 +75950,7 @@ index c0782fd96c591..88a167fc830e2 100644 +} +EXPORT_SYMBOL_GPL(media_request_unpin); diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig -index 7e152bbb4fa66..e8c0dc223ba28 100644 +index 7e152bbb4fa6..e8c0dc223ba2 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -152,6 +152,7 @@ source "drivers/media/platform/am437x/Kconfig" @@ -75960,7 +75962,7 @@ index 7e152bbb4fa66..e8c0dc223ba28 100644 config VIDEO_TI_CAL diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile -index 62b6cdc8c7300..1fb1a67451e3f 100644 +index 62b6cdc8c730..1fb1a67451e3 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -79,4 +79,6 @@ obj-$(CONFIG_VIDEO_QCOM_CAMSS) += qcom/camss/ @@ -75972,7 +75974,7 @@ index 62b6cdc8c7300..1fb1a67451e3f 100644 obj-y += sunxi/ diff --git a/drivers/media/platform/bcm2835/Kconfig b/drivers/media/platform/bcm2835/Kconfig new file mode 100644 -index 0000000000000..bd13701996509 +index 000000000000..bd1370199650 --- /dev/null +++ b/drivers/media/platform/bcm2835/Kconfig @@ -0,0 +1,21 @@ @@ -75999,7 +76001,7 @@ index 0000000000000..bd13701996509 + called bcm2835-unicam. diff --git a/drivers/media/platform/bcm2835/Makefile b/drivers/media/platform/bcm2835/Makefile new file mode 100644 -index 0000000000000..a98aba03598ab +index 000000000000..a98aba03598a --- /dev/null +++ b/drivers/media/platform/bcm2835/Makefile @@ -0,0 +1,3 @@ @@ -76008,7 +76010,7 @@ index 0000000000000..a98aba03598ab +obj-$(CONFIG_VIDEO_BCM2835_UNICAM) += bcm2835-unicam.o diff --git a/drivers/media/platform/bcm2835/bcm2835-unicam.c b/drivers/media/platform/bcm2835/bcm2835-unicam.c new file mode 100644 -index 0000000000000..59163f93b2071 +index 000000000000..59163f93b207 --- /dev/null +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c @@ -0,0 +1,2913 @@ @@ -78927,7 +78929,7 @@ index 0000000000000..59163f93b2071 +MODULE_VERSION(UNICAM_VERSION); diff --git a/drivers/media/platform/bcm2835/vc4-regs-unicam.h b/drivers/media/platform/bcm2835/vc4-regs-unicam.h new file mode 100644 -index 0000000000000..ae059a171d0fe +index 000000000000..ae059a171d0f --- /dev/null +++ b/drivers/media/platform/bcm2835/vc4-regs-unicam.h @@ -0,0 +1,253 @@ @@ -79185,7 +79187,7 @@ index 0000000000000..ae059a171d0fe + +#endif diff --git a/drivers/media/spi/Kconfig b/drivers/media/spi/Kconfig -index 857ef4ace6e9b..deae75ea3c448 100644 +index 857ef4ace6e9..deae75ea3c44 100644 --- a/drivers/media/spi/Kconfig +++ b/drivers/media/spi/Kconfig @@ -25,6 +25,7 @@ menu "Media SPI Adapters" @@ -79197,7 +79199,7 @@ index 857ef4ace6e9b..deae75ea3c448 100644 help Choose if you would like to have SPI interface support for Sony CXD2880. diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c -index c278b9b0f1024..05f2297cf583a 100644 +index c278b9b0f102..05f2297cf583 100644 --- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c +++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c @@ -1953,6 +1953,10 @@ static const struct usb_device_id rtl28xxu_id_table[] = { @@ -79212,7 +79214,7 @@ index c278b9b0f1024..05f2297cf583a 100644 &rtl28xxu_props, "Leadtek WinFast DTV Dongle mini", NULL) }, { DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A, diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c -index 41f8410d08d65..517c4499f56d3 100644 +index 41f8410d08d6..517c4499f56d 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -275,6 +275,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) @@ -79262,7 +79264,7 @@ index 41f8410d08d65..517c4499f56d3 100644 elem_size = sizeof(struct v4l2_area); break; diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c -index 9eda8b91d17af..d72b462bb054b 100644 +index 9eda8b91d17a..d72b462bb054 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -1283,6 +1283,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) @@ -79293,7 +79295,7 @@ index 9eda8b91d17af..d72b462bb054b 100644 default: /* Compressed formats */ diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c -index b221b4e438a1a..fb8708ddc1dc3 100644 +index b221b4e438a1..fb8708ddc1dc 100644 --- a/drivers/media/v4l2-core/v4l2-mem2mem.c +++ b/drivers/media/v4l2-core/v4l2-mem2mem.c @@ -301,9 +301,10 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, @@ -79320,7 +79322,7 @@ index b221b4e438a1a..fb8708ddc1dc3 100644 schedule_next = _v4l2_m2m_job_finish(m2m_dev, m2m_ctx); spin_unlock_irqrestore(&m2m_dev->job_spinlock, flags); diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index b8847ae04d938..525cb2c705383 100644 +index b8847ae04d93..525cb2c70538 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -11,6 +11,14 @@ config MFD_CORE @@ -79339,7 +79341,7 @@ index b8847ae04d938..525cb2c705383 100644 tristate "AMD CS5535 and CS5536 southbridge core functions" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 1780019d24748..d6091f3b1ca3a 100644 +index 1780019d2474..d6091f3b1ca3 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -263,6 +263,7 @@ obj-$(CONFIG_MFD_ROHM_BD71828) += rohm-bd71828.o @@ -79351,7 +79353,7 @@ index 1780019d24748..d6091f3b1ca3a 100644 obj-$(CONFIG_SGI_MFD_IOC3) += ioc3.o obj-$(CONFIG_MFD_SIMPLE_MFD_I2C) += simple-mfd-i2c.o diff --git a/drivers/mfd/bcm2835-pm.c b/drivers/mfd/bcm2835-pm.c -index 42fe67f1538e7..f66f92fe28c34 100644 +index 42fe67f1538e..f66f92fe28c3 100644 --- a/drivers/mfd/bcm2835-pm.c +++ b/drivers/mfd/bcm2835-pm.c @@ -50,6 +50,17 @@ static int bcm2835_pm_probe(struct platform_device *pdev) @@ -79374,7 +79376,7 @@ index 42fe67f1538e7..f66f92fe28c34 100644 * the full PM register range and support power domains. diff --git a/drivers/mfd/rpisense-core.c b/drivers/mfd/rpisense-core.c new file mode 100644 -index 0000000000000..6cfd63e5e8b8d +index 000000000000..6cfd63e5e8b8 --- /dev/null +++ b/drivers/mfd/rpisense-core.c @@ -0,0 +1,165 @@ @@ -79544,7 +79546,7 @@ index 0000000000000..6cfd63e5e8b8d +MODULE_LICENSE("GPL"); + diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index fafa8b0d80996..5b01870e8f6fe 100644 +index fafa8b0d8099..5b01870e8f6f 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -9,6 +9,14 @@ config SENSORS_LIS3LV02D @@ -79563,7 +79565,7 @@ index fafa8b0d80996..5b01870e8f6fe 100644 tristate "Analog Devices Digital Potentiometers" depends on (I2C || SPI) && SYSFS diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index d23231e733303..3fd91279bdd97 100644 +index d23231e73330..3fd91279bdd9 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_dpot-spi.o @@ -79576,7 +79578,7 @@ index d23231e733303..3fd91279bdd97 100644 obj-$(CONFIG_LKDTM) += lkdtm/ diff --git a/drivers/misc/bcm2835_smi.c b/drivers/misc/bcm2835_smi.c new file mode 100644 -index 0000000000000..f1a7f6a3e966b +index 000000000000..f1a7f6a3e966 --- /dev/null +++ b/drivers/misc/bcm2835_smi.c @@ -0,0 +1,955 @@ @@ -80536,7 +80538,7 @@ index 0000000000000..f1a7f6a3e966b +MODULE_DESCRIPTION("Device driver for BCM2835's secondary memory interface"); +MODULE_AUTHOR("Luke Wren "); diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c -index 87bac99207023..b1c3f3c567562 100644 +index 94caee49da99..da599f075bc2 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -165,6 +165,13 @@ static DEFINE_MUTEX(open_lock); @@ -80553,7 +80555,7 @@ index 87bac99207023..b1c3f3c567562 100644 static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq, -@@ -2898,6 +2905,7 @@ static int mmc_blk_probe(struct mmc_card *card) +@@ -2897,6 +2904,7 @@ static int mmc_blk_probe(struct mmc_card *card) { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -80561,7 +80563,7 @@ index 87bac99207023..b1c3f3c567562 100644 /* * Check that the card supports the command class(es) we need. -@@ -2905,7 +2913,16 @@ static int mmc_blk_probe(struct mmc_card *card) +@@ -2904,7 +2912,16 @@ static int mmc_blk_probe(struct mmc_card *card) if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -80579,7 +80581,7 @@ index 87bac99207023..b1c3f3c567562 100644 card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2920,9 +2937,14 @@ static int mmc_blk_probe(struct mmc_card *card) +@@ -2919,9 +2936,14 @@ static int mmc_blk_probe(struct mmc_card *card) string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); @@ -80597,7 +80599,7 @@ index 87bac99207023..b1c3f3c567562 100644 if (mmc_blk_alloc_parts(card, md)) goto out; diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index b5f3f160c8420..c73368d5d6b26 100644 +index b5f3f160c842..c73368d5d6b2 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1874,7 +1874,8 @@ EXPORT_SYMBOL(mmc_erase); @@ -80611,7 +80613,7 @@ index b5f3f160c8420..c73368d5d6b26 100644 return 0; } diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h -index d68e6e513a4f4..e41bc00ece429 100644 +index d68e6e513a4f..e41bc00ece42 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -99,6 +99,14 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = { @@ -80630,7 +80632,7 @@ index d68e6e513a4f4..e41bc00ece429 100644 }; diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 31481c9fcc2ec..49f56beb5fde2 100644 +index 31481c9fcc2e..49f56beb5fde 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -5,6 +5,45 @@ @@ -80680,7 +80682,7 @@ index 31481c9fcc2ec..49f56beb5fde2 100644 bool "MMC host drivers debugging" depends on MMC != n diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 451c25fc2c692..ecf787b7e2774 100644 +index 451c25fc2c69..ecf787b7e277 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -24,6 +24,8 @@ obj-$(CONFIG_MMC_SDHCI_F_SDH30) += sdhci_f_sdh30.o @@ -80694,7 +80696,7 @@ index 451c25fc2c692..ecf787b7e2774 100644 obj-$(CONFIG_MMC_ALCOR) += alcor.o diff --git a/drivers/mmc/host/bcm2835-mmc.c b/drivers/mmc/host/bcm2835-mmc.c new file mode 100644 -index 0000000000000..cdc1318e59360 +index 000000000000..cdc1318e5936 --- /dev/null +++ b/drivers/mmc/host/bcm2835-mmc.c @@ -0,0 +1,1576 @@ @@ -82276,7 +82278,7 @@ index 0000000000000..cdc1318e59360 +MODULE_AUTHOR("Gellert Weisz"); diff --git a/drivers/mmc/host/bcm2835-sdhost.c b/drivers/mmc/host/bcm2835-sdhost.c new file mode 100644 -index 0000000000000..2c41240827852 +index 000000000000..2c4124082785 --- /dev/null +++ b/drivers/mmc/host/bcm2835-sdhost.c @@ -0,0 +1,2208 @@ @@ -84489,7 +84491,7 @@ index 0000000000000..2c41240827852 +MODULE_LICENSE("GPL v2"); +MODULE_AUTHOR("Phil Elwell"); diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index b9eb2ec61a83a..404870e6b759b 100644 +index b9eb2ec61a83..404870e6b759 100644 --- a/drivers/mmc/host/sdhci-iproc.c +++ b/drivers/mmc/host/sdhci-iproc.c @@ -207,6 +207,7 @@ static const struct sdhci_ops sdhci_iproc_32only_ops = { @@ -84501,7 +84503,7 @@ index b9eb2ec61a83a..404870e6b759b 100644 .reset = sdhci_reset, .set_uhs_signaling = sdhci_set_uhs_signaling, diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index b1e1d327cb8eb..30d5f2debfd9e 100644 +index b1e1d327cb8e..30d5f2debfd9 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -41,7 +41,7 @@ @@ -84532,7 +84534,7 @@ index b1e1d327cb8eb..30d5f2debfd9e 100644 sdhci_dumpregs(host); diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -index aac837aa2c24b..18460c3536dc3 100644 +index aac837aa2c24..18460c3536dc 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -67,6 +67,9 @@ @@ -84625,7 +84627,7 @@ index aac837aa2c24b..18460c3536dc3 100644 /* Reinitialize TDMA and RDMA and SW housekeeping */ ret = bcmgenet_init_dma(priv); diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h -index f6ca01da141d4..45ea07829b8c4 100644 +index f6ca01da141d..45ea07829b8c 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -29,7 +29,7 @@ @@ -84638,7 +84640,7 @@ index f6ca01da141d4..45ea07829b8c4 100644 /* misc. configuration */ #define MAX_NUM_OF_FS_RULES 16 diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c -index f9e91304d2327..7abd5ddebd8e4 100644 +index f9e91304d232..7abd5ddebd8e 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -293,6 +293,8 @@ int bcmgenet_mii_probe(struct net_device *dev) @@ -84651,7 +84653,7 @@ index f9e91304d2327..7abd5ddebd8e4 100644 /* Initialize link state variables that bcmgenet_mii_setup() uses */ priv->old_link = -1; diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c -index dbed15dc0fe77..8b0ac38742d06 100644 +index dbed15dc0fe7..8b0ac38742d0 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -82,6 +82,11 @@ static int bcm54210e_config_init(struct phy_device *phydev) @@ -84751,7 +84753,7 @@ index dbed15dc0fe77..8b0ac38742d06 100644 { PHY_ID_BCM54612E, 0xfffffff0 }, { PHY_ID_BCM54616S, 0xfffffff0 }, diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c -index a644e8e5071c3..15e0a7383f688 100644 +index a644e8e5071c..15e0a7383f68 100644 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c @@ -217,6 +217,7 @@ static int lan88xx_probe(struct phy_device *phydev) @@ -84796,7 +84798,7 @@ index a644e8e5071c3..15e0a7383f688 100644 priv->chip_id = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_ID); priv->chip_rev = phy_read_mmd(phydev, 3, LAN88XX_MMD3_CHIP_REV); diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c -index caf7291ffaf83..9983eeded6244 100644 +index caf7291ffaf8..9983eeded624 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -195,12 +195,12 @@ static int lan87xx_read_status(struct phy_device *phydev) @@ -84815,7 +84817,7 @@ index caf7291ffaf83..9983eeded6244 100644 if (rc < 0) return rc; diff --git a/drivers/net/usb/Makefile b/drivers/net/usb/Makefile -index 99fd12be21111..99381e6bea782 100644 +index 99fd12be2111..99381e6bea78 100644 --- a/drivers/net/usb/Makefile +++ b/drivers/net/usb/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_USB_LAN78XX) += lan78xx.o @@ -84828,7 +84830,7 @@ index 99fd12be21111..99381e6bea782 100644 obj-$(CONFIG_USB_NET_DM9601) += dm9601.o obj-$(CONFIG_USB_NET_SR9700) += sr9700.o diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c -index a5cd42bae9621..2c54e4eadde60 100644 +index a5cd42bae962..2c54e4eadde6 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -425,6 +425,20 @@ static int msg_level = -1; @@ -84959,7 +84961,7 @@ index a5cd42bae9621..2c54e4eadde60 100644 buf = kmalloc(maxp, GFP_KERNEL); if (buf) { diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 63b64fa7f33c2..bf402dfd0c2c0 100644 +index 63b64fa7f33c..bf402dfd0c2c 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -26,9 +26,10 @@ @@ -90133,7 +90135,7 @@ index 63b64fa7f33c2..bf402dfd0c2c0 100644 {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)}, diff --git a/drivers/net/usb/r8153_ecm.c b/drivers/net/usb/r8153_ecm.c new file mode 100644 -index 0000000000000..2c3fabd38b163 +index 000000000000..2c3fabd38b16 --- /dev/null +++ b/drivers/net/usb/r8153_ecm.c @@ -0,0 +1,162 @@ @@ -90300,7 +90302,7 @@ index 0000000000000..2c3fabd38b163 +MODULE_DESCRIPTION("Realtek USB ECM device"); +MODULE_LICENSE("GPL"); diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c -index ea0d5f04dc3a8..09d4c1963b2c4 100644 +index ea0d5f04dc3a..09d4c1963b2c 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -50,6 +50,7 @@ @@ -90435,7 +90437,7 @@ index ea0d5f04dc3a8..09d4c1963b2c4 100644 usbnet_skb_return(dev, ax_skb); } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h -index 3f5da3bb6aa59..ba3c58caac9f6 100644 +index 3f5da3bb6aa5..ba3c58caac9f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h @@ -78,7 +78,7 @@ struct brcmf_bus_ops { @@ -90464,7 +90466,7 @@ index 3f5da3bb6aa59..ba3c58caac9f6 100644 static inline diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index c2b6e5c966d04..e51b42b547beb 100644 +index c2b6e5c966d0..e51b42b547be 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -9,6 +9,7 @@ @@ -90590,7 +90592,7 @@ index c2b6e5c966d04..e51b42b547beb 100644 return; diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c -index e3758bd86acf0..9047a0813ebf0 100644 +index e3758bd86acf..9047a0813ebf 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -134,13 +134,23 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) @@ -90620,7 +90622,7 @@ index e3758bd86acf0..9047a0813ebf0 100644 brcmf_info("no clm_blob available (err=%d), device may have limited channels available\n", err); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c -index d821a4758f8cf..b14963be17f15 100644 +index d821a4758f8c..b14963be17f1 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c @@ -10,6 +10,7 @@ @@ -90678,7 +90680,7 @@ index d821a4758f8cf..b14963be17f15 100644 return ret; } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -index 1f12dfb33938a..89cdd2075846a 100644 +index 1f12dfb33938..89cdd2075846 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -1400,7 +1400,8 @@ static int brcmf_pcie_get_memdump(struct device *dev, void *data, size_t len) @@ -90703,7 +90705,7 @@ index 1f12dfb33938a..89cdd2075846a 100644 brcmf_pcie_fwnames, ARRAY_SIZE(brcmf_pcie_fwnames), diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index 6d5d5c39c6359..3ab944c39677c 100644 +index 6d5d5c39c635..3ab944c39677 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -611,12 +611,14 @@ BRCMF_FW_DEF(4329, "brcmfmac4329-sdio"); @@ -90764,7 +90766,7 @@ index 6d5d5c39c6359..3ab944c39677c 100644 brcmf_sdio_fwnames, ARRAY_SIZE(brcmf_sdio_fwnames), diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c -index 9fb68c2dc7e39..9bf2dbd30ded1 100644 +index 9fb68c2dc7e3..9bf2dbd30ded 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -1155,7 +1155,8 @@ struct brcmf_usbdev *brcmf_usb_attach(struct brcmf_usbdev_info *devinfo, @@ -90789,7 +90791,7 @@ index 9fb68c2dc7e39..9bf2dbd30ded1 100644 brcmf_usb_fwnames, ARRAY_SIZE(brcmf_usb_fwnames), diff --git a/drivers/nvmem/Kconfig b/drivers/nvmem/Kconfig -index 954d3b4a52aba..fecc19b884bfb 100644 +index 954d3b4a52ab..fecc19b884bf 100644 --- a/drivers/nvmem/Kconfig +++ b/drivers/nvmem/Kconfig @@ -270,4 +270,12 @@ config SPRD_EFUSE @@ -90806,7 +90808,7 @@ index 954d3b4a52aba..fecc19b884bfb 100644 + will be called nvmem-rmem. endif diff --git a/drivers/nvmem/Makefile b/drivers/nvmem/Makefile -index a7c3772183410..5376b8e0dae5a 100644 +index a7c377218341..5376b8e0dae5 100644 --- a/drivers/nvmem/Makefile +++ b/drivers/nvmem/Makefile @@ -55,3 +55,5 @@ obj-$(CONFIG_NVMEM_ZYNQMP) += nvmem_zynqmp_nvmem.o @@ -90817,7 +90819,7 @@ index a7c3772183410..5376b8e0dae5a 100644 +nvmem-rmem-y := rmem.o diff --git a/drivers/nvmem/rmem.c b/drivers/nvmem/rmem.c new file mode 100644 -index 0000000000000..b11c3c974b3d6 +index 000000000000..b11c3c974b3d --- /dev/null +++ b/drivers/nvmem/rmem.c @@ -0,0 +1,97 @@ @@ -90919,7 +90921,7 @@ index 0000000000000..b11c3c974b3d6 +MODULE_DESCRIPTION("Reserved Memory Based nvmem Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index 18450437d5d5a..0fec52ff94ac8 100644 +index 18450437d5d5..0fec52ff94ac 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -100,4 +100,11 @@ config OF_DMA_DEFAULT_COHERENT @@ -90935,7 +90937,7 @@ index 18450437d5d5a..0fec52ff94ac8 100644 + endif # OF diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index c13b982084a3a..957a5b60c167d 100644 +index c13b982084a3..957a5b60c167 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -1,6 +1,7 @@ @@ -90948,7 +90950,7 @@ index c13b982084a3a..957a5b60c167d 100644 obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o diff --git a/drivers/of/configfs.c b/drivers/of/configfs.c new file mode 100644 -index 0000000000000..ac04301dabe13 +index 000000000000..ac04301dabe1 --- /dev/null +++ b/drivers/of/configfs.c @@ -0,0 +1,277 @@ @@ -91230,7 +91232,7 @@ index 0000000000000..ac04301dabe13 +} +late_initcall(of_cfs_init); diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c -index 43a77d7200087..bccef312f4c30 100644 +index 43a77d720008..bccef312f4c3 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -245,6 +245,8 @@ static struct property *dup_and_fixup_symbol_prop( @@ -91243,7 +91245,7 @@ index 43a77d7200087..bccef312f4c30 100644 new_prop = kzalloc(sizeof(*new_prop), GFP_KERNEL); if (!new_prop) diff --git a/drivers/of/platform.c b/drivers/of/platform.c -index b557a0fcd4ba0..281856ac19886 100644 +index b557a0fcd4ba..281856ac1988 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -511,6 +511,7 @@ static const struct of_device_id reserved_mem_matches[] = { @@ -91255,7 +91257,7 @@ index b557a0fcd4ba0..281856ac19886 100644 }; diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c -index 9c3d2982248d3..840f264f7a9bf 100644 +index 9c3d2982248d..840f264f7a9b 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -114,8 +114,9 @@ @@ -91337,7 +91339,7 @@ index 9c3d2982248d3..840f264f7a9bf 100644 ret = clk_prepare_enable(pcie->clk); if (ret) { diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig -index 1e82ab01e75f5..585a4411c90b4 100644 +index 1e82ab01e75f..585a4411c90b 100644 --- a/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig @@ -130,6 +130,14 @@ config ARM_SPE_PMU @@ -91356,7 +91358,7 @@ index 1e82ab01e75f5..585a4411c90b4 100644 endmenu diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile -index 5365fd56f88f3..fe8c4eb61511f 100644 +index 5365fd56f88f..fe8c4eb61511 100644 --- a/drivers/perf/Makefile +++ b/drivers/perf/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_QCOM_L3_PMU) += qcom_l3_pmu.o @@ -91366,7 +91368,7 @@ index 5365fd56f88f3..fe8c4eb61511f 100644 +obj-$(CONFIG_RPI_AXIPERF) += raspberrypi_axi_monitor.o diff --git a/drivers/perf/raspberrypi_axi_monitor.c b/drivers/perf/raspberrypi_axi_monitor.c new file mode 100644 -index 0000000000000..5ae2bdaa88b41 +index 000000000000..5ae2bdaa88b4 --- /dev/null +++ b/drivers/perf/raspberrypi_axi_monitor.c @@ -0,0 +1,637 @@ @@ -92008,7 +92010,7 @@ index 0000000000000..5ae2bdaa88b41 +MODULE_LICENSE("GPL"); + diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c -index 1d21129f7751c..c5d88157f4b28 100644 +index 1d21129f7751..c5d88157f4b2 100644 --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c @@ -362,7 +362,7 @@ static const struct gpio_chip bcm2835_gpio_chip = { @@ -92104,7 +92106,7 @@ index 1d21129f7751c..c5d88157f4b28 100644 } diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c -index 1c5af2fef1423..81e7acb8acb5f 100644 +index 1c5af2fef142..81e7acb8acb5 100644 --- a/drivers/power/reset/gpio-poweroff.c +++ b/drivers/power/reset/gpio-poweroff.c @@ -24,6 +24,7 @@ static struct gpio_desc *reset_gpio; @@ -92165,7 +92167,7 @@ index 1c5af2fef1423..81e7acb8acb5f 100644 return 0; } diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig -index 0aa46b4510177..dadc866870547 100644 +index 0aa46b451017..dadc86687054 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -28,6 +28,12 @@ config POWER_SUPPLY_HWMON @@ -92182,7 +92184,7 @@ index 0aa46b4510177..dadc866870547 100644 config PDA_POWER tristate "Generic PDA/phone power driver" diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile -index dd4b86318cd9b..f881637da4f72 100644 +index dd4b86318cd9..f881637da4f7 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o @@ -92195,7 +92197,7 @@ index dd4b86318cd9b..f881637da4f72 100644 obj-$(CONFIG_AXP20X_POWER) += axp20x_usb_power.o diff --git a/drivers/power/supply/rpi_poe_power.c b/drivers/power/supply/rpi_poe_power.c new file mode 100644 -index 0000000000000..0c96b2c1e8ab6 +index 000000000000..0c96b2c1e8ab --- /dev/null +++ b/drivers/power/supply/rpi_poe_power.c @@ -0,0 +1,227 @@ @@ -92427,7 +92429,7 @@ index 0000000000000..0c96b2c1e8ab6 +MODULE_DESCRIPTION("Raspberry Pi PoE+ HAT power supply driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/pps/clients/pps-gpio.c b/drivers/pps/clients/pps-gpio.c -index e0de1df2ede07..ee7d8f4e7f2e2 100644 +index e0de1df2ede0..ee7d8f4e7f2e 100644 --- a/drivers/pps/clients/pps-gpio.c +++ b/drivers/pps/clients/pps-gpio.c @@ -145,6 +145,8 @@ static int pps_gpio_setup(struct platform_device *pdev) @@ -92440,7 +92442,7 @@ index e0de1df2ede07..ee7d8f4e7f2e2 100644 } diff --git a/drivers/regulator/rpi-panel-attiny-regulator.c b/drivers/regulator/rpi-panel-attiny-regulator.c -index ee46bfbf5eee7..8090b9a485b5e 100644 +index ee46bfbf5eee..8090b9a485b5 100644 --- a/drivers/regulator/rpi-panel-attiny-regulator.c +++ b/drivers/regulator/rpi-panel-attiny-regulator.c @@ -8,6 +8,7 @@ @@ -92826,7 +92828,7 @@ index ee46bfbf5eee7..8090b9a485b5e 100644 module_i2c_driver(attiny_regulator_driver); diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c -index c3691fa4210e5..ead1fd376d2d8 100644 +index c3691fa4210e..ead1fd376d2d 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c @@ -465,3 +465,4 @@ module_spi_driver(pcf2123_driver); @@ -92835,7 +92837,7 @@ index c3691fa4210e5..ead1fd376d2d8 100644 MODULE_LICENSE("GPL"); +MODULE_ALIAS("spi:rtc-pcf2123"); diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c -index 62684ca3a665e..fc293d4d8901f 100644 +index 62684ca3a665..fc293d4d8901 100644 --- a/drivers/rtc/rtc-pcf85063.c +++ b/drivers/rtc/rtc-pcf85063.c @@ -34,6 +34,7 @@ @@ -92855,7 +92857,7 @@ index 62684ca3a665e..fc293d4d8901f 100644 PCF85063_REG_CTRL1_STOP); if (rc) diff --git a/drivers/rtc/rtc-pcf8523.c b/drivers/rtc/rtc-pcf8523.c -index 57d351dfe2723..0aa1e8f9ee759 100644 +index 57d351dfe272..0aa1e8f9ee75 100644 --- a/drivers/rtc/rtc-pcf8523.c +++ b/drivers/rtc/rtc-pcf8523.c @@ -205,8 +205,28 @@ static int pcf8523_rtc_read_time(struct device *dev, struct rtc_time *tm) @@ -92898,7 +92900,7 @@ index 57d351dfe2723..0aa1e8f9ee759 100644 regs[2] = bin2bcd(tm->tm_min); regs[3] = bin2bcd(tm->tm_hour); diff --git a/drivers/rtc/rtc-rv3028.c b/drivers/rtc/rtc-rv3028.c -index fa226f0fe67d7..20baf22576319 100644 +index fa226f0fe67d..20baf2257631 100644 --- a/drivers/rtc/rtc-rv3028.c +++ b/drivers/rtc/rtc-rv3028.c @@ -80,6 +80,7 @@ @@ -92940,7 +92942,7 @@ index fa226f0fe67d7..20baf22576319 100644 if (!device_property_read_u32(&client->dev, "trickle-resistor-ohms", &ohms)) { diff --git a/drivers/soc/bcm/Kconfig b/drivers/soc/bcm/Kconfig -index 24f92a6e882af..a6a705ec30c7f 100644 +index 24f92a6e882a..a6a705ec30c7 100644 --- a/drivers/soc/bcm/Kconfig +++ b/drivers/soc/bcm/Kconfig @@ -17,6 +17,7 @@ config RASPBERRYPI_POWER @@ -92952,7 +92954,7 @@ index 24f92a6e882af..a6a705ec30c7f 100644 help This enables support for the RPi power domains which can be enabled diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c -index 1e0041ec81323..6059210170bc6 100644 +index 1e0041ec8132..6059210170bc 100644 --- a/drivers/soc/bcm/bcm2835-power.c +++ b/drivers/soc/bcm/bcm2835-power.c @@ -143,6 +143,8 @@ struct bcm2835_power { @@ -93006,7 +93008,7 @@ index 1e0041ec81323..6059210170bc6 100644 if (id != 0x62726467 /* "BRDG" */) { dev_err(dev, "ASB register ID returned 0x%08x\n", id); diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c -index 33c32e9317675..0f6a2f7c8b533 100644 +index 33c32e931767..0f6a2f7c8b53 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -28,6 +28,7 @@ @@ -93068,7 +93070,7 @@ index 33c32e9317675..0f6a2f7c8b533 100644 if (err) { dev_err(&pdev->dev, "could not request IRQ: %d\n", err); diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c -index 8c261eac2cee5..4436fd319df39 100644 +index 8c261eac2cee..4436fd319df3 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3338,6 +3338,7 @@ static int __spi_validate_bits_per_word(struct spi_controller *ctlr, @@ -93095,7 +93097,7 @@ index 8c261eac2cee5..4436fd319df39 100644 * that aren't supported with their current controller * SPI_CS_WORD has a fallback software implementation, diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index 859910ec8d9f6..a262479f0a92c 100644 +index 859910ec8d9f..a262479f0a92 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -402,7 +402,6 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) @@ -93127,7 +93129,7 @@ index 859910ec8d9f6..a262479f0a92c 100644 "%pOF: buggy DT: spidev listed directly in DT\n", spi->dev.of_node); diff --git a/drivers/staging/fbtft/fb_st7735r.c b/drivers/staging/fbtft/fb_st7735r.c -index 9670a8989b917..1a3219657cbb2 100644 +index 9670a8989b91..1a3219657cbb 100644 --- a/drivers/staging/fbtft/fb_st7735r.c +++ b/drivers/staging/fbtft/fb_st7735r.c @@ -16,6 +16,10 @@ @@ -93195,7 +93197,7 @@ index 9670a8989b917..1a3219657cbb2 100644 MODULE_DESCRIPTION("FB driver for the ST7735R LCD Controller"); MODULE_AUTHOR("Noralf Tronnes"); diff --git a/drivers/staging/fbtft/fb_st7789v.c b/drivers/staging/fbtft/fb_st7789v.c -index 3a280cc1892ca..af4e975e7b300 100644 +index 3a280cc1892c..af4e975e7b30 100644 --- a/drivers/staging/fbtft/fb_st7789v.c +++ b/drivers/staging/fbtft/fb_st7789v.c @@ -66,6 +66,12 @@ enum st7789v_command { @@ -93286,7 +93288,7 @@ index 3a280cc1892ca..af4e975e7b300 100644 MODULE_ALIAS("spi:" DRVNAME); MODULE_ALIAS("platform:" DRVNAME); diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c -index 3723269890d5f..6f4ad6e97637c 100644 +index 3723269890d5..6f4ad6e97637 100644 --- a/drivers/staging/fbtft/fbtft-core.c +++ b/drivers/staging/fbtft/fbtft-core.c @@ -24,6 +24,8 @@ @@ -93339,7 +93341,7 @@ index 3723269890d5f..6f4ad6e97637c 100644 info = fbtft_framebuffer_alloc(display, dev, pdata); diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h -index 76f8c090a8370..f4f5ff0dc0c02 100644 +index 76f8c090a837..f4f5ff0dc0c0 100644 --- a/drivers/staging/fbtft/fbtft.h +++ b/drivers/staging/fbtft/fbtft.h @@ -251,7 +251,8 @@ void fbtft_register_backlight(struct fbtft_par *par); @@ -93409,7 +93411,7 @@ index 76f8c090a8370..f4f5ff0dc0c02 100644 /* shorthand debug levels */ diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig -index 747c6cf1d795e..a0c5ec9b39684 100644 +index 747c6cf1d795..a0c5ec9b3968 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -34,6 +34,8 @@ source "drivers/staging/media/omap4iss/Kconfig" @@ -93422,7 +93424,7 @@ index 747c6cf1d795e..a0c5ec9b39684 100644 source "drivers/staging/media/tegra-vde/Kconfig" diff --git a/drivers/staging/media/Makefile b/drivers/staging/media/Makefile -index b59571826ba69..51a921132ca73 100644 +index b59571826ba6..51a921132ca7 100644 --- a/drivers/staging/media/Makefile +++ b/drivers/staging/media/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_VIDEO_IMX_MEDIA) += imx/ @@ -93435,7 +93437,7 @@ index b59571826ba69..51a921132ca73 100644 obj-$(CONFIG_TEGRA_VDE) += tegra-vde/ diff --git a/drivers/staging/media/rpivid/Kconfig b/drivers/staging/media/rpivid/Kconfig new file mode 100644 -index 0000000000000..304c3edf0e71b +index 000000000000..304c3edf0e71 --- /dev/null +++ b/drivers/staging/media/rpivid/Kconfig @@ -0,0 +1,16 @@ @@ -93457,7 +93459,7 @@ index 0000000000000..304c3edf0e71b + diff --git a/drivers/staging/media/rpivid/Makefile b/drivers/staging/media/rpivid/Makefile new file mode 100644 -index 0000000000000..990257052b072 +index 000000000000..990257052b07 --- /dev/null +++ b/drivers/staging/media/rpivid/Makefile @@ -0,0 +1,5 @@ @@ -93468,7 +93470,7 @@ index 0000000000000..990257052b072 + rpivid_hw.o rpivid_h265.o diff --git a/drivers/staging/media/rpivid/rpivid.c b/drivers/staging/media/rpivid/rpivid.c new file mode 100644 -index 0000000000000..848a1823ec7fc +index 000000000000..848a1823ec7f --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid.c @@ -0,0 +1,447 @@ @@ -93921,7 +93923,7 @@ index 0000000000000..848a1823ec7fc +MODULE_DESCRIPTION("Raspberry Pi HEVC V4L2 driver"); diff --git a/drivers/staging/media/rpivid/rpivid.h b/drivers/staging/media/rpivid/rpivid.h new file mode 100644 -index 0000000000000..31d320b596b48 +index 000000000000..31d320b596b4 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid.h @@ -0,0 +1,202 @@ @@ -94129,7 +94131,7 @@ index 0000000000000..31d320b596b48 +#endif diff --git a/drivers/staging/media/rpivid/rpivid_dec.c b/drivers/staging/media/rpivid/rpivid_dec.c new file mode 100644 -index 0000000000000..fa8af01d753bd +index 000000000000..fa8af01d753b --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_dec.c @@ -0,0 +1,81 @@ @@ -94216,7 +94218,7 @@ index 0000000000000..fa8af01d753bd +} diff --git a/drivers/staging/media/rpivid/rpivid_dec.h b/drivers/staging/media/rpivid/rpivid_dec.h new file mode 100644 -index 0000000000000..8f15bb6406abc +index 000000000000..8f15bb6406ab --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_dec.h @@ -0,0 +1,19 @@ @@ -94241,7 +94243,7 @@ index 0000000000000..8f15bb6406abc +#endif diff --git a/drivers/staging/media/rpivid/rpivid_h265.c b/drivers/staging/media/rpivid/rpivid_h265.c new file mode 100644 -index 0000000000000..17b3a565c3150 +index 000000000000..17b3a565c315 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_h265.c @@ -0,0 +1,2688 @@ @@ -96935,7 +96937,7 @@ index 0000000000000..17b3a565c3150 + diff --git a/drivers/staging/media/rpivid/rpivid_hw.c b/drivers/staging/media/rpivid/rpivid_hw.c new file mode 100644 -index 0000000000000..e7d1793105c59 +index 000000000000..e7d1793105c5 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_hw.c @@ -0,0 +1,366 @@ @@ -97307,7 +97309,7 @@ index 0000000000000..e7d1793105c59 + diff --git a/drivers/staging/media/rpivid/rpivid_hw.h b/drivers/staging/media/rpivid/rpivid_hw.h new file mode 100644 -index 0000000000000..ec73a2332b73f +index 000000000000..ec73a2332b73 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_hw.h @@ -0,0 +1,303 @@ @@ -97616,7 +97618,7 @@ index 0000000000000..ec73a2332b73f +#endif diff --git a/drivers/staging/media/rpivid/rpivid_video.c b/drivers/staging/media/rpivid/rpivid_video.c new file mode 100644 -index 0000000000000..1efaa99a55f60 +index 000000000000..1efaa99a55f6 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_video.c @@ -0,0 +1,708 @@ @@ -98330,7 +98332,7 @@ index 0000000000000..1efaa99a55f60 +} diff --git a/drivers/staging/media/rpivid/rpivid_video.h b/drivers/staging/media/rpivid/rpivid_video.h new file mode 100644 -index 0000000000000..e22cc0e32aa30 +index 000000000000..e22cc0e32aa3 --- /dev/null +++ b/drivers/staging/media/rpivid/rpivid_video.h @@ -0,0 +1,33 @@ @@ -98368,7 +98370,7 @@ index 0000000000000..e22cc0e32aa30 + +#endif diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig -index 4b886293f1983..8b912617bfece 100644 +index 4b886293f198..8b912617bfec 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -23,6 +23,10 @@ source "drivers/staging/vc04_services/bcm2835-audio/Kconfig" @@ -98383,7 +98385,7 @@ index 4b886293f1983..8b912617bfece 100644 endif diff --git a/drivers/staging/vc04_services/Makefile b/drivers/staging/vc04_services/Makefile -index 7546d70116a04..fc42251ec5ef9 100644 +index 7546d70116a0..fc42251ec5ef 100644 --- a/drivers/staging/vc04_services/Makefile +++ b/drivers/staging/vc04_services/Makefile @@ -11,6 +11,9 @@ vchiq-objs := \ @@ -98397,7 +98399,7 @@ index 7546d70116a04..fc42251ec5ef9 100644 ccflags-y += -I $(srctree)/$(src)/include -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c -index 096f2c54258aa..fa5cf5b9550f1 100644 +index 096f2c54258a..fa5cf5b9550f 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c @@ -14,14 +14,14 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = { @@ -98421,7 +98423,7 @@ index 096f2c54258aa..fa5cf5b9550f1 100644 .periods_max = 128, }; diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c -index c250fbef2fa3d..ccda115ab9e04 100644 +index c250fbef2fa3..ccda115ab9e0 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -6,13 +6,14 @@ @@ -98634,7 +98636,7 @@ index c250fbef2fa3d..ccda115ab9e04 100644 }; module_platform_driver(bcm2835_alsa_driver); diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h -index 1b36475872d6c..02f50768af96a 100644 +index 1b36475872d6..02f50768af96 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h @@ -33,7 +33,9 @@ enum { @@ -98649,7 +98651,7 @@ index 1b36475872d6c..02f50768af96a 100644 }; diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -index df90c1f9d1483..7bee6e1bc69a2 100644 +index df90c1f9d148..7bee6e1bc69a 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -178,7 +178,7 @@ static struct mmal_fmt formats[] = { @@ -98692,7 +98694,7 @@ index df90c1f9d1483..7bee6e1bc69a2 100644 q->buf_struct_size = sizeof(struct vb2_mmal_buffer); q->ops = &bm2835_mmal_video_qops; diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c -index b096a12387f71..f3480a5c51702 100644 +index b096a12387f7..f3480a5c5170 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c @@ -474,6 +474,10 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev, @@ -98759,7 +98761,7 @@ index b096a12387f71..f3480a5c51702 100644 .imenu = NULL, diff --git a/drivers/staging/vc04_services/bcm2835-codec/Kconfig b/drivers/staging/vc04_services/bcm2835-codec/Kconfig new file mode 100644 -index 0000000000000..c104be9ad6da5 +index 000000000000..c104be9ad6da --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/Kconfig @@ -0,0 +1,11 @@ @@ -98776,7 +98778,7 @@ index 0000000000000..c104be9ad6da5 + to a service running on VideoCore. diff --git a/drivers/staging/vc04_services/bcm2835-codec/Makefile b/drivers/staging/vc04_services/bcm2835-codec/Makefile new file mode 100644 -index 0000000000000..7fb908d824b2f +index 000000000000..7fb908d824b2 --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/Makefile @@ -0,0 +1,8 @@ @@ -98790,7 +98792,7 @@ index 0000000000000..7fb908d824b2f + -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-codec/TODO b/drivers/staging/vc04_services/bcm2835-codec/TODO new file mode 100644 -index 0000000000000..bc27a04ee9bd9 +index 000000000000..bc27a04ee9bd --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/TODO @@ -0,0 +1 @@ @@ -98798,7 +98800,7 @@ index 0000000000000..bc27a04ee9bd9 \ No newline at end of file diff --git a/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c new file mode 100644 -index 0000000000000..6078d6e2ace01 +index 000000000000..6078d6e2ace0 --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-codec/bcm2835-v4l2-codec.c @@ -0,0 +1,3646 @@ @@ -102450,7 +102452,7 @@ index 0000000000000..6078d6e2ace01 +MODULE_ALIAS("platform:bcm2835-codec"); diff --git a/drivers/staging/vc04_services/bcm2835-isp/Kconfig b/drivers/staging/vc04_services/bcm2835-isp/Kconfig new file mode 100644 -index 0000000000000..71b14acc297e0 +index 000000000000..71b14acc297e --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/Kconfig @@ -0,0 +1,14 @@ @@ -102470,7 +102472,7 @@ index 0000000000000..71b14acc297e0 + will be called bcm2835-isp. diff --git a/drivers/staging/vc04_services/bcm2835-isp/Makefile b/drivers/staging/vc04_services/bcm2835-isp/Makefile new file mode 100644 -index 0000000000000..42d3081d342f4 +index 000000000000..42d3081d342f --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/Makefile @@ -0,0 +1,8 @@ @@ -102484,7 +102486,7 @@ index 0000000000000..42d3081d342f4 + -D__VCCOREVER__=0x04000000 diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h new file mode 100644 -index 0000000000000..172605718cdfb +index 000000000000..172605718cdf --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-ctrls.h @@ -0,0 +1,72 @@ @@ -102562,7 +102564,7 @@ index 0000000000000..172605718cdfb +#endif diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h new file mode 100644 -index 0000000000000..f6d6c88d13ba9 +index 000000000000..f6d6c88d13ba --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-isp-fmts.h @@ -0,0 +1,552 @@ @@ -103120,7 +103122,7 @@ index 0000000000000..f6d6c88d13ba9 +#endif diff --git a/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c new file mode 100644 -index 0000000000000..08dce8bba9bb0 +index 000000000000..08dce8bba9bb --- /dev/null +++ b/drivers/staging/vc04_services/bcm2835-isp/bcm2835-v4l2-isp.c @@ -0,0 +1,1762 @@ @@ -104888,7 +104890,7 @@ index 0000000000000..08dce8bba9bb0 +MODULE_ALIAS("platform:bcm2835-isp"); diff --git a/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h new file mode 100644 -index 0000000000000..107460ad1be34 +index 000000000000..107460ad1be3 --- /dev/null +++ b/drivers/staging/vc04_services/include/linux/broadcom/vc_sm_cma_ioctl.h @@ -0,0 +1,114 @@ @@ -105007,7 +105009,7 @@ index 0000000000000..107460ad1be34 + +#endif /* __VC_SM_CMA_IOCTL_H */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c -index 8782ebe0b39a5..2a1d8d6541b2d 100644 +index 8782ebe0b39a..2a1d8d6541b2 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -7,6 +7,7 @@ @@ -105282,7 +105284,7 @@ index 8782ebe0b39a5..2a1d8d6541b2d 100644 pagelistinfo->scatterlist_mapped = 0; diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c -index 3d378da119e7a..a936102dbc34d 100644 +index 3d378da119e7..a936102dbc34 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -109,6 +109,9 @@ static struct class *vchiq_class; @@ -105381,7 +105383,7 @@ index 3d378da119e7a..a936102dbc34d 100644 device_destroy(vchiq_class, vchiq_devid); cdev_del(&vchiq_cdev); diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h -index 0784c5002417d..f8b1c005af62c 100644 +index 0784c5002417..f8b1c005af62 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h @@ -52,6 +52,7 @@ struct vchiq_arm_state { @@ -105394,7 +105396,7 @@ index 0784c5002417d..f8b1c005af62c 100644 diff --git a/drivers/staging/vc04_services/vc-sm-cma/Kconfig b/drivers/staging/vc04_services/vc-sm-cma/Kconfig new file mode 100644 -index 0000000000000..d812021385a0f +index 000000000000..d812021385a0 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/Kconfig @@ -0,0 +1,10 @@ @@ -105410,7 +105412,7 @@ index 0000000000000..d812021385a0f + running on VideoCore. diff --git a/drivers/staging/vc04_services/vc-sm-cma/Makefile b/drivers/staging/vc04_services/vc-sm-cma/Makefile new file mode 100644 -index 0000000000000..c92a5775c62e4 +index 000000000000..c92a5775c62e --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/Makefile @@ -0,0 +1,12 @@ @@ -105428,14 +105430,14 @@ index 0000000000000..c92a5775c62e4 +obj-$(CONFIG_BCM_VC_SM_CMA) += vc-sm-cma.o diff --git a/drivers/staging/vc04_services/vc-sm-cma/TODO b/drivers/staging/vc04_services/vc-sm-cma/TODO new file mode 100644 -index 0000000000000..ac9b5f8a73895 +index 000000000000..ac9b5f8a7389 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/TODO @@ -0,0 +1 @@ +No currently outstanding tasks except some clean-up. diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c new file mode 100644 -index 0000000000000..88c4df8229224 +index 000000000000..88c4df822922 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.c @@ -0,0 +1,1707 @@ @@ -107148,7 +107150,7 @@ index 0000000000000..88c4df8229224 +MODULE_ALIAS("platform:vcsm-cma"); diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h new file mode 100644 -index 0000000000000..f1c7b95b14cee +index 000000000000..f1c7b95b14ce --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm.h @@ -0,0 +1,84 @@ @@ -107238,7 +107240,7 @@ index 0000000000000..f1c7b95b14cee +#endif diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c new file mode 100644 -index 0000000000000..122f2f66096f7 +index 000000000000..122f2f66096f --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.c @@ -0,0 +1,503 @@ @@ -107747,7 +107749,7 @@ index 0000000000000..122f2f66096f7 +} diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h new file mode 100644 -index 0000000000000..ed881c56d69cd +index 000000000000..ed881c56d69c --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_cma_vchi.h @@ -0,0 +1,63 @@ @@ -107816,7 +107818,7 @@ index 0000000000000..ed881c56d69cd +#endif /* __VC_SM_CMA_VCHI_H__INCLUDED__ */ diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h new file mode 100644 -index 0000000000000..4e6354000dfdc +index 000000000000..4e6354000dfd --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_defs.h @@ -0,0 +1,297 @@ @@ -108119,7 +108121,7 @@ index 0000000000000..4e6354000dfdc +#endif /* __VC_SM_DEFS_H__INCLUDED__ */ diff --git a/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h new file mode 100644 -index 0000000000000..988fdd967922b +index 000000000000..988fdd967922 --- /dev/null +++ b/drivers/staging/vc04_services/vc-sm-cma/vc_sm_knl.h @@ -0,0 +1,28 @@ @@ -108152,7 +108154,7 @@ index 0000000000000..988fdd967922b + +#endif /* __VC_SM_KNL_H__INCLUDED__ */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/Kconfig b/drivers/staging/vc04_services/vchiq-mmal/Kconfig -index c99525a0bb452..5df9198cdab17 100644 +index c99525a0bb45..5df9198cdab1 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/Kconfig +++ b/drivers/staging/vc04_services/vchiq-mmal/Kconfig @@ -1,6 +1,7 @@ @@ -108165,7 +108167,7 @@ index c99525a0bb452..5df9198cdab17 100644 Enables the MMAL API over VCHIQ interface as used for the majority of the multimedia services on VideoCore. diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h -index 5bd7410a034a4..72e5a0386c5b1 100644 +index 5bd7410a034a..72e5a0386c5b 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-common.h @@ -50,6 +50,11 @@ struct mmal_buffer { @@ -108181,7 +108183,7 @@ index 5bd7410a034a4..72e5a0386c5b1 100644 u32 mmal_flags; s64 dts; diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h -index 2be9941a1f30e..59f7ad3a5b3b3 100644 +index 2be9941a1f30..59f7ad3a5b3b 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-encodings.h @@ -69,10 +69,76 @@ @@ -108262,7 +108264,7 @@ index 2be9941a1f30e..59f7ad3a5b3b3 100644 /** \name Pre-defined audio encodings */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h -index b636e889c8a1d..883b77ffae25c 100644 +index b636e889c8a1..883b77ffae25 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h @@ -253,6 +253,25 @@ struct mmal_msg_port_action_reply { @@ -108334,7 +108336,7 @@ index b636e889c8a1d..883b77ffae25c 100644 u32 client_component; /* component context */ diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h -index a1e39b1b1701d..21087496a4817 100644 +index a1e39b1b1701..21087496a481 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h @@ -221,6 +221,64 @@ enum mmal_parameter_camera_type { @@ -108631,7 +108633,7 @@ index a1e39b1b1701d..21087496a4817 100644 #endif diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c -index d697ea55a0da1..a6cdc7dc9c300 100644 +index d697ea55a0da..a6cdc7dc9c30 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -15,21 +15,33 @@ @@ -109324,7 +109326,7 @@ index d697ea55a0da1..a6cdc7dc9c300 100644 mutex_unlock(&instance->vchiq_mutex); diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h -index 1dc81ecf92682..247521fbcc1d8 100644 +index 1dc81ecf9268..247521fbcc1d 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h @@ -49,6 +49,7 @@ typedef void (*vchiq_mmal_buffer_cb)( @@ -109347,7 +109349,7 @@ index 1dc81ecf92682..247521fbcc1d8 100644 struct vchiq_mmal_component { diff --git a/drivers/thermal/broadcom/bcm2711_thermal.c b/drivers/thermal/broadcom/bcm2711_thermal.c -index 67c2a737bc9d9..73cf85fc24b7b 100644 +index 67c2a737bc9d..73cf85fc24b7 100644 --- a/drivers/thermal/broadcom/bcm2711_thermal.c +++ b/drivers/thermal/broadcom/bcm2711_thermal.c @@ -52,7 +52,7 @@ static int bcm2711_get_temp(void *data, int *temp) @@ -109360,7 +109362,7 @@ index 67c2a737bc9d9..73cf85fc24b7b 100644 return 0; } diff --git a/drivers/thermal/gov_step_wise.c b/drivers/thermal/gov_step_wise.c -index 2ae7198d3067c..5c86029332016 100644 +index 2ae7198d3067..5c8602933201 100644 --- a/drivers/thermal/gov_step_wise.c +++ b/drivers/thermal/gov_step_wise.c @@ -24,7 +24,7 @@ @@ -109433,7 +109435,7 @@ index 2ae7198d3067c..5c86029332016 100644 dev_dbg(&instance->cdev->device, "old_target=%d, target=%d\n", old_target, (int)instance->target); diff --git a/drivers/tty/serial/8250/8250_bcm2835aux.c b/drivers/tty/serial/8250/8250_bcm2835aux.c -index fd95860cd6611..fc36e5963e30e 100644 +index fd95860cd661..fc36e5963e30 100644 --- a/drivers/tty/serial/8250/8250_bcm2835aux.c +++ b/drivers/tty/serial/8250/8250_bcm2835aux.c @@ -148,6 +148,13 @@ static int bcm2835aux_serial_probe(struct platform_device *pdev) @@ -109451,7 +109453,7 @@ index fd95860cd6611..fc36e5963e30e 100644 ret = serial8250_register_8250_port(&up); if (ret < 0) { diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c -index 51ca2d4a8bb3e..1c5d9ded54b03 100644 +index 51ca2d4a8bb3..1c5d9ded54b0 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -266,6 +266,7 @@ struct uart_amba_port { @@ -109648,7 +109650,7 @@ index 51ca2d4a8bb3e..1c5d9ded54b03 100644 uap->vendor = vendor; uap->fifosize = vendor->get_fifosize(dev); diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c -index 9adb8362578c5..8e3b83fac33cc 100644 +index 9adb8362578c..8e3b83fac33c 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -523,8 +523,9 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud) @@ -109703,7 +109705,7 @@ index 9adb8362578c5..8e3b83fac33cc 100644 regcache_cache_bypass(s->regmap, false); diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile -index 1c1c1d659394a..68317e5634e8b 100644 +index 1c1c1d659394..68317e5634e8 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_USB_COMMON) += common/ @@ -109715,7 +109717,7 @@ index 1c1c1d659394a..68317e5634e8b 100644 obj-$(CONFIG_USB_DWC2) += dwc2/ obj-$(CONFIG_USB_ISP1760) += isp1760/ diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c -index 26f9fb9f67ca2..fe8c7a85e141b 100644 +index 26f9fb9f67ca..fe8c7a85e141 100644 --- a/drivers/usb/core/generic.c +++ b/drivers/usb/core/generic.c @@ -190,6 +190,7 @@ int usb_choose_configuration(struct usb_device *udev) @@ -109727,7 +109729,7 @@ index 26f9fb9f67ca2..fe8c7a85e141b 100644 return i; } diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c -index 99908d8d2dd36..07f5a39a6e31b 100644 +index 99908d8d2dd3..07f5a39a6e31 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1945,6 +1945,16 @@ int usb_hcd_alloc_bandwidth(struct usb_device *udev, @@ -109748,7 +109750,7 @@ index 99908d8d2dd36..07f5a39a6e31b 100644 * endpoint state is gone from hardware. usb_hcd_flush_endpoint() must * have been called previously. Use for set_configuration, set_interface, diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 95a9bae72f135..54a53e225625b 100644 +index 95a9bae72f13..54a53e225625 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5494,7 +5494,7 @@ static void port_event(struct usb_hub *hub, int port1) @@ -109761,7 +109763,7 @@ index 95a9bae72f135..54a53e225625b 100644 usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_OVER_CURRENT); diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c -index dba2baca486e7..62611141f0146 100644 +index dba2baca486e..62611141f014 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -1265,6 +1265,21 @@ static void remove_intf_ep_devs(struct usb_interface *intf) @@ -109873,7 +109875,7 @@ index dba2baca486e7..62611141f0146 100644 /* Now that the interfaces are installed, re-enable LPM. */ usb_unlocked_enable_lpm(dev); diff --git a/drivers/usb/core/otg_productlist.h b/drivers/usb/core/otg_productlist.h -index db67df29fb2b1..b16e528859a80 100644 +index db67df29fb2b..b16e528859a8 100644 --- a/drivers/usb/core/otg_productlist.h +++ b/drivers/usb/core/otg_productlist.h @@ -11,33 +11,82 @@ @@ -110031,7 +110033,7 @@ index db67df29fb2b1..b16e528859a80 100644 diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c new file mode 100644 -index 0000000000000..a896d73f7a933 +index 000000000000..a896d73f7a93 --- /dev/null +++ b/drivers/usb/gadget/file_storage.c @@ -0,0 +1,3676 @@ @@ -113712,7 +113714,7 @@ index 0000000000000..a896d73f7a933 +} +module_exit(fsg_cleanup); diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig -index ab12c4bf0ef1f..8f2d915ecae5e 100644 +index ab12c4bf0ef1..8f2d915ecae5 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -741,6 +741,16 @@ config USB_RENESAS_USBHS_HCD @@ -113733,7 +113735,7 @@ index ab12c4bf0ef1f..8f2d915ecae5e 100644 tristate "i.MX21 HCD support" depends on ARM && ARCH_MXC diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile -index bc731332fed9d..5a808bde2a14d 100644 +index bc731332fed9..5a808bde2a14 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -81,6 +81,7 @@ obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o @@ -113746,7 +113748,7 @@ index bc731332fed9d..5a808bde2a14d 100644 obj-$(CONFIG_USB_EHCI_FSL) += fsl-mph-dr-of.o diff --git a/drivers/usb/host/dwc_common_port/Makefile b/drivers/usb/host/dwc_common_port/Makefile new file mode 100644 -index 0000000000000..f10d466d1aea8 +index 000000000000..f10d466d1aea --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile @@ -0,0 +1,58 @@ @@ -113810,7 +113812,7 @@ index 0000000000000..f10d466d1aea8 + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff --git a/drivers/usb/host/dwc_common_port/Makefile.fbsd b/drivers/usb/host/dwc_common_port/Makefile.fbsd new file mode 100644 -index 0000000000000..45db9915b9d31 +index 000000000000..45db9915b9d3 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile.fbsd @@ -0,0 +1,17 @@ @@ -113833,7 +113835,7 @@ index 0000000000000..45db9915b9d31 +.include diff --git a/drivers/usb/host/dwc_common_port/Makefile.linux b/drivers/usb/host/dwc_common_port/Makefile.linux new file mode 100644 -index 0000000000000..0cef7b461bd50 +index 000000000000..0cef7b461bd5 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/Makefile.linux @@ -0,0 +1,49 @@ @@ -113888,7 +113890,7 @@ index 0000000000000..0cef7b461bd50 + rm -rf *.o *.ko .*.cmd *.mod.c .*.o.d .*.o.tmp modules.order Module.markers Module.symvers .tmp_versions/ diff --git a/drivers/usb/host/dwc_common_port/changes.txt b/drivers/usb/host/dwc_common_port/changes.txt new file mode 100644 -index 0000000000000..f6839f92c2760 +index 000000000000..f6839f92c276 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/changes.txt @@ -0,0 +1,174 @@ @@ -114068,7 +114070,7 @@ index 0000000000000..f6839f92c2760 +library code directly into a driver module, instead of as a standalone module. diff --git a/drivers/usb/host/dwc_common_port/doc/doxygen.cfg b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg new file mode 100644 -index 0000000000000..89aa887af29df +index 000000000000..89aa887af29d --- /dev/null +++ b/drivers/usb/host/dwc_common_port/doc/doxygen.cfg @@ -0,0 +1,270 @@ @@ -114344,7 +114346,7 @@ index 0000000000000..89aa887af29df +SEARCHENGINE = NO diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.c b/drivers/usb/host/dwc_common_port/dwc_cc.c new file mode 100644 -index 0000000000000..5ec2ae28698c1 +index 000000000000..5ec2ae28698c --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_cc.c @@ -0,0 +1,532 @@ @@ -114882,7 +114884,7 @@ index 0000000000000..5ec2ae28698c1 +#endif /* DWC_CCLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_cc.h b/drivers/usb/host/dwc_common_port/dwc_cc.h new file mode 100644 -index 0000000000000..f86e6f21792b9 +index 000000000000..f86e6f21792b --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_cc.h @@ -0,0 +1,224 @@ @@ -115112,7 +115114,7 @@ index 0000000000000..f86e6f21792b9 +#endif /* _DWC_CC_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c new file mode 100644 -index 0000000000000..6dd04b58f8f6c +index 000000000000..6dd04b58f8f6 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_fbsd.c @@ -0,0 +1,1308 @@ @@ -116426,7 +116428,7 @@ index 0000000000000..6dd04b58f8f6c +} diff --git a/drivers/usb/host/dwc_common_port/dwc_common_linux.c b/drivers/usb/host/dwc_common_port/dwc_common_linux.c new file mode 100644 -index 0000000000000..1460afaf997d7 +index 000000000000..1460afaf997d --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_linux.c @@ -0,0 +1,1409 @@ @@ -117841,7 +117843,7 @@ index 0000000000000..1460afaf997d7 +#endif /* DWC_LIBMODULE */ diff --git a/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c new file mode 100644 -index 0000000000000..49b07e1722645 +index 000000000000..49b07e172264 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_common_nbsd.c @@ -0,0 +1,1275 @@ @@ -119122,7 +119124,7 @@ index 0000000000000..49b07e1722645 +} diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.c b/drivers/usb/host/dwc_common_port/dwc_crypto.c new file mode 100644 -index 0000000000000..3b0353296148f +index 000000000000..3b0353296148 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.c @@ -0,0 +1,308 @@ @@ -119436,7 +119438,7 @@ index 0000000000000..3b0353296148f +#endif /* DWC_CRYPTOLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_crypto.h b/drivers/usb/host/dwc_common_port/dwc_crypto.h new file mode 100644 -index 0000000000000..26fcddcfe9ba4 +index 000000000000..26fcddcfe9ba --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_crypto.h @@ -0,0 +1,111 @@ @@ -119553,7 +119555,7 @@ index 0000000000000..26fcddcfe9ba4 +#endif /* _DWC_CRYPTO_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.c b/drivers/usb/host/dwc_common_port/dwc_dh.c new file mode 100644 -index 0000000000000..2b429a32aaf09 +index 000000000000..2b429a32aaf0 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_dh.c @@ -0,0 +1,291 @@ @@ -119850,7 +119852,7 @@ index 0000000000000..2b429a32aaf09 +#endif /* DWC_CRYPTOLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_dh.h b/drivers/usb/host/dwc_common_port/dwc_dh.h new file mode 100644 -index 0000000000000..25c1cc0d588a4 +index 000000000000..25c1cc0d588a --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_dh.h @@ -0,0 +1,106 @@ @@ -119962,7 +119964,7 @@ index 0000000000000..25c1cc0d588a4 +#endif /* _DWC_DH_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_list.h b/drivers/usb/host/dwc_common_port/dwc_list.h new file mode 100644 -index 0000000000000..4ce560df0cae6 +index 000000000000..4ce560df0cae --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_list.h @@ -0,0 +1,594 @@ @@ -120562,7 +120564,7 @@ index 0000000000000..4ce560df0cae6 +#endif /* _DWC_LIST_H_ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_mem.c b/drivers/usb/host/dwc_common_port/dwc_mem.c new file mode 100644 -index 0000000000000..ad645ff1ba7e0 +index 000000000000..ad645ff1ba7e --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_mem.c @@ -0,0 +1,245 @@ @@ -120813,7 +120815,7 @@ index 0000000000000..ad645ff1ba7e0 +#endif /* DWC_DEBUG_MEMORY */ diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.c b/drivers/usb/host/dwc_common_port/dwc_modpow.c new file mode 100644 -index 0000000000000..20045381208a3 +index 000000000000..20045381208a --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.c @@ -0,0 +1,636 @@ @@ -121455,7 +121457,7 @@ index 0000000000000..20045381208a3 +#endif /*DWC_CRYPTOLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_modpow.h b/drivers/usb/host/dwc_common_port/dwc_modpow.h new file mode 100644 -index 0000000000000..64f00c276e71b +index 000000000000..64f00c276e71 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_modpow.h @@ -0,0 +1,34 @@ @@ -121495,7 +121497,7 @@ index 0000000000000..64f00c276e71b +#endif /* _LINUX_BIGNUM_H */ diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.c b/drivers/usb/host/dwc_common_port/dwc_notifier.c new file mode 100644 -index 0000000000000..8b3772afe11d1 +index 000000000000..8b3772afe11d --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.c @@ -0,0 +1,319 @@ @@ -121820,7 +121822,7 @@ index 0000000000000..8b3772afe11d1 +#endif /* DWC_NOTIFYLIB */ diff --git a/drivers/usb/host/dwc_common_port/dwc_notifier.h b/drivers/usb/host/dwc_common_port/dwc_notifier.h new file mode 100644 -index 0000000000000..4a8cdfe565b1f +index 000000000000..4a8cdfe565b1 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_notifier.h @@ -0,0 +1,122 @@ @@ -121948,7 +121950,7 @@ index 0000000000000..4a8cdfe565b1f +#endif /* __DWC_NOTIFIER_H__ */ diff --git a/drivers/usb/host/dwc_common_port/dwc_os.h b/drivers/usb/host/dwc_common_port/dwc_os.h new file mode 100644 -index 0000000000000..9a86d299403bd +index 000000000000..9a86d299403b --- /dev/null +++ b/drivers/usb/host/dwc_common_port/dwc_os.h @@ -0,0 +1,1276 @@ @@ -123230,7 +123232,7 @@ index 0000000000000..9a86d299403bd +#endif /* _DWC_OS_H_ */ diff --git a/drivers/usb/host/dwc_common_port/usb.h b/drivers/usb/host/dwc_common_port/usb.h new file mode 100644 -index 0000000000000..b1cedb1876b7f +index 000000000000..b1cedb1876b7 --- /dev/null +++ b/drivers/usb/host/dwc_common_port/usb.h @@ -0,0 +1,275 @@ @@ -123511,7 +123513,7 @@ index 0000000000000..b1cedb1876b7f +#endif /* _USB_H_ */ diff --git a/drivers/usb/host/dwc_otg/Makefile b/drivers/usb/host/dwc_otg/Makefile new file mode 100644 -index 0000000000000..7ea65a6bcdb7a +index 000000000000..7ea65a6bcdb7 --- /dev/null +++ b/drivers/usb/host/dwc_otg/Makefile @@ -0,0 +1,85 @@ @@ -123602,7 +123604,7 @@ index 0000000000000..7ea65a6bcdb7a +endif diff --git a/drivers/usb/host/dwc_otg/doc/doxygen.cfg b/drivers/usb/host/dwc_otg/doc/doxygen.cfg new file mode 100644 -index 0000000000000..712b057ef7c29 +index 000000000000..712b057ef7c2 --- /dev/null +++ b/drivers/usb/host/dwc_otg/doc/doxygen.cfg @@ -0,0 +1,224 @@ @@ -123832,7 +123834,7 @@ index 0000000000000..712b057ef7c29 +SEARCHENGINE = NO diff --git a/drivers/usb/host/dwc_otg/dummy_audio.c b/drivers/usb/host/dwc_otg/dummy_audio.c new file mode 100644 -index 0000000000000..f827102fa6441 +index 000000000000..f827102fa644 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dummy_audio.c @@ -0,0 +1,1574 @@ @@ -125412,7 +125414,7 @@ index 0000000000000..f827102fa6441 +module_exit (cleanup); diff --git a/drivers/usb/host/dwc_otg/dwc_cfi_common.h b/drivers/usb/host/dwc_otg/dwc_cfi_common.h new file mode 100644 -index 0000000000000..7770e201ad3bd +index 000000000000..7770e201ad3b --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_cfi_common.h @@ -0,0 +1,142 @@ @@ -125560,7 +125562,7 @@ index 0000000000000..7770e201ad3bd +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.c b/drivers/usb/host/dwc_otg/dwc_otg_adp.c new file mode 100644 -index 0000000000000..ce0618dd3f4a6 +index 000000000000..ce0618dd3f4a --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.c @@ -0,0 +1,854 @@ @@ -126420,7 +126422,7 @@ index 0000000000000..ce0618dd3f4a6 +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_adp.h b/drivers/usb/host/dwc_otg/dwc_otg_adp.h new file mode 100644 -index 0000000000000..4110b25d2002e +index 000000000000..4110b25d2002 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_adp.h @@ -0,0 +1,80 @@ @@ -126506,7 +126508,7 @@ index 0000000000000..4110b25d2002e +#endif //__DWC_OTG_ADP_H__ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.c b/drivers/usb/host/dwc_otg/dwc_otg_attr.c new file mode 100644 -index 0000000000000..2f8ea77c3892b +index 000000000000..2f8ea77c3892 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.c @@ -0,0 +1,1212 @@ @@ -127724,7 +127726,7 @@ index 0000000000000..2f8ea77c3892b +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_attr.h b/drivers/usb/host/dwc_otg/dwc_otg_attr.h new file mode 100644 -index 0000000000000..e10b67f97c522 +index 000000000000..e10b67f97c52 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_attr.h @@ -0,0 +1,89 @@ @@ -127819,7 +127821,7 @@ index 0000000000000..e10b67f97c522 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.c b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c new file mode 100644 -index 0000000000000..bbb3d32093d02 +index 000000000000..bbb3d32093d0 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.c @@ -0,0 +1,1876 @@ @@ -129701,7 +129703,7 @@ index 0000000000000..bbb3d32093d02 +#endif //DWC_UTE_CFI diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cfi.h b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h new file mode 100644 -index 0000000000000..55fd337a283c3 +index 000000000000..55fd337a283c --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cfi.h @@ -0,0 +1,320 @@ @@ -130027,7 +130029,7 @@ index 0000000000000..55fd337a283c3 +#endif /* (__DWC_OTG_CFI_H__) */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.c b/drivers/usb/host/dwc_otg/dwc_otg_cil.c new file mode 100644 -index 0000000000000..14300ad0f2af7 +index 000000000000..14300ad0f2af --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.c @@ -0,0 +1,7146 @@ @@ -137179,7 +137181,7 @@ index 0000000000000..14300ad0f2af7 +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil.h b/drivers/usb/host/dwc_otg/dwc_otg_cil.h new file mode 100644 -index 0000000000000..79dbf8374f023 +index 000000000000..79dbf8374f02 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil.h @@ -0,0 +1,1464 @@ @@ -138649,7 +138651,7 @@ index 0000000000000..79dbf8374f023 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c new file mode 100644 -index 0000000000000..e1c1e38040953 +index 000000000000..e1c1e3804095 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_cil_intr.c @@ -0,0 +1,1601 @@ @@ -140256,7 +140258,7 @@ index 0000000000000..e1c1e38040953 +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_core_if.h b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h new file mode 100644 -index 0000000000000..4138fd173337d +index 000000000000..4138fd173337 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_core_if.h @@ -0,0 +1,705 @@ @@ -140967,7 +140969,7 @@ index 0000000000000..4138fd173337d +#endif /* __DWC_CORE_IF_H__ */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_dbg.h b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h new file mode 100644 -index 0000000000000..ccc24e010e449 +index 000000000000..ccc24e010e44 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_dbg.h @@ -0,0 +1,117 @@ @@ -141090,7 +141092,7 @@ index 0000000000000..ccc24e010e449 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.c b/drivers/usb/host/dwc_otg/dwc_otg_driver.c new file mode 100644 -index 0000000000000..cb576e553d76a +index 000000000000..cb576e553d76 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.c @@ -0,0 +1,1772 @@ @@ -142868,7 +142870,7 @@ index 0000000000000..cb576e553d76a +*/ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_driver.h b/drivers/usb/host/dwc_otg/dwc_otg_driver.h new file mode 100644 -index 0000000000000..6a8be63a0ab20 +index 000000000000..6a8be63a0ab2 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_driver.h @@ -0,0 +1,86 @@ @@ -142960,7 +142962,7 @@ index 0000000000000..6a8be63a0ab20 +#endif diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c new file mode 100644 -index 0000000000000..f644acbce748f +index 000000000000..f644acbce748 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c @@ -0,0 +1,1433 @@ @@ -144399,7 +144401,7 @@ index 0000000000000..f644acbce748f +} diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h new file mode 100644 -index 0000000000000..86b4aaf977fb5 +index 000000000000..86b4aaf977fb --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.h @@ -0,0 +1,399 @@ @@ -144804,7 +144806,7 @@ index 0000000000000..86b4aaf977fb5 +#endif /* DWC_OTG_FIQ_FSM_H_ */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S new file mode 100644 -index 0000000000000..ffa8d21bc61e8 +index 000000000000..ffa8d21bc61e --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_fiq_stub.S @@ -0,0 +1,80 @@ @@ -144890,7 +144892,7 @@ index 0000000000000..ffa8d21bc61e8 +END(_dwc_otg_fiq_stub) diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c new file mode 100644 -index 0000000000000..e42d8ca89c013 +index 000000000000..e42d8ca89c01 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c @@ -0,0 +1,4363 @@ @@ -149259,7 +149261,7 @@ index 0000000000000..e42d8ca89c013 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h new file mode 100644 -index 0000000000000..5ed8dccf03959 +index 000000000000..5ed8dccf0395 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.h @@ -0,0 +1,870 @@ @@ -150135,7 +150137,7 @@ index 0000000000000..5ed8dccf03959 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c new file mode 100644 -index 0000000000000..2fd96e56e4129 +index 000000000000..2fd96e56e412 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_ddma.c @@ -0,0 +1,1135 @@ @@ -151276,7 +151278,7 @@ index 0000000000000..2fd96e56e4129 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h new file mode 100644 -index 0000000000000..a384db5e7ac21 +index 000000000000..a384db5e7ac2 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_if.h @@ -0,0 +1,421 @@ @@ -151703,7 +151705,7 @@ index 0000000000000..a384db5e7ac21 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c new file mode 100644 -index 0000000000000..9d49b2b332276 +index 000000000000..9d49b2b33227 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_intr.c @@ -0,0 +1,2757 @@ @@ -154466,7 +154468,7 @@ index 0000000000000..9d49b2b332276 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c new file mode 100644 -index 0000000000000..2ee27450c6f67 +index 000000000000..2ee27450c6f6 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c @@ -0,0 +1,1087 @@ @@ -155559,7 +155561,7 @@ index 0000000000000..2ee27450c6f67 +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c new file mode 100644 -index 0000000000000..f51fad1e6b70a +index 000000000000..f51fad1e6b70 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_queue.c @@ -0,0 +1,974 @@ @@ -156539,7 +156541,7 @@ index 0000000000000..f51fad1e6b70a +#endif /* DWC_DEVICE_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h new file mode 100644 -index 0000000000000..7a77977c9ddf9 +index 000000000000..7a77977c9ddf --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_os_dep.h @@ -0,0 +1,200 @@ @@ -156745,7 +156747,7 @@ index 0000000000000..7a77977c9ddf9 +#endif /* _DWC_OS_DEP_H_ */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c new file mode 100644 -index 0000000000000..2ffd4f11d0bf8 +index 000000000000..2ffd4f11d0bf --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.c @@ -0,0 +1,2725 @@ @@ -159476,7 +159478,7 @@ index 0000000000000..2ffd4f11d0bf8 +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h new file mode 100644 -index 0000000000000..a70ebd049d2cc +index 000000000000..a70ebd049d2c --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd.h @@ -0,0 +1,273 @@ @@ -159755,7 +159757,7 @@ index 0000000000000..a70ebd049d2cc +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h new file mode 100644 -index 0000000000000..4c1d591fbc098 +index 000000000000..4c1d591fbc09 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_if.h @@ -0,0 +1,361 @@ @@ -160122,7 +160124,7 @@ index 0000000000000..4c1d591fbc098 +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c new file mode 100644 -index 0000000000000..76e94b4ebb43a +index 000000000000..76e94b4ebb43 --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_intr.c @@ -0,0 +1,5148 @@ @@ -165276,7 +165278,7 @@ index 0000000000000..76e94b4ebb43a +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c new file mode 100644 -index 0000000000000..a5ed8e83711db +index 000000000000..a5ed8e83711d --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_pcd_linux.c @@ -0,0 +1,1262 @@ @@ -166544,7 +166546,7 @@ index 0000000000000..a5ed8e83711db +#endif /* DWC_HOST_ONLY */ diff --git a/drivers/usb/host/dwc_otg/dwc_otg_regs.h b/drivers/usb/host/dwc_otg/dwc_otg_regs.h new file mode 100644 -index 0000000000000..8e0e7b569f1ac +index 000000000000..8e0e7b569f1a --- /dev/null +++ b/drivers/usb/host/dwc_otg/dwc_otg_regs.h @@ -0,0 +1,2550 @@ @@ -169100,7 +169102,7 @@ index 0000000000000..8e0e7b569f1ac +#endif diff --git a/drivers/usb/host/dwc_otg/test/Makefile b/drivers/usb/host/dwc_otg/test/Makefile new file mode 100644 -index 0000000000000..fc453759dea3e +index 000000000000..fc453759dea3 --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/Makefile @@ -0,0 +1,16 @@ @@ -169122,7 +169124,7 @@ index 0000000000000..fc453759dea3e + done diff --git a/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm new file mode 100644 -index 0000000000000..85e55fd6ddbc7 +index 000000000000..85e55fd6ddbc --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/dwc_otg_test.pm @@ -0,0 +1,337 @@ @@ -169465,7 +169467,7 @@ index 0000000000000..85e55fd6ddbc7 +1; diff --git a/drivers/usb/host/dwc_otg/test/test_mod_param.pl b/drivers/usb/host/dwc_otg/test/test_mod_param.pl new file mode 100644 -index 0000000000000..dc3820df577ba +index 000000000000..dc3820df577b --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/test_mod_param.pl @@ -0,0 +1,133 @@ @@ -169604,7 +169606,7 @@ index 0000000000000..dc3820df577ba +0; diff --git a/drivers/usb/host/dwc_otg/test/test_sysfs.pl b/drivers/usb/host/dwc_otg/test/test_sysfs.pl new file mode 100644 -index 0000000000000..cdc9963176e5a +index 000000000000..cdc9963176e5 --- /dev/null +++ b/drivers/usb/host/dwc_otg/test/test_sysfs.pl @@ -0,0 +1,193 @@ @@ -169802,7 +169804,7 @@ index 0000000000000..cdc9963176e5a +test_main(); +0; diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c -index 93f429436e454..796122ac737bb 100644 +index 93f429436e45..796122ac737b 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -2533,9 +2533,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags) @@ -169829,7 +169831,7 @@ index 93f429436e454..796122ac737bb 100644 "// Write ERST size = %i to ir_set 0 (some bits preserved)", val); diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index b62382afe4a90..694eab533414a 100644 +index b62382afe4a9..694eab533414 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -278,8 +278,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -169846,7 +169848,7 @@ index b62382afe4a90..694eab533414a 100644 if (pdev->vendor == PCI_VENDOR_ID_ZHAOXIN && (pdev->device == 0x9202 || diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c -index dc2068e3bedb7..8bbe602c0a073 100644 +index dc2068e3bedb..8bbe602c0a07 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c @@ -556,7 +556,10 @@ void xhci_find_new_dequeue_state(struct xhci_hcd *xhci, @@ -169921,7 +169923,7 @@ index dc2068e3bedb7..8bbe602c0a073 100644 /* This function gets called from contexts where it cannot sleep */ diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c -index e9d67ee299d92..2d9d978a92969 100644 +index d6bdeb5405a4..7d6d7e175bc2 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1466,6 +1466,103 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id, @@ -170062,7 +170064,7 @@ index e9d67ee299d92..2d9d978a92969 100644 .enable_device = xhci_enable_device, .update_hub_device = xhci_update_hub_device, diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 2f1c03cfe4b99..0f8542045677a 100644 +index 2f1c03cfe4b9..0f8542045677 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1653,8 +1653,8 @@ struct urb_priv { @@ -170086,7 +170088,7 @@ index 2f1c03cfe4b99..0f8542045677a 100644 unsigned int num_active_eps; unsigned int limit_active_eps; diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig -index d83c87b902c16..ed22a119c9927 100644 +index d83c87b902c1..ed22a119c992 100644 --- a/drivers/video/backlight/Kconfig +++ b/drivers/video/backlight/Kconfig @@ -248,6 +248,13 @@ config BACKLIGHT_PWM @@ -170104,7 +170106,7 @@ index d83c87b902c16..ed22a119c9927 100644 tristate "Backlight Driver for DA9030/DA9034 using WLED" depends on PMIC_DA903X diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile -index 685f3f1ca4df6..836f0d0d1ca0a 100644 +index 685f3f1ca4df..836f0d0d1ca0 100644 --- a/drivers/video/backlight/Makefile +++ b/drivers/video/backlight/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_BACKLIGHT_PANDORA) += pandora_bl.o @@ -170117,7 +170119,7 @@ index 685f3f1ca4df6..836f0d0d1ca0a 100644 obj-$(CONFIG_BACKLIGHT_TOSA) += tosa_bl.o diff --git a/drivers/video/backlight/rpi_backlight.c b/drivers/video/backlight/rpi_backlight.c new file mode 100644 -index 0000000000000..14a0d9b037395 +index 000000000000..14a0d9b03739 --- /dev/null +++ b/drivers/video/backlight/rpi_backlight.c @@ -0,0 +1,119 @@ @@ -170241,7 +170243,7 @@ index 0000000000000..14a0d9b037395 +MODULE_DESCRIPTION("Raspberry Pi mailbox based Backlight Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig -index 4f02db65dedec..d3f87a523f6ed 100644 +index 4f02db65dede..d3f87a523f6e 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -219,6 +219,20 @@ config FB_TILEBLITTING @@ -170286,7 +170288,7 @@ index 4f02db65dedec..d3f87a523f6ed 100644 source "drivers/video/fbdev/omap2/Kconfig" source "drivers/video/fbdev/mmp/Kconfig" diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile -index 477b9624b7033..5a478be6bcb4d 100644 +index 477b9624b703..5a478be6bcb4 100644 --- a/drivers/video/fbdev/Makefile +++ b/drivers/video/fbdev/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_FB_MACMODES) += macmodes.o @@ -170307,7 +170309,7 @@ index 477b9624b7033..5a478be6bcb4d 100644 obj-$(CONFIG_FB_VIRTUAL) += vfb.o diff --git a/drivers/video/fbdev/bcm2708_fb.c b/drivers/video/fbdev/bcm2708_fb.c new file mode 100644 -index 0000000000000..365c5b96b8a08 +index 000000000000..365c5b96b8a0 --- /dev/null +++ b/drivers/video/fbdev/bcm2708_fb.c @@ -0,0 +1,1274 @@ @@ -171586,7 +171588,7 @@ index 0000000000000..365c5b96b8a08 +MODULE_PARM_DESC(fbdepth, "Bit depth of ARM Framebuffer"); +MODULE_PARM_DESC(fbswap, "Swap order of red and blue in 24 and 32 bit modes"); diff --git a/drivers/video/fbdev/core/cfbimgblt.c b/drivers/video/fbdev/core/cfbimgblt.c -index a2bb276a8b246..436494fba15ab 100644 +index a2bb276a8b24..436494fba15a 100644 --- a/drivers/video/fbdev/core/cfbimgblt.c +++ b/drivers/video/fbdev/core/cfbimgblt.c @@ -28,6 +28,11 @@ @@ -171763,7 +171765,7 @@ index a2bb276a8b246..436494fba15ab 100644 start_index, pitch_index); } else diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c -index 00939ca2065a9..098cd5dfc06f4 100644 +index 00939ca2065a..098cd5dfc06f 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -1085,6 +1085,30 @@ fb_blank(struct fb_info *info, int blank) @@ -171831,7 +171833,7 @@ index 00939ca2065a9..098cd5dfc06f4 100644 case FBIOBLANK: diff --git a/drivers/video/fbdev/rpisense-fb.c b/drivers/video/fbdev/rpisense-fb.c new file mode 100644 -index 0000000000000..325977def5311 +index 000000000000..325977def531 --- /dev/null +++ b/drivers/video/fbdev/rpisense-fb.c @@ -0,0 +1,296 @@ @@ -172132,7 +172134,7 @@ index 0000000000000..325977def5311 +MODULE_LICENSE("GPL"); + diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm -index 3c14e43b82fef..7626beb6a5bb8 100644 +index 3c14e43b82fe..7626beb6a5bb 100644 --- a/drivers/video/logo/logo_linux_clut224.ppm +++ b/drivers/video/logo/logo_linux_clut224.ppm @@ -1,1604 +1,883 @@ @@ -174622,7 +174624,7 @@ index 3c14e43b82fef..7626beb6a5bb8 100644 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c -index d4632aace4022..4832cd8c2596a 100644 +index d4632aace402..4832cd8c2596 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -30,7 +30,7 @@ static u8 w1_gpio_set_pullup(void *data, int delay) @@ -174635,7 +174637,7 @@ index d4632aace4022..4832cd8c2596a 100644 /* * This will simply set the line as input since we are doing diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c -index dec6ca019beaa..de25e3682f037 100644 +index dec6ca019bea..de25e3682f03 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -32,13 +32,7 @@ @@ -174720,7 +174722,7 @@ index dec6ca019beaa..de25e3682f037 100644 static int bcm2835_wdt_probe(struct platform_device *pdev) diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h -index d07c851d255b5..5d34c1df03f38 100644 +index d07c851d255b..5d34c1df03f3 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -248,6 +248,26 @@ struct drm_private_state_funcs { @@ -174751,7 +174753,7 @@ index d07c851d255b5..5d34c1df03f38 100644 struct drm_private_obj { /** diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h -index 85df04c8e62f8..dc7e3aef7f134 100644 +index 85df04c8e62f..dc7e3aef7f13 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -147,10 +147,6 @@ int drm_atomic_helper_page_flip_target( @@ -174766,7 +174768,7 @@ index 85df04c8e62f8..dc7e3aef7f134 100644 /** * drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index 928136556174c..42cbacd1acb58 100644 +index 928136556174..42cbacd1acb5 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1622,6 +1622,10 @@ int drm_connector_attach_scaling_mode_property(struct drm_connector *connector, @@ -174781,7 +174783,7 @@ index 928136556174c..42cbacd1acb58 100644 int drm_mode_create_hdmi_colorspace_property(struct drm_connector *connector); int drm_mode_create_dp_colorspace_property(struct drm_connector *connector); diff --git a/include/drm/drm_modeset_helper_vtables.h b/include/drm/drm_modeset_helper_vtables.h -index 4efec30f8badc..cbe613858a93e 100644 +index 4efec30f8bad..cbe613858a93 100644 --- a/include/drm/drm_modeset_helper_vtables.h +++ b/include/drm/drm_modeset_helper_vtables.h @@ -336,8 +336,7 @@ struct drm_crtc_helper_funcs { @@ -174923,7 +174925,7 @@ index 4efec30f8badc..cbe613858a93e 100644 #endif diff --git a/include/drm/drm_probe_helper.h b/include/drm/drm_probe_helper.h -index 8d3ed2834d345..04c57564c397d 100644 +index 8d3ed2834d34..04c57564c397 100644 --- a/include/drm/drm_probe_helper.h +++ b/include/drm/drm_probe_helper.h @@ -18,6 +18,7 @@ int drm_helper_probe_detect(struct drm_connector *connector, @@ -174936,7 +174938,7 @@ index 8d3ed2834d345..04c57564c397d 100644 void drm_kms_helper_poll_disable(struct drm_device *dev); diff --git a/include/drm/gud.h b/include/drm/gud.h new file mode 100644 -index 0000000000000..0b46b54fe56ef +index 000000000000..0b46b54fe56e --- /dev/null +++ b/include/drm/gud.h @@ -0,0 +1,333 @@ @@ -175275,7 +175277,7 @@ index 0000000000000..0b46b54fe56ef +#endif diff --git a/include/dt-bindings/gpio/gpio-fsm.h b/include/dt-bindings/gpio/gpio-fsm.h new file mode 100644 -index 0000000000000..eb40cfdc71dfe +index 000000000000..eb40cfdc71df --- /dev/null +++ b/include/dt-bindings/gpio/gpio-fsm.h @@ -0,0 +1,21 @@ @@ -175301,7 +175303,7 @@ index 0000000000000..eb40cfdc71dfe + +#endif diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h -index 54665952d6ade..92948c26da2a4 100644 +index 54665952d6ad..92948c26da2a 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -22,6 +22,7 @@ @@ -175314,7 +175316,7 @@ index 54665952d6ade..92948c26da2a4 100644 #define PHY_ID_BCM54612E 0x03625e60 diff --git a/include/linux/broadcom/bcm2835_smi.h b/include/linux/broadcom/bcm2835_smi.h new file mode 100644 -index 0000000000000..ee3a75edfc033 +index 000000000000..ee3a75edfc03 --- /dev/null +++ b/include/linux/broadcom/bcm2835_smi.h @@ -0,0 +1,391 @@ @@ -175711,7 +175713,7 @@ index 0000000000000..ee3a75edfc033 +#endif /* BCM2835_SMI_H */ diff --git a/include/linux/broadcom/vc_mem.h b/include/linux/broadcom/vc_mem.h new file mode 100644 -index 0000000000000..3c70792374964 +index 000000000000..3c7079237496 --- /dev/null +++ b/include/linux/broadcom/vc_mem.h @@ -0,0 +1,39 @@ @@ -175755,7 +175757,7 @@ index 0000000000000..3c70792374964 + +#endif /* _VC_MEM_H */ diff --git a/include/linux/clk.h b/include/linux/clk.h -index 7fd6a1febcf4f..ab53a0873c8d1 100644 +index 7fd6a1febcf4..ab53a0873c8d 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h @@ -15,6 +15,7 @@ @@ -175777,7 +175779,7 @@ index 7fd6a1febcf4f..ab53a0873c8d1 100644 static inline struct clk *clk_get(struct device *dev, const char *id) diff --git a/include/linux/hdmi.h b/include/linux/hdmi.h -index 9850d59d6f1c0..c8ec982ff4984 100644 +index 9850d59d6f1c..c8ec982ff498 100644 --- a/include/linux/hdmi.h +++ b/include/linux/hdmi.h @@ -156,7 +156,7 @@ enum hdmi_content_type { @@ -175790,7 +175792,7 @@ index 9850d59d6f1c0..c8ec982ff4984 100644 enum hdmi_eotf { diff --git a/include/linux/leds.h b/include/linux/leds.h -index 6a8d6409c993e..aefab0783075c 100644 +index 6a8d6409c993..aefab0783075 100644 --- a/include/linux/leds.h +++ b/include/linux/leds.h @@ -79,6 +79,9 @@ struct led_classdev { @@ -175804,7 +175806,7 @@ index 6a8d6409c993e..aefab0783075c 100644 /* set_brightness_work / blink_timer flags, atomic, private. */ unsigned long work_flags; diff --git a/include/linux/mfd/bcm2835-pm.h b/include/linux/mfd/bcm2835-pm.h -index ed37dc40e82a8..f70a810c55f7d 100644 +index ed37dc40e82a..f70a810c55f7 100644 --- a/include/linux/mfd/bcm2835-pm.h +++ b/include/linux/mfd/bcm2835-pm.h @@ -9,6 +9,7 @@ struct bcm2835_pm { @@ -175817,7 +175819,7 @@ index ed37dc40e82a8..f70a810c55f7d 100644 #endif /* BCM2835_MFD_PM_H */ diff --git a/include/linux/mfd/rpisense/core.h b/include/linux/mfd/rpisense/core.h new file mode 100644 -index 0000000000000..4856aa3c8b066 +index 000000000000..4856aa3c8b06 --- /dev/null +++ b/include/linux/mfd/rpisense/core.h @@ -0,0 +1,47 @@ @@ -175870,7 +175872,7 @@ index 0000000000000..4856aa3c8b066 +#endif diff --git a/include/linux/mfd/rpisense/framebuffer.h b/include/linux/mfd/rpisense/framebuffer.h new file mode 100644 -index 0000000000000..2ba95d7eebaf9 +index 000000000000..2ba95d7eebaf --- /dev/null +++ b/include/linux/mfd/rpisense/framebuffer.h @@ -0,0 +1,32 @@ @@ -175908,7 +175910,7 @@ index 0000000000000..2ba95d7eebaf9 +#endif diff --git a/include/linux/mfd/rpisense/joystick.h b/include/linux/mfd/rpisense/joystick.h new file mode 100644 -index 0000000000000..56196dc2af10e +index 000000000000..56196dc2af10 --- /dev/null +++ b/include/linux/mfd/rpisense/joystick.h @@ -0,0 +1,35 @@ @@ -175948,7 +175950,7 @@ index 0000000000000..56196dc2af10e + +#endif diff --git a/include/linux/microchipphy.h b/include/linux/microchipphy.h -index 517288da19fd3..626c450d71f45 100644 +index 517288da19fd..626c450d71f4 100644 --- a/include/linux/microchipphy.h +++ b/include/linux/microchipphy.h @@ -61,6 +61,14 @@ @@ -175967,7 +175969,7 @@ index 517288da19fd3..626c450d71f45 100644 #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG (0x806A) #define PHY_ARDENNES_MMD_DEV_3_PHY_CFG_ZD_DLY_EN_ (0x2000) diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h -index 42df06c6b19ce..e7f45a2b0c728 100644 +index 42df06c6b19c..e7f45a2b0c72 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -271,6 +271,8 @@ struct mmc_card { @@ -175981,7 +175983,7 @@ index 42df06c6b19ce..e7f45a2b0c728 100644 unsigned int erase_size; /* erase size in sectors */ diff --git a/include/linux/platform_data/dma-bcm2708.h b/include/linux/platform_data/dma-bcm2708.h new file mode 100644 -index 0000000000000..6ca874d332a8b +index 000000000000..6ca874d332a8 --- /dev/null +++ b/include/linux/platform_data/dma-bcm2708.h @@ -0,0 +1,143 @@ @@ -176129,7 +176131,7 @@ index 0000000000000..6ca874d332a8b + +#endif /* _PLAT_BCM2708_DMA_H */ diff --git a/include/linux/usb.h b/include/linux/usb.h -index d6a41841b93e4..32be892f53cf5 100644 +index d6a41841b93e..32be892f53cf 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -1838,6 +1838,8 @@ extern int usb_clear_halt(struct usb_device *dev, int pipe); @@ -176142,7 +176144,7 @@ index d6a41841b93e4..32be892f53cf5 100644 /* this request isn't really synchronous, but it belongs with the others */ extern int usb_driver_set_configuration(struct usb_device *udev, int config); diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h -index 3dbb42c637c14..a60b7fc02fce3 100644 +index 3dbb42c637c1..a60b7fc02fce 100644 --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h @@ -382,6 +382,11 @@ struct hc_driver { @@ -176168,7 +176170,7 @@ index 3dbb42c637c14..a60b7fc02fce3 100644 extern void usb_hcd_reset_endpoint(struct usb_device *udev, diff --git a/include/linux/usb/r8152.h b/include/linux/usb/r8152.h new file mode 100644 -index 0000000000000..20d88b1defc30 +index 000000000000..20d88b1defc3 --- /dev/null +++ b/include/linux/usb/r8152.h @@ -0,0 +1,37 @@ @@ -176210,7 +176212,7 @@ index 0000000000000..20d88b1defc30 + +#endif /* __LINUX_R8152_H */ diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index a3b650ab00f66..6a4901d7caf39 100644 +index a3b650ab00f6..6a4901d7caf3 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -19,6 +19,7 @@ @@ -176264,7 +176266,7 @@ index a3b650ab00f66..6a4901d7caf39 100644 + #endif diff --git a/include/media/media-request.h b/include/media/media-request.h -index 3cd25a2717ce7..0de5c2c941883 100644 +index 3cd25a2717ce..0de5c2c94188 100644 --- a/include/media/media-request.h +++ b/include/media/media-request.h @@ -189,6 +189,10 @@ static inline void media_request_get(struct media_request *req) @@ -176294,7 +176296,7 @@ index 3cd25a2717ce7..0de5c2c941883 100644 media_request_get_by_fd(struct media_device *mdev, int request_fd) { diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h -index c20e2dc6d4320..396fb88266be0 100644 +index c20e2dc6d432..396fb88266be 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h @@ -92,6 +92,14 @@ @@ -176313,7 +176315,7 @@ index c20e2dc6d4320..396fb88266be0 100644 /** * enum v4l2_mbus_type - media bus type diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h -index bbb3f26fbde97..7a4aa9cb28c98 100644 +index bbb3f26fbde9..7a4aa9cb28c9 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -901,6 +901,21 @@ int vb2_core_streamon(struct vb2_queue *q, unsigned int type); @@ -176339,7 +176341,7 @@ index bbb3f26fbde97..7a4aa9cb28c98 100644 * vb2_core_expbuf() - Export a buffer as a file descriptor. * @q: pointer to &struct vb2_queue with videobuf2 queue. diff --git a/include/soc/bcm2835/raspberrypi-firmware.h b/include/soc/bcm2835/raspberrypi-firmware.h -index fdfef7fe40df9..b2c462446cf7d 100644 +index fdfef7fe40df..b2c462446cf7 100644 --- a/include/soc/bcm2835/raspberrypi-firmware.h +++ b/include/soc/bcm2835/raspberrypi-firmware.h @@ -36,6 +36,8 @@ struct rpi_firmware_property_tag_header { @@ -176431,7 +176433,7 @@ index fdfef7fe40df9..b2c462446cf7d 100644 int rpi_firmware_property(struct rpi_firmware *fw, u32 tag, void *data, size_t len); diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h -index b55970859a13c..4fc733c8c570e 100644 +index b55970859a13..4fc733c8c570 100644 --- a/include/sound/hdmi-codec.h +++ b/include/sound/hdmi-codec.h @@ -34,6 +34,11 @@ struct hdmi_codec_daifmt { @@ -176471,7 +176473,7 @@ index b55970859a13c..4fc733c8c570e 100644 * Shuts down the audio stream. * Mandatory diff --git a/include/sound/pcm_iec958.h b/include/sound/pcm_iec958.h -index 0939aa45e2fe3..64e84441cde1d 100644 +index 0939aa45e2fe..64e84441cde1 100644 --- a/include/sound/pcm_iec958.h +++ b/include/sound/pcm_iec958.h @@ -4,6 +4,14 @@ @@ -176490,7 +176492,7 @@ index 0939aa45e2fe3..64e84441cde1d 100644 size_t len); diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index 5498d7a6556a7..3aeab26802951 100644 +index 5498d7a6556a..3aeab2680295 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -287,6 +287,13 @@ extern "C" { @@ -176519,7 +176521,7 @@ index 5498d7a6556a7..3aeab26802951 100644 #define DRM_FORMAT_MOD_BROADCOM_SAND32_COL_HEIGHT(v) \ diff --git a/include/uapi/drm/drm_mode.h b/include/uapi/drm/drm_mode.h -index 863eda0482652..8bc13daec0a36 100644 +index 863eda048265..8bc13daec0a3 100644 --- a/include/uapi/drm/drm_mode.h +++ b/include/uapi/drm/drm_mode.h @@ -367,6 +367,7 @@ enum drm_mode_subconnector { @@ -176532,7 +176534,7 @@ index 863eda0482652..8bc13daec0a36 100644 diff --git a/include/uapi/linux/bcm2835-isp.h b/include/uapi/linux/bcm2835-isp.h new file mode 100644 -index 0000000000000..c50e3ca815657 +index 000000000000..c50e3ca81565 --- /dev/null +++ b/include/uapi/linux/bcm2835-isp.h @@ -0,0 +1,347 @@ @@ -176884,7 +176886,7 @@ index 0000000000000..c50e3ca815657 + +#endif /* __BCM2835_ISP_H_ */ diff --git a/include/uapi/linux/fb.h b/include/uapi/linux/fb.h -index 4c14e8be72677..3c6f12b76214c 100644 +index 4c14e8be7267..3c6f12b76214 100644 --- a/include/uapi/linux/fb.h +++ b/include/uapi/linux/fb.h @@ -35,6 +35,12 @@ @@ -176914,7 +176916,7 @@ index 4c14e8be72677..3c6f12b76214c 100644 __u32 dx; /* screen-relative */ __u32 dy; diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h -index 84fa53ffb13fc..c4abd49af073a 100644 +index 84fa53ffb13f..c4abd49af073 100644 --- a/include/uapi/linux/media-bus-format.h +++ b/include/uapi/linux/media-bus-format.h @@ -34,7 +34,7 @@ @@ -176946,7 +176948,7 @@ index 84fa53ffb13fc..c4abd49af073a 100644 + #endif /* __LINUX_MEDIA_BUS_FORMAT_H */ diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h -index a184c49394389..0b8ae128b9618 100644 +index a184c4939438..0b8ae128b961 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -198,6 +198,10 @@ enum v4l2_colorfx { @@ -176969,7 +176971,7 @@ index a184c49394389..0b8ae128b9618 100644 #define V4L2_CID_WIDE_DYNAMIC_RANGE (V4L2_CID_CAMERA_CLASS_BASE+21) diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h -index 534eaa4d39bc8..53d526dbe0044 100644 +index 534eaa4d39bc..53d526dbe004 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -82,6 +82,11 @@ @@ -177014,7 +177016,7 @@ index 534eaa4d39bc8..53d526dbe0044 100644 /* priv field value to indicates that subsequent fields are valid. */ #define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c -index 701ef7ba4f95f..18d8247a1ac51 100644 +index 701ef7ba4f95..18d8247a1ac5 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -5705,6 +5705,9 @@ int __init cgroup_init_early(void) @@ -177084,7 +177086,7 @@ index 701ef7ba4f95f..18d8247a1ac51 100644 static int __init enable_cgroup_debug(char *str) diff --git a/kernel/resource.c b/kernel/resource.c -index 817545ff80b9b..375a43d99b289 100644 +index 817545ff80b9..375a43d99b28 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -214,6 +214,12 @@ static int __release_resource(struct resource *old, bool release_child) @@ -177101,7 +177103,7 @@ index 817545ff80b9b..375a43d99b289 100644 for (;;) { tmp = *p; diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 71afec177233e..fc932333f4131 100644 +index 71afec177233..fc932333f413 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -8761,8 +8761,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, @@ -177114,7 +177116,7 @@ index 71afec177233e..fc932333f4131 100644 goto done; } diff --git a/mm/zswap.c b/mm/zswap.c -index cf27989034457..8d6546ec5be38 100644 +index cf2798903445..8d6546ec5be3 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -592,8 +592,9 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor) @@ -177221,7 +177223,7 @@ index cf27989034457..8d6546ec5be38 100644 cpuhp_remove_state(CPUHP_MM_ZSWP_MEM_PREPARE); dstmem_fail: diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c -index 31a01aa6f1395..4dc15fe4473d7 100644 +index 31a01aa6f139..4dc15fe4473d 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -883,16 +883,9 @@ static int tk_request(struct l2cap_conn *conn, u8 remote_oob, u8 auth, @@ -177263,7 +177265,7 @@ index 31a01aa6f1395..4dc15fe4473d7 100644 hcon->dst_type, passkey, confirm_hint); if (err) diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 50d580d77ae92..079b833080110 100644 +index 50d580d77ae9..079b83308011 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -18,9 +18,10 @@ include scripts/Kbuild.include @@ -177289,7 +177291,7 @@ index 50d580d77ae92..079b833080110 100644 $(subdirs): $(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 94133708889d7..43758c8d4b68c 100644 +index 94133708889d..43758c8d4b68 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -281,6 +281,7 @@ DTC_FLAGS += -Wno-interrupt_provider @@ -177326,7 +177328,7 @@ index 94133708889d7..43758c8d4b68c 100644 # Bzip2 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh -index b79fd0bea8384..c3d0c8fedbddf 100755 +index b79fd0bea838..c3d0c8fedbdd 100755 --- a/scripts/gcc-plugin.sh +++ b/scripts/gcc-plugin.sh @@ -1,5 +1,6 @@ @@ -177337,7 +177339,7 @@ index b79fd0bea8384..c3d0c8fedbddf 100755 set -e diff --git a/sound/core/pcm_iec958.c b/sound/core/pcm_iec958.c -index f9a211cc1f2c7..a60908efe159c 100644 +index f9a211cc1f2c..a60908efe159 100644 --- a/sound/core/pcm_iec958.c +++ b/sound/core/pcm_iec958.c @@ -9,41 +9,68 @@ @@ -177509,7 +177511,7 @@ index f9a211cc1f2c7..a60908efe159c 100644 } EXPORT_SYMBOL(snd_pcm_create_iec958_consumer_hw_params); diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig -index 4218057b08742..c85714895f1ed 100644 +index 4218057b0874..c85714895f1e 100644 --- a/sound/soc/bcm/Kconfig +++ b/sound/soc/bcm/Kconfig @@ -26,3 +26,301 @@ config SND_BCM63XX_I2S_WHISTLER @@ -177815,7 +177817,7 @@ index 4218057b08742..c85714895f1ed 100644 + Say Y or M if you want to add support for the Raspberry Pi + generic driver for WM8804 based soundcards. diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile -index 7c2d7899603b7..1efb734f1c864 100644 +index 7c2d7899603b..1efb734f1c86 100644 --- a/sound/soc/bcm/Makefile +++ b/sound/soc/bcm/Makefile @@ -12,4 +12,71 @@ obj-$(CONFIG_SND_SOC_CYGNUS) += snd-soc-cygnus.o @@ -177894,7 +177896,7 @@ index 7c2d7899603b7..1efb734f1c864 100644 +obj-$(CONFIG_SND_BCM2708_SOC_CHIPDIP_DAC) += snd-soc-chipdip-dac.o diff --git a/sound/soc/bcm/allo-boss-dac.c b/sound/soc/bcm/allo-boss-dac.c new file mode 100644 -index 0000000000000..22564e895bba4 +index 000000000000..22564e895bba --- /dev/null +++ b/sound/soc/bcm/allo-boss-dac.c @@ -0,0 +1,456 @@ @@ -178356,7 +178358,7 @@ index 0000000000000..22564e895bba4 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/allo-boss2-dac.c b/sound/soc/bcm/allo-boss2-dac.c new file mode 100644 -index 0000000000000..5ad7f16964aa8 +index 000000000000..5ad7f16964aa --- /dev/null +++ b/sound/soc/bcm/allo-boss2-dac.c @@ -0,0 +1,1133 @@ @@ -179495,7 +179497,7 @@ index 0000000000000..5ad7f16964aa8 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/allo-katana-codec.c b/sound/soc/bcm/allo-katana-codec.c new file mode 100644 -index 0000000000000..b0aebd40fe5ea +index 000000000000..b0aebd40fe5e --- /dev/null +++ b/sound/soc/bcm/allo-katana-codec.c @@ -0,0 +1,388 @@ @@ -179889,7 +179891,7 @@ index 0000000000000..b0aebd40fe5ea +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/allo-piano-dac-plus.c b/sound/soc/bcm/allo-piano-dac-plus.c new file mode 100644 -index 0000000000000..fd0fe58421b06 +index 000000000000..fd0fe58421b0 --- /dev/null +++ b/sound/soc/bcm/allo-piano-dac-plus.c @@ -0,0 +1,1063 @@ @@ -180958,7 +180960,7 @@ index 0000000000000..fd0fe58421b06 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/allo-piano-dac.c b/sound/soc/bcm/allo-piano-dac.c new file mode 100644 -index 0000000000000..61640fb954314 +index 000000000000..61640fb95431 --- /dev/null +++ b/sound/soc/bcm/allo-piano-dac.c @@ -0,0 +1,122 @@ @@ -181086,7 +181088,7 @@ index 0000000000000..61640fb954314 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/audioinjector-isolated-soundcard.c b/sound/soc/bcm/audioinjector-isolated-soundcard.c new file mode 100644 -index 0000000000000..e3cf29eef8125 +index 000000000000..e3cf29eef812 --- /dev/null +++ b/sound/soc/bcm/audioinjector-isolated-soundcard.c @@ -0,0 +1,183 @@ @@ -181275,7 +181277,7 @@ index 0000000000000..e3cf29eef8125 +MODULE_ALIAS("platform:audioinjector-isolated-soundcard"); diff --git a/sound/soc/bcm/audioinjector-octo-soundcard.c b/sound/soc/bcm/audioinjector-octo-soundcard.c new file mode 100644 -index 0000000000000..2da73a46c0f8f +index 000000000000..2da73a46c0f8 --- /dev/null +++ b/sound/soc/bcm/audioinjector-octo-soundcard.c @@ -0,0 +1,346 @@ @@ -181627,7 +181629,7 @@ index 0000000000000..2da73a46c0f8f +MODULE_ALIAS("platform:audioinjector-octo-soundcard"); diff --git a/sound/soc/bcm/audioinjector-pi-soundcard.c b/sound/soc/bcm/audioinjector-pi-soundcard.c new file mode 100644 -index 0000000000000..3f24fa7390818 +index 000000000000..3f24fa739081 --- /dev/null +++ b/sound/soc/bcm/audioinjector-pi-soundcard.c @@ -0,0 +1,187 @@ @@ -181820,7 +181822,7 @@ index 0000000000000..3f24fa7390818 + diff --git a/sound/soc/bcm/audiosense-pi.c b/sound/soc/bcm/audiosense-pi.c new file mode 100644 -index 0000000000000..b76d97488a442 +index 000000000000..b76d97488a44 --- /dev/null +++ b/sound/soc/bcm/audiosense-pi.c @@ -0,0 +1,248 @@ @@ -182074,7 +182076,7 @@ index 0000000000000..b76d97488a442 + diff --git a/sound/soc/bcm/chipdip-dac.c b/sound/soc/bcm/chipdip-dac.c new file mode 100644 -index 0000000000000..6cb53692b3c5a +index 000000000000..6cb53692b3c5 --- /dev/null +++ b/sound/soc/bcm/chipdip-dac.c @@ -0,0 +1,275 @@ @@ -182355,7 +182357,7 @@ index 0000000000000..6cb53692b3c5a +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/digidac1-soundcard.c b/sound/soc/bcm/digidac1-soundcard.c new file mode 100644 -index 0000000000000..4649c6f75c59b +index 000000000000..4649c6f75c59 --- /dev/null +++ b/sound/soc/bcm/digidac1-soundcard.c @@ -0,0 +1,421 @@ @@ -182782,7 +182784,7 @@ index 0000000000000..4649c6f75c59b +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/dionaudio_loco-v2.c b/sound/soc/bcm/dionaudio_loco-v2.c new file mode 100644 -index 0000000000000..ca48aef621b66 +index 000000000000..ca48aef621b6 --- /dev/null +++ b/sound/soc/bcm/dionaudio_loco-v2.c @@ -0,0 +1,117 @@ @@ -182905,7 +182907,7 @@ index 0000000000000..ca48aef621b66 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/dionaudio_loco.c b/sound/soc/bcm/dionaudio_loco.c new file mode 100644 -index 0000000000000..b19a06afb6af0 +index 000000000000..b19a06afb6af --- /dev/null +++ b/sound/soc/bcm/dionaudio_loco.c @@ -0,0 +1,117 @@ @@ -183028,7 +183030,7 @@ index 0000000000000..b19a06afb6af0 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/fe-pi-audio.c b/sound/soc/bcm/fe-pi-audio.c new file mode 100644 -index 0000000000000..ded4ba1a28154 +index 000000000000..ded4ba1a2815 --- /dev/null +++ b/sound/soc/bcm/fe-pi-audio.c @@ -0,0 +1,154 @@ @@ -183188,7 +183190,7 @@ index 0000000000000..ded4ba1a28154 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/googlevoicehat-codec.c b/sound/soc/bcm/googlevoicehat-codec.c new file mode 100644 -index 0000000000000..67e937425cff5 +index 000000000000..67e937425cff --- /dev/null +++ b/sound/soc/bcm/googlevoicehat-codec.c @@ -0,0 +1,214 @@ @@ -183408,7 +183410,7 @@ index 0000000000000..67e937425cff5 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/hifiberry_dacplus.c b/sound/soc/bcm/hifiberry_dacplus.c new file mode 100644 -index 0000000000000..1d8985468be42 +index 000000000000..1d8985468be4 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplus.c @@ -0,0 +1,527 @@ @@ -183941,7 +183943,7 @@ index 0000000000000..1d8985468be42 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/hifiberry_dacplusadc.c b/sound/soc/bcm/hifiberry_dacplusadc.c new file mode 100644 -index 0000000000000..5fe6fd2205560 +index 000000000000..5fe6fd220556 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusadc.c @@ -0,0 +1,398 @@ @@ -184345,7 +184347,7 @@ index 0000000000000..5fe6fd2205560 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/hifiberry_dacplusadcpro.c b/sound/soc/bcm/hifiberry_dacplusadcpro.c new file mode 100644 -index 0000000000000..517a70fba7d71 +index 000000000000..517a70fba7d7 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusadcpro.c @@ -0,0 +1,605 @@ @@ -184956,7 +184958,7 @@ index 0000000000000..517a70fba7d71 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/hifiberry_dacplusdsp.c b/sound/soc/bcm/hifiberry_dacplusdsp.c new file mode 100644 -index 0000000000000..cda7ee5190930 +index 000000000000..cda7ee519093 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplusdsp.c @@ -0,0 +1,90 @@ @@ -185052,7 +185054,7 @@ index 0000000000000..cda7ee5190930 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/hifiberry_dacplushd.c b/sound/soc/bcm/hifiberry_dacplushd.c new file mode 100644 -index 0000000000000..7e7e514a3019d +index 000000000000..7e7e514a3019 --- /dev/null +++ b/sound/soc/bcm/hifiberry_dacplushd.c @@ -0,0 +1,238 @@ @@ -185296,7 +185298,7 @@ index 0000000000000..7e7e514a3019d +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/i-sabre-q2m.c b/sound/soc/bcm/i-sabre-q2m.c new file mode 100644 -index 0000000000000..6809232e28cb6 +index 000000000000..6809232e28cb --- /dev/null +++ b/sound/soc/bcm/i-sabre-q2m.c @@ -0,0 +1,158 @@ @@ -185460,7 +185462,7 @@ index 0000000000000..6809232e28cb6 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/bcm/iqaudio-codec.c b/sound/soc/bcm/iqaudio-codec.c new file mode 100644 -index 0000000000000..e0c2e3c5d2ea0 +index 000000000000..e0c2e3c5d2ea --- /dev/null +++ b/sound/soc/bcm/iqaudio-codec.c @@ -0,0 +1,274 @@ @@ -185740,7 +185742,7 @@ index 0000000000000..e0c2e3c5d2ea0 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/iqaudio-dac.c b/sound/soc/bcm/iqaudio-dac.c new file mode 100644 -index 0000000000000..62f64c8432199 +index 000000000000..62f64c843219 --- /dev/null +++ b/sound/soc/bcm/iqaudio-dac.c @@ -0,0 +1,223 @@ @@ -185969,7 +185971,7 @@ index 0000000000000..62f64c8432199 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/justboom-both.c b/sound/soc/bcm/justboom-both.c new file mode 100644 -index 0000000000000..471ecebddcaae +index 000000000000..471ecebddcaa --- /dev/null +++ b/sound/soc/bcm/justboom-both.c @@ -0,0 +1,266 @@ @@ -186241,7 +186243,7 @@ index 0000000000000..471ecebddcaae +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/justboom-dac.c b/sound/soc/bcm/justboom-dac.c new file mode 100644 -index 0000000000000..f9fbdc9ddeb6f +index 000000000000..f9fbdc9ddeb6 --- /dev/null +++ b/sound/soc/bcm/justboom-dac.c @@ -0,0 +1,147 @@ @@ -186394,7 +186396,7 @@ index 0000000000000..f9fbdc9ddeb6f +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/pifi-40.c b/sound/soc/bcm/pifi-40.c new file mode 100644 -index 0000000000000..ae699fb0485c5 +index 000000000000..ae699fb0485c --- /dev/null +++ b/sound/soc/bcm/pifi-40.c @@ -0,0 +1,283 @@ @@ -186683,7 +186685,7 @@ index 0000000000000..ae699fb0485c5 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/pisound.c b/sound/soc/bcm/pisound.c new file mode 100644 -index 0000000000000..4c9c9c6c2511c +index 000000000000..4c9c9c6c2511 --- /dev/null +++ b/sound/soc/bcm/pisound.c @@ -0,0 +1,1238 @@ @@ -187927,7 +187929,7 @@ index 0000000000000..4c9c9c6c2511c +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/rpi-cirrus.c b/sound/soc/bcm/rpi-cirrus.c new file mode 100644 -index 0000000000000..227a528d59bdb +index 000000000000..227a528d59bd --- /dev/null +++ b/sound/soc/bcm/rpi-cirrus.c @@ -0,0 +1,1025 @@ @@ -188958,7 +188960,7 @@ index 0000000000000..227a528d59bdb +MODULE_LICENSE("GPL"); diff --git a/sound/soc/bcm/rpi-proto.c b/sound/soc/bcm/rpi-proto.c new file mode 100644 -index 0000000000000..9a5cf91719fbc +index 000000000000..9a5cf91719fb --- /dev/null +++ b/sound/soc/bcm/rpi-proto.c @@ -0,0 +1,147 @@ @@ -189111,7 +189113,7 @@ index 0000000000000..9a5cf91719fbc +MODULE_LICENSE("GPL"); diff --git a/sound/soc/bcm/rpi-simple-soundcard.c b/sound/soc/bcm/rpi-simple-soundcard.c new file mode 100644 -index 0000000000000..c25351e6ee902 +index 000000000000..c25351e6ee90 --- /dev/null +++ b/sound/soc/bcm/rpi-simple-soundcard.c @@ -0,0 +1,419 @@ @@ -189536,7 +189538,7 @@ index 0000000000000..c25351e6ee902 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/bcm/rpi-wm8804-soundcard.c b/sound/soc/bcm/rpi-wm8804-soundcard.c new file mode 100644 -index 0000000000000..835d0f9420e76 +index 000000000000..835d0f9420e7 --- /dev/null +++ b/sound/soc/bcm/rpi-wm8804-soundcard.c @@ -0,0 +1,410 @@ @@ -189951,7 +189953,7 @@ index 0000000000000..835d0f9420e76 +MODULE_DESCRIPTION("ASoC Raspberry Pi Hat generic digi driver for WM8804 based cards"); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 34c6dd04b85a3..e9be753187235 100644 +index 34c6dd04b85a..e9be75318723 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -100,12 +100,14 @@ config SND_SOC_ALL_CODECS @@ -190054,7 +190056,7 @@ index 34c6dd04b85a3..e9be753187235 100644 + endmenu diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile -index 11ce98c25d6cc..42dbabda8e147 100644 +index 11ce98c25d6c..42dbabda8e14 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -96,6 +96,7 @@ snd-soc-hdac-hda-objs := hdac_hda.o @@ -190122,7 +190124,7 @@ index 11ce98c25d6cc..42dbabda8e147 100644 obj-$(CONFIG_SND_SOC_TLV320AIC23_I2C) += snd-soc-tlv320aic23-i2c.o obj-$(CONFIG_SND_SOC_TLV320AIC23_SPI) += snd-soc-tlv320aic23-spi.o diff --git a/sound/soc/codecs/cs42xx8-i2c.c b/sound/soc/codecs/cs42xx8-i2c.c -index 0214e3ab9da00..b8b15b886c224 100644 +index 0214e3ab9da0..b8b15b886c22 100644 --- a/sound/soc/codecs/cs42xx8-i2c.c +++ b/sound/soc/codecs/cs42xx8-i2c.c @@ -45,11 +45,18 @@ static struct i2c_device_id cs42xx8_i2c_id[] = { @@ -190146,7 +190148,7 @@ index 0214e3ab9da00..b8b15b886c224 100644 .probe = cs42xx8_i2c_probe, .remove = cs42xx8_i2c_remove, diff --git a/sound/soc/codecs/cs42xx8.c b/sound/soc/codecs/cs42xx8.c -index 5d6ef660f851f..7d840313bccb2 100644 +index 5d6ef660f851..7d840313bccb 100644 --- a/sound/soc/codecs/cs42xx8.c +++ b/sound/soc/codecs/cs42xx8.c @@ -517,8 +517,10 @@ const struct of_device_id cs42xx8_of_match[] = { @@ -190161,7 +190163,7 @@ index 5d6ef660f851f..7d840313bccb2 100644 int cs42xx8_probe(struct device *dev, struct regmap *regmap) { diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c -index 403d4c6a49a80..b9e96d7ed00bb 100644 +index 403d4c6a49a8..b9e96d7ed00b 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -278,6 +278,7 @@ struct hdmi_codec_priv { @@ -190469,7 +190471,7 @@ index 403d4c6a49a80..b9e96d7ed00bb 100644 return -ENOMEM; diff --git a/sound/soc/codecs/i-sabre-codec.c b/sound/soc/codecs/i-sabre-codec.c new file mode 100644 -index 0000000000000..714e1f5852cb7 +index 000000000000..714e1f5852cb --- /dev/null +++ b/sound/soc/codecs/i-sabre-codec.c @@ -0,0 +1,392 @@ @@ -190867,7 +190869,7 @@ index 0000000000000..714e1f5852cb7 +MODULE_LICENSE("GPL"); diff --git a/sound/soc/codecs/i-sabre-codec.h b/sound/soc/codecs/i-sabre-codec.h new file mode 100644 -index 0000000000000..9cac5a2446b9e +index 000000000000..9cac5a2446b9 --- /dev/null +++ b/sound/soc/codecs/i-sabre-codec.h @@ -0,0 +1,42 @@ @@ -190915,7 +190917,7 @@ index 0000000000000..9cac5a2446b9e +#endif /* _SND_SOC_ISABRECODEC */ diff --git a/sound/soc/codecs/ma120x0p.c b/sound/soc/codecs/ma120x0p.c new file mode 100644 -index 0000000000000..e1591b6aff431 +index 000000000000..e1591b6aff43 --- /dev/null +++ b/sound/soc/codecs/ma120x0p.c @@ -0,0 +1,1384 @@ @@ -192305,7 +192307,7 @@ index 0000000000000..e1591b6aff431 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/pcm1794a.c b/sound/soc/codecs/pcm1794a.c new file mode 100644 -index 0000000000000..36b5b6c26655a +index 000000000000..36b5b6c26655 --- /dev/null +++ b/sound/soc/codecs/pcm1794a.c @@ -0,0 +1,69 @@ @@ -192379,7 +192381,7 @@ index 0000000000000..36b5b6c26655a +MODULE_AUTHOR("Florian Meier "); +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c -index 8153d3d01654f..7a5b716c8adde 100644 +index 8153d3d01654..7a5b716c8add 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c @@ -534,7 +534,7 @@ static unsigned long pcm512x_ncp_target(struct pcm512x_priv *pcm512x, @@ -192393,7 +192395,7 @@ index 8153d3d01654f..7a5b716c8adde 100644 static const struct snd_pcm_hw_constraint_list constraints_slave = { diff --git a/sound/soc/codecs/tas5713.c b/sound/soc/codecs/tas5713.c new file mode 100644 -index 0000000000000..53acd2b355d63 +index 000000000000..53acd2b355d6 --- /dev/null +++ b/sound/soc/codecs/tas5713.c @@ -0,0 +1,363 @@ @@ -192762,7 +192764,7 @@ index 0000000000000..53acd2b355d63 +MODULE_LICENSE("GPL v2"); diff --git a/sound/soc/codecs/tas5713.h b/sound/soc/codecs/tas5713.h new file mode 100644 -index 0000000000000..8f019e0489875 +index 000000000000..8f019e048987 --- /dev/null +++ b/sound/soc/codecs/tas5713.h @@ -0,0 +1,210 @@ @@ -192977,7 +192979,7 @@ index 0000000000000..8f019e0489875 + +#endif /* _TAS5713_H */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c -index e677422c10585..54cbdb75f1095 100644 +index e677422c1058..54cbdb75f109 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1016,7 +1016,7 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, @@ -193016,7 +193018,7 @@ index e677422c10585..54cbdb75f1095 100644 dev_warn(codec_dai->dev, "ASoC: Failed to set DAI format: %d\n", ret); diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h -index 5728bf722c88a..18e5cec82bc20 100644 +index 5728bf722c88..18e5cec82bc2 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -46,6 +46,15 @@ @@ -193036,7 +193038,7 @@ index 5728bf722c88a..18e5cec82bc20 100644 /* Creative BT-D1 */ USB_DEVICE(0x041e, 0x0005), diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index a45b27a2ed4ec..12fb94a7b7538 100644 +index a45b27a2ed4e..12fb94a7b753 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -531,6 +531,11 @@ static int setup_disable_autosuspend(struct snd_usb_audio *chip, diff --git a/SOURCE b/SOURCE index 855bd3e..f00588f 100644 --- a/SOURCE +++ b/SOURCE @@ -1 +1 @@ -5.10.0-14.0.0 +5.10.0-15.0.0 diff --git a/kernel.spec b/kernel.spec index 2afaaea..dc1bb07 100644 --- a/kernel.spec +++ b/kernel.spec @@ -10,9 +10,9 @@ %global upstream_version 5.10 %global upstream_sublevel 0 -%global devel_release 14 +%global devel_release 15 %global maintenance_release .0.0 -%global pkg_release .4 +%global pkg_release .5 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -858,6 +858,490 @@ fi %endif %changelog +* Tue Oct 26 2021 Zheng Zengkai - 5.10.0-15.0.0.5 +- net: dsa: bcm_sf2: Fix array overrun in bcm_sf2_num_active_ports() +- bnxt_en: Fix error recovery regression +- x86/mce: Avoid infinite loop for copy from user recovery +- net: renesas: sh_eth: Fix freeing wrong tx descriptor +- mfd: lpc_sch: Rename GPIOBASE to prevent build error +- mfd: lpc_sch: Partially revert "Add support for Intel Quark X1000" +- bnxt_en: Fix possible unintended driver initiated error recovery +- bnxt_en: Improve logging of error recovery settings information. +- bnxt_en: Convert to use netif_level() helpers. +- bnxt_en: Consolidate firmware reset event logging. +- bnxt_en: log firmware debug notifications +- bnxt_en: Fix asic.rev in devlink dev info command +- bnxt_en: fix stored FW_PSID version masks +- net: dsa: b53: Fix IMP port setup on BCM5301x +- ip_gre: validate csum_start only on pull +- qlcnic: Remove redundant unlock in qlcnic_pinit_from_rom +- fq_codel: reject silly quantum parameters +- netfilter: socket: icmp6: fix use-after-scope +- net: dsa: b53: Set correct number of ports in the DSA struct +- net: dsa: b53: Fix calculating number of switch ports +- net: hso: add failure handler for add_net_device +- selftests: mptcp: clean tmp files in simult_flows +- net: dsa: tag_rtl4_a: Fix egress tags +- gpio: mpc8xxx: Use 'devm_gpiochip_add_data()' to simplify the code and avoid a leak +- gpio: mpc8xxx: Fix a resources leak in the error handling path of 'mpc8xxx_probe()' +- perf bench inject-buildid: Handle writen() errors +- perf unwind: Do not overwrite FEATURE_CHECK_LDFLAGS-libunwind-{x86,aarch64} +- ARC: export clear_user_page() for modules +- mtd: rawnand: cafe: Fix a resource leak in the error handling path of 'cafe_nand_probe()' +- PCI: Sync __pci_register_driver() stub for CONFIG_PCI=n +- KVM: arm64: Handle PSCI resets before userspace touches vCPU state +- KVM: arm64: Fix read-side race on updates to vcpu reset state +- tracing/boot: Fix a hist trigger dependency for boot time tracing +- mfd: tqmx86: Clear GPIO IRQ resource when no IRQ is set +- PCI: Fix pci_dev_str_match_path() alloc while atomic bug +- KVM: arm64: Restrict IPA size to maximum 48 bits on 4K and 16K page size +- netfilter: nft_ct: protect nft_ct_pcpu_template_refcnt with mutex +- netfilter: Fix fall-through warnings for Clang +- PCI: iproc: Fix BCMA probe resource handling +- PCI: of: Don't fail devm_pci_alloc_host_bridge() on missing 'ranges' +- backlight: ktd253: Stabilize backlight +- mfd: axp20x: Update AXP288 volatile ranges +- s390/bpf: Fix branch shortening during codegen pass +- s390/bpf: Fix 64-bit subtraction of the -0x80000000 constant +- s390/bpf: Fix optimizing out zero-extensions +- NTB: perf: Fix an error code in perf_setup_inbuf() +- NTB: Fix an error code in ntb_msit_probe() +- ethtool: Fix an error code in cxgb2.c +- PCI: ibmphp: Fix double unmap of io_mem +- block, bfq: honor already-setup queue merges +- net: usb: cdc_mbim: avoid altsetting toggling for Telit LN920 +- Set fc_nlinfo in nh_create_ipv4, nh_create_ipv6 +- octeontx2-af: Add additional register check to rvu_poll_reg() +- watchdog: Start watchdog in watchdog_set_last_hw_keepalive only if appropriate +- PCI: Add ACS quirks for Cavium multi-function devices +- PCI: j721e: Add PCIe support for AM64 +- PCI: j721e: Add PCIe support for J7200 +- PCI: cadence: Add quirk flag to set minimum delay in LTSSM Detect.Quiet state +- PCI: cadence: Use bitfield for *quirk_retrain_flag* instead of bool +- tracing/probes: Reject events which have the same name of existing one +- PCI: rcar: Fix runtime PM imbalance in rcar_pcie_ep_probe() +- mfd: Don't use irq_create_mapping() to resolve a mapping +- PCI: tegra: Fix OF node reference leak +- PCI: tegra194: Fix MSI-X programming +- PCI: tegra194: Fix handling BME_CHGED event +- fuse: fix use after free in fuse_read_interrupt() +- PCI: Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms +- mfd: db8500-prcmu: Adjust map to reality +- dt-bindings: mtd: gpmc: Fix the ECC bytes vs. OOB bytes equation +- mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range() +- bnxt_en: make bnxt_free_skbs() safe to call after bnxt_free_mem() +- KVM: PPC: Book3S HV: Tolerate treclaim. in fake-suspend mode changing registers +- ibmvnic: check failover_pending in login response +- dt-bindings: arm: Fix Toradex compatible typo +- udp_tunnel: Fix udp_tunnel_nic work-queue type +- qed: Handle management FW error +- selftest: net: fix typo in altname test +- tcp: fix tp->undo_retrans accounting in tcp_sacktag_one() +- x86/uaccess: Fix 32-bit __get_user_asm_u64() when CC_HAS_ASM_GOTO_OUTPUT=y +- net: dsa: destroy the phylink instance on any error in dsa_slave_phy_setup +- net/af_unix: fix a data-race in unix_dgram_poll +- vhost_net: fix OoB on sendmsg() failure. +- gen_compile_commands: fix missing 'sys' package +- net: ipa: initialize all filter table slots +- events: Reuse value read using READ_ONCE instead of re-reading it +- nvme-tcp: fix io_work priority inversion +- net/mlx5: Fix potential sleeping in atomic context +- net/mlx5: FWTrace, cancel work on alloc pd error flow +- perf machine: Initialize srcline string member in add_location struct +- drm/rockchip: cdn-dp-core: Make cdn_dp_core_resume __maybe_unused +- tipc: increase timeout in tipc_sk_enqueue() +- r6040: Restore MDIO clock frequency after MAC reset +- net/l2tp: Fix reference count leak in l2tp_udp_recv_core +- dccp: don't duplicate ccid when cloning dccp sock +- ptp: dp83640: don't define PAGE0 +- net-caif: avoid user-triggerable WARN_ON(1) +- net/{mlx5|nfp|bnxt}: Remove unnecessary RTNL lock assert +- ethtool: Fix rxnfc copy to user buffer overflow +- tipc: fix an use-after-free issue in tipc_recvmsg +- x86/mm: Fix kern_addr_valid() to cope with existing but not present entries +- x86/pat: Pass valid address to sanitize_phys() +- s390/sclp: fix Secure-IPL facility detection +- drm/etnaviv: add missing MMU context put when reaping MMU mapping +- drm/etnaviv: reference MMU context when setting up hardware state +- drm/etnaviv: fix MMU context leak on GPU reset +- drm/etnaviv: exec and MMU state is lost when resetting the GPU +- drm/etnaviv: keep MMU context across runtime suspend/resume +- drm/etnaviv: stop abusing mmu_context as FE running marker +- drm/etnaviv: put submit prev MMU context when it exists +- drm/etnaviv: return context from etnaviv_iommu_context_get +- drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10 +- PCI: Add AMD GPU multi-function power dependencies +- PM: base: power: don't try to use non-existing RTC for storing data +- arm64/sve: Use correct size when reinitialising SVE state +- bnx2x: Fix enabling network interfaces without VFs +- xen: reset legacy rtc flag for PV domU +- btrfs: fix upper limit for max_inline for page size 64K +- drm/bridge: lt9611: Fix handling of 4k panels +- fanotify: limit number of event merge attempts +- drm/panfrost: Clamp lock region to Bifrost minimum +- drm/panfrost: Use u64 for size in lock_region +- drm/panfrost: Simplify lock_region calculation +- drm/amd/display: Update bounding box states (v2) +- drm/amd/display: Update number of DCN3 clock states +- drm/amdgpu: Fix BUG_ON assert +- drm/panfrost: Make sure MMU context lifetime is not bound to panfrost_priv +- drm/dp_mst: Fix return code on sideband message failure +- drm/msi/mdp4: populate priv->kms in mdp4_kms_init +- drm/mgag200: Select clock in PLL update functions +- net: dsa: lantiq_gswip: fix maximum frame length +- lib/test_stackinit: Fix static initializer test +- platform/chrome: cros_ec_proto: Send command again when timeout occurs +- libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind +- mm,vmscan: fix divide by zero in get_scan_count +- mm/hugetlb: initialize hugetlb_usage in mm_init +- mm/hmm: bypass devmap pte when all pfn requested flags are fulfilled +- hugetlb: fix hugetlb cgroup refcounting during vma split +- s390/pv: fix the forcing of the swiotlb +- cpufreq: powernv: Fix init_chip_info initialization in numa=off +- scsi: qla2xxx: Sync queue idx with queue_pair_map idx +- scsi: qla2xxx: Changes to support kdump kernel +- scsi: BusLogic: Fix missing pr_cont() use +- ovl: fix BUG_ON() in may_delete() when called from ovl_cleanup() +- parisc: fix crash with signals and alloca +- io_uring: remove duplicated io_size from rw +- fs/io_uring Don't use the return value from import_iovec(). +- net: w5100: check return value after calling platform_get_resource() +- fix array-index-out-of-bounds in taprio_change +- net: fix NULL pointer reference in cipso_v4_doi_free +- ath9k: fix sleeping in atomic context +- ath9k: fix OOB read ar9300_eeprom_restore_internal +- wcn36xx: Fix missing frame timestamp for beacon/probe-resp +- selftests/bpf: Fix potential unreleased lock +- parport: remove non-zero check on count +- net/mlx5: DR, Enable QP retransmission +- net/mlx5: DR, fix a potential use-after-free bug +- iwlwifi: mvm: Fix scan channel flags settings +- iwlwifi: fw: correctly limit to monitor dump +- iwlwifi: mvm: fix access to BSS elements +- iwlwifi: mvm: avoid static queue number aliasing +- iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed +- iwlwifi: pcie: free RBs during configure +- nfsd: fix crash on LOCKT on reexported NFSv3 +- drm/amdkfd: Account for SH/SE count when setting up cu masks. +- ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B +- ASoC: rockchip: i2s: Fix regmap_ops hang +- usbip:vhci_hcd USB port can get stuck in the disabled state +- usbip: give back URBs for unsent unlink requests during cleanup +- usb: musb: musb_dsps: request_irq() after initializing musb +- Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set" +- cifs: fix wrong release in sess_alloc_buffer() failed path +- mmc: core: Return correct emmc response in case of ioctl error +- selftests/bpf: Enlarge select() timeout for test_maps +- mmc: rtsx_pci: Fix long reads when clock is prescaled +- mmc: sdhci-of-arasan: Check return value of non-void funtions +- mmc: sdhci-of-arasan: Modified SD default speed to 19MHz for ZynqMP +- of: Don't allow __of_attached_node_sysfs() without CONFIG_SYSFS +- ASoC: Intel: Skylake: Fix passing loadable flag for module +- ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER +- soundwire: intel: fix potential race condition during power down +- btrfs: tree-log: check btrfs_lookup_data_extent return value +- m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch +- octeontx2-pf: Fix NIX1_RX interface backpressure +- rtw88: wow: fix size access error of probe request +- rtw88: wow: build wow function only if CONFIG_PM is on +- rtw88: use read_poll_timeout instead of fixed sleep +- rtl8xxxu: Fix the handling of TX A-MPDU aggregation +- drm/exynos: Always initialize mapping in exynos_drm_register_dma() +- lockd: lockd server-side shouldn't set fl_ops +- usb: chipidea: host: fix port index underflow and UBSAN complains +- gfs2: Don't call dlm after protocol is unmounted +- kselftest/arm64: pac: Fix skipping of tests on systems without PAC +- kselftest/arm64: mte: Fix misleading output when skipping tests +- net: Fix offloading indirect devices dependency on qdisc order creation +- staging: rts5208: Fix get_ms_information() heap buffer size +- hwmon: (pmbus/ibm-cffps) Fix write bits for LED control +- selftests/bpf: Fix flaky send_signal test +- rpc: fix gss_svc_init cleanup on failure +- tcp: enable data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD +- iomap: pass writeback errors to the mapping +- serial: sh-sci: fix break handling for sysrq +- opp: Don't print an error if required-opps is missing +- Bluetooth: Fix handling of LE Enhanced Connection Complete +- nvme: code command_id with a genctr for use-after-free validation +- nvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data +- arm64: dts: ls1046a: fix eeprom entries +- arm64: tegra: Fix compatible string for Tegra132 CPUs +- ARM: tegra: tamonten: Fix UART pad setting +- ARM: tegra: acer-a500: Remove bogus USB VBUS regulators +- mac80211: Fix monitor MTU limit so that A-MSDUs get through +- drm/display: fix possible null-pointer dereference in dcn10_set_clock() +- gpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port() +- net/mlx5: Fix variable type to match 64bit +- drm/msm/dp: return correct edid checksum after corrupted edid checksum read +- Bluetooth: avoid circular locks in sco_sock_connect +- Bluetooth: schedule SCO timeouts with delayed_work +- drm/vmwgfx: fix potential UAF in vmwgfx_surface.c +- selftests/bpf: Fix xdp_tx.c prog section name +- drm/amd/display: fix incorrect CM/TF programming sequence in dwb +- drm/amd/display: fix missing writeback disablement if plane is removed +- thunderbolt: Fix port linking by checking all adapters +- drm: xlnx: zynqmp: release reset to DP controller before accessing DP registers +- drm: xlnx: zynqmp_dpsub: Call pm_runtime_get_sync before setting pixel clock +- drm/msm/dsi: Fix DSI and DSI PHY regulator config from SDM660 +- drm/msm: mdp4: drop vblank get/put from prepare/complete_commit +- net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe() +- nvmem: qfprom: Fix up qfprom_disable_fuse_blowing() ordering +- arm64: dts: qcom: sm8250: Fix epss_l3 unit address +- arm64: dts: qcom: msm8996: don't use underscore in node name +- arm64: dts: qcom: msm8994: don't use underscore in node name +- arm64: dts: qcom: sdm630: don't use underscore in node name +- arm64: dts: qcom: ipq6018: drop '0x' from unit address +- arm64: dts: qcom: sdm660: use reg value for memory node +- arm64: dts: qcom: ipq8074: fix pci node reg property +- ARM: dts: imx53-ppd: Fix ACHC entry +- serial: 8250_omap: Handle optional overrun-throttle-ms property +- arm64: dts: qcom: sdm630: Fix TLMM node and pinctrl configuration +- arm64: dts: qcom: sdm630: Rewrite memory map +- gfs2: Fix glock recursion in freeze_go_xmote_bh +- media: tegra-cec: Handle errors of clk_prepare_enable() +- media: TDA1997x: fix tda1997x_query_dv_timings() return value +- media: v4l2-dv-timings.c: fix wrong condition in two for-loops +- media: imx258: Limit the max analogue gain to 480 +- media: imx258: Rectify mismatch of VTS value +- ASoC: Intel: update sof_pcm512x quirks +- ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output +- arm64: tegra: Fix Tegra194 PCIe EP compatible string +- ARM: dts: at91: use the right property for shutdown controller +- bonding: 3ad: fix the concurrency between __bond_release_one() and bond_3ad_state_machine_handler() +- ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check +- ARM: dts: stm32: Set {bitclock,frame}-master phandles on ST DKx +- ARM: dts: stm32: Set {bitclock,frame}-master phandles on DHCOM SoM +- workqueue: Fix possible memory leaks in wq_numa_init() +- Bluetooth: skip invalid hci_sync_conn_complete_evt +- ata: sata_dwc_460ex: No need to call phy_exit() befre phy_init() +- libbpf: Fix race when pinning maps in parallel +- samples: bpf: Fix tracex7 error raised on the missing argument +- staging: ks7010: Fix the initialization of the 'sleep_status' structure +- serial: 8250_pci: make setup_port() parameters explicitly unsigned +- hvsi: don't panic on tty_register_driver failure +- xtensa: ISS: don't panic in rs_init +- serial: 8250: Define RX trigger levels for OxSemi 950 devices +- s390: make PCI mio support a machine flag +- s390/jump_label: print real address in a case of a jump label bug +- flow_dissector: Fix out-of-bounds warnings +- ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs() +- video: fbdev: riva: Error out if 'pixclock' equals zero +- video: fbdev: kyro: Error out if 'pixclock' equals zero +- video: fbdev: asiliantfb: Error out if 'pixclock' equals zero +- arm64: dts: allwinner: h6: tanix-tx6: Fix regulator node names +- drm/bridge: nwl-dsi: Avoid potential multiplication overflow on 32-bit +- bpf/tests: Do not PASS tests without actually testing the result +- bpf/tests: Fix copy-and-paste error in double word test +- drm/amd/amdgpu: Update debugfs link_settings output link_rate field in hex +- drm/amdgpu: Fix a printing message +- ethtool: improve compat ioctl handling +- nfp: fix return statement in nfp_net_parse_meta() +- media: atomisp: pci: fix error return code in atomisp_pci_probe() +- media: atomisp: Fix runtime PM imbalance in atomisp_pci_probe +- media: platform: stm32: unprepare clocks at handling errors in probe +- media: hantro: vp8: Move noisy WARN_ON to vpu_debug +- drm/amd/display: Fix timer_per_pixel unit error +- selftests: firmware: Fix ignored return val of asprintf() warn +- bus: fsl-mc: fix mmio base address for child DPRCs +- tty: serial: jsm: hold port lock when reporting modem line changes +- staging: board: Fix uninitialized spinlock when attaching genpd +- usb: gadget: composite: Allow bMaxPower=0 if self-powered +- USB: EHCI: ehci-mv: improve error handling in mv_ehci_enable() +- usb: gadget: u_ether: fix a potential null pointer dereference +- usb: host: fotg210: fix the actual_length of an iso packet +- usb: host: fotg210: fix the endpoint's transactional opportunities calculation +- igc: Check if num of q_vectors is smaller than max before array access +- rcu: Fix macro name CONFIG_TASKS_RCU_TRACE +- drm: protect drm_master pointers in drm_lease.c +- drm: serialize drm_file.master with a new spinlock +- drm: avoid blocking in drm_clients_info's rcu section +- Smack: Fix wrong semantics in smk_access_entry() +- netlink: Deal with ESRCH error in nlmsg_notify() +- video: fbdev: kyro: fix a DoS bug by restricting user input +- ARM: dts: qcom: apq8064: correct clock names +- iavf: fix locking of critical sections +- iavf: do not override the adapter state in the watchdog task +- iio: dac: ad5624r: Fix incorrect handling of an optional regulator. +- net: phy: Fix data type in DP83822 dp8382x_disable_wol() +- tipc: keep the skb in rcv queue until the whole data is read +- PCI: Use pci_update_current_state() in pci_enable_device_flags() +- crypto: mxs-dcp - Use sg_mapping_iter to copy data +- x86/hyperv: fix for unwanted manipulation of sched_clock when TSC marked unstable +- libbpf: Fix reuse of pinned map on older kernel +- media: dib8000: rewrite the init prbs logic +- ASoC: atmel: ATMEL drivers don't need HAS_DMA +- drm/amdgpu: Fix amdgpu_ras_eeprom_init() +- drm/vc4: hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET +- userfaultfd: prevent concurrent API initialization +- kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y +- MIPS: Malta: fix alignment of the devicetree buffer +- f2fs: should put a page beyond EOF when preparing a write +- f2fs: deallocate compressed pages when error happens +- f2fs: fix to unmap pages from userspace process in punch_hole() +- f2fs: fix unexpected ENOENT comes from f2fs_map_blocks() +- f2fs: fix to account missing .skipped_gc_rwsem +- soc: mediatek: cmdq: add address shift in jump +- KVM: PPC: Fix clearing never mapped TCEs in realmode +- clk: at91: clk-generated: Limit the requested rate to our range +- fscache: Fix cookie key hashing +- RDMA/hns: Fix QP's resp incomplete assignment +- powerpc/smp: Update cpu_core_map on all PowerPc systems +- platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call +- KVM: PPC: Book3S HV Nested: Reflect guest PMU in-use to L0 when guest SPRs are live +- scsi: ufs: ufs-exynos: Fix static checker warning +- KVM: PPC: Book3S HV: Fix copy_tofrom_guest routines +- clk: imx8m: fix clock tree update of TF-A managed clocks +- HID: i2c-hid: Fix Elan touchpad regression +- iommu/vt-d: Update the virtual command related registers +- powerpc/config: Renable MTD_PHYSMAP_OF +- scsi: qedf: Fix error codes in qedf_alloc_global_queues() +- scsi: qedi: Fix error codes in qedi_alloc_global_queues() +- scsi: smartpqi: Fix an error code in pqi_get_raid_map() +- powerpc/numa: Consider the max NUMA node for migratable LPAR +- pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry() +- scsi: fdomain: Fix error return code in fdomain_probe() +- sunrpc: Fix return value of get_srcport() +- SUNRPC query transport's source port +- SUNRPC/xprtrdma: Fix reconnection locking +- SUNRPC: Fix potential memory corruption +- NFSv4/pnfs: The layout barrier indicate a minimal value for the seqid +- NFSv4/pNFS: Always allow update of a zero valued layout barrier +- NFSv4/pNFS: Fix a layoutget livelock loop +- dma-debug: fix debugfs initialization order +- openrisc: don't printk() unconditionally +- f2fs: reduce the scope of setting fsck tag when de->name_len is zero +- cpuidle: pseries: Mark pseries_idle_proble() as __init +- RDMA/mlx5: Delete not-available udata check +- RDMA/efa: Remove double QP type assignment +- powerpc/stacktrace: Include linux/delay.h +- cpuidle: pseries: Fixup CEDE0 latency only for POWER10 onwards +- scsi: ufs: Fix memory corruption by ufshcd_read_desc_param() +- vfio: Use config not menuconfig for VFIO_NOIOMMU +- pinctrl: samsung: Fix pinctrl bank pin count +- scsi: BusLogic: Use %X for u32 sized integer rather than %lX +- docs: Fix infiniband uverbs minor number +- RDMA/iwcm: Release resources if iw_cm module initialization fails +- IB/hfi1: Adjust pkey entry in index 0 +- clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types +- scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMAND +- pinctrl: armada-37xx: Correct PWM pins definitions +- pinctrl: remove empty lines in pinctrl subsystem +- f2fs: quota: fix potential deadlock +- HID: input: do not report stylus battery state as "full" +- PCI: aardvark: Fix masking and unmasking legacy INTx interrupts +- PCI: aardvark: Fix checking for PIO status +- PCI: Export pci_pio_to_address() for module use +- PCI: aardvark: Configure PCIe resources from 'ranges' DT property +- PCI: xilinx-nwl: Enable the clock through CCF +- PCI: Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure +- PCI: Restrict ASMedia ASM1062 SATA Max Payload Size Supported +- PCI/portdrv: Enable Bandwidth Notification only if port supports it +- f2fs: fix to do sanity check for sb/cp fields correctly +- ARM: 9105/1: atags_to_fdt: don't warn about stack size +- libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs +- dmaengine: imx-sdma: remove duplicated sdma_load_context +- Revert "dmaengine: imx-sdma: refine to load context only once" +- s390/qdio: cancel the ESTABLISH ccw after timeout +- s390/qdio: fix roll-back after timeout on ESTABLISH ccw +- media: rc-loopback: return number of emitters rather than error +- media: uvc: don't do DMA on stack +- VMCI: fix NULL pointer dereference when unmapping queue pair +- crypto: ccp - shutdown SEV firmware on kexec +- dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc() +- power: supply: max17042: handle fails of reading status register +- block: bfq: fix bfq_set_next_ioprio_data() +- crypto: public_key: fix overflow during implicit conversion +- wcn36xx: Ensure finish scan is not requested before start scan +- iio: ltc2983: fix device probe +- arm64: head: avoid over-mapping in map_memory +- arm64: mm: Fix TLBI vs ASID rollover +- soc: aspeed: p2a-ctrl: Fix boundary check for mmap +- soc: aspeed: lpc-ctrl: Fix boundary check for mmap +- soc: qcom: aoss: Fix the out of bound usage of cooling_devs +- pinctrl: ingenic: Fix incorrect pull up/down info +- pinctrl: stmfx: Fix hazardous u8[] to unsigned long cast +- clk: socfpga: agilex: add the bypass register for s2f_usr0 clock +- clk: socfpga: agilex: fix up s2f_user0_clk representation +- clk: socfpga: agilex: fix the parents of the psi_ref_clk +- tools/thermal/tmon: Add cross compiling support +- selftests/ftrace: Fix requirement check of README file +- ceph: fix dereference of null pointer cf +- 9p/xen: Fix end of loop tests for list_for_each_entry +- xen: fix setting of max_pfn in shared_info +- powerpc/perf/hv-gpci: Fix counter value parsing +- PCI/MSI: Skip masking MSI-X on Xen PV +- blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN +- blk-zoned: allow zone management send operations without CAP_SYS_ADMIN +- btrfs: reset replace target device to allocation state on close +- btrfs: wake up async_delalloc_pages waiters after submit +- io-wq: fix wakeup race when adding new work +- io_uring: fail links of cancelled timeouts +- io_uring: add ->splice_fd_in checks +- io_uring: place fixed tables under memcg limits +- io_uring: limit fixed table size by RLIMIT_NOFILE +- rtc: tps65910: Correct driver module alias +- ext4: flush s_error_work before journal destroy in ext4_fill_super +- crypto: ccp - fix resource leaks in ccp_run_aes_gcm_cmd() +- make OPTIMIZE_INLINING config editable +- bpf: Fix integer overflow in prealloc_elems_and_freelist() +- iommu/vt-d: Fix clearing real DMA device's scalable-mode context entries +- iommu/vt-d: Global devTLB flush when present context entry changed +- mm: slub: fix slub_debug disabling for list of slabs +- mm: vmscan: fix missing psi annotation for node_reclaim() +- ipc: replace costly bailout check in sysvipc_find_ipc() +- bpf, mips: Validate conditional branch offsets +- ARM: Qualify enabling of swiotlb_init() +- arm64: mm: account for hotplug memory when randomizing the linear region +- blk-mq-sched: Fix blk_mq_sched_alloc_tags() error handling +- disable OPTIMIZE_INLINING by default +- Revert "compiler: remove CONFIG_OPTIMIZE_INLINING entirely" +- ARM: Support KFENCE for ARM +- ARM: mm: Provide is_write_fault() +- ARM: mm: Provide set_memory_valid() +- kfence: show cpu and timestamp in alloc/free info +- kfence: test: fail fast if disabled at boot +- slub: force on no_hash_pointers when slub_debug is enabled +- printk: clarify the documentation for plain pointer printing +- lib/vsprintf: do not show no_hash_pointers message multiple times +- kfence: add function to mask address bits +- kfence, x86: only define helpers if !MODULE +- kfence: fix is_kfence_address() for addresses below KFENCE_POOL_SIZE +- kfence: skip all GFP_ZONEMASK allocations +- kfence: move the size check to the beginning of __kfence_alloc() +- kfence: defer kfence_test_init to ensure that kunit debugfs is created +- kfence: unconditionally use unbound work queue +- mm, slub: change run-time assertion in kmalloc_index() to compile-time +- kfence: use TASK_IDLE when awaiting allocation +- arm64: mm: don't use CON and BLK mapping if KFENCE is enabled +- kfence: use power-efficient work queue to run delayed work +- kfence: maximize allocation wait timeout duration +- kfence: await for allocation using wait_event +- kfence: zero guard page after out-of-bounds access +- powerpc: Enable KFENCE for PPC32 +- powerpc/32s: Always map kernel text and rodata with BATs +- kfence, x86: fix preemptible warning on KPTI-enabled systems +- kfence: make compatible with kmemleak +- kfence: fix reports if constant function prefixes exist +- kfence, slab: fix cache_alloc_debugcheck_after() for bulk allocations +- kfence: fix printk format for ptrdiff_t +- kasan: use error_report_end tracepoint +- kfence: use error_report_end tracepoint +- tracing: add error_report_end trace point +- kfence: report sensitive information based on no_hash_pointers +- lib/vsprintf: no_hash_pointers prints all addresses as unhashed +- kselftest: add support for skipped tests +- lib: use KSTM_MODULE_GLOBALS macro in kselftest drivers +- MAINTAINERS: add entry for KFENCE +- kfence: add test suite +- kfence, Documentation: add KFENCE documentation +- kfence, kasan: make KFENCE compatible with KASAN +- mm, kfence: insert KFENCE hooks for SLUB +- mm, kfence: insert KFENCE hooks for SLAB +- kfence: use pt_regs to generate stack trace on faults +- arm64, kfence: enable KFENCE for ARM64 +- x86, kfence: enable KFENCE for x86 +- mm: add Kernel Electric-Fence infrastructure + * Tue Oct 19 2021 Zheng Zengkai - 5.10.0-14.0.0.4 - Revert "time: Handle negative seconds correctly in timespec64_to_ns()" - Revert "posix-cpu-timers: Force next expiration recalc after itimer reset" diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index d090e87..a884e7c 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -2,13 +2,13 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 14.0.0 +%global hulkrelease 15.0.0 %global debug_package %{nil} Name: raspberrypi-kernel Version: 5.10.0 -Release: %{hulkrelease}.2 +Release: %{hulkrelease}.3 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -174,6 +174,9 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/ /lib/modules/%{KernelVer} %changelog +* Mon Oct 25 2021 Yafen Fang - 5.10.0-15.0.0.3 +- update kernel version to openEuler 5.10.0-15.0.0 + * Wed Oct 20 2021 Yafen Fang - 5.10.0-14.0.0.2 - update Raspberry Pi patch, last commit (03ab8875d1fc756bd6d2fd8fdb211532eff33062): gpio: bcm-virt: Fix the get() method