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

Commit c92b83a8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-4.1' of... 

Merge tag 'imx-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Pull "The i.MX fixes for 4.1" from Shawn Guo:

 - A couple of imx23-olinuxino device tree fixes regarding to LED GPIO
   polarity and USB dr_mode setting
 - One i.MX28 device tree fix on AUART4 TX-DMA interrupt name
 - Add missing pwm-cells to PWM4 for i.MX25 device tree
 - Fix imx6q-phytec device tree to get correct USB VBUS control
 - Drop invalid pinctrl-assert-gpios property from imx6qdl-sabreauto
   device tree, which was sneaked in from vendor device tree
 - One fix on Wolfram's broken email address

* tag 'imx-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-sabreauto: remove pinctrl-assert-gpios
  ARM: dts: imx28: Fix AUART4 TX-DMA interrupt name
  ARM: dts: imx25: Add #pwm-cells to pwm4
  ARM: dts: imx6: phyFLEX: USB VBUS control is active-high
  ARM: mach-imx: devices: platform-sdhci-esdhc-imx: fix broken email address
  ARM: dts: imx23-olinuxino: Fix dr_mode of usb0
  ARM: dts: imx23-olinuxino: Fix polarity of LED GPIO
parents d6bcc806 68ce9a1f

Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { 
		      80 81 68 69

		      70 71 72 73

		      74 75 76 77>;

	interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",

	interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",

			  "saif0", "saif1", "i2c0", "i2c1",

			  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

			  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

arch/arm/boot/dts/imx23-olinuxino.dts

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



/dts-v1/;

#include <dt-bindings/gpio/gpio.h>

#include "imx23.dtsi"



/ {
@@ -93,6 +94,7 @@ 


	ahb@80080000 {

		usb0: usb@80080000 {

			dr_mode = "host";

			vbus-supply = <&reg_usb0_vbus>;

			status = "okay";

		};
@@ -122,7 +124,7 @@ 


		user {

			label = "green";

			gpios = <&gpio2 1 1>;

			gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;

		};

	};

};

arch/arm/boot/dts/imx25.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -428,6 +428,7 @@ 


			pwm4: pwm@53fc8000 {

				compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";

				#pwm-cells = <2>;

				reg = <0x53fc8000 0x4000>;

				clocks = <&clks 108>, <&clks 52>;

				clock-names = "ipg", "per";

arch/arm/boot/dts/imx28.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ 
					      80 81 68 69

					      70 71 72 73

					      74 75 76 77>;

				interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",

				interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",

						  "saif0", "saif1", "i2c0", "i2c1",

						  "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",

						  "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio4 15 0>;

			enable-active-high;

		};



		reg_usb_h1_vbus: regulator@1 {
@@ -40,6 +41,7 @@ 
			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			gpio = <&gpio1 0 0>;

			enable-active-high;

		};

	};