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

Commit cb311494 authored Sep 28, 2015 by 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: Olof Johansson <olof@lixom.net>

parents 9ffecb10 0af82211

arch/arm/boot/dts/imx53-qsrb.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		pinctrl-0 = <&pinctrl_pmic>;
		reg = <0x08>;
		interrupt-parent = <&gpio5>;
		interrupts = <23 0x8>;
		interrupts = <23 IRQ_TYPE_LEVEL_HIGH>;
		regulators {
		sw1_reg: sw1a {
		regulator-name = "SW1";

arch/arm/boot/dts/imx53.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <dt-bindings/clock/imx5-clock.h>
		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/input/input.h>
		#include <dt-bindings/interrupt-controller/irq.h>

		/ {
		aliases {

arch/arm/boot/dts/imx6qdl-rex.dtsi

+0 −2

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@
		compatible = "regulator-fixed";
		reg = <1>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_usbh1>;
		regulator-name = "usbh1_vbus";
		regulator-min-microvolt = <5000000>;
		regulator-max-microvolt = <5000000>;
		@@ -47,7 +46,6 @@
		compatible = "regulator-fixed";
		reg = <2>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_usbotg>;
		regulator-name = "usb_otg_vbus";
		regulator-min-microvolt = <5000000>;
		regulator-max-microvolt = <5000000>;