From f4b95fd443bf2727e3de687be33b417ffbc15793 Mon Sep 17 00:00:00 2001 From: Fancy Fang Date: Mon, 29 Feb 2016 18:06:53 +0800 Subject: [PATCH] MLK-12457 dts: imx7d-12x12-lpddr3-arm2: correct pwm1 pinctrl settings The pwm1's pin belongs to lpsr iomux. So this should be corrected. Signed-off-by: Fancy Fang --- arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts index cb8d050a36f6..dda4fe365fef 100644 --- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts +++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts @@ -684,12 +684,6 @@ >; }; - pinctrl_pwm1: pwm1grp { - fsl,pins = < - MX7D_PAD_GPIO1_IO08__PWM1_OUT 0x110b0 - >; - }; - pinctrl_sai1: sai1grp { fsl,pins = < MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f @@ -841,6 +835,14 @@ }; &iomuxc_lpsr { + imx7d-12x12-lpddr3-arm2 { + pinctrl_pwm1: pwm1grp { + fsl,pins = < + MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0 + >; + }; + }; + imx7d-sdb { pinctrl_usbotg1_vbus: usbotg1vbusgrp { fsl,pins = < -- 2.17.1