Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -3
+1 -1
arch/arm/boot/dts/imx53-qsrb.dts
··· 36 36 pinctrl-0 = <&pinctrl_pmic>; 37 37 reg = <0x08>; 38 38 interrupt-parent = <&gpio5>; 39 - interrupts = <23 0x8>; 39 + interrupts = <23 IRQ_TYPE_LEVEL_HIGH>; 40 40 regulators { 41 41 sw1_reg: sw1a { 42 42 regulator-name = "SW1";
+1
arch/arm/boot/dts/imx53.dtsi
··· 15 15 #include <dt-bindings/clock/imx5-clock.h> 16 16 #include <dt-bindings/gpio/gpio.h> 17 17 #include <dt-bindings/input/input.h> 18 + #include <dt-bindings/interrupt-controller/irq.h> 18 19 19 20 / { 20 21 aliases {
-2
arch/arm/boot/dts/imx6qdl-rex.dtsi
··· 35 35 compatible = "regulator-fixed"; 36 36 reg = <1>; 37 37 pinctrl-names = "default"; 38 - pinctrl-0 = <&pinctrl_usbh1>; 39 38 regulator-name = "usbh1_vbus"; 40 39 regulator-min-microvolt = <5000000>; 41 40 regulator-max-microvolt = <5000000>; ··· 46 47 compatible = "regulator-fixed"; 47 48 reg = <2>; 48 49 pinctrl-names = "default"; 49 - pinctrl-0 = <&pinctrl_usbotg>; 50 50 regulator-name = "usb_otg_vbus"; 51 51 regulator-min-microvolt = <5000000>; 52 52 regulator-max-microvolt = <5000000>;