diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-11 13:00:30 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2014-09-11 13:00:30 +0200 |
| commit | 7713e4c7293440407b50a533388599ef6541d849 (patch) | |
| tree | fafdd521b5ec18439b14f384433b5917a4ef914e | |
| parent | fd95561751c9292cf6ae134dc43e3f4eb40583d3 (diff) | |
Colibri iMX6 dtb: fix PWM to SOC instance mapping
Fix the mapping of PWM<A> to SOC pwmX mapping and
set the second SOC pin to input on PWM<A>, PWM<D>.
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 28 |
2 files changed, 22 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 2c5aa113a481..56262fef67c0 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -58,13 +58,13 @@ ledpwm3 { label = "PWM<C>"; - pwms = <&pwm2 0 50000>; + pwms = <&pwm4 0 50000>; max-brightness = <255>; }; ledpwm4 { label = "PWM<D>"; - pwms = <&pwm3 0 50000>; + pwms = <&pwm2 0 50000>; max-brightness = <255>; }; }; diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index eecedf893b17..5107d59971c3 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -23,7 +23,7 @@ backlight: backlight { compatible = "pwm-backlight"; - pwms = <&pwm1 0 5000000>; + pwms = <&pwm3 0 5000000>; status = "disabled"; }; @@ -312,6 +312,7 @@ #define PAD_CTRL_HYS_PU 0x1b0b0 /*(PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)*/ #define PAD_CTRL_HYS_PD 0x130b0 /*(PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm)*/ #define PAD_CTRL_PU_22k 0x0f058 /*(PAD_CTL_PUS_22K_UP | PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm)*/ +#define PAD_CTRL_IN 0x0040 /*( PAD_CTL_SPEED_LOW )*/ #define PAD_CTRL_NO 0x80000000 //TODO @@ -338,6 +339,16 @@ MX6QDL_PAD_NANDF_D5__GPIO2_IO05 PAD_CTRL_NO /* MMC1 CD */ >; }; + pinctrl_pwm_a_cif_d7: pwm_d_cif_d7 { + fsl,pins = < + MX6QDL_PAD_EIM_A22__GPIO2_IO16 PAD_CTRL_IN /* disable, muxed with PWM<A> */ + >; + }; + pinctrl_pwm_d_cif_d6: pwm_d_cif_d6 { + fsl,pins = < + MX6QDL_PAD_EIM_A21__GPIO2_IO17 PAD_CTRL_IN /* disable, muxed with PWM<D> */ + >; + }; pinctrl_regulator_usbh_pwr: gpio_regulator_usbh_pwr { fsl,pins = < MX6QDL_PAD_EIM_D31__GPIO3_IO31 PAD_CTRL_PU_22k /* USBH_EN */ @@ -363,27 +374,28 @@ }; }; +/* PWM B */ &pwm1 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm3_1>; + pinctrl-0 = <&pinctrl_pwm1_3>; status = "disabled"; }; - +/* PWM D */ &pwm2 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm1_3>; + pinctrl-0 = <&pinctrl_pwm2_2 &pinctrl_pwm_d_cif_d6>; status = "disabled"; }; - +/* PWM A */ &pwm3 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm4_1>; + pinctrl-0 = <&pinctrl_pwm3_1 &pinctrl_pwm_a_cif_d7>; status = "disabled"; }; - +/* PWM C */ &pwm4 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pwm2_2>; + pinctrl-0 = <&pinctrl_pwm4_1>; status = "disabled"; }; |