tools: pinmux-generator: P9.28 is special, it has two pwm, fix this in the generation script

fixes: #85
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

Author: RobertCNelson

tools/beaglebone-universal-io/config-pin

@@ -954,8 +954,8 @@ else
 	P9_28_PRU="145"
 	P9_28_GPIO="113"
 	P9_28_PIN="audio"
-	P9_28_PINMUX="default gpio gpio_pu gpio_pd gpio_input spi_cs pwm pruout pruin"
-	P9_28_INFO="gpio3_17 default gpio3_17 gpio3_17 gpio3_17 gpio3_17 spi1_cs0 ehrpwm0_synci pru0_out3 pru0_in3"
+	P9_28_PINMUX="default gpio gpio_pu gpio_pd gpio_input spi_cs pwm pwm2 pruout pruin"
+	P9_28_INFO="gpio3_17 default gpio3_17 gpio3_17 gpio3_17 gpio3_17 spi1_cs0 ehrpwm0_synci ecap2_in_pwm2_out pru0_out3 pru0_in3"
 	P9_28_CAPE=""
 
 	P9_29_PRU="143"

tools/pinmux-generator/BeagleBone_Black.dts

@@ -1007,6 +1007,8 @@ P9_28_pwm_pin: pinmux_P9_28_pwm_pin { pinctrl-single,pins = <
 	AM33XX_IOPAD(0x099c, PIN_OUTPUT_PULLDOWN | INPUT_EN | MUX_MODE1) >; };	/* mcasp0_ahclkr.ehrpwm0_synci */
 P9_28_spi_cs_pin: pinmux_P9_28_spi_cs_pin { pinctrl-single,pins = <
 	AM33XX_IOPAD(0x099c, PIN_OUTPUT_PULLUP | INPUT_EN | MUX_MODE3) >; };	/* mcasp0_ahclkr.spi1_cs0 */
+P9_28_pwm2_pin: pinmux_P9_28_pwm2_pin { pinctrl-single,pins = <
+	AM33XX_IOPAD(0x099c, PIN_OUTPUT_PULLDOWN | INPUT_EN | MUX_MODE4) >; };	/* mcasp0_ahclkr.ecap2_in_pwm2_out */
 P9_28_pruout_pin: pinmux_P9_28_pruout_pin { pinctrl-single,pins = <
 	AM33XX_IOPAD(0x099c, PIN_OUTPUT_PULLDOWN | INPUT_EN | MUX_MODE5) >; };	/* mcasp0_ahclkr.pru0_out3 */
 P9_28_pruin_pin: pinmux_P9_28_pruin_pin { pinctrl-single,pins = <
@@ -2059,16 +2061,17 @@ P9_27_pinmux {
 P9_28_pinmux {
 	compatible = "bone-pinmux-helper";
 	status = "okay";
-	pinctrl-names = "default", "gpio", "gpio_pu", "gpio_pd", "gpio_input", "spi_cs", "pwm", "pruout", "pruin";
+	pinctrl-names = "default", "gpio", "gpio_pu", "gpio_pd", "gpio_input", "spi_cs", "pwm", "pwm2", "pruout", "pruin";
 	pinctrl-0 = <&P9_28_default_pin>;
 	pinctrl-1 = <&P9_28_gpio_pin>;
 	pinctrl-2 = <&P9_28_gpio_pu_pin>;
 	pinctrl-3 = <&P9_28_gpio_pd_pin>;
 	pinctrl-4 = <&P9_28_gpio_input_pin>;
 	pinctrl-5 = <&P9_28_spi_cs_pin>;
 	pinctrl-6 = <&P9_28_pwm_pin>;
-	pinctrl-7 = <&P9_28_pruout_pin>;
-	pinctrl-8 = <&P9_28_pruin_pin>;
+	pinctrl-7 = <&P9_28_pwm2_pin>;
+	pinctrl-8 = <&P9_28_pruout_pin>;
+	pinctrl-9 = <&P9_28_pruin_pin>;
 };
 
 /* P9_29 (ZCZ ball B13) audio */

tools/pinmux-generator/BeagleBone_Black_config-pin.txt

@@ -477,8 +477,8 @@ P9_27_CAPE=""
 P9_28_PRU="145"
 P9_28_GPIO="113"
 P9_28_PIN="audio"
-P9_28_PINMUX="default gpio gpio_pu gpio_pd gpio_input spi_cs pwm pruout pruin"
-P9_28_INFO="gpio3_17 default gpio3_17 gpio3_17 gpio3_17 gpio3_17 spi1_cs0 ehrpwm0_synci pru0_out3 pru0_in3"
+P9_28_PINMUX="default gpio gpio_pu gpio_pd gpio_input spi_cs pwm pwm2 pruout pruin"
+P9_28_INFO="gpio3_17 default gpio3_17 gpio3_17 gpio3_17 gpio3_17 spi1_cs0 ehrpwm0_synci ecap2_in_pwm2_out pru0_out3 pru0_in3"
 P9_28_CAPE=""
 
 P9_29_PRU="143"

tools/pinmux-generator/lib/pinmux.sh

@@ -84,6 +84,11 @@ echo_pinmux () {
 		cp_pinmux="${cp_pinmux} pwm"
 		cp_info="${cp_info} ${pwm_name}"
 	fi
+	if [ "x${got_pwm2_pin}" = "xenable" ] ; then
+		list="${list}, \"pwm2\""
+		cp_pinmux="${cp_pinmux} pwm2"
+		cp_info="${cp_info} ${pwm2_name}"
+	fi
 	if [ "x${got_pru_uart_pin}" = "xenable" ] ; then
 		list="${list}, \"pru_uart\""
 		cp_pinmux="${cp_pinmux} pru_uart"
@@ -164,6 +169,10 @@ echo_pinmux () {
 		echo "	pinctrl-${index} = <&${pcbpin}_pwm_pin>;" >> ${file}-pinmux.dts
 		index=$((index + 1))
 	fi
+	if [ "x${got_pwm2_pin}" = "xenable" ] ; then
+		echo "	pinctrl-${index} = <&${pcbpin}_pwm2_pin>;" >> ${file}-pinmux.dts
+		index=$((index + 1))
+	fi
 	if [ "x${got_pru_uart_pin}" = "xenable" ] ; then
 		echo "	pinctrl-${index} = <&${pcbpin}_pru_uart_pin>;" >> ${file}-pinmux.dts
 		index=$((index + 1))
@@ -386,7 +395,7 @@ find_ball () {
 		dtabs=3
 		pinsetting="PIN_INPUT"
 		;;
-	pwm)
+	pwm|pwm2)
 		pinsetting="PIN_OUTPUT_PULLDOWN | INPUT_EN"
 		;;
 	uart|i2c|spi|spi_cs|spi_sclk)
@@ -432,6 +441,7 @@ find_ball () {
 	unset got_can_pin
 	unset got_eqep_pin
 	unset got_pwm_pin
+	unset got_pwm2_pin
 	unset got_i2c_pin
 	unset got_pru_ecap_pin
 	unset got_pru_uart_pin
@@ -481,6 +491,12 @@ find_ball () {
 				pinsetting="PIN_OUTPUT_PULLDOWN | INPUT_EN"
 				got_pwm_pin="enable"
 				;;
+			ecap2_in_pwm2_out)
+				valid_pin_mode="pwm2"
+				pwm2_name=${name}
+				pinsetting="PIN_OUTPUT_PULLDOWN | INPUT_EN"
+				got_pwm2_pin="enable"
+				;;
 			i2c*_sda|i2c*_scl)
 				valid_pin_mode="i2c"
 				i2c_name=${name}