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

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

Revert "ANDROID: Revert: Merge 5.4.60 into android11-5.4" 



This reverts commit f553ed04 and really
does merge v5.4.60 into the tree.

Bug: 161946584
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I164a49d7930e441b52c8a80b2fa5aa2b7ec41ed9
parent 395ea775

Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ controller state. The mux controller state is described in 


Example:

	mux: mux-controller {

		compatible = "mux-gpio";

		compatible = "gpio-mux";

		#mux-control-cells = <0>;



		mux-gpios = <&pioA 0 GPIO_ACTIVE_HIGH>,

Makefile

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

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 59

SUBLEVEL = 60

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
	model = "Globalscale Marvell ESPRESSOBin Board";

	compatible = "globalscale,espressobin", "marvell,armada3720", "marvell,armada3710";



	aliases {

		ethernet0 = &eth0;

		serial0 = &uart0;

		serial1 = &uart1;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

arch/arm64/kernel/perf_event.c

+8 −5
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ armv8pmu_events_sysfs_show(struct device *dev, 


	pmu_attr = container_of(attr, struct perf_pmu_events_attr, attr);



	return sprintf(page, "event=0x%03llx\n", pmu_attr->id);

	return sprintf(page, "event=0x%04llx\n", pmu_attr->id);

}



#define ARMV8_EVENT_ATTR(name, config) \
@@ -303,10 +303,13 @@ armv8pmu_event_attr_is_visible(struct kobject *kobj, 
	    test_bit(pmu_attr->id, cpu_pmu->pmceid_bitmap))

		return attr->mode;



	pmu_attr->id -= ARMV8_PMUV3_EXT_COMMON_EVENT_BASE;

	if (pmu_attr->id < ARMV8_PMUV3_MAX_COMMON_EVENTS &&

	    test_bit(pmu_attr->id, cpu_pmu->pmceid_ext_bitmap))

	if (pmu_attr->id >= ARMV8_PMUV3_EXT_COMMON_EVENT_BASE) {

		u64 id = pmu_attr->id - ARMV8_PMUV3_EXT_COMMON_EVENT_BASE;



		if (id < ARMV8_PMUV3_MAX_COMMON_EVENTS &&

		    test_bit(id, cpu_pmu->pmceid_ext_bitmap))

			return attr->mode;

	}



	return 0;

}

arch/mips/boot/dts/ingenic/qi_lb60.dts

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
			"Speaker", "OUTL",

			"Speaker", "OUTR",

			"INL", "LOUT",

			"INL", "ROUT";

			"INR", "ROUT";



		simple-audio-card,aux-devs = <&amp>;