]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
pinctrl: amlogic: gxbb: add spi nor pins
authorJerome Brunet <jbrunet@baylibre.com>
Tue, 13 Sep 2016 15:12:21 +0000 (17:12 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 15 Sep 2016 12:06:18 +0000 (14:06 +0200)
Add EE domains pins for the SPI flash controller

Acked-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/meson/pinctrl-meson-gxbb.c

index f115638e869930fbe4232fff8c394c88fea20380..573901887cee255eeb736cd11eb22229ac932ca7 100644 (file)
@@ -156,6 +156,11 @@ static const unsigned int emmc_clk_pins[] = { PIN(BOOT_8, EE_OFF) };
 static const unsigned int emmc_cmd_pins[] = { PIN(BOOT_10, EE_OFF) };
 static const unsigned int emmc_ds_pins[] = { PIN(BOOT_15, EE_OFF) };
 
+static const unsigned int nor_d_pins[]         = { PIN(BOOT_11, EE_OFF) };
+static const unsigned int nor_q_pins[]         = { PIN(BOOT_12, EE_OFF) };
+static const unsigned int nor_c_pins[]         = { PIN(BOOT_13, EE_OFF) };
+static const unsigned int nor_cs_pins[]                = { PIN(BOOT_15, EE_OFF) };
+
 static const unsigned int sdcard_d0_pins[] = { PIN(CARD_1, EE_OFF) };
 static const unsigned int sdcard_d1_pins[] = { PIN(CARD_0, EE_OFF) };
 static const unsigned int sdcard_d2_pins[] = { PIN(CARD_5, EE_OFF) };
@@ -430,6 +435,10 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = {
        GROUP(emmc_clk,         4,      18),
        GROUP(emmc_cmd,         4,      19),
        GROUP(emmc_ds,          4,      31),
+       GROUP(nor_d,            5,      1),
+       GROUP(nor_q,            5,      3),
+       GROUP(nor_c,            5,      2),
+       GROUP(nor_cs,           5,      0),
 
        /* Bank CARD */
        GROUP(sdcard_d1,        2,      14),
@@ -517,6 +526,10 @@ static const char * const emmc_groups[] = {
        "emmc_nand_d07", "emmc_clk", "emmc_cmd", "emmc_ds",
 };
 
+static const char * const nor_groups[] = {
+       "nor_d", "nor_q", "nor_c", "nor_cs",
+};
+
 static const char * const sdcard_groups[] = {
        "sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3",
        "sdcard_cmd", "sdcard_clk",
@@ -619,6 +632,7 @@ static const char * const pwm_ao_b_groups[] = {
 static struct meson_pmx_func meson_gxbb_periphs_functions[] = {
        FUNCTION(gpio_periphs),
        FUNCTION(emmc),
+       FUNCTION(nor),
        FUNCTION(sdcard),
        FUNCTION(sdio),
        FUNCTION(uart_a),