Skip to content
  1. Apr 03, 2013
  2. Apr 02, 2013
  3. Mar 21, 2013
    • Simon Horman's avatar
      Revert "ARM: shmobile: streamline mackerel SD and MMC devices" · ac22dde7
      Simon Horman authored
      This reverts commit 626a645e
      
      .
      
      This appears to be incompatible with
      "ARM: shmobile: sh7372: Remove SDHI and MMCIF function GPIOs"
      
      Reverting this change resolves the following build failure:
      
      arch/arm/mach-shmobile/board-mackerel.c: In function ‘mackerel_init’:
      arch/arm/mach-shmobile/board-mackerel.c:1468: error: ‘GPIO_FN_SDHICMD1’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1468: error: (Each undeclared identifier is reported only once
      arch/arm/mach-shmobile/board-mackerel.c:1468: error: for each function it appears in.)
      arch/arm/mach-shmobile/board-mackerel.c:1469: error: ‘GPIO_FN_SDHICLK1’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1470: error: ‘GPIO_FN_SDHID1_3’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1471: error: ‘GPIO_FN_SDHID1_2’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1472: error: ‘GPIO_FN_SDHID1_1’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1473: error: ‘GPIO_FN_SDHID1_0’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1489: error: ‘GPIO_FN_SDHICMD2’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1490: error: ‘GPIO_FN_SDHICLK2’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1491: error: ‘GPIO_FN_SDHID2_3’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1492: error: ‘GPIO_FN_SDHID2_2’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1493: error: ‘GPIO_FN_SDHID2_1’ undeclared (first use in this function)
      arch/arm/mach-shmobile/board-mackerel.c:1494: error: ‘GPIO_FN_SDHID2_0’ undeclared (first use in this function)
      
      Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
      Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
      ac22dde7