Commit 0869331f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To get the rest of 5.18.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents e0e14cdf 4b0986a3

Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Mediatek's Keypad Controller device tree bindings



maintainers:

  - Fengping Yu <fengping.yu@mediatek.com>

  - Mattijs Korpershoek <mkorpershoek@baylibre.com>



allOf:

  - $ref: "/schemas/input/matrix-keymap.yaml#"

Documentation/devicetree/bindings/pinctrl/aspeed,ast2600-pinctrl.yaml

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ patternProperties: 
          $ref: "/schemas/types.yaml#/definitions/string"

          enum: [ ADC0, ADC1, ADC10, ADC11, ADC12, ADC13, ADC14, ADC15, ADC2,

                  ADC3, ADC4, ADC5, ADC6, ADC7, ADC8, ADC9, BMCINT, EMMC, ESPI, ESPIALT,

                  FSI1, FSI2, FWSPIABR, FWSPID, FWSPIWP, GPIT0, GPIT1, GPIT2, GPIT3,

                  FSI1, FSI2, FWQSPI, FWSPIABR, FWSPID, FWSPIWP, GPIT0, GPIT1, GPIT2, GPIT3,

                  GPIT4, GPIT5, GPIT6, GPIT7, GPIU0, GPIU1, GPIU2, GPIU3, GPIU4, GPIU5,

                  GPIU6, GPIU7, I2C1, I2C10, I2C11, I2C12, I2C13, I2C14, I2C15, I2C16,

                  I2C2, I2C3, I2C4, I2C5, I2C6, I2C7, I2C8, I2C9, I3C3, I3C4, I3C5,
@@ -58,7 +58,7 @@ patternProperties: 
          $ref: "/schemas/types.yaml#/definitions/string"

          enum: [ ADC0, ADC1, ADC10, ADC11, ADC12, ADC13, ADC14, ADC15, ADC2,

                  ADC3, ADC4, ADC5, ADC6, ADC7, ADC8, ADC9, BMCINT, EMMCG1, EMMCG4,

                  EMMCG8, ESPI, ESPIALT, FSI1, FSI2, FWSPIABR, FWSPID, FWQSPID, FWSPIWP,

                  EMMCG8, ESPI, ESPIALT, FSI1, FSI2, FWQSPI, FWSPIABR, FWSPID, FWSPIWP,

                  GPIT0, GPIT1, GPIT2, GPIT3, GPIT4, GPIT5, GPIT6, GPIT7, GPIU0, GPIU1,

                  GPIU2, GPIU3, GPIU4, GPIU5, GPIU6, GPIU7, HVI3C3, HVI3C4, I2C1, I2C10,

                  I2C11, I2C12, I2C13, I2C14, I2C15, I2C16, I2C2, I2C3, I2C4, I2C5,

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -14374,7 +14374,6 @@ F: arch/arm/*omap*/*pm* 
F:	drivers/cpufreq/omap-cpufreq.c









OMAP POWERDOMAIN SOC ADAPTATION LAYER SUPPORT









M:	Rajendra Nayak <rnayak@codeaurora.org>









M:	Paul Walmsley <paul@pwsan.com>









L:	linux-omap@vger.kernel.org









S:	Maintained
































Makefile



+1
−1






























Original line number
Diff line number
Diff line







@@ -2,7 +2,7 @@







VERSION = 5









PATCHLEVEL = 18









SUBLEVEL = 0









EXTRAVERSION = -rc7









EXTRAVERSION =









NAME = Superb Owl



















# *DOCUMENTATION*
































arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts



+3
−1






























Original line number
Diff line number
Diff line







@@ -100,12 +100,14 @@







	lm25066@40 {









		compatible = "lm25066";









		reg = <0x40>;









		shunt-resistor-micro-ohms = <1000>;









	};



















	/* 12VSB PMIC */









	lm25066@41 {









		compatible = "lm25066";









		reg = <0x41>;









		shunt-resistor-micro-ohms = <10000>;









	};









};


















@@ -196,7 +198,7 @@







	gpio-line-names =









		/*  A */ "LOCATORLED_STATUS_N", "BMC_MAC2_INTB", "NMI_BTN_N", "BMC_NMI",









			"", "", "", "",









		/*  B */ "DDR_MEM_TEMP", "", "", "", "", "", "", "",









		/*  B */ "POST_COMPLETE_N", "", "", "", "", "", "", "",









		/*  C */ "", "", "", "", "PCIE_HP_SEL_N", "PCIE_SATA_SEL_N", "LOCATORBTN", "",









		/*  D */ "BMC_PSIN", "BMC_PSOUT", "BMC_RESETCON", "RESETCON",









			"", "", "", "PSU_FAN_FAIL_N",