pinctrl: introduce PINCTRL_STATE_DEFAULT, define hogs as that state

This provides a single centralized name for the default state.

Update PIN_MAP_* macros to use this state name, instead of requiring the
user to pass a state name in.

With this change, hog entries in the mapping table are defined as those
with state name PINCTRL_STATE_DEFAULT, i.e. all entries have the same
name. This interacts badly with the nested iteration over mapping table
entries in pinctrl_hog_maps() and pinctrl_hog_map() which would now
attempt to claim each hog mapping table entry multiple times. Replacing
the custom hog code with a simple pinctrl_get()/pinctrl_enable().

Update documentation and mapping tables to use this.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 030b2c0d322d..ea6c79076a91 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1608,9 +1608,9 @@ static struct platform_device dma_device = {
 /* Pinmux settings */
 static struct pinctrl_map __initdata u300_pinmux_map[] = {
         /* anonymous maps for chip power and EMIFs */
-        PIN_MAP_SYS_HOG("POWER", "pinctrl-u300", "power"),
-        PIN_MAP_SYS_HOG("EMIF0", "pinctrl-u300", "emif0"),
-        PIN_MAP_SYS_HOG("EMIF1", "pinctrl-u300", "emif1"),
+        PIN_MAP_SYS_HOG("pinctrl-u300", "power"),
+        PIN_MAP_SYS_HOG("pinctrl-u300", "emif0"),
+        PIN_MAP_SYS_HOG("pinctrl-u300", "emif1"),
         /* per-device maps for MMC/SD, SPI and UART */
         PIN_MAP("MMCSD", "pinctrl-u300", "mmc0", "mmci"),
         PIN_MAP("SPI", "pinctrl-u300", "spi0", "pl022"),