Merge tag 'pinctrl-v5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git] / drivers / pinctrl / pinctrl-ingenic.c
index db6b48ea5f473047401957aa252052be8bdc4b6c..bc21ceb15d68137a36caef78b234f63133dbb7d5 100644 (file)
@@ -233,6 +233,19 @@ static int jz4725b_pwm_pwm2_pins[] = { 0x4c, };
 static int jz4725b_pwm_pwm3_pins[] = { 0x4d, };
 static int jz4725b_pwm_pwm4_pins[] = { 0x4e, };
 static int jz4725b_pwm_pwm5_pins[] = { 0x4f, };
+static int jz4725b_lcd_8bit_pins[] = {
+       0x72, 0x73, 0x74,
+       0x60, 0x61, 0x62, 0x63,
+       0x64, 0x65, 0x66, 0x67,
+};
+static int jz4725b_lcd_16bit_pins[] = {
+       0x68, 0x69, 0x6a, 0x6b,
+       0x6c, 0x6d, 0x6e, 0x6f,
+};
+static int jz4725b_lcd_18bit_pins[] = { 0x70, 0x71, };
+static int jz4725b_lcd_24bit_pins[] = { 0x76, 0x77, 0x78, 0x79, };
+static int jz4725b_lcd_special_pins[] = { 0x76, 0x77, 0x78, 0x79, };
+static int jz4725b_lcd_generic_pins[] = { 0x75, };
 
 static int jz4725b_mmc0_1bit_funcs[] = { 1, 1, 1, };
 static int jz4725b_mmc0_4bit_funcs[] = { 1, 0, 1, };
@@ -251,6 +264,12 @@ static int jz4725b_pwm_pwm2_funcs[] = { 0, };
 static int jz4725b_pwm_pwm3_funcs[] = { 0, };
 static int jz4725b_pwm_pwm4_funcs[] = { 0, };
 static int jz4725b_pwm_pwm5_funcs[] = { 0, };
+static int jz4725b_lcd_8bit_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
+static int jz4725b_lcd_16bit_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, };
+static int jz4725b_lcd_18bit_funcs[] = { 0, 0, };
+static int jz4725b_lcd_24bit_funcs[] = { 1, 1, 1, 1, };
+static int jz4725b_lcd_special_funcs[] = { 0, 0, 0, 0, };
+static int jz4725b_lcd_generic_funcs[] = { 0, };
 
 static const struct group_desc jz4725b_groups[] = {
        INGENIC_PIN_GROUP("mmc0-1bit", jz4725b_mmc0_1bit),
@@ -270,6 +289,12 @@ static const struct group_desc jz4725b_groups[] = {
        INGENIC_PIN_GROUP("pwm3", jz4725b_pwm_pwm3),
        INGENIC_PIN_GROUP("pwm4", jz4725b_pwm_pwm4),
        INGENIC_PIN_GROUP("pwm5", jz4725b_pwm_pwm5),
+       INGENIC_PIN_GROUP("lcd-8bit", jz4725b_lcd_8bit),
+       INGENIC_PIN_GROUP("lcd-16bit", jz4725b_lcd_16bit),
+       INGENIC_PIN_GROUP("lcd-18bit", jz4725b_lcd_18bit),
+       INGENIC_PIN_GROUP("lcd-24bit", jz4725b_lcd_24bit),
+       INGENIC_PIN_GROUP("lcd-special", jz4725b_lcd_special),
+       INGENIC_PIN_GROUP("lcd-generic", jz4725b_lcd_generic),
 };
 
 static const char *jz4725b_mmc0_groups[] = { "mmc0-1bit", "mmc0-4bit", };
@@ -285,6 +310,10 @@ static const char *jz4725b_pwm2_groups[] = { "pwm2", };
 static const char *jz4725b_pwm3_groups[] = { "pwm3", };
 static const char *jz4725b_pwm4_groups[] = { "pwm4", };
 static const char *jz4725b_pwm5_groups[] = { "pwm5", };
+static const char *jz4725b_lcd_groups[] = {
+       "lcd-8bit", "lcd-16bit", "lcd-18bit", "lcd-24bit",
+       "lcd-special", "lcd-generic",
+};
 
 static const struct function_desc jz4725b_functions[] = {
        { "mmc0", jz4725b_mmc0_groups, ARRAY_SIZE(jz4725b_mmc0_groups), },
@@ -297,6 +326,7 @@ static const struct function_desc jz4725b_functions[] = {
        { "pwm3", jz4725b_pwm3_groups, ARRAY_SIZE(jz4725b_pwm3_groups), },
        { "pwm4", jz4725b_pwm4_groups, ARRAY_SIZE(jz4725b_pwm4_groups), },
        { "pwm5", jz4725b_pwm5_groups, ARRAY_SIZE(jz4725b_pwm5_groups), },
+       { "lcd", jz4725b_lcd_groups, ARRAY_SIZE(jz4725b_lcd_groups), },
 };
 
 static const struct ingenic_chip_info jz4725b_chip_info = {
@@ -321,47 +351,57 @@ static int jz4770_uart0_data_pins[] = { 0xa0, 0xa3, };
 static int jz4770_uart0_hwflow_pins[] = { 0xa1, 0xa2, };
 static int jz4770_uart1_data_pins[] = { 0x7a, 0x7c, };
 static int jz4770_uart1_hwflow_pins[] = { 0x7b, 0x7d, };
-static int jz4770_uart2_data_pins[] = { 0x66, 0x67, };
-static int jz4770_uart2_hwflow_pins[] = { 0x65, 0x64, };
+static int jz4770_uart2_data_pins[] = { 0x5c, 0x5e, };
+static int jz4770_uart2_hwflow_pins[] = { 0x5d, 0x5f, };
 static int jz4770_uart3_data_pins[] = { 0x6c, 0x85, };
 static int jz4770_uart3_hwflow_pins[] = { 0x88, 0x89, };
-static int jz4770_uart4_data_pins[] = { 0x54, 0x4a, };
-static int jz4770_mmc0_8bit_a_pins[] = { 0x04, 0x05, 0x06, 0x07, 0x18, };
-static int jz4770_mmc0_4bit_a_pins[] = { 0x15, 0x16, 0x17, };
 static int jz4770_mmc0_1bit_a_pins[] = { 0x12, 0x13, 0x14, };
-static int jz4770_mmc0_4bit_e_pins[] = { 0x95, 0x96, 0x97, };
+static int jz4770_mmc0_4bit_a_pins[] = { 0x15, 0x16, 0x17, };
 static int jz4770_mmc0_1bit_e_pins[] = { 0x9c, 0x9d, 0x94, };
-static int jz4770_mmc1_4bit_d_pins[] = { 0x75, 0x76, 0x77, };
+static int jz4770_mmc0_4bit_e_pins[] = { 0x95, 0x96, 0x97, };
+static int jz4770_mmc0_8bit_e_pins[] = { 0x98, 0x99, 0x9a, 0x9b, };
 static int jz4770_mmc1_1bit_d_pins[] = { 0x78, 0x79, 0x74, };
-static int jz4770_mmc1_4bit_e_pins[] = { 0x95, 0x96, 0x97, };
+static int jz4770_mmc1_4bit_d_pins[] = { 0x75, 0x76, 0x77, };
 static int jz4770_mmc1_1bit_e_pins[] = { 0x9c, 0x9d, 0x94, };
-static int jz4770_nemc_data_pins[] = {
+static int jz4770_mmc1_4bit_e_pins[] = { 0x95, 0x96, 0x97, };
+static int jz4770_mmc1_8bit_e_pins[] = { 0x98, 0x99, 0x9a, 0x9b, };
+static int jz4770_mmc2_1bit_b_pins[] = { 0x3c, 0x3d, 0x34, };
+static int jz4770_mmc2_4bit_b_pins[] = { 0x35, 0x3e, 0x3f, };
+static int jz4770_mmc2_1bit_e_pins[] = { 0x9c, 0x9d, 0x94, };
+static int jz4770_mmc2_4bit_e_pins[] = { 0x95, 0x96, 0x97, };
+static int jz4770_mmc2_8bit_e_pins[] = { 0x98, 0x99, 0x9a, 0x9b, };
+static int jz4770_nemc_8bit_data_pins[] = {
        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
 };
+static int jz4770_nemc_16bit_data_pins[] = {
+       0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
+};
 static int jz4770_nemc_cle_ale_pins[] = { 0x20, 0x21, };
 static int jz4770_nemc_addr_pins[] = { 0x22, 0x23, 0x24, 0x25, };
 static int jz4770_nemc_rd_we_pins[] = { 0x10, 0x11, };
 static int jz4770_nemc_frd_fwe_pins[] = { 0x12, 0x13, };
+static int jz4770_nemc_wait_pins[] = { 0x1b, };
 static int jz4770_nemc_cs1_pins[] = { 0x15, };
 static int jz4770_nemc_cs2_pins[] = { 0x16, };
 static int jz4770_nemc_cs3_pins[] = { 0x17, };
 static int jz4770_nemc_cs4_pins[] = { 0x18, };
 static int jz4770_nemc_cs5_pins[] = { 0x19, };
 static int jz4770_nemc_cs6_pins[] = { 0x1a, };
-static int jz4770_i2c0_pins[] = { 0x6e, 0x6f, };
-static int jz4770_i2c1_pins[] = { 0x8e, 0x8f, };
+static int jz4770_i2c0_pins[] = { 0x7e, 0x7f, };
+static int jz4770_i2c1_pins[] = { 0x9e, 0x9f, };
 static int jz4770_i2c2_pins[] = { 0xb0, 0xb1, };
-static int jz4770_i2c3_pins[] = { 0x6a, 0x6b, };
-static int jz4770_i2c4_e_pins[] = { 0x8c, 0x8d, };
-static int jz4770_i2c4_f_pins[] = { 0xb9, 0xb8, };
-static int jz4770_cim_pins[] = {
-       0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31,
+static int jz4770_cim_8bit_pins[] = {
+       0x26, 0x27, 0x28, 0x29,
+       0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31,
+};
+static int jz4770_cim_12bit_pins[] = {
+       0x32, 0x33, 0xb0, 0xb1,
 };
-static int jz4770_lcd_32bit_pins[] = {
+static int jz4770_lcd_24bit_pins[] = {
        0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
        0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
        0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
-       0x58, 0x59, 0x51,
+       0x58, 0x59, 0x5a, 0x5b,
 };
 static int jz4770_pwm_pwm0_pins[] = { 0x80, };
 static int jz4770_pwm_pwm1_pins[] = { 0x81, };
@@ -371,30 +411,41 @@ static int jz4770_pwm_pwm4_pins[] = { 0x84, };
 static int jz4770_pwm_pwm5_pins[] = { 0x85, };
 static int jz4770_pwm_pwm6_pins[] = { 0x6a, };
 static int jz4770_pwm_pwm7_pins[] = { 0x6b, };
+static int jz4770_mac_rmii_pins[] = {
+       0xa9, 0xab, 0xaa, 0xac, 0xa5, 0xa4, 0xad, 0xae, 0xa6, 0xa8,
+};
+static int jz4770_mac_mii_pins[] = { 0xa7, 0xaf, };
 
 static int jz4770_uart0_data_funcs[] = { 0, 0, };
 static int jz4770_uart0_hwflow_funcs[] = { 0, 0, };
 static int jz4770_uart1_data_funcs[] = { 0, 0, };
 static int jz4770_uart1_hwflow_funcs[] = { 0, 0, };
-static int jz4770_uart2_data_funcs[] = { 1, 1, };
-static int jz4770_uart2_hwflow_funcs[] = { 1, 1, };
+static int jz4770_uart2_data_funcs[] = { 0, 0, };
+static int jz4770_uart2_hwflow_funcs[] = { 0, 0, };
 static int jz4770_uart3_data_funcs[] = { 0, 1, };
 static int jz4770_uart3_hwflow_funcs[] = { 0, 0, };
-static int jz4770_uart4_data_funcs[] = { 2, 2, };
-static int jz4770_mmc0_8bit_a_funcs[] = { 1, 1, 1, 1, 1, };
-static int jz4770_mmc0_4bit_a_funcs[] = { 1, 1, 1, };
 static int jz4770_mmc0_1bit_a_funcs[] = { 1, 1, 0, };
-static int jz4770_mmc0_4bit_e_funcs[] = { 0, 0, 0, };
+static int jz4770_mmc0_4bit_a_funcs[] = { 1, 1, 1, };
 static int jz4770_mmc0_1bit_e_funcs[] = { 0, 0, 0, };
-static int jz4770_mmc1_4bit_d_funcs[] = { 0, 0, 0, };
+static int jz4770_mmc0_4bit_e_funcs[] = { 0, 0, 0, };
+static int jz4770_mmc0_8bit_e_funcs[] = { 0, 0, 0, 0, };
 static int jz4770_mmc1_1bit_d_funcs[] = { 0, 0, 0, };
-static int jz4770_mmc1_4bit_e_funcs[] = { 1, 1, 1, };
+static int jz4770_mmc1_4bit_d_funcs[] = { 0, 0, 0, };
 static int jz4770_mmc1_1bit_e_funcs[] = { 1, 1, 1, };
-static int jz4770_nemc_data_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, };
+static int jz4770_mmc1_4bit_e_funcs[] = { 1, 1, 1, };
+static int jz4770_mmc1_8bit_e_funcs[] = { 1, 1, 1, 1, };
+static int jz4770_mmc2_1bit_b_funcs[] = { 0, 0, 0, };
+static int jz4770_mmc2_4bit_b_funcs[] = { 0, 0, 0, };
+static int jz4770_mmc2_1bit_e_funcs[] = { 2, 2, 2, };
+static int jz4770_mmc2_4bit_e_funcs[] = { 2, 2, 2, };
+static int jz4770_mmc2_8bit_e_funcs[] = { 2, 2, 2, 2, };
+static int jz4770_nemc_8bit_data_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, };
+static int jz4770_nemc_16bit_data_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, };
 static int jz4770_nemc_cle_ale_funcs[] = { 0, 0, };
 static int jz4770_nemc_addr_funcs[] = { 0, 0, 0, 0, };
 static int jz4770_nemc_rd_we_funcs[] = { 0, 0, };
 static int jz4770_nemc_frd_fwe_funcs[] = { 0, 0, };
+static int jz4770_nemc_wait_funcs[] = { 0, };
 static int jz4770_nemc_cs1_funcs[] = { 0, };
 static int jz4770_nemc_cs2_funcs[] = { 0, };
 static int jz4770_nemc_cs3_funcs[] = { 0, };
@@ -404,14 +455,13 @@ static int jz4770_nemc_cs6_funcs[] = { 0, };
 static int jz4770_i2c0_funcs[] = { 0, 0, };
 static int jz4770_i2c1_funcs[] = { 0, 0, };
 static int jz4770_i2c2_funcs[] = { 2, 2, };
-static int jz4770_i2c3_funcs[] = { 1, 1, };
-static int jz4770_i2c4_e_funcs[] = { 1, 1, };
-static int jz4770_i2c4_f_funcs[] = { 1, 1, };
-static int jz4770_cim_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
-static int jz4770_lcd_32bit_funcs[] = {
+static int jz4770_cim_8bit_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
+static int jz4770_cim_12bit_funcs[] = { 0, 0, 0, 0, };
+static int jz4770_lcd_24bit_funcs[] = {
+       0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0,
-       0, 0, 0,
+       0, 0, 0, 0,
 };
 static int jz4770_pwm_pwm0_funcs[] = { 0, };
 static int jz4770_pwm_pwm1_funcs[] = { 0, };
@@ -421,6 +471,8 @@ static int jz4770_pwm_pwm4_funcs[] = { 0, };
 static int jz4770_pwm_pwm5_funcs[] = { 0, };
 static int jz4770_pwm_pwm6_funcs[] = { 0, };
 static int jz4770_pwm_pwm7_funcs[] = { 0, };
+static int jz4770_mac_rmii_funcs[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, };
+static int jz4770_mac_mii_funcs[] = { 0, 0, };
 
 static const struct group_desc jz4770_groups[] = {
        INGENIC_PIN_GROUP("uart0-data", jz4770_uart0_data),
@@ -431,21 +483,28 @@ static const struct group_desc jz4770_groups[] = {
        INGENIC_PIN_GROUP("uart2-hwflow", jz4770_uart2_hwflow),
        INGENIC_PIN_GROUP("uart3-data", jz4770_uart3_data),
        INGENIC_PIN_GROUP("uart3-hwflow", jz4770_uart3_hwflow),
-       INGENIC_PIN_GROUP("uart4-data", jz4770_uart4_data),
-       INGENIC_PIN_GROUP("mmc0-8bit-a", jz4770_mmc0_8bit_a),
-       INGENIC_PIN_GROUP("mmc0-4bit-a", jz4770_mmc0_4bit_a),
        INGENIC_PIN_GROUP("mmc0-1bit-a", jz4770_mmc0_1bit_a),
-       INGENIC_PIN_GROUP("mmc0-4bit-e", jz4770_mmc0_4bit_e),
+       INGENIC_PIN_GROUP("mmc0-4bit-a", jz4770_mmc0_4bit_a),
        INGENIC_PIN_GROUP("mmc0-1bit-e", jz4770_mmc0_1bit_e),
-       INGENIC_PIN_GROUP("mmc1-4bit-d", jz4770_mmc1_4bit_d),
+       INGENIC_PIN_GROUP("mmc0-4bit-e", jz4770_mmc0_4bit_e),
+       INGENIC_PIN_GROUP("mmc0-8bit-e", jz4770_mmc0_8bit_e),
        INGENIC_PIN_GROUP("mmc1-1bit-d", jz4770_mmc1_1bit_d),
-       INGENIC_PIN_GROUP("mmc1-4bit-e", jz4770_mmc1_4bit_e),
+       INGENIC_PIN_GROUP("mmc1-4bit-d", jz4770_mmc1_4bit_d),
        INGENIC_PIN_GROUP("mmc1-1bit-e", jz4770_mmc1_1bit_e),
-       INGENIC_PIN_GROUP("nemc-data", jz4770_nemc_data),
+       INGENIC_PIN_GROUP("mmc1-4bit-e", jz4770_mmc1_4bit_e),
+       INGENIC_PIN_GROUP("mmc1-8bit-e", jz4770_mmc1_8bit_e),
+       INGENIC_PIN_GROUP("mmc2-1bit-b", jz4770_mmc2_1bit_b),
+       INGENIC_PIN_GROUP("mmc2-4bit-b", jz4770_mmc2_4bit_b),
+       INGENIC_PIN_GROUP("mmc2-1bit-e", jz4770_mmc2_1bit_e),
+       INGENIC_PIN_GROUP("mmc2-4bit-e", jz4770_mmc2_4bit_e),
+       INGENIC_PIN_GROUP("mmc2-8bit-e", jz4770_mmc2_8bit_e),
+       INGENIC_PIN_GROUP("nemc-8bit-data", jz4770_nemc_8bit_data),
+       INGENIC_PIN_GROUP("nemc-16bit-data", jz4770_nemc_16bit_data),
        INGENIC_PIN_GROUP("nemc-cle-ale", jz4770_nemc_cle_ale),
        INGENIC_PIN_GROUP("nemc-addr", jz4770_nemc_addr),
        INGENIC_PIN_GROUP("nemc-rd-we", jz4770_nemc_rd_we),
        INGENIC_PIN_GROUP("nemc-frd-fwe", jz4770_nemc_frd_fwe),
+       INGENIC_PIN_GROUP("nemc-wait", jz4770_nemc_wait),
        INGENIC_PIN_GROUP("nemc-cs1", jz4770_nemc_cs1),
        INGENIC_PIN_GROUP("nemc-cs2", jz4770_nemc_cs2),
        INGENIC_PIN_GROUP("nemc-cs3", jz4770_nemc_cs3),
@@ -455,11 +514,9 @@ static const struct group_desc jz4770_groups[] = {
        INGENIC_PIN_GROUP("i2c0-data", jz4770_i2c0),
        INGENIC_PIN_GROUP("i2c1-data", jz4770_i2c1),
        INGENIC_PIN_GROUP("i2c2-data", jz4770_i2c2),
-       INGENIC_PIN_GROUP("i2c3-data", jz4770_i2c3),
-       INGENIC_PIN_GROUP("i2c4-data-e", jz4770_i2c4_e),
-       INGENIC_PIN_GROUP("i2c4-data-f", jz4770_i2c4_f),
-       INGENIC_PIN_GROUP("cim-data", jz4770_cim),
-       INGENIC_PIN_GROUP("lcd-32bit", jz4770_lcd_32bit),
+       INGENIC_PIN_GROUP("cim-data-8bit", jz4770_cim_8bit),
+       INGENIC_PIN_GROUP("cim-data-12bit", jz4770_cim_12bit),
+       INGENIC_PIN_GROUP("lcd-24bit", jz4770_lcd_24bit),
        { "lcd-no-pins", },
        INGENIC_PIN_GROUP("pwm0", jz4770_pwm_pwm0),
        INGENIC_PIN_GROUP("pwm1", jz4770_pwm_pwm1),
@@ -469,32 +526,41 @@ static const struct group_desc jz4770_groups[] = {
        INGENIC_PIN_GROUP("pwm5", jz4770_pwm_pwm5),
        INGENIC_PIN_GROUP("pwm6", jz4770_pwm_pwm6),
        INGENIC_PIN_GROUP("pwm7", jz4770_pwm_pwm7),
+       INGENIC_PIN_GROUP("mac-rmii", jz4770_mac_rmii),
+       INGENIC_PIN_GROUP("mac-mii", jz4770_mac_mii),
 };
 
 static const char *jz4770_uart0_groups[] = { "uart0-data", "uart0-hwflow", };
 static const char *jz4770_uart1_groups[] = { "uart1-data", "uart1-hwflow", };
 static const char *jz4770_uart2_groups[] = { "uart2-data", "uart2-hwflow", };
 static const char *jz4770_uart3_groups[] = { "uart3-data", "uart3-hwflow", };
-static const char *jz4770_uart4_groups[] = { "uart4-data", };
 static const char *jz4770_mmc0_groups[] = {
-       "mmc0-8bit-a", "mmc0-4bit-a", "mmc0-1bit-a",
-       "mmc0-1bit-e", "mmc0-4bit-e",
+       "mmc0-1bit-a", "mmc0-4bit-a",
+       "mmc0-1bit-e", "mmc0-4bit-e", "mmc0-8bit-e",
 };
 static const char *jz4770_mmc1_groups[] = {
-       "mmc1-1bit-d", "mmc1-4bit-d", "mmc1-1bit-e", "mmc1-4bit-e",
+       "mmc1-1bit-d", "mmc1-4bit-d",
+       "mmc1-1bit-e", "mmc1-4bit-e", "mmc1-8bit-e",
+};
+static const char *jz4770_mmc2_groups[] = {
+       "mmc2-1bit-b", "mmc2-4bit-b",
+       "mmc2-1bit-e", "mmc2-4bit-e", "mmc2-8bit-e",
 };
 static const char *jz4770_nemc_groups[] = {
-       "nemc-data", "nemc-cle-ale", "nemc-addr", "nemc-rd-we", "nemc-frd-fwe",
+       "nemc-8bit-data", "nemc-16bit-data", "nemc-cle-ale",
+       "nemc-addr", "nemc-rd-we", "nemc-frd-fwe", "nemc-wait",
 };
 static const char *jz4770_cs1_groups[] = { "nemc-cs1", };
+static const char *jz4770_cs2_groups[] = { "nemc-cs2", };
+static const char *jz4770_cs3_groups[] = { "nemc-cs3", };
+static const char *jz4770_cs4_groups[] = { "nemc-cs4", };
+static const char *jz4770_cs5_groups[] = { "nemc-cs5", };
 static const char *jz4770_cs6_groups[] = { "nemc-cs6", };
 static const char *jz4770_i2c0_groups[] = { "i2c0-data", };
 static const char *jz4770_i2c1_groups[] = { "i2c1-data", };
 static const char *jz4770_i2c2_groups[] = { "i2c2-data", };
-static const char *jz4770_i2c3_groups[] = { "i2c3-data", };
-static const char *jz4770_i2c4_groups[] = { "i2c4-data-e", "i2c4-data-f", };
-static const char *jz4770_cim_groups[] = { "cim-data", };
-static const char *jz4770_lcd_groups[] = { "lcd-32bit", "lcd-no-pins", };
+static const char *jz4770_cim_groups[] = { "cim-data-8bit", "cim-data-12bit", };
+static const char *jz4770_lcd_groups[] = { "lcd-24bit", "lcd-no-pins", };
 static const char *jz4770_pwm0_groups[] = { "pwm0", };
 static const char *jz4770_pwm1_groups[] = { "pwm1", };
 static const char *jz4770_pwm2_groups[] = { "pwm2", };
@@ -503,23 +569,26 @@ static const char *jz4770_pwm4_groups[] = { "pwm4", };
 static const char *jz4770_pwm5_groups[] = { "pwm5", };
 static const char *jz4770_pwm6_groups[] = { "pwm6", };
 static const char *jz4770_pwm7_groups[] = { "pwm7", };
+static const char *jz4770_mac_groups[] = { "mac-rmii", "mac-mii", };
 
 static const struct function_desc jz4770_functions[] = {
        { "uart0", jz4770_uart0_groups, ARRAY_SIZE(jz4770_uart0_groups), },
        { "uart1", jz4770_uart1_groups, ARRAY_SIZE(jz4770_uart1_groups), },
        { "uart2", jz4770_uart2_groups, ARRAY_SIZE(jz4770_uart2_groups), },
        { "uart3", jz4770_uart3_groups, ARRAY_SIZE(jz4770_uart3_groups), },
-       { "uart4", jz4770_uart4_groups, ARRAY_SIZE(jz4770_uart4_groups), },
        { "mmc0", jz4770_mmc0_groups, ARRAY_SIZE(jz4770_mmc0_groups), },
        { "mmc1", jz4770_mmc1_groups, ARRAY_SIZE(jz4770_mmc1_groups), },
+       { "mmc2", jz4770_mmc2_groups, ARRAY_SIZE(jz4770_mmc2_groups), },
        { "nemc", jz4770_nemc_groups, ARRAY_SIZE(jz4770_nemc_groups), },
        { "nemc-cs1", jz4770_cs1_groups, ARRAY_SIZE(jz4770_cs1_groups), },
+       { "nemc-cs2", jz4770_cs2_groups, ARRAY_SIZE(jz4770_cs2_groups), },
+       { "nemc-cs3", jz4770_cs3_groups, ARRAY_SIZE(jz4770_cs3_groups), },
+       { "nemc-cs4", jz4770_cs4_groups, ARRAY_SIZE(jz4770_cs4_groups), },
+       { "nemc-cs5", jz4770_cs5_groups, ARRAY_SIZE(jz4770_cs5_groups), },
        { "nemc-cs6", jz4770_cs6_groups, ARRAY_SIZE(jz4770_cs6_groups), },
        { "i2c0", jz4770_i2c0_groups, ARRAY_SIZE(jz4770_i2c0_groups), },
        { "i2c1", jz4770_i2c1_groups, ARRAY_SIZE(jz4770_i2c1_groups), },
        { "i2c2", jz4770_i2c2_groups, ARRAY_SIZE(jz4770_i2c2_groups), },
-       { "i2c3", jz4770_i2c3_groups, ARRAY_SIZE(jz4770_i2c3_groups), },
-       { "i2c4", jz4770_i2c4_groups, ARRAY_SIZE(jz4770_i2c4_groups), },
        { "cim", jz4770_cim_groups, ARRAY_SIZE(jz4770_cim_groups), },
        { "lcd", jz4770_lcd_groups, ARRAY_SIZE(jz4770_lcd_groups), },
        { "pwm0", jz4770_pwm0_groups, ARRAY_SIZE(jz4770_pwm0_groups), },
@@ -530,6 +599,7 @@ static const struct function_desc jz4770_functions[] = {
        { "pwm5", jz4770_pwm5_groups, ARRAY_SIZE(jz4770_pwm5_groups), },
        { "pwm6", jz4770_pwm6_groups, ARRAY_SIZE(jz4770_pwm6_groups), },
        { "pwm7", jz4770_pwm7_groups, ARRAY_SIZE(jz4770_pwm7_groups), },
+       { "mac", jz4770_mac_groups, ARRAY_SIZE(jz4770_mac_groups), },
 };
 
 static const struct ingenic_chip_info jz4770_chip_info = {
@@ -542,7 +612,140 @@ static const struct ingenic_chip_info jz4770_chip_info = {
        .pull_downs = jz4770_pull_downs,
 };
 
-static u32 gpio_ingenic_read_reg(struct ingenic_gpio_chip *jzgc, u8 reg)
+static int jz4780_uart2_data_pins[] = { 0x66, 0x67, };
+static int jz4780_uart2_hwflow_pins[] = { 0x65, 0x64, };
+static int jz4780_uart4_data_pins[] = { 0x54, 0x4a, };
+static int jz4780_mmc0_8bit_a_pins[] = { 0x04, 0x05, 0x06, 0x07, 0x18, };
+static int jz4780_i2c3_pins[] = { 0x6a, 0x6b, };
+static int jz4780_i2c4_e_pins[] = { 0x8c, 0x8d, };
+static int jz4780_i2c4_f_pins[] = { 0xb9, 0xb8, };
+
+static int jz4780_uart2_data_funcs[] = { 1, 1, };
+static int jz4780_uart2_hwflow_funcs[] = { 1, 1, };
+static int jz4780_uart4_data_funcs[] = { 2, 2, };
+static int jz4780_mmc0_8bit_a_funcs[] = { 1, 1, 1, 1, 1, };
+static int jz4780_i2c3_funcs[] = { 1, 1, };
+static int jz4780_i2c4_e_funcs[] = { 1, 1, };
+static int jz4780_i2c4_f_funcs[] = { 1, 1, };
+
+static const struct group_desc jz4780_groups[] = {
+       INGENIC_PIN_GROUP("uart0-data", jz4770_uart0_data),
+       INGENIC_PIN_GROUP("uart0-hwflow", jz4770_uart0_hwflow),
+       INGENIC_PIN_GROUP("uart1-data", jz4770_uart1_data),
+       INGENIC_PIN_GROUP("uart1-hwflow", jz4770_uart1_hwflow),
+       INGENIC_PIN_GROUP("uart2-data", jz4780_uart2_data),
+       INGENIC_PIN_GROUP("uart2-hwflow", jz4780_uart2_hwflow),
+       INGENIC_PIN_GROUP("uart3-data", jz4770_uart3_data),
+       INGENIC_PIN_GROUP("uart3-hwflow", jz4770_uart3_hwflow),
+       INGENIC_PIN_GROUP("uart4-data", jz4780_uart4_data),
+       INGENIC_PIN_GROUP("mmc0-1bit-a", jz4770_mmc0_1bit_a),
+       INGENIC_PIN_GROUP("mmc0-4bit-a", jz4770_mmc0_4bit_a),
+       INGENIC_PIN_GROUP("mmc0-8bit-a", jz4780_mmc0_8bit_a),
+       INGENIC_PIN_GROUP("mmc0-1bit-e", jz4770_mmc0_1bit_e),
+       INGENIC_PIN_GROUP("mmc0-4bit-e", jz4770_mmc0_4bit_e),
+       INGENIC_PIN_GROUP("mmc1-1bit-d", jz4770_mmc1_1bit_d),
+       INGENIC_PIN_GROUP("mmc1-4bit-d", jz4770_mmc1_4bit_d),
+       INGENIC_PIN_GROUP("mmc1-1bit-e", jz4770_mmc1_1bit_e),
+       INGENIC_PIN_GROUP("mmc1-4bit-e", jz4770_mmc1_4bit_e),
+       INGENIC_PIN_GROUP("mmc2-1bit-b", jz4770_mmc2_1bit_b),
+       INGENIC_PIN_GROUP("mmc2-4bit-b", jz4770_mmc2_4bit_b),
+       INGENIC_PIN_GROUP("mmc2-1bit-e", jz4770_mmc2_1bit_e),
+       INGENIC_PIN_GROUP("mmc2-4bit-e", jz4770_mmc2_4bit_e),
+       INGENIC_PIN_GROUP("nemc-data", jz4770_nemc_8bit_data),
+       INGENIC_PIN_GROUP("nemc-cle-ale", jz4770_nemc_cle_ale),
+       INGENIC_PIN_GROUP("nemc-addr", jz4770_nemc_addr),
+       INGENIC_PIN_GROUP("nemc-rd-we", jz4770_nemc_rd_we),
+       INGENIC_PIN_GROUP("nemc-frd-fwe", jz4770_nemc_frd_fwe),
+       INGENIC_PIN_GROUP("nemc-wait", jz4770_nemc_wait),
+       INGENIC_PIN_GROUP("nemc-cs1", jz4770_nemc_cs1),
+       INGENIC_PIN_GROUP("nemc-cs2", jz4770_nemc_cs2),
+       INGENIC_PIN_GROUP("nemc-cs3", jz4770_nemc_cs3),
+       INGENIC_PIN_GROUP("nemc-cs4", jz4770_nemc_cs4),
+       INGENIC_PIN_GROUP("nemc-cs5", jz4770_nemc_cs5),
+       INGENIC_PIN_GROUP("nemc-cs6", jz4770_nemc_cs6),
+       INGENIC_PIN_GROUP("i2c0-data", jz4770_i2c0),
+       INGENIC_PIN_GROUP("i2c1-data", jz4770_i2c1),
+       INGENIC_PIN_GROUP("i2c2-data", jz4770_i2c2),
+       INGENIC_PIN_GROUP("i2c3-data", jz4780_i2c3),
+       INGENIC_PIN_GROUP("i2c4-data-e", jz4780_i2c4_e),
+       INGENIC_PIN_GROUP("i2c4-data-f", jz4780_i2c4_f),
+       INGENIC_PIN_GROUP("cim-data", jz4770_cim_8bit),
+       INGENIC_PIN_GROUP("lcd-24bit", jz4770_lcd_24bit),
+       { "lcd-no-pins", },
+       INGENIC_PIN_GROUP("pwm0", jz4770_pwm_pwm0),
+       INGENIC_PIN_GROUP("pwm1", jz4770_pwm_pwm1),
+       INGENIC_PIN_GROUP("pwm2", jz4770_pwm_pwm2),
+       INGENIC_PIN_GROUP("pwm3", jz4770_pwm_pwm3),
+       INGENIC_PIN_GROUP("pwm4", jz4770_pwm_pwm4),
+       INGENIC_PIN_GROUP("pwm5", jz4770_pwm_pwm5),
+       INGENIC_PIN_GROUP("pwm6", jz4770_pwm_pwm6),
+       INGENIC_PIN_GROUP("pwm7", jz4770_pwm_pwm7),
+};
+
+static const char *jz4780_uart2_groups[] = { "uart2-data", "uart2-hwflow", };
+static const char *jz4780_uart4_groups[] = { "uart4-data", };
+static const char *jz4780_mmc0_groups[] = {
+       "mmc0-1bit-a", "mmc0-4bit-a", "mmc0-8bit-a",
+       "mmc0-1bit-e", "mmc0-4bit-e",
+};
+static const char *jz4780_mmc1_groups[] = {
+       "mmc1-1bit-d", "mmc1-4bit-d", "mmc1-1bit-e", "mmc1-4bit-e",
+};
+static const char *jz4780_mmc2_groups[] = {
+       "mmc2-1bit-b", "mmc2-4bit-b", "mmc2-1bit-e", "mmc2-4bit-e",
+};
+static const char *jz4780_nemc_groups[] = {
+       "nemc-data", "nemc-cle-ale", "nemc-addr",
+       "nemc-rd-we", "nemc-frd-fwe", "nemc-wait",
+};
+static const char *jz4780_i2c3_groups[] = { "i2c3-data", };
+static const char *jz4780_i2c4_groups[] = { "i2c4-data-e", "i2c4-data-f", };
+static const char *jz4780_cim_groups[] = { "cim-data", };
+
+static const struct function_desc jz4780_functions[] = {
+       { "uart0", jz4770_uart0_groups, ARRAY_SIZE(jz4770_uart0_groups), },
+       { "uart1", jz4770_uart1_groups, ARRAY_SIZE(jz4770_uart1_groups), },
+       { "uart2", jz4780_uart2_groups, ARRAY_SIZE(jz4780_uart2_groups), },
+       { "uart3", jz4770_uart3_groups, ARRAY_SIZE(jz4770_uart3_groups), },
+       { "uart4", jz4780_uart4_groups, ARRAY_SIZE(jz4780_uart4_groups), },
+       { "mmc0", jz4780_mmc0_groups, ARRAY_SIZE(jz4780_mmc0_groups), },
+       { "mmc1", jz4780_mmc1_groups, ARRAY_SIZE(jz4780_mmc1_groups), },
+       { "mmc2", jz4780_mmc2_groups, ARRAY_SIZE(jz4780_mmc2_groups), },
+       { "nemc", jz4780_nemc_groups, ARRAY_SIZE(jz4780_nemc_groups), },
+       { "nemc-cs1", jz4770_cs1_groups, ARRAY_SIZE(jz4770_cs1_groups), },
+       { "nemc-cs2", jz4770_cs2_groups, ARRAY_SIZE(jz4770_cs2_groups), },
+       { "nemc-cs3", jz4770_cs3_groups, ARRAY_SIZE(jz4770_cs3_groups), },
+       { "nemc-cs4", jz4770_cs4_groups, ARRAY_SIZE(jz4770_cs4_groups), },
+       { "nemc-cs5", jz4770_cs5_groups, ARRAY_SIZE(jz4770_cs5_groups), },
+       { "nemc-cs6", jz4770_cs6_groups, ARRAY_SIZE(jz4770_cs6_groups), },
+       { "i2c0", jz4770_i2c0_groups, ARRAY_SIZE(jz4770_i2c0_groups), },
+       { "i2c1", jz4770_i2c1_groups, ARRAY_SIZE(jz4770_i2c1_groups), },
+       { "i2c2", jz4770_i2c2_groups, ARRAY_SIZE(jz4770_i2c2_groups), },
+       { "i2c3", jz4780_i2c3_groups, ARRAY_SIZE(jz4780_i2c3_groups), },
+       { "i2c4", jz4780_i2c4_groups, ARRAY_SIZE(jz4780_i2c4_groups), },
+       { "cim", jz4780_cim_groups, ARRAY_SIZE(jz4780_cim_groups), },
+       { "lcd", jz4770_lcd_groups, ARRAY_SIZE(jz4770_lcd_groups), },
+       { "pwm0", jz4770_pwm0_groups, ARRAY_SIZE(jz4770_pwm0_groups), },
+       { "pwm1", jz4770_pwm1_groups, ARRAY_SIZE(jz4770_pwm1_groups), },
+       { "pwm2", jz4770_pwm2_groups, ARRAY_SIZE(jz4770_pwm2_groups), },
+       { "pwm3", jz4770_pwm3_groups, ARRAY_SIZE(jz4770_pwm3_groups), },
+       { "pwm4", jz4770_pwm4_groups, ARRAY_SIZE(jz4770_pwm4_groups), },
+       { "pwm5", jz4770_pwm5_groups, ARRAY_SIZE(jz4770_pwm5_groups), },
+       { "pwm6", jz4770_pwm6_groups, ARRAY_SIZE(jz4770_pwm6_groups), },
+       { "pwm7", jz4770_pwm7_groups, ARRAY_SIZE(jz4770_pwm7_groups), },
+};
+
+static const struct ingenic_chip_info jz4780_chip_info = {
+       .num_chips = 6,
+       .groups = jz4780_groups,
+       .num_groups = ARRAY_SIZE(jz4780_groups),
+       .functions = jz4780_functions,
+       .num_functions = ARRAY_SIZE(jz4780_functions),
+       .pull_ups = jz4770_pull_ups,
+       .pull_downs = jz4770_pull_downs,
+};
+
+static u32 ingenic_gpio_read_reg(struct ingenic_gpio_chip *jzgc, u8 reg)
 {
        unsigned int val;
 
@@ -551,7 +754,7 @@ static u32 gpio_ingenic_read_reg(struct ingenic_gpio_chip *jzgc, u8 reg)
        return (u32) val;
 }
 
-static void gpio_ingenic_set_bit(struct ingenic_gpio_chip *jzgc,
+static void ingenic_gpio_set_bit(struct ingenic_gpio_chip *jzgc,
                u8 reg, u8 offset, bool set)
 {
        if (set)
@@ -565,7 +768,7 @@ static void gpio_ingenic_set_bit(struct ingenic_gpio_chip *jzgc,
 static inline bool ingenic_gpio_get_value(struct ingenic_gpio_chip *jzgc,
                                          u8 offset)
 {
-       unsigned int val = gpio_ingenic_read_reg(jzgc, GPIO_PIN);
+       unsigned int val = ingenic_gpio_read_reg(jzgc, GPIO_PIN);
 
        return !!(val & BIT(offset));
 }
@@ -574,9 +777,9 @@ static void ingenic_gpio_set_value(struct ingenic_gpio_chip *jzgc,
                                   u8 offset, int value)
 {
        if (jzgc->jzpc->version >= ID_JZ4770)
-               gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_PAT0, offset, !!value);
+               ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_PAT0, offset, !!value);
        else
-               gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_DATA, offset, !!value);
+               ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_DATA, offset, !!value);
 }
 
 static void irq_set_type(struct ingenic_gpio_chip *jzgc,
@@ -594,21 +797,21 @@ static void irq_set_type(struct ingenic_gpio_chip *jzgc,
 
        switch (type) {
        case IRQ_TYPE_EDGE_RISING:
-               gpio_ingenic_set_bit(jzgc, reg2, offset, true);
-               gpio_ingenic_set_bit(jzgc, reg1, offset, true);
+               ingenic_gpio_set_bit(jzgc, reg2, offset, true);
+               ingenic_gpio_set_bit(jzgc, reg1, offset, true);
                break;
        case IRQ_TYPE_EDGE_FALLING:
-               gpio_ingenic_set_bit(jzgc, reg2, offset, false);
-               gpio_ingenic_set_bit(jzgc, reg1, offset, true);
+               ingenic_gpio_set_bit(jzgc, reg2, offset, false);
+               ingenic_gpio_set_bit(jzgc, reg1, offset, true);
                break;
        case IRQ_TYPE_LEVEL_HIGH:
-               gpio_ingenic_set_bit(jzgc, reg2, offset, true);
-               gpio_ingenic_set_bit(jzgc, reg1, offset, false);
+               ingenic_gpio_set_bit(jzgc, reg2, offset, true);
+               ingenic_gpio_set_bit(jzgc, reg1, offset, false);
                break;
        case IRQ_TYPE_LEVEL_LOW:
        default:
-               gpio_ingenic_set_bit(jzgc, reg2, offset, false);
-               gpio_ingenic_set_bit(jzgc, reg1, offset, false);
+               ingenic_gpio_set_bit(jzgc, reg2, offset, false);
+               ingenic_gpio_set_bit(jzgc, reg1, offset, false);
                break;
        }
 }
@@ -618,7 +821,7 @@ static void ingenic_gpio_irq_mask(struct irq_data *irqd)
        struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
        struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
 
-       gpio_ingenic_set_bit(jzgc, GPIO_MSK, irqd->hwirq, true);
+       ingenic_gpio_set_bit(jzgc, GPIO_MSK, irqd->hwirq, true);
 }
 
 static void ingenic_gpio_irq_unmask(struct irq_data *irqd)
@@ -626,7 +829,7 @@ static void ingenic_gpio_irq_unmask(struct irq_data *irqd)
        struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
        struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
 
-       gpio_ingenic_set_bit(jzgc, GPIO_MSK, irqd->hwirq, false);
+       ingenic_gpio_set_bit(jzgc, GPIO_MSK, irqd->hwirq, false);
 }
 
 static void ingenic_gpio_irq_enable(struct irq_data *irqd)
@@ -636,9 +839,9 @@ static void ingenic_gpio_irq_enable(struct irq_data *irqd)
        int irq = irqd->hwirq;
 
        if (jzgc->jzpc->version >= ID_JZ4770)
-               gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
+               ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
        else
-               gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, true);
+               ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, true);
 
        ingenic_gpio_irq_unmask(irqd);
 }
@@ -652,9 +855,9 @@ static void ingenic_gpio_irq_disable(struct irq_data *irqd)
        ingenic_gpio_irq_mask(irqd);
 
        if (jzgc->jzpc->version >= ID_JZ4770)
-               gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_INT, irq, false);
+               ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, false);
        else
-               gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false);
+               ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false);
 }
 
 static void ingenic_gpio_irq_ack(struct irq_data *irqd)
@@ -677,9 +880,9 @@ static void ingenic_gpio_irq_ack(struct irq_data *irqd)
        }
 
        if (jzgc->jzpc->version >= ID_JZ4770)
-               gpio_ingenic_set_bit(jzgc, JZ4770_GPIO_FLAG, irq, false);
+               ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_FLAG, irq, false);
        else
-               gpio_ingenic_set_bit(jzgc, JZ4740_GPIO_DATA, irq, true);
+               ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_DATA, irq, true);
 }
 
 static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
@@ -734,9 +937,9 @@ static void ingenic_gpio_irq_handler(struct irq_desc *desc)
        chained_irq_enter(irq_chip, desc);
 
        if (jzgc->jzpc->version >= ID_JZ4770)
-               flag = gpio_ingenic_read_reg(jzgc, JZ4770_GPIO_FLAG);
+               flag = ingenic_gpio_read_reg(jzgc, JZ4770_GPIO_FLAG);
        else
-               flag = gpio_ingenic_read_reg(jzgc, JZ4740_GPIO_FLAG);
+               flag = ingenic_gpio_read_reg(jzgc, JZ4740_GPIO_FLAG);
 
        for_each_set_bit(i, &flag, 32)
                generic_handle_irq(irq_linear_revmap(gc->irq.domain, i));
@@ -1185,7 +1388,9 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev)
        else
                jzpc->version = (enum jz_version)id->driver_data;
 
-       if (jzpc->version >= ID_JZ4770)
+       if (jzpc->version >= ID_JZ4780)
+               chip_info = &jz4780_chip_info;
+       else if (jzpc->version >= ID_JZ4770)
                chip_info = &jz4770_chip_info;
        else if (jzpc->version >= ID_JZ4725B)
                chip_info = &jz4725b_chip_info;