Commit cb311494 authored by Olof Johansson's avatar Olof Johansson

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

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

The i.MX fixes for 4.3:
 - One fix for i.MX6 Rex Pro board to remove a duplicated pinctrl entry
   which causes error for USB pinctrl setup.
 - Fix MC34708 PMIC interrupt level for imx53-qsrb board.

* tag 'imx-fixes-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: fix usb pin control for imx-rex dts
  ARM: imx53: qsrb: fix PMIC interrupt level
  ARM: imx53: include IRQ dt-bindings header
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9ffecb10 0af82211
...@@ -36,7 +36,7 @@ pmic: mc34708@8 { ...@@ -36,7 +36,7 @@ pmic: mc34708@8 {
pinctrl-0 = <&pinctrl_pmic>; pinctrl-0 = <&pinctrl_pmic>;
reg = <0x08>; reg = <0x08>;
interrupt-parent = <&gpio5>; interrupt-parent = <&gpio5>;
interrupts = <23 0x8>; interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
regulators { regulators {
sw1_reg: sw1a { sw1_reg: sw1a {
regulator-name = "SW1"; regulator-name = "SW1";
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <dt-bindings/clock/imx5-clock.h> #include <dt-bindings/clock/imx5-clock.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
/ { / {
aliases { aliases {
......
...@@ -35,7 +35,6 @@ reg_usbh1_vbus: regulator@1 { ...@@ -35,7 +35,6 @@ reg_usbh1_vbus: regulator@1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; reg = <1>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbh1>;
regulator-name = "usbh1_vbus"; regulator-name = "usbh1_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
...@@ -47,7 +46,6 @@ reg_usb_otg_vbus: regulator@2 { ...@@ -47,7 +46,6 @@ reg_usb_otg_vbus: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; reg = <2>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg>;
regulator-name = "usb_otg_vbus"; regulator-name = "usb_otg_vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
......
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