Message ID | 1618080886-32061-9-git-send-email-zhouyanjie@wanyeetech.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | Fix bugs and add support for new Ingenic SoCs. | expand |
Hi "周琰杰, Thank you for the patch! Yet something to improve: [auto build test ERROR on pinctrl/devel] [also build test ERROR on robh/for-next linus/master v5.12-rc6 next-20210409] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Zhou-Yanjie/Fix-bugs-and-add-support-for-new-Ingenic-SoCs/20210411-025656 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gcc (GCC) 9.3.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/0day-ci/linux/commit/76f684ad7bcc8b973c1a622beb0c12cf13e7ba10 git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Zhou-Yanjie/Fix-bugs-and-add-support-for-new-Ingenic-SoCs/20210411-025656 git checkout 76f684ad7bcc8b973c1a622beb0c12cf13e7ba10 # save the attached .config to linux build tree COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sh If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> Note: the linux-review/Zhou-Yanjie/Fix-bugs-and-add-support-for-new-Ingenic-SoCs/20210411-025656 HEAD f620590a49d7d82d9e111928ccb3d435768a62e4 builds fine. It only hurts bisectibility. All error/warnings (new ones prefixed by >>): >> drivers/pinctrl/pinctrl-ingenic.c:2882:3: error: field name not in record or union initializer 2882 | .compatible = "ingenic,jz4760-pinctrl", | ^ drivers/pinctrl/pinctrl-ingenic.c:2882:3: note: (near initialization for 'ingenic_pinctrl_of_match') drivers/pinctrl/pinctrl-ingenic.c:2883:3: error: field name not in record or union initializer 2883 | .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) | ^ drivers/pinctrl/pinctrl-ingenic.c:2883:3: note: (near initialization for 'ingenic_pinctrl_of_match') In file included from <command-line>: >> include/linux/kconfig.h:79:33: warning: initialization of 'char' from 'const struct ingenic_chip_info *' makes integer from pointer without a cast [-Wint-conversion] 79 | #define IF_ENABLED(option, ptr) (IS_ENABLED(option) ? (ptr) : NULL) | ^ drivers/pinctrl/pinctrl-ingenic.c:2883:11: note: in expansion of macro 'IF_ENABLED' 2883 | .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) | ^~~~~~~~~~ include/linux/kconfig.h:79:33: note: (near initialization for 'ingenic_pinctrl_of_match[5].name[0]') 79 | #define IF_ENABLED(option, ptr) (IS_ENABLED(option) ? (ptr) : NULL) | ^ drivers/pinctrl/pinctrl-ingenic.c:2883:11: note: in expansion of macro 'IF_ENABLED' 2883 | .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) | ^~~~~~~~~~ >> drivers/pinctrl/pinctrl-ingenic.c:2865:63: warning: missing braces around initializer [-Wmissing-braces] 2865 | static const struct of_device_id ingenic_pinctrl_of_match[] = { | ^ >> drivers/pinctrl/pinctrl-ingenic.c:2885:2: error: expected identifier or '(' before '{' token 2885 | { | ^ drivers/pinctrl/pinctrl-ingenic.c:2888:3: error: expected identifier or '(' before ',' token 2888 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2892:3: error: expected identifier or '(' before ',' token 2892 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2896:3: error: expected identifier or '(' before ',' token 2896 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2900:3: error: expected identifier or '(' before ',' token 2900 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2904:3: error: expected identifier or '(' before ',' token 2904 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2908:3: error: expected identifier or '(' before ',' token 2908 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2912:3: error: expected identifier or '(' before ',' token 2912 | }, | ^ drivers/pinctrl/pinctrl-ingenic.c:2913:20: error: expected identifier or '(' before ',' token 2913 | { /* sentinel */ }, | ^ drivers/pinctrl/pinctrl-ingenic.c:1901:39: warning: 'x1830_chip_info' defined but not used [-Wunused-const-variable=] 1901 | static const struct ingenic_chip_info x1830_chip_info = { | ^~~~~~~~~~~~~~~ drivers/pinctrl/pinctrl-ingenic.c:1695:39: warning: 'x1500_chip_info' defined but not used [-Wunused-const-variable=] 1695 | static const struct ingenic_chip_info x1500_chip_info = { | ^~~~~~~~~~~~~~~ drivers/pinctrl/pinctrl-ingenic.c:1592:39: warning: 'x1000_chip_info' defined but not used [-Wunused-const-variable=] 1592 | static const struct ingenic_chip_info x1000_chip_info = { | ^~~~~~~~~~~~~~~ drivers/pinctrl/pinctrl-ingenic.c:1379:39: warning: 'jz4780_chip_info' defined but not used [-Wunused-const-variable=] 1379 | static const struct ingenic_chip_info jz4780_chip_info = { | ^~~~~~~~~~~~~~~~ drivers/pinctrl/pinctrl-ingenic.c:1119:39: warning: 'jz4770_chip_info' defined but not used [-Wunused-const-variable=] 1119 | static const struct ingenic_chip_info jz4770_chip_info = { | ^~~~~~~~~~~~~~~~ Kconfig warnings: (for reference only) WARNING: unmet direct dependencies detected for SND_ATMEL_SOC_PDC Depends on SOUND && !UML && SND && SND_SOC && SND_ATMEL_SOC && HAS_DMA Selected by - SND_ATMEL_SOC_SSC && SOUND && !UML && SND && SND_SOC && SND_ATMEL_SOC - SND_ATMEL_SOC_SSC_PDC && SOUND && !UML && SND && SND_SOC && SND_ATMEL_SOC && ATMEL_SSC vim +2882 drivers/pinctrl/pinctrl-ingenic.c b5c23aa4653796 Paul Cercueil 2017-05-12 2864 baf15647387e82 Paul Cercueil 2020-01-07 @2865 static const struct of_device_id ingenic_pinctrl_of_match[] = { c6de2661f69f58 周琰杰 (Zhou Yanjie 2021-04-11 2866) { c6de2661f69f58 周琰杰 (Zhou Yanjie 2021-04-11 2867) .compatible = "ingenic,jz4730-pinctrl", c6de2661f69f58 周琰杰 (Zhou Yanjie 2021-04-11 2868) .data = IF_ENABLED(CONFIG_MACH_JZ4730, &jz4730_chip_info) c6de2661f69f58 周琰杰 (Zhou Yanjie 2021-04-11 2869) }, 9aa351784e6962 Paul Cercueil 2020-12-13 2870 { 9aa351784e6962 Paul Cercueil 2020-12-13 2871 .compatible = "ingenic,jz4740-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2872 .data = IF_ENABLED(CONFIG_MACH_JZ4740, &jz4740_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2873 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2874 { 9aa351784e6962 Paul Cercueil 2020-12-13 2875 .compatible = "ingenic,jz4725b-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2876 .data = IF_ENABLED(CONFIG_MACH_JZ4725B, &jz4725b_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2877 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2878 { 76f684ad7bcc8b 周琰杰 (Zhou Yanjie 2021-04-11 2879) .compatible = "ingenic,jz4750-pinctrl", 76f684ad7bcc8b 周琰杰 (Zhou Yanjie 2021-04-11 2880) .data = IF_ENABLED(CONFIG_MACH_JZ4750, &jz4750_chip_info) 76f684ad7bcc8b 周琰杰 (Zhou Yanjie 2021-04-11 2881) }, 9aa351784e6962 Paul Cercueil 2020-12-13 @2882 .compatible = "ingenic,jz4760-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 @2883 .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2884 }, 9aa351784e6962 Paul Cercueil 2020-12-13 @2885 { 9aa351784e6962 Paul Cercueil 2020-12-13 2886 .compatible = "ingenic,jz4760b-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2887 .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2888 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2889 { 9aa351784e6962 Paul Cercueil 2020-12-13 2890 .compatible = "ingenic,jz4770-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2891 .data = IF_ENABLED(CONFIG_MACH_JZ4770, &jz4770_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2892 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2893 { 9aa351784e6962 Paul Cercueil 2020-12-13 2894 .compatible = "ingenic,jz4780-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2895 .data = IF_ENABLED(CONFIG_MACH_JZ4780, &jz4780_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2896 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2897 { 9aa351784e6962 Paul Cercueil 2020-12-13 2898 .compatible = "ingenic,x1000-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2899 .data = IF_ENABLED(CONFIG_MACH_X1000, &x1000_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2900 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2901 { 9aa351784e6962 Paul Cercueil 2020-12-13 2902 .compatible = "ingenic,x1000e-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2903 .data = IF_ENABLED(CONFIG_MACH_X1000, &x1000_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2904 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2905 { 9aa351784e6962 Paul Cercueil 2020-12-13 2906 .compatible = "ingenic,x1500-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2907 .data = IF_ENABLED(CONFIG_MACH_X1500, &x1500_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2908 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2909 { 9aa351784e6962 Paul Cercueil 2020-12-13 2910 .compatible = "ingenic,x1830-pinctrl", 9aa351784e6962 Paul Cercueil 2020-12-13 2911 .data = IF_ENABLED(CONFIG_MACH_X1830, &x1830_chip_info) 9aa351784e6962 Paul Cercueil 2020-12-13 2912 }, 9aa351784e6962 Paul Cercueil 2020-12-13 2913 { /* sentinel */ }, baf15647387e82 Paul Cercueil 2020-01-07 2914 }; baf15647387e82 Paul Cercueil 2020-01-07 2915 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 4c48250..02fe3bf 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -85,6 +85,7 @@ enum jz_version { ID_JZ4730, ID_JZ4740, ID_JZ4725B, + ID_JZ4750, ID_JZ4760, ID_JZ4770, ID_JZ4780, @@ -427,6 +428,140 @@ static const struct ingenic_chip_info jz4725b_chip_info = { .pull_downs = jz4740_pull_downs, }; +static const u32 jz4750_pull_ups[6] = { + 0xffffffff, 0xffffffff, 0x3fffffff, 0x7fffffff, 0x1fff3fff, 0x00ffffff, +}; + +static const u32 jz4750_pull_downs[6] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +static int jz4750_uart0_data_pins[] = { 0xa4, 0xa5, }; +static int jz4750_uart0_hwflow_pins[] = { 0xa6, 0xa7, }; +static int jz4750_uart1_data_pins[] = { 0x90, 0x91, }; +static int jz4750_uart1_hwflow_pins[] = { 0x92, 0x93, }; +static int jz4750_uart2_data_pins[] = { 0x9b, 0x9a, }; +static int jz4750_uart3_data_pins[] = { 0xb0, 0xb1, }; +static int jz4750_uart3_hwflow_pins[] = { 0xb2, 0xb3, }; +static int jz4750_mmc0_1bit_pins[] = { 0xa8, 0xa9, 0xa0, }; +static int jz4750_mmc0_4bit_pins[] = { 0xa1, 0xa2, 0xa3, }; +static int jz4750_mmc0_8bit_pins[] = { 0xa4, 0xa5, 0xa6, 0xa7, }; +static int jz4750_mmc1_1bit_pins[] = { 0xae, 0xaf, 0xaa, }; +static int jz4750_mmc1_4bit_pins[] = { 0xab, 0xac, 0xad, }; +static int jz4750_i2c_pins[] = { 0x8c, 0x8d, }; +static int jz4750_cim_pins[] = { + 0x89, 0x8b, 0x8a, 0x88, + 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, +}; +static int jz4750_lcd_8bit_pins[] = { + 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, + 0x72, 0x73, 0x74, +}; +static int jz4750_lcd_16bit_pins[] = { + 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, +}; +static int jz4750_lcd_18bit_pins[] = { 0x70, 0x71, }; +static int jz4750_lcd_special_pins[] = { 0x76, 0x77, 0x78, 0x79, }; +static int jz4750_lcd_generic_pins[] = { 0x75, }; +static int jz4750_nand_cs1_pins[] = { 0x55, }; +static int jz4750_nand_cs2_pins[] = { 0x56, }; +static int jz4750_nand_cs3_pins[] = { 0x57, }; +static int jz4750_nand_cs4_pins[] = { 0x58, }; +static int jz4750_nand_fre_fwe_pins[] = { 0x5c, 0x5d, }; +static int jz4750_pwm_pwm0_pins[] = { 0x94, }; +static int jz4750_pwm_pwm1_pins[] = { 0x95, }; +static int jz4750_pwm_pwm2_pins[] = { 0x96, }; +static int jz4750_pwm_pwm3_pins[] = { 0x97, }; +static int jz4750_pwm_pwm4_pins[] = { 0x98, }; +static int jz4750_pwm_pwm5_pins[] = { 0x99, }; + +static const struct group_desc jz4750_groups[] = { + INGENIC_PIN_GROUP("uart0-data", jz4750_uart0_data, 1), + INGENIC_PIN_GROUP("uart0-hwflow", jz4750_uart0_hwflow, 1), + INGENIC_PIN_GROUP("uart1-data", jz4750_uart1_data, 0), + INGENIC_PIN_GROUP("uart1-hwflow", jz4750_uart1_hwflow, 0), + INGENIC_PIN_GROUP("uart2-data", jz4750_uart2_data, 1), + INGENIC_PIN_GROUP("uart3-data", jz4750_uart3_data, 0), + INGENIC_PIN_GROUP("uart3-hwflow", jz4750_uart3_hwflow, 0), + INGENIC_PIN_GROUP("mmc0-1bit", jz4750_mmc0_1bit, 0), + INGENIC_PIN_GROUP("mmc0-4bit", jz4750_mmc0_4bit, 0), + INGENIC_PIN_GROUP("mmc0-8bit", jz4750_mmc0_8bit, 0), + INGENIC_PIN_GROUP("mmc1-1bit", jz4750_mmc1_1bit, 0), + INGENIC_PIN_GROUP("mmc1-4bit", jz4750_mmc1_4bit, 0), + INGENIC_PIN_GROUP("i2c-data", jz4750_i2c, 0), + INGENIC_PIN_GROUP("cim-data", jz4750_cim, 0), + INGENIC_PIN_GROUP("lcd-8bit", jz4750_lcd_8bit, 0), + INGENIC_PIN_GROUP("lcd-16bit", jz4750_lcd_16bit, 0), + INGENIC_PIN_GROUP("lcd-18bit", jz4750_lcd_18bit, 0), + INGENIC_PIN_GROUP("lcd-special", jz4750_lcd_special, 0), + INGENIC_PIN_GROUP("lcd-generic", jz4750_lcd_generic, 0), + INGENIC_PIN_GROUP("nand-cs1", jz4750_nand_cs1, 0), + INGENIC_PIN_GROUP("nand-cs2", jz4750_nand_cs2, 0), + INGENIC_PIN_GROUP("nand-cs3", jz4750_nand_cs3, 0), + INGENIC_PIN_GROUP("nand-cs4", jz4750_nand_cs4, 0), + INGENIC_PIN_GROUP("nand-fre-fwe", jz4750_nand_fre_fwe, 0), + INGENIC_PIN_GROUP("pwm0", jz4750_pwm_pwm0, 0), + INGENIC_PIN_GROUP("pwm1", jz4750_pwm_pwm1, 0), + INGENIC_PIN_GROUP("pwm2", jz4750_pwm_pwm2, 0), + INGENIC_PIN_GROUP("pwm3", jz4750_pwm_pwm3, 0), + INGENIC_PIN_GROUP("pwm4", jz4750_pwm_pwm4, 0), + INGENIC_PIN_GROUP("pwm5", jz4750_pwm_pwm5, 0), +}; + +static const char *jz4750_uart0_groups[] = { "uart0-data", "uart0-hwflow", }; +static const char *jz4750_uart1_groups[] = { "uart1-data", "uart1-hwflow", }; +static const char *jz4750_uart2_groups[] = { "uart2-data", }; +static const char *jz4750_uart3_groups[] = { "uart3-data", "uart3-hwflow", }; +static const char *jz4750_mmc0_groups[] = { + "mmc0-1bit", "mmc0-4bit", "mmc0-8bit", +}; +static const char *jz4750_mmc1_groups[] = { "mmc0-1bit", "mmc0-4bit", }; +static const char *jz4750_i2c_groups[] = { "i2c-data", }; +static const char *jz4750_cim_groups[] = { "cim-data", }; +static const char *jz4750_lcd_groups[] = { + "lcd-8bit", "lcd-16bit", "lcd-18bit", "lcd-special", "lcd-generic", +}; +static const char *jz4750_nand_groups[] = { + "nand-cs1", "nand-cs2", "nand-cs3", "nand-cs4", "nand-fre-fwe", +}; +static const char *jz4750_pwm0_groups[] = { "pwm0", }; +static const char *jz4750_pwm1_groups[] = { "pwm1", }; +static const char *jz4750_pwm2_groups[] = { "pwm2", }; +static const char *jz4750_pwm3_groups[] = { "pwm3", }; +static const char *jz4750_pwm4_groups[] = { "pwm4", }; +static const char *jz4750_pwm5_groups[] = { "pwm5", }; + +static const struct function_desc jz4750_functions[] = { + { "uart0", jz4750_uart0_groups, ARRAY_SIZE(jz4750_uart0_groups), }, + { "uart1", jz4750_uart1_groups, ARRAY_SIZE(jz4750_uart1_groups), }, + { "uart2", jz4750_uart2_groups, ARRAY_SIZE(jz4750_uart2_groups), }, + { "uart3", jz4750_uart3_groups, ARRAY_SIZE(jz4750_uart3_groups), }, + { "mmc0", jz4750_mmc0_groups, ARRAY_SIZE(jz4750_mmc0_groups), }, + { "mmc1", jz4750_mmc1_groups, ARRAY_SIZE(jz4750_mmc1_groups), }, + { "i2c", jz4750_i2c_groups, ARRAY_SIZE(jz4750_i2c_groups), }, + { "cim", jz4750_cim_groups, ARRAY_SIZE(jz4750_cim_groups), }, + { "lcd", jz4750_lcd_groups, ARRAY_SIZE(jz4750_lcd_groups), }, + { "nand", jz4750_nand_groups, ARRAY_SIZE(jz4750_nand_groups), }, + { "pwm0", jz4750_pwm0_groups, ARRAY_SIZE(jz4750_pwm0_groups), }, + { "pwm1", jz4750_pwm1_groups, ARRAY_SIZE(jz4750_pwm1_groups), }, + { "pwm2", jz4750_pwm2_groups, ARRAY_SIZE(jz4750_pwm2_groups), }, + { "pwm3", jz4750_pwm3_groups, ARRAY_SIZE(jz4750_pwm3_groups), }, + { "pwm4", jz4750_pwm4_groups, ARRAY_SIZE(jz4750_pwm4_groups), }, + { "pwm5", jz4750_pwm5_groups, ARRAY_SIZE(jz4750_pwm5_groups), }, +}; + +static const struct ingenic_chip_info jz4750_chip_info = { + .num_chips = 6, + .reg_offset = 0x100, + .version = ID_JZ4750, + .groups = jz4750_groups, + .num_groups = ARRAY_SIZE(jz4750_groups), + .functions = jz4750_functions, + .num_functions = ARRAY_SIZE(jz4750_functions), + .pull_ups = jz4750_pull_ups, + .pull_downs = jz4750_pull_downs, +}; + static const u32 jz4760_pull_ups[6] = { 0xffffffff, 0xfffcf3ff, 0xffffffff, 0xffffcfff, 0xfffffb7c, 0xfffff00f, }; @@ -2534,6 +2669,7 @@ static const struct of_device_id ingenic_gpio_of_match[] __initconst = { { .compatible = "ingenic,jz4730-gpio", }, { .compatible = "ingenic,jz4740-gpio", }, { .compatible = "ingenic,jz4725b-gpio", }, + { .compatible = "ingenic,jz4750-gpio", }, { .compatible = "ingenic,jz4760-gpio", }, { .compatible = "ingenic,jz4770-gpio", }, { .compatible = "ingenic,jz4780-gpio", }, @@ -2738,6 +2874,9 @@ static const struct of_device_id ingenic_pinctrl_of_match[] = { .data = IF_ENABLED(CONFIG_MACH_JZ4725B, &jz4725b_chip_info) }, { + .compatible = "ingenic,jz4750-pinctrl", + .data = IF_ENABLED(CONFIG_MACH_JZ4750, &jz4750_chip_info) + }, .compatible = "ingenic,jz4760-pinctrl", .data = IF_ENABLED(CONFIG_MACH_JZ4760, &jz4760_chip_info) },