Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffab1c7d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.153 into android11-5.4-lts 



Changes in 5.4.153
	Partially revert "usb: Kconfig: using select for USB_COMMON dependency"
	USB: cdc-acm: fix racy tty buffer accesses
	USB: cdc-acm: fix break reporting
	usb: typec: tcpm: handle SRC_STARTUP state if cc changes
	xen/privcmd: fix error handling in mmap-resource processing
	mmc: meson-gx: do not use memcpy_to/fromio for dram-access-quirk
	ovl: fix missing negative dentry check in ovl_rename()
	nfsd: fix error handling of register_pernet_subsys() in init_nfsd()
	nfsd4: Handle the NFSv4 READDIR 'dircount' hint being zero
	xen/balloon: fix cancelled balloon action
	ARM: dts: omap3430-sdp: Fix NAND device node
	ARM: dts: qcom: apq8064: use compatible which contains chipid
	MIPS: BPF: Restore MIPS32 cBPF JIT
	bpf, mips: Validate conditional branch offsets
	soc: qcom: socinfo: Fixed argument passed to platform_set_data()
	ARM: dts: qcom: apq8064: Use 27MHz PXO clock as DSI PLL reference
	soc: qcom: mdt_loader: Drop PT_LOAD check on hash segment
	ARM: dts: imx: Add missing pinctrl-names for panel on M53Menlo
	ARM: dts: imx: Fix USB host power regulator polarity on M53Menlo
	arm64: dts: qcom: pm8150: use qcom,pm8998-pon binding
	xtensa: move XCHAL_KIO_* definitions to kmem_layout.h
	xtensa: use CONFIG_USE_OF instead of CONFIG_OF
	xtensa: call irqchip_init only when CONFIG_USE_OF is selected
	bpf, arm: Fix register clobbering in div/mod implementation
	bpf: Fix integer overflow in prealloc_elems_and_freelist()
	phy: mdio: fix memory leak
	net_sched: fix NULL deref in fifo_set_limit()
	powerpc/fsl/dts: Fix phy-connection-type for fm1mac3
	ptp_pch: Load module automatically if ID matches
	arm64: dts: freescale: Fix SP805 clock-names
	arm64: dts: ls1028a: add missing CAN nodes
	ARM: imx6: disable the GIC CPU interface before calling stby-poweroff sequence
	net: bridge: use nla_total_size_64bit() in br_get_linkxstats_size()
	net/sched: sch_taprio: properly cancel timer from taprio_destroy()
	net: sfp: Fix typo in state machine debug string
	netlink: annotate data races around nlk->bound
	bus: ti-sysc: Use CLKDM_NOAUTO for dra7 dcan1 for errata i893
	video: fbdev: gbefb: Only instantiate device when built for IP32
	drm/nouveau/debugfs: fix file release memory leak
	gve: Correct available tx qpl check
	rtnetlink: fix if_nlmsg_stats_size() under estimation
	gve: fix gve_get_stats()
	i40e: fix endless loop under rtnl
	i40e: Fix freeing of uninitialized misc IRQ vector
	net: prefer socket bound to interface when not in VRF
	i2c: acpi: fix resource leak in reconfiguration device addition
	bpf, s390: Fix potential memory leak about jit_data
	RISC-V: Include clone3() on rv32
	x86/platform/olpc: Correct ifdef symbol to intended CONFIG_OLPC_XO15_SCI
	x86/hpet: Use another crystalball to evaluate HPET usability
	x86/Kconfig: Correct reference to MWINCHIP3D
	Linux 5.4.153

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I9c69f5eb4cd896e6f3f585e983956b5711ea09b6
parents cc109ff1 940a14a7

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 152

SUBLEVEL = 153

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/imx53-m53menlo.dts

+2 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
	panel {

		compatible = "edt,etm0700g0dh6";

		pinctrl-0 = <&pinctrl_display_gpio>;

		pinctrl-names = "default";

		enable-gpios = <&gpio6 0 GPIO_ACTIVE_HIGH>;



		port {
@@ -76,8 +77,7 @@ 
		regulator-name = "vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		gpio = <&gpio1 2 0>;

	};

};

arch/arm/boot/dts/omap3430-sdp.dts

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ 


	nand@1,0 {

		compatible = "ti,omap2-nand";

		reg = <0 0 4>; /* CS0, offset 0, IO size 4 */

		reg = <1 0 4>; /* CS1, offset 0, IO size 4 */

		interrupt-parent = <&gpmc>;

		interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */

			     <1 IRQ_TYPE_NONE>;	/* termcount */

arch/arm/boot/dts/qcom-apq8064.dtsi

+3 −4
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ 
			clock-frequency = <19200000>;

		};



		pxo_board {

		pxo_board: pxo_board {

			compatible = "fixed-clock";

			#clock-cells = <0>;

			clock-frequency = <27000000>;
@@ -1147,7 +1147,7 @@ 
		};



		gpu: adreno-3xx@4300000 {

			compatible = "qcom,adreno-3xx";

			compatible = "qcom,adreno-320.2", "qcom,adreno";

			reg = <0x04300000 0x20000>;

			reg-names = "kgsl_3d0_reg_memory";

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
@@ -1162,7 +1162,6 @@ 
			    <&mmcc GFX3D_AHB_CLK>,

			    <&mmcc GFX3D_AXI_CLK>,

			    <&mmcc MMSS_IMEM_AHB_CLK>;

			qcom,chipid = <0x03020002>;



			iommus = <&gfx3d 0

				  &gfx3d 1
@@ -1305,7 +1304,7 @@ 
			reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";

			clock-names = "iface_clk", "ref";

			clocks = <&mmcc DSI_M_AHB_CLK>,

				 <&cxo_board>;

				 <&pxo_board>;

		};

arch/arm/mach-imx/pm-imx6.c

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/io.h>

#include <linux/irq.h>

#include <linux/genalloc.h>

#include <linux/irqchip/arm-gic.h>

#include <linux/mfd/syscon.h>

#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>

#include <linux/of.h>
@@ -618,6 +619,7 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata 


static void imx6_pm_stby_poweroff(void)

{

	gic_cpu_if_down(0);

	imx6_set_lpm(STOP_POWER_OFF);

	imx6q_suspend_finish(0);