diff options
author | Shinobu Uehara <shinobu.uehara.xc@renesas.com> | 2015-06-05 18:35:54 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-06-16 04:54:01 -0400 |
commit | f1f74b640c952e311aebaa594d9d81fecb72cc17 (patch) | |
tree | 24551d99f0d263290da336d750165ddf65a1e35d /drivers/pinctrl/sh-pfc | |
parent | 43c4436e2f1890a7b28dc0f0d901866cda99a08c (diff) |
pinctrl: sh-pfc: r8a7794: add MMCIF pin groups
Add MMCIF pin groups to R8A7794 PFC driver.
Signed-off-by: Shinobu Uehara <shinobu.uehara.xc@renesas.com>
[Sergei: rebased, renamed, added changelog.]
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc')
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c index 0e2686a2093c..4679ca01f976 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c | |||
@@ -1919,6 +1919,40 @@ static const unsigned int intc_irq9_pins[] = { | |||
1919 | static const unsigned int intc_irq9_mux[] = { | 1919 | static const unsigned int intc_irq9_mux[] = { |
1920 | IRQ9_MARK, | 1920 | IRQ9_MARK, |
1921 | }; | 1921 | }; |
1922 | /* - MMCIF ------------------------------------------------------------------ */ | ||
1923 | static const unsigned int mmc_data1_pins[] = { | ||
1924 | /* D[0] */ | ||
1925 | RCAR_GP_PIN(6, 18), | ||
1926 | }; | ||
1927 | static const unsigned int mmc_data1_mux[] = { | ||
1928 | MMC_D0_MARK, | ||
1929 | }; | ||
1930 | static const unsigned int mmc_data4_pins[] = { | ||
1931 | /* D[0:3] */ | ||
1932 | RCAR_GP_PIN(6, 18), RCAR_GP_PIN(6, 19), | ||
1933 | RCAR_GP_PIN(6, 20), RCAR_GP_PIN(6, 21), | ||
1934 | }; | ||
1935 | static const unsigned int mmc_data4_mux[] = { | ||
1936 | MMC_D0_MARK, MMC_D1_MARK, MMC_D2_MARK, MMC_D3_MARK, | ||
1937 | }; | ||
1938 | static const unsigned int mmc_data8_pins[] = { | ||
1939 | /* D[0:7] */ | ||
1940 | RCAR_GP_PIN(6, 18), RCAR_GP_PIN(6, 19), | ||
1941 | RCAR_GP_PIN(6, 20), RCAR_GP_PIN(6, 21), | ||
1942 | RCAR_GP_PIN(6, 22), RCAR_GP_PIN(6, 23), | ||
1943 | RCAR_GP_PIN(6, 24), RCAR_GP_PIN(6, 25), | ||
1944 | }; | ||
1945 | static const unsigned int mmc_data8_mux[] = { | ||
1946 | MMC_D0_MARK, MMC_D1_MARK, MMC_D2_MARK, MMC_D3_MARK, | ||
1947 | MMC_D4_MARK, MMC_D5_MARK, MMC_D6_MARK, MMC_D7_MARK, | ||
1948 | }; | ||
1949 | static const unsigned int mmc_ctrl_pins[] = { | ||
1950 | /* CLK, CMD */ | ||
1951 | RCAR_GP_PIN(6, 16), RCAR_GP_PIN(6, 17), | ||
1952 | }; | ||
1953 | static const unsigned int mmc_ctrl_mux[] = { | ||
1954 | MMC_CLK_MARK, MMC_CMD_MARK, | ||
1955 | }; | ||
1922 | /* - MSIOF0 ----------------------------------------------------------------- */ | 1956 | /* - MSIOF0 ----------------------------------------------------------------- */ |
1923 | static const unsigned int msiof0_clk_pins[] = { | 1957 | static const unsigned int msiof0_clk_pins[] = { |
1924 | /* SCK */ | 1958 | /* SCK */ |
@@ -2683,6 +2717,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { | |||
2683 | SH_PFC_PIN_GROUP(intc_irq7), | 2717 | SH_PFC_PIN_GROUP(intc_irq7), |
2684 | SH_PFC_PIN_GROUP(intc_irq8), | 2718 | SH_PFC_PIN_GROUP(intc_irq8), |
2685 | SH_PFC_PIN_GROUP(intc_irq9), | 2719 | SH_PFC_PIN_GROUP(intc_irq9), |
2720 | SH_PFC_PIN_GROUP(mmc_data1), | ||
2721 | SH_PFC_PIN_GROUP(mmc_data4), | ||
2722 | SH_PFC_PIN_GROUP(mmc_data8), | ||
2723 | SH_PFC_PIN_GROUP(mmc_ctrl), | ||
2686 | SH_PFC_PIN_GROUP(msiof0_clk), | 2724 | SH_PFC_PIN_GROUP(msiof0_clk), |
2687 | SH_PFC_PIN_GROUP(msiof0_sync), | 2725 | SH_PFC_PIN_GROUP(msiof0_sync), |
2688 | SH_PFC_PIN_GROUP(msiof0_ss1), | 2726 | SH_PFC_PIN_GROUP(msiof0_ss1), |
@@ -2869,6 +2907,13 @@ static const char * const intc_groups[] = { | |||
2869 | "intc_irq9", | 2907 | "intc_irq9", |
2870 | }; | 2908 | }; |
2871 | 2909 | ||
2910 | static const char * const mmc_groups[] = { | ||
2911 | "mmc_data1", | ||
2912 | "mmc_data4", | ||
2913 | "mmc_data8", | ||
2914 | "mmc_ctrl", | ||
2915 | }; | ||
2916 | |||
2872 | static const char * const msiof0_groups[] = { | 2917 | static const char * const msiof0_groups[] = { |
2873 | "msiof0_clk", | 2918 | "msiof0_clk", |
2874 | "msiof0_sync", | 2919 | "msiof0_sync", |
@@ -3035,6 +3080,7 @@ static const struct sh_pfc_function pinmux_functions[] = { | |||
3035 | SH_PFC_FUNCTION(i2c3), | 3080 | SH_PFC_FUNCTION(i2c3), |
3036 | SH_PFC_FUNCTION(i2c4), | 3081 | SH_PFC_FUNCTION(i2c4), |
3037 | SH_PFC_FUNCTION(intc), | 3082 | SH_PFC_FUNCTION(intc), |
3083 | SH_PFC_FUNCTION(mmc), | ||
3038 | SH_PFC_FUNCTION(msiof0), | 3084 | SH_PFC_FUNCTION(msiof0), |
3039 | SH_PFC_FUNCTION(msiof1), | 3085 | SH_PFC_FUNCTION(msiof1), |
3040 | SH_PFC_FUNCTION(msiof2), | 3086 | SH_PFC_FUNCTION(msiof2), |