From: Christian Marangi Date: Sat, 6 May 2023 05:44:05 +0000 (+0200) Subject: bcm4908: 5.15: fix compilation error for BCM4908 pinmux patch X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2b1de625eb0d335750c7118a1a2a95eb61514b89;p=openwrt%2Fstaging%2Fjow.git bcm4908: 5.15: fix compilation error for BCM4908 pinmux patch Fix compilation warning: drivers/pinctrl/bcm/pinctrl-bcm4908.c: In function 'bcm4908_pinctrl_probe': drivers/pinctrl/bcm/pinctrl-bcm4908.c:541:53: error: passing argument 3 of 'pinmux_generic_add_function' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] 541 | function->groups, | ~~~~~~~~^~~~~~~~ In file included from drivers/pinctrl/bcm/pinctrl-bcm4908.c:16: drivers/pinctrl/bcm/../pinmux.h:153:46: note: expected 'const char **' but argument is of type 'const char * const*' 153 | const char **groups, | ~~~~~~~~~~~~~^~~~~~ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- diff --git a/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch b/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch index 7e7dccb6f6..3fd847b97e 100644 --- a/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch +++ b/target/linux/bcm4908/patches-5.15/080-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch @@ -379,50 +379,50 @@ Signed-off-by: Linus Walleij + +struct bcm4908_pinctrl_function { + const char *name; -+ const char * const *groups; ++ const char **groups; + const unsigned int num_groups; +}; + -+static const char * const led_0_groups[] = { "led_0_grp_a" }; -+static const char * const led_1_groups[] = { "led_1_grp_a" }; -+static const char * const led_2_groups[] = { "led_2_grp_a" }; -+static const char * const led_3_groups[] = { "led_3_grp_a" }; -+static const char * const led_4_groups[] = { "led_4_grp_a" }; -+static const char * const led_5_groups[] = { "led_5_grp_a" }; -+static const char * const led_6_groups[] = { "led_6_grp_a" }; -+static const char * const led_7_groups[] = { "led_7_grp_a" }; -+static const char * const led_8_groups[] = { "led_8_grp_a" }; -+static const char * const led_9_groups[] = { "led_9_grp_a" }; -+static const char * const led_10_groups[] = { "led_10_grp_a", "led_10_grp_b" }; -+static const char * const led_11_groups[] = { "led_11_grp_a", "led_11_grp_b" }; -+static const char * const led_12_groups[] = { "led_12_grp_a", "led_12_grp_b" }; -+static const char * const led_13_groups[] = { "led_13_grp_a", "led_13_grp_b" }; -+static const char * const led_14_groups[] = { "led_14_grp_a" }; -+static const char * const led_15_groups[] = { "led_15_grp_a" }; -+static const char * const led_16_groups[] = { "led_16_grp_a" }; -+static const char * const led_17_groups[] = { "led_17_grp_a" }; -+static const char * const led_18_groups[] = { "led_18_grp_a" }; -+static const char * const led_19_groups[] = { "led_19_grp_a" }; -+static const char * const led_20_groups[] = { "led_20_grp_a" }; -+static const char * const led_21_groups[] = { "led_21_grp_a" }; -+static const char * const led_22_groups[] = { "led_22_grp_a" }; -+static const char * const led_23_groups[] = { "led_23_grp_a" }; -+static const char * const led_24_groups[] = { "led_24_grp_a" }; -+static const char * const led_25_groups[] = { "led_25_grp_a" }; -+static const char * const led_26_groups[] = { "led_26_grp_a" }; -+static const char * const led_27_groups[] = { "led_27_grp_a" }; -+static const char * const led_28_groups[] = { "led_28_grp_a" }; -+static const char * const led_29_groups[] = { "led_29_grp_a" }; -+static const char * const led_30_groups[] = { "led_30_grp_a" }; -+static const char * const led_31_groups[] = { "led_31_grp_a", "led_31_grp_b" }; -+static const char * const hs_uart_groups[] = { "hs_uart_grp" }; -+static const char * const i2c_groups[] = { "i2c_grp_a", "i2c_grp_b" }; -+static const char * const i2s_groups[] = { "i2s_grp" }; -+static const char * const nand_ctrl_groups[] = { "nand_ctrl_grp" }; -+static const char * const nand_data_groups[] = { "nand_data_grp" }; -+static const char * const emmc_ctrl_groups[] = { "emmc_ctrl_grp" }; -+static const char * const usb0_pwr_groups[] = { "usb0_pwr_grp" }; -+static const char * const usb1_pwr_groups[] = { "usb1_pwr_grp" }; ++static const char *led_0_groups[] = { "led_0_grp_a" }; ++static const char *led_1_groups[] = { "led_1_grp_a" }; ++static const char *led_2_groups[] = { "led_2_grp_a" }; ++static const char *led_3_groups[] = { "led_3_grp_a" }; ++static const char *led_4_groups[] = { "led_4_grp_a" }; ++static const char *led_5_groups[] = { "led_5_grp_a" }; ++static const char *led_6_groups[] = { "led_6_grp_a" }; ++static const char *led_7_groups[] = { "led_7_grp_a" }; ++static const char *led_8_groups[] = { "led_8_grp_a" }; ++static const char *led_9_groups[] = { "led_9_grp_a" }; ++static const char *led_10_groups[] = { "led_10_grp_a", "led_10_grp_b" }; ++static const char *led_11_groups[] = { "led_11_grp_a", "led_11_grp_b" }; ++static const char *led_12_groups[] = { "led_12_grp_a", "led_12_grp_b" }; ++static const char *led_13_groups[] = { "led_13_grp_a", "led_13_grp_b" }; ++static const char *led_14_groups[] = { "led_14_grp_a" }; ++static const char *led_15_groups[] = { "led_15_grp_a" }; ++static const char *led_16_groups[] = { "led_16_grp_a" }; ++static const char *led_17_groups[] = { "led_17_grp_a" }; ++static const char *led_18_groups[] = { "led_18_grp_a" }; ++static const char *led_19_groups[] = { "led_19_grp_a" }; ++static const char *led_20_groups[] = { "led_20_grp_a" }; ++static const char *led_21_groups[] = { "led_21_grp_a" }; ++static const char *led_22_groups[] = { "led_22_grp_a" }; ++static const char *led_23_groups[] = { "led_23_grp_a" }; ++static const char *led_24_groups[] = { "led_24_grp_a" }; ++static const char *led_25_groups[] = { "led_25_grp_a" }; ++static const char *led_26_groups[] = { "led_26_grp_a" }; ++static const char *led_27_groups[] = { "led_27_grp_a" }; ++static const char *led_28_groups[] = { "led_28_grp_a" }; ++static const char *led_29_groups[] = { "led_29_grp_a" }; ++static const char *led_30_groups[] = { "led_30_grp_a" }; ++static const char *led_31_groups[] = { "led_31_grp_a", "led_31_grp_b" }; ++static const char *hs_uart_groups[] = { "hs_uart_grp" }; ++static const char *i2c_groups[] = { "i2c_grp_a", "i2c_grp_b" }; ++static const char *i2s_groups[] = { "i2s_grp" }; ++static const char *nand_ctrl_groups[] = { "nand_ctrl_grp" }; ++static const char *nand_data_groups[] = { "nand_data_grp" }; ++static const char *emmc_ctrl_groups[] = { "emmc_ctrl_grp" }; ++static const char *usb0_pwr_groups[] = { "usb0_pwr_grp" }; ++static const char *usb1_pwr_groups[] = { "usb1_pwr_grp" }; + +static const struct bcm4908_pinctrl_function bcm4908_pinctrl_functions[] = { + { "led_0", led_0_groups, ARRAY_SIZE(led_0_groups) },