Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d49aa5effa20d0b943c74ced84e67defce6d6d1c

Authored by Franklin S Cooper Jr
Committed by Lokesh Vutla
1 parent 44f8c1f450
Exists in v2015.07-smarct4x and in 3 other branches ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc

ARM: DRA74/beagle_x15: 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>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

board/ti/beagle_x15/mux_data.h
Diff comments   View file @ d49aa5e
... ... @@ -255,10 +255,10 @@
255 255 {UART2_RTSN, (M1 | PIN_INPUT_SLEW)}, /* uart2_rtsn.uart3_txd */
256 256 {I2C2_SDA, (M1 | PIN_INPUT)}, /* i2c2_sda.hdmi1_ddc_scl */
257 257 {I2C2_SCL, (M1 | PIN_INPUT)}, /* i2c2_scl.hdmi1_ddc_sda */
258   - {WAKEUP0, (M0 | PIN_OUTPUT_PULLUP)}, /* Wakeup0.Wakeup0 */
259   - {WAKEUP1, (M0 | PIN_OUTPUT_PULLDOWN)}, /* Wakeup1.Wakeup1 */
260   - {WAKEUP2, (M0 | PIN_OUTPUT_PULLDOWN)}, /* Wakeup2.Wakeup2 */
261   - {WAKEUP3, (M0 | PIN_OUTPUT_PULLUP)}, /* Wakeup3.Wakeup3 */
  258 + {WAKEUP0, (M0 | PULL_UP)}, /* Wakeup0.Wakeup0 */
  259 + {WAKEUP1, (M0)}, /* Wakeup1.Wakeup1 */
  260 + {WAKEUP2, (M0)}, /* Wakeup2.Wakeup2 */
  261 + {WAKEUP3, (M0 | PULL_UP)}, /* Wakeup3.Wakeup3 */
262 262 {ON_OFF, (M1 | PIN_OUTPUT_PULLUP)}, /* on_off.on_off */
263 263 {RTC_PORZ, (M0 | PIN_OUTPUT_PULLDOWN)}, /* rtc_porz.rtc_porz */
264 264 {RTCK, (M0 | PIN_INPUT_PULLDOWN)}, /* rtck.rtck */
board/ti/dra7xx/mux_data.h
Diff comments   View file @ d49aa5e
... ... @@ -173,7 +173,7 @@
173 173 {I2C2_SDA, (M1 | PIN_INPUT_PULLUP)}, /* i2c2_sda.hdmi1_ddc_scl */
174 174 {I2C2_SCL, (M1 | PIN_INPUT_PULLUP)}, /* i2c2_scl.hdmi1_ddc_sda */
175 175 {WAKEUP0, (M15 | PULL_UP)}, /* Wakeup0.safe for dcan1_rx */
176   - {WAKEUP3, (M1 | PIN_INPUT_PULLUP)}, /* Wakeup3.sys_nirq1 */
  176 + {WAKEUP3, (M1 | PULL_ENA | PULL_UP)}, /* Wakeup3.sys_nirq1 */
177 177 };
178 178  
179 179 const struct pad_conf_entry early_padconf[] = {
... ... @@ -393,7 +393,7 @@
393 393 {I2C2_SDA, (M0 | PIN_INPUT_PULLUP)}, /* i2c2_sda.i2c2_sda */
394 394 {I2C2_SCL, (M0 | PIN_INPUT_PULLUP)}, /* i2c2_scl.i2c2_scl */
395 395 {WAKEUP0, (M15 | PULL_UP)}, /* Wakeup0.safe for dcan1_rx */
396   - {WAKEUP2, (M14 | PIN_OUTPUT)}, /* Wakeup2.gpio1_2 */
  396 + {WAKEUP2, (M14)}, /* Wakeup2.gpio1_2 */
397 397 };
398 398  
399 399 #ifdef CONFIG_IODELAY_RECALIBRATION