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

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

Merge 5.4.30 into android-5.4 



Changes in 5.4.30
	mac80211: Check port authorization in the ieee80211_tx_dequeue() case
	mac80211: fix authentication with iwlwifi/mvm
	serial: sprd: Fix a dereference warning
	vt: selection, introduce vc_is_sel
	vt: ioctl, switch VT_IS_IN_USE and VT_BUSY to inlines
	vt: switch vt_dont_switch to bool
	vt: vt_ioctl: remove unnecessary console allocation checks
	vt: vt_ioctl: fix VT_DISALLOCATE freeing in-use virtual console
	vt: vt_ioctl: fix use-after-free in vt_in_use()
	platform/x86: pmc_atom: Add Lex 2I385SW to critclk_systems DMI table
	bpf: Explicitly memset the bpf_attr structure
	bpf: Explicitly memset some bpf info structures declared on the stack
	gpiolib: acpi: Add quirk to ignore EC wakeups on HP x2 10 CHT + AXP288 model
	net: ks8851-ml: Fix IO operations, again
	clk: imx: Align imx sc clock msg structs to 4
	clk: imx: Align imx sc clock parent msg structs to 4
	clk: ti: am43xx: Fix clock parent for RTC clock
	libceph: fix alloc_msg_with_page_vector() memory leaks
	arm64: alternative: fix build with clang integrated assembler
	perf map: Fix off by one in strncpy() size argument
	ARM: dts: oxnas: Fix clear-mask property
	ARM: bcm2835-rpi-zero-w: Add missing pinctrl name
	ARM: dts: imx6: phycore-som: fix arm and soc minimum voltage
	ARM: dts: N900: fix onenand timings
	ARM: dts: sun8i: r40: Move AHCI device node based on address order
	arm64: dts: ls1043a-rdb: correct RGMII delay mode to rgmii-id
	arm64: dts: ls1046ardb: set RGMII interfaces to RGMII_ID mode
	Linux 5.4.30

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Iccbb5cb60b867ab3339dad8de0d73559c8e27526
parents 10dd55a5 ad13e142

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 29

SUBLEVEL = 30

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm/boot/dts/bcm2835-rpi-zero-w.dts

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ 
&sdhci {

	#address-cells = <1>;

	#size-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&emmc_gpio34 &gpclk2_gpio43>;

	bus-width = <4>;

	mmc-pwrseq = <&wifi_pwrseq>;

arch/arm/boot/dts/imx6qdl-phytec-phycore-som.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -107,14 +107,14 @@ 
		regulators {

			vdd_arm: buck1 {

				regulator-name = "vdd_arm";

				regulator-min-microvolt = <730000>;

				regulator-min-microvolt = <925000>;

				regulator-max-microvolt = <1380000>;

				regulator-always-on;

			};



			vdd_soc: buck2 {

				regulator-name = "vdd_soc";

				regulator-min-microvolt = <730000>;

				regulator-min-microvolt = <1150000>;

				regulator-max-microvolt = <1380000>;

				regulator-always-on;

			};

arch/arm/boot/dts/omap3-n900.dts

+28 −16
Original line number Diff line number Diff line
@@ -849,34 +849,46 @@ 
		compatible = "ti,omap2-onenand";

		reg = <0 0 0x20000>;	/* CS0, offset 0, IO size 128K */



		/*

		 * These timings are based on CONFIG_OMAP_GPMC_DEBUG=y reported

		 * bootloader set values when booted with v5.1

		 * (OneNAND Manufacturer: Samsung):

		 *

		 *   cs0 GPMC_CS_CONFIG1: 0xfb001202

		 *   cs0 GPMC_CS_CONFIG2: 0x00111100

		 *   cs0 GPMC_CS_CONFIG3: 0x00020200

		 *   cs0 GPMC_CS_CONFIG4: 0x11001102

		 *   cs0 GPMC_CS_CONFIG5: 0x03101616

		 *   cs0 GPMC_CS_CONFIG6: 0x90060000

		 */

		gpmc,sync-read;

		gpmc,sync-write;

		gpmc,burst-length = <16>;

		gpmc,burst-read;

		gpmc,burst-wrap;

		gpmc,burst-write;

		gpmc,device-width = <2>; /* GPMC_DEVWIDTH_16BIT */

		gpmc,mux-add-data = <2>; /* GPMC_MUX_AD */

		gpmc,device-width = <2>;

		gpmc,mux-add-data = <2>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <87>;

		gpmc,cs-wr-off-ns = <87>;

		gpmc,cs-rd-off-ns = <102>;

		gpmc,cs-wr-off-ns = <102>;

		gpmc,adv-on-ns = <0>;

		gpmc,adv-rd-off-ns = <10>;

		gpmc,adv-wr-off-ns = <10>;

		gpmc,oe-on-ns = <15>;

		gpmc,oe-off-ns = <87>;

		gpmc,adv-rd-off-ns = <12>;

		gpmc,adv-wr-off-ns = <12>;

		gpmc,oe-on-ns = <12>;

		gpmc,oe-off-ns = <102>;

		gpmc,we-on-ns = <0>;

		gpmc,we-off-ns = <87>;

		gpmc,rd-cycle-ns = <112>;

		gpmc,wr-cycle-ns = <112>;

		gpmc,access-ns = <81>;

		gpmc,page-burst-access-ns = <15>;

		gpmc,we-off-ns = <102>;

		gpmc,rd-cycle-ns = <132>;

		gpmc,wr-cycle-ns = <132>;

		gpmc,access-ns = <96>;

		gpmc,page-burst-access-ns = <18>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,wait-monitoring-ns = <0>;

		gpmc,clk-activation-ns = <5>;

		gpmc,wr-data-mux-bus-ns = <30>;

		gpmc,wr-access-ns = <81>;

		gpmc,clk-activation-ns = <6>;

		gpmc,wr-data-mux-bus-ns = <36>;

		gpmc,wr-access-ns = <96>;

		gpmc,sync-clk-ps = <15000>;



		/*

arch/arm/boot/dts/ox810se.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -323,8 +323,8 @@ 
					interrupt-controller;

					reg = <0 0x200>;

					#interrupt-cells = <1>;

					valid-mask = <0xFFFFFFFF>;

					clear-mask = <0>;

					valid-mask = <0xffffffff>;

					clear-mask = <0xffffffff>;

				};



				timer0: timer@200 {