瀏覽代碼

ARM: dra7x/am57x: Remove pin input/output config from WAKEUP pins

The WAKEUP_X pins are always an input no matter the pinmux mode.
However, the 18th bit that typical configures a pin as an input is
considered reserved for the WAKEUP_X pins. Therefore, for any WAKEUP
pin remove any configuration that sets that pin as an input. Since
those pins are only inputs remove any output configuration from those
pins.

Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
Cooper Jr., Franklin 9 年之前
父節點
當前提交
bc622966c9
共有 2 個文件被更改,包括 5 次插入5 次删除
  1. 4 4
      board/ti/am57xx/mux_data.h
  2. 1 1
      board/ti/dra7xx/mux_data.h

+ 4 - 4
board/ti/am57xx/mux_data.h

@@ -255,10 +255,10 @@ const struct pad_conf_entry core_padconf_array_essential[] = {
 	{UART2_RTSN, (M1 | PIN_INPUT_SLEW)},	/* uart2_rtsn.uart3_txd */
 	{I2C2_SDA, (M1 | PIN_INPUT)},		/* i2c2_sda.hdmi1_ddc_scl */
 	{I2C2_SCL, (M1 | PIN_INPUT)},		/* i2c2_scl.hdmi1_ddc_sda */
-	{WAKEUP0, (M0 | PIN_OUTPUT_PULLUP)},	/* Wakeup0.Wakeup0 */
-	{WAKEUP1, (M0 | PIN_OUTPUT_PULLDOWN)},	/* Wakeup1.Wakeup1 */
-	{WAKEUP2, (M0 | PIN_OUTPUT_PULLDOWN)},	/* Wakeup2.Wakeup2 */
-	{WAKEUP3, (M0 | PIN_OUTPUT_PULLUP)},	/* Wakeup3.Wakeup3 */
+	{WAKEUP0, (M0 | PULL_UP)},		/* Wakeup0.Wakeup0 */
+	{WAKEUP1, (M0)},			/* Wakeup1.Wakeup1 */
+	{WAKEUP2, (M0)},			/* Wakeup2.Wakeup2 */
+	{WAKEUP3, (M0 | PULL_UP)},		/* Wakeup3.Wakeup3 */
 	{ON_OFF, (M1 | PIN_OUTPUT_PULLUP)},	/* on_off.on_off */
 	{RTC_PORZ, (M0 | PIN_OUTPUT_PULLDOWN)},	/* rtc_porz.rtc_porz */
 	{RTCK, (M0 | PIN_INPUT_PULLDOWN)},	/* rtck.rtck */

+ 1 - 1
board/ti/dra7xx/mux_data.h

@@ -372,7 +372,7 @@ const struct pad_conf_entry dra74x_core_padconf_array[] = {
 	{I2C2_SDA, (M0 | PIN_INPUT_PULLUP)},	/* i2c2_sda.i2c2_sda */
 	{I2C2_SCL, (M0 | PIN_INPUT_PULLUP)},	/* i2c2_scl.i2c2_scl */
 	{WAKEUP0, (M15 | PULL_UP)},	/* Wakeup0.safe for dcan1_rx */
-	{WAKEUP2, (M14 | PIN_OUTPUT)},	/* Wakeup2.gpio1_2 */
+	{WAKEUP2, (M14)},		/* Wakeup2.gpio1_2 */
 };
 
 #ifdef CONFIG_IODELAY_RECALIBRATION