Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ffec1eb9c7a88db4be06dbf596fc8578e4586b62

Authored by Lucas Stach
Committed by Albert ARIBAUD
1 parent e21649be56
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

tegra: sync SDIO1 pingroup enum name with TRM 

Signed-off-by: Lucas Stach <dev@lynxeye.de>
CC: Tom Warren <twarren@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

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

arch/arm/include/asm/arch-tegra2/pinmux.h
Diff comments   View file @ ffec1eb
... ... @@ -67,7 +67,7 @@
67 67 PINGRP_KBCF,
68 68 PINGRP_GMA,
69 69 PINGRP_GMC,
70   - PINGRP_SDMMC1,
  70 + PINGRP_SDIO1,
71 71 PINGRP_OWC,
72 72  
73 73 /* 32: APB_MISC_PP_TRISTATE_REG_B_0 */
board/compal/paz00/paz00.c
Diff comments   View file @ ffec1eb
... ... @@ -48,10 +48,10 @@
48 48 pinmux_tristate_disable(PINGRP_GMA);
49 49 pinmux_tristate_disable(PINGRP_GME);
50 50  
51   - /* SDMMC1: SDIO1_CLK, SDIO1_CMD, SDIO1_DAT[3:0] */
52   - pinmux_set_func(PINGRP_SDMMC1, PMUX_FUNC_SDIO1);
  51 + /* SDIO1: SDIO1_CLK, SDIO1_CMD, SDIO1_DAT[3:0] */
  52 + pinmux_set_func(PINGRP_SDIO1, PMUX_FUNC_SDIO1);
53 53  
54   - pinmux_tristate_disable(PINGRP_SDMMC1);
  54 + pinmux_tristate_disable(PINGRP_SDIO1);
55 55  
56 56 /* For power GPIO PV1 */
57 57 pinmux_tristate_disable(PINGRP_UAC);