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

Commit 443318e0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.1/fixes-rc1' of... 

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

Merge "omap fixes against v4.1-rc1" from Tony Lindgren:

Fixes for omaps, mostly a fix for power power consumption
creeping up during idle, and two l3-noc device fixes:

- Fix power consumption creeping up with I2C4 staying on
- Fix n900 microphone bias voltages
- Fix dra7 l3-noc for host clock
- Fix omap5 l3-noc id address decoding

The rest are all just minor dts fixes:

- Fix changed EXTCON_USB_GPIO_USB in defconfig
- Fix missing isp and iva #iommu-cells property
- Various beagle x15 dts fixes for pre-production changes
- Fix am437x-sk display dts entries

* tag 'omap-for-v4.1/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  bus: omap_l3_noc: Fix master id address decoding for OMAP5
  bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance
  ARM: dts: dra7: Fix efuse register size for ABB
  ARM: dts: am57xx-beagle-x15: Switch GPIO fan number
  ARM: dts: am57xx-beagle-x15: Switch UART mux pins
  ARM: dts: am437x-sk: reduce col-scan-delay-us
  ARM: dts: am437x-sk: fix for new newhaven display module revision
  ARM: dts: am57xx-beagle-x15: Fix RTC aliases
  ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x
  ARM: dts: omap3: Add #iommu-cells to isp and iva iommu
  ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO
  ARM: dts: OMAP3-N900: Add microphone bias voltages
  ARM: OMAP2+: Fix omap off idle power consumption creeping up
parents d6ad446d e7309c26

Documentation/devicetree/bindings/arm/omap/l3-noc.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ provided by Arteris. 
Required properties:

- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family

               Should be "ti,omap4-l3-noc" for OMAP4 family

               Should be "ti,omap5-l3-noc" for OMAP5 family

	       Should be "ti,dra7-l3-noc" for DRA7 family

               Should be "ti,am4372-l3-noc" for AM43 family

- reg:	Contains L3 register address range for each noc domain.

arch/arm/boot/dts/am437x-sk-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
		pinctrl-0 = <&matrix_keypad_pins>;



		debounce-delay-ms = <5>;

		col-scan-delay-us = <1500>;

		col-scan-delay-us = <5>;



		row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH		/* Bank5, pin5 */

				&gpio5 6 GPIO_ACTIVE_HIGH>;	/* Bank5, pin6 */
@@ -473,7 +473,7 @@ 
		interrupt-parent = <&gpio0>;

		interrupts = <31 0>;



		wake-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;



		touchscreen-size-x = <480>;

		touchscreen-size-y = <272>;

arch/arm/boot/dts/am57xx-beagle-x15.dts

+6 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
	aliases {

		rtc0 = &mcp_rtc;

		rtc1 = &tps659038_rtc;

		rtc2 = &rtc;

	};



	memory {
@@ -83,7 +84,7 @@ 
	gpio_fan: gpio_fan {

		/* Based on 5v 500mA AFB02505HHB */

		compatible = "gpio-fan";

		gpios =  <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>;

		gpios =  <&tps659038_gpio 2 GPIO_ACTIVE_HIGH>;

		gpio-fan,speed-map = <0     0>,

				     <13000 1>;

		#cooling-cells = <2>;
@@ -130,8 +131,8 @@ 


	uart3_pins_default: uart3_pins_default {

		pinctrl-single,pins = <

			0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */

			0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */

			0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */

			0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */

		>;

	};
@@ -455,7 +456,7 @@ 
	mcp_rtc: rtc@6f {

		compatible = "microchip,mcp7941x";

		reg = <0x6f>;

		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_LOW>;  /* IRQ_SYS_1N */

		interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>;  /* IRQ_SYS_1N */



		pinctrl-names = "default";

		pinctrl-0 = <&mcp79410_pins_default>;
@@ -478,7 +479,7 @@ 
&uart3 {

	status = "okay";

	interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,

			      <&dra7_pmx_core 0x248>;

			      <&dra7_pmx_core 0x3f8>;



	pinctrl-names = "default";

	pinctrl-0 = <&uart3_pins_default>;

arch/arm/boot/dts/dra7.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ 
			ti,clock-cycles = <16>;



			reg = <0x4ae07ddc 0x4>, <0x4ae07de0 0x4>,

			      <0x4ae06014 0x4>, <0x4a003b20 0x8>,

			      <0x4ae06014 0x4>, <0x4a003b20 0xc>,

			      <0x4ae0c158 0x4>;

			reg-names = "setup-address", "control-address",

				    "int-address", "efuse-address",
@@ -944,7 +944,7 @@ 
			ti,clock-cycles = <16>;



			reg = <0x4ae07e34 0x4>, <0x4ae07e24 0x4>,

			      <0x4ae06010 0x4>, <0x4a0025cc 0x8>,

			      <0x4ae06010 0x4>, <0x4a0025cc 0xc>,

			      <0x4a002470 0x4>;

			reg-names = "setup-address", "control-address",

				    "int-address", "efuse-address",
@@ -977,7 +977,7 @@ 
			ti,clock-cycles = <16>;



			reg = <0x4ae07e30 0x4>, <0x4ae07e20 0x4>,

			      <0x4ae06010 0x4>, <0x4a0025e0 0x8>,

			      <0x4ae06010 0x4>, <0x4a0025e0 0xc>,

			      <0x4a00246c 0x4>;

			reg-names = "setup-address", "control-address",

				    "int-address", "efuse-address",
@@ -1010,7 +1010,7 @@ 
			ti,clock-cycles = <16>;



			reg = <0x4ae07de4 0x4>, <0x4ae07de8 0x4>,

			      <0x4ae06010 0x4>, <0x4a003b08 0x8>,

			      <0x4ae06010 0x4>, <0x4a003b08 0xc>,

			      <0x4ae0c154 0x4>;

			reg-names = "setup-address", "control-address",

				    "int-address", "efuse-address",
@@ -1203,7 +1203,7 @@ 
			status = "disabled";

		};



		rtc@48838000 {

		rtc: rtc@48838000 {

			compatible = "ti,am3352-rtc";

			reg = <0x48838000 0x100>;

			interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/omap3-n900.dts

+4 −0
Original line number Diff line number Diff line
@@ -498,6 +498,8 @@ 
		DRVDD-supply = <&vmmc2>;

		IOVDD-supply = <&vio>;

		DVDD-supply = <&vio>;



		ai3x-micbias-vg = <1>;

	};



	tlv320aic3x_aux: tlv320aic3x@19 {
@@ -509,6 +511,8 @@ 
		DRVDD-supply = <&vmmc2>;

		IOVDD-supply = <&vio>;

		DVDD-supply = <&vio>;



		ai3x-micbias-vg = <2>;

	};



	tsl2563: tsl2563@29 {