Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / arch / arm / boot / dts / am335x-boneblue.dts

diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts
index c696d57..69acaf4 100644 (file)
--- a/arch/arm/boot/dts/am335x-boneblue.dts
+++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -241,6 +241,30 @@
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD0, PIN_OUTPUT, MUX_MODE7)             /* (M16) gmii1_rxd0.gpio2[21] */
                >;
        };
+
+       /* E1 */
+       eqep0_pins: pinmux_eqep0_pins {
+               pinctrl-single,pins = <
+                       AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR0, PIN_INPUT, MUX_MODE1)            /* (B12) mcasp0_aclkr.eQEP0A_in */
+                       AM33XX_PADCONF(AM335X_PIN_MCASP0_FSR, PIN_INPUT, MUX_MODE1)             /* (C13) mcasp0_fsr.eQEP0B_in */
+               >;
+       };
+
+       /* E2 */
+       eqep1_pins: pinmux_eqep1_pins {
+               pinctrl-single,pins = <
+                       AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT, MUX_MODE2)             /* (V2) lcd_data12.eQEP1A_in */
+                       AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_INPUT, MUX_MODE2)             /* (V3) lcd_data13.eQEP1B_in */
+               >;
+       };
+
+       /* E3 */
+       eqep2_pins: pinmux_eqep2_pins {
+               pinctrl-single,pins = <
+                       AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT, MUX_MODE4)              /* (T12) gpmc_ad12.eQEP2A_in */
+                       AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT, MUX_MODE4)              /* (R12) gpmc_ad13.eQEP2B_in */
+               >;
+       };
 };
 
 &uart0 {
@@ -419,3 +443,33 @@
                line-name = "LS_BUF_EN";
        };
 };
+
+&epwmss0 {
+       status = "okay";
+};
+
+&eqep0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&eqep0_pins>;
+       status = "okay";
+};
+
+&epwmss1 {
+       status = "okay";
+};
+
+&eqep1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&eqep1_pins>;
+       status = "okay";
+};
+
+&epwmss2 {
+       status = "okay";
+};
+
+&eqep2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&eqep2_pins>;
+       status = "okay";
+};