Commit c92b83a8 authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 { ...@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 {
80 81 68 69 80 81 68 69
70 71 72 73 70 71 72 73
74 75 76 77>; 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", "saif0", "saif1", "i2c0", "i2c1",
"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx"; "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
*/ */
/dts-v1/; /dts-v1/;
#include <dt-bindings/gpio/gpio.h>
#include "imx23.dtsi" #include "imx23.dtsi"
/ { / {
...@@ -93,6 +94,7 @@ usbphy0: usbphy@8007c000 { ...@@ -93,6 +94,7 @@ usbphy0: usbphy@8007c000 {
ahb@80080000 { ahb@80080000 {
usb0: usb@80080000 { usb0: usb@80080000 {
dr_mode = "host";
vbus-supply = <&reg_usb0_vbus>; vbus-supply = <&reg_usb0_vbus>;
status = "okay"; status = "okay";
}; };
...@@ -122,7 +124,7 @@ leds { ...@@ -122,7 +124,7 @@ leds {
user { user {
label = "green"; label = "green";
gpios = <&gpio2 1 1>; gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
}; };
}; };
}; };
...@@ -428,6 +428,7 @@ slcdc@53fc0000 { ...@@ -428,6 +428,7 @@ slcdc@53fc0000 {
pwm4: pwm@53fc8000 { pwm4: pwm@53fc8000 {
compatible = "fsl,imx25-pwm", "fsl,imx27-pwm"; compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
#pwm-cells = <2>;
reg = <0x53fc8000 0x4000>; reg = <0x53fc8000 0x4000>;
clocks = <&clks 108>, <&clks 52>; clocks = <&clks 108>, <&clks 52>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
......
...@@ -913,7 +913,7 @@ dma_apbx: dma-apbx@80024000 { ...@@ -913,7 +913,7 @@ dma_apbx: dma-apbx@80024000 {
80 81 68 69 80 81 68 69
70 71 72 73 70 71 72 73
74 75 76 77>; 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", "saif0", "saif1", "i2c0", "i2c1",
"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx", "auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx"; "auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";
......
...@@ -31,6 +31,7 @@ reg_usb_otg_vbus: regulator@0 { ...@@ -31,6 +31,7 @@ reg_usb_otg_vbus: regulator@0 {
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio4 15 0>; gpio = <&gpio4 15 0>;
enable-active-high;
}; };
reg_usb_h1_vbus: regulator@1 { reg_usb_h1_vbus: regulator@1 {
...@@ -40,6 +41,7 @@ reg_usb_h1_vbus: regulator@1 { ...@@ -40,6 +41,7 @@ reg_usb_h1_vbus: regulator@1 {
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpio1 0 0>; gpio = <&gpio1 0 0>;
enable-active-high;
}; };
}; };
......
...@@ -185,7 +185,6 @@ vgen6_reg: vgen6 { ...@@ -185,7 +185,6 @@ vgen6_reg: vgen6 {
&i2c3 { &i2c3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>; pinctrl-0 = <&pinctrl_i2c3>;
pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
max7310_a: gpio@30 { max7310_a: gpio@30 {
......
/* /*
* Copyright (C) 2010 Pengutronix, Wolfram Sang <w.sang@pengutronix.de> * Copyright (C) 2010 Pengutronix, Wolfram Sang <kernel@pengutronix.de>
* *
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License version 2 as published by the * the terms of the GNU General Public License version 2 as published by the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment