diff --git a/[refs] b/[refs] index 1591933341d4..53edd3189764 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 21a89344aed62609a6815ed0e50cbd53484d3fc7 +refs/heads/master: d3d03e486594dac021caad5befce7d87af4ca00a diff --git a/trunk/arch/arm/mach-shmobile/board-ap4evb.c b/trunk/arch/arm/mach-shmobile/board-ap4evb.c index 67da7371451c..2963a11c92b4 100644 --- a/trunk/arch/arm/mach-shmobile/board-ap4evb.c +++ b/trunk/arch/arm/mach-shmobile/board-ap4evb.c @@ -128,15 +128,21 @@ */ /* - * MMC (CN7) + * MMC0/SDHI1 (CN7) * - * J22 : 1-2: 1.8v for MMC - * 2-3: 3.3v for MMC - * SW1 : OFF - * SW33: bit1: OFF - * bit2: ON - * bit3: ON - * bit4: X + * J22 : select card voltage + * 1-2 pin : 1.8v + * 2-3 pin : 3.3v + * + * SW1 | SW33 + * | bit1 | bit2 | bit3 | bit4 + * ------------+------+------+------+------- + * MMC0 OFF | OFF | ON | ON | X + * SDHI1 OFF | ON | X | OFF | ON + * + * voltage lebel + * CN7 : 1.8v + * CN12: 3.3v */ /* MTD */