1. 03 4月, 2013 8 次提交
  2. 02 4月, 2013 27 次提交
  3. 21 3月, 2013 5 次提交
    • S
      Revert "ARM: shmobile: streamline mackerel SD and MMC devices" · ac22dde7
      Simon Horman 提交于
      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: NSimon Horman <horms+renesas@verge.net.au>
      ac22dde7
    • G
      ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names · a463f731
      Guennadi Liakhovetski 提交于
      Fix several device-tree bindings, that haven't been updated for newest
      versions of respective drivers, and device names and pin numbers, left over
      from non-DT and old pinctrl versions.
      Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Acked-by: NLaurent Pinchart <laurent.pinchart@ideasonboard.com>
      Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
      a463f731
    • G
      ARM: shmobile: kzm9g: add fixed voltage regulators for SDHI0 and SDHI2 · 54ca74ef
      Guennadi Liakhovetski 提交于
      Both SDHI0 and SDHI2 power supplies on kzm9g can be switched on and off. In
      the current version this is not used and the regulators are hard-wired to
      "on." This patch switches SDHI0 and SDHI2 to proper fixed-voltage
      regulators, using GPIOs to enable and disable them. Both ports shall
      now be specifying the MMC_CAP_POWER_OFF_CARD MMC capability. Only SDHI0
      has been tested with an SDIO card, since SDHI2 is a microSD slot.
      Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
      54ca74ef
    • G
      ARM: shmobile: armadillo800eva: add a fixed voltage regulator for SDHI1 · a9060f89
      Guennadi Liakhovetski 提交于
      The SDHI1 power supply on armadillo800eva can be switched on and off. In
      the current version this is not used and the regulator is hard-wired to
      "on." This patch switches SDHI1 to a proper fixed-voltage regulator,
      using a GPIO to enable and disable it. Both SDHI0 and SDHI1 ports shall
      now be specifying the MMC_CAP_POWER_OFF_CARD MMC capability. Both
      interfaces tested with an SDIO card.
      Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
      a9060f89
    • G
      ARM: shmobile: kzm9g: SDHI0 and SDHI1 use a 3.3V power supply · c791c036
      Guennadi Liakhovetski 提交于
      kzm9g supplies 3.3V to its SDHI0 and SDHI2 interfaces. Specifying 2.8V
      prevents some (e.g. certain SDIO) cards from working. This patch fixes the
      voltage and removes redundant OCR masks from platform data.
      Signed-off-by: NGuennadi Liakhovetski <g.liakhovetski@gmx.de>
      Signed-off-by: NSimon Horman <horms+renesas@verge.net.au>
      c791c036