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

Commit 52cad4b5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.9/fixes-for-rc-cycle' of... 

Merge tag 'omap-for-v4.9/fixes-for-rc-cycle' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Fixes for omaps for v4.9-rc cycle. Except for the omap3 fix for the SoC
features printed, all these are quite trivial and tiny. The omap5 jack
detection and gpadc patches are not strictly fixes, but I wanted to get
binding document typo fixed before it pops up on other boards. The
gpadc one liner was in the same series and I applied and pushed it out
already before noticing it could have waited. The list of changes is:

- Fix omap3 SoC features printed
- Make sure OMAP_INTERCONNECT is selected for am43xx only configurations
- Add missing memory node for torpedo
- Initialize uart4_mask properly to avoid writing garbage to PRM registers
- Fix NULL pointer dereference for omap4 volt_data
- Add alias for omap5 gpadc needed by iio drivers
- Enable omap5 jack headset jack detection and fix it's binding typo
- Add missing memory node for logicpd-som-lv
- Fix wrong SMPS6 voltage for VDD-DDR3 for omap5

* tag 'omap-for-v4.9/fixes-for-rc-cycle' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: dts: omap5: board-common: fix wrong SMPS6 (VDD-DDR3) voltage
  ARM: omap3: Add missing memory node in SOM-LV
  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

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fbcdf687 1bc2f5fa

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/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 {

arch/arm/boot/dts/omap5-board-common.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ 
		compatible = "ti,abe-twl6040";

		ti,model = "omap5-uevm";



		ti,jack-detection;

		ti,mclk-freq = <19200000>;



		ti,mcpdm = <&mcpdm>;
@@ -415,7 +416,7 @@ 
			ti,backup-battery-charge-high-current;

		};



		gpadc {

		gpadc: gpadc {

			compatible = "ti,palmas-gpadc";

			interrupts = <18 0

				      16 0
@@ -475,8 +476,8 @@ 
				smps6_reg: smps6 {

					/* VDD_DDR3 - over VDD_SMPS6 */

					regulator-name = "smps6";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;

					regulator-always-on;

					regulator-boot-on;

				};

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ config SOC_AM43XX 
	select HAVE_ARM_TWD

	select ARM_ERRATA_754322

	select ARM_ERRATA_775420

	select OMAP_INTERCONNECT



config SOC_DRA7XX

	bool "TI DRA7XX"