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

Commit 77079b13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "Again a set of smaller fixes across several platforms (OMAP, Marvell,
  Allwinner, i.MX, etc).

  A handful of typo fixes and smaller missing contents from device
  trees, with some tweaks to OMAP mach files to deal with CPU feature
  print misformatting, potential NULL ptr dereference and one setup
  issue with UARTs"

* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ipmi/bt-bmc: change compatible node to 'aspeed, ast2400-ibt-bmc'
  ARM: dts: STiH410-b2260: Fix typo in spi0 chipselect definition
  ARM: dts: omap5: board-common: fix wrong SMPS6 (VDD-DDR3) voltage
  ARM: omap3: Add missing memory node in SOM-LV
  arm64: dts: marvell: add unique identifiers for Armada A8k SPI controllers
  arm64: dts: marvell: fix clocksource for CP110 slave SPI0
  arm64: dts: marvell: Fix typo in label name on Armada 37xx
  ASoC: omap-abe-twl6040: fix typo in bindings documentation
  dts: omap5: board-common: enable twl6040 headset jack detection
  dts: omap5: board-common: add phandle to reference Palmas gpadc
  ARM: OMAP2+: avoid NULL pointer dereference
  ARM: OMAP2+: PRM: initialize en_uart4_mask and grpsel_uart4_mask
  ARM: dts: omap3: Fix memory node in Torpedo board
  ARM: AM43XX: Select OMAP_INTERCONNECT in Kconfig
  ARM: OMAP3: Fix formatting of features printed
  ARM: dts: imx53-qsb: Fix regulator constraints
  ARM: dts: sun8i: fix the pinmux for UART1
parents d117b9ac 9883ed44

Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt→Documentation/devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ perform in-band IPMI communication with their host. 


Required properties:



- compatible : should be "aspeed,ast2400-bt-bmc"

- compatible : should be "aspeed,ast2400-ibt-bmc"

- reg: physical address and size of the registers



Optional properties:
@@ -17,7 +17,7 @@ Optional properties: 
Example:



	ibt@1e789140 {

		compatible = "aspeed,ast2400-bt-bmc";

		compatible = "aspeed,ast2400-ibt-bmc";

		reg = <0x1e789140 0x18>;

		interrupts = <8>;

	};

Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Required properties: 


Optional properties:

- ti,dmic: phandle for the OMAP dmic node if the machine have it connected

- ti,jack_detection: Need to be present if the board capable to detect jack

- ti,jack-detection: Need to be present if the board capable to detect jack

  insertion, removal.



Available audio endpoints for the audio-routing table:

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

+7 −7
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 
			};



			ldo3_reg: ldo3 {

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1800000>;

				regulator-min-microvolt = <1725000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};
@@ -76,8 +76,8 @@ 
			};



			ldo5_reg: ldo5 {

				regulator-min-microvolt = <1725000>;

				regulator-max-microvolt = <3300000>;

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3600000>;

				regulator-always-on;

			};
@@ -100,14 +100,14 @@ 
			};



			ldo9_reg: ldo9 {

				regulator-min-microvolt = <1200000>;

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3600000>;

				regulator-always-on;

			};



			ldo10_reg: ldo10 {

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3650000>;

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3600000>;

				regulator-always-on;

			};

		};

arch/arm/boot/dts/logicpd-som-lv.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ 
		};

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0>;

	};



	wl12xx_vmmc: wl12xx_vmmc {

		compatible = "regulator-fixed";

		regulator-name = "vwl1271";

arch/arm/boot/dts/logicpd-torpedo-som.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ 
		};

	};



	memory@0 {

	memory@80000000 {

		device_type = "memory";

		reg = <0 0>;

		reg = <0x80000000 0>;

	};



	leds {