Commit 5494d0eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "The SoC bug fixes have calmed down sufficiently, there is one minor
  update for the MAINTAINERS file, and few bug fixes for dts
  descriptions:

   - Updates to the BananaPi R2-Pro (rk3568) dts to match production
     hardware rather than the prototype version.

   - Qualcomm sm8250 soundwire gets disabled on some machines to avoid
     crashes

   - A number of aspeed SoC specific fixes, addressing incorrect pin
     cotrol settings, some values in the romed8hm board, and a revert
     for an accidental removal of a DT node"

* 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  MAINTAINERS: omap: remove me as a maintainer
  ARM: dts: aspeed: Add video engine to g6
  ARM: dts: aspeed: romed8hm3: Fix GPIOB0 name
  ARM: dts: aspeed: romed8hm3: Add lm25066 sense resistor values
  ARM: dts: aspeed-g6: fix SPI1/SPI2 quad pin group
  ARM: dts: aspeed-g6: add FWQSPI group in pinctrl dtsi
  dt-bindings: pinctrl: aspeed-g6: add FWQSPI function/group
  pinctrl: pinctrl-aspeed-g6: add FWQSPI function-group
  dt-bindings: pinctrl: aspeed-g6: remove FWQSPID group
  pinctrl: pinctrl-aspeed-g6: remove FWQSPID group in pinctrl
  ARM: dts: aspeed-g6: remove FWQSPID group in pinctrl dtsi
  arm64: dts: qcom: sm8250: don't enable rx/tx macro by default
  arm64: dts: rockchip: Add gmac1 and change network settings of bpi-r2-pro
  arm64: dts: rockchip: Change io-domains of bpi-r2-pro
parents dbd380bb 609a097f

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
































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",
































arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi



+5
−5






























Original line number
Diff line number
Diff line







@@ -117,9 +117,9 @@







		groups = "FWSPID";









	};



















	pinctrl_fwqspid_default: fwqspid_default {









		function = "FWSPID";









		groups = "FWQSPID";









	pinctrl_fwqspi_default: fwqspi_default {









		function = "FWQSPI";









		groups = "FWQSPI";









	};



















	pinctrl_fwspiwp_default: fwspiwp_default {








@@ -653,12 +653,12 @@







	};



















	pinctrl_qspi1_default: qspi1_default {









		function = "QSPI1";









		function = "SPI1";









		groups = "QSPI1";









	};



















	pinctrl_qspi2_default: qspi2_default {









		function = "QSPI2";









		function = "SPI2";









		groups = "QSPI2";









	};










































arch/arm/boot/dts/aspeed-g6.dtsi



+10
−0






























Original line number
Diff line number
Diff line







@@ -389,6 +389,16 @@







				reg = <0x1e6f2000 0x1000>;









			};



















			video: video@1e700000 {









				compatible = "aspeed,ast2600-video-engine";









				reg = <0x1e700000 0x1000>;









				clocks = <&syscon ASPEED_CLK_GATE_VCLK>,









					 <&syscon ASPEED_CLK_GATE_ECLK>;









				clock-names = "vclk", "eclk";









				interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;









				status = "disabled";









			};



















			gpio0: gpio@1e780000 {









				#gpio-cells = <2>;









				gpio-controller;