pinctrl: qcom: sc7180: Add new qup functions
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 2/2 pinctrl: qcom: sc7180: Add new qup functions
on sc7180 we have cases where multiple functions from the same qup instance share the same pin. This is true for qup02/04/11 and qup13. Add new function names to distinguish which qup function to use.
The device tree files for this platform haven't landed in mainline yet, so there aren't any users upstream who should break with this change in function names, however, anyone using the devicetree files that were posted on the lists and using these specific function names will need to update their changes.
--- drivers/pinctrl/qcom/pinctrl-sc7180.c | 60 +++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 20 deletions(-)
drivers/pinctrl/qcom/pinctrl-sc7180.c +40 -20
@@ -456,14 +456,18 @@ enum sc7180_functions { msm_mux_qspi_data, msm_mux_qup00, msm_mux_qup01, - msm_mux_qup02, + msm_mux_qup02_i2c, + msm_mux_qup02_uart, msm_mux_qup03, - msm_mux_qup04, + msm_mux_qup04_i2c, + msm_mux_qup04_uart, msm_mux_qup05, msm_mux_qup10, - msm_mux_qup11, + msm_mux_qup11_i2c, + msm_mux_qup11_uart, msm_mux_qup12, - msm_mux_qup13, + msm_mux_qup13_i2c, + msm_mux_qup13_uart, msm_mux_qup14, msm_mux_qup15, msm_mux_sdc1_tb,
@@ -543,7 +547,10 @@ static const char * const sdc1_tb_groups[] = {static const char *const sdc2_tb_groups[] = {"gpio5" , }; -static const char *const qup11_groups[] = { +static const char *const qup11_i2c_groups[] = { +"gpio6" ,"gpio7" , +}; +static const char *const qup11_uart_groups[] = {"gpio6" ,"gpio7" , };static const char *const ddr_bist_groups[] = {
@@ -593,7 +600,10 @@ static const char * const qdss_groups[] = {static const char *const pll_reset_groups[] = {"gpio14" , }; -static const char *const qup02_groups[] = { +static const char *const qup02_i2c_groups[] = { +"gpio15" ,"gpio16" , +}; +static const char *const qup02_uart_groups[] = {"gpio15" ,"gpio16" , };static const char *const cci_i2c_groups[] = {
@@ -698,7 +708,10 @@ static const char * const wlan1_adc1_groups[] = {static const char *const atest_usb13_groups[] = {"gpio44" , }; -static const char *const qup13_groups[] = { +static const char *const qup13_i2c_groups[] = { +"gpio46" ,"gpio47" , +}; +static const char *const qup13_uart_groups[] = {"gpio46" ,"gpio47" , };static const char *const gcc_gp1_groups[] = {
@@ -848,7 +861,10 @@ static const char * const usb_phy_groups[] = {static const char *const mss_lte_groups[] = {"gpio108" ,"gpio109" , }; -static const char *const qup04_groups[] = { +static const char *const qup04_i2c_groups[] = { +"gpio115" ,"gpio116" , +}; +static const char *const qup04_uart_groups[] = {"gpio115" ,"gpio116" , };
@@ -929,14 +945,18 @@ static const struct msm_function sc7180_functions[] = {FUNCTION (qspi_data),FUNCTION (qup00),FUNCTION (qup01), -FUNCTION (qup02), +FUNCTION (qup02_i2c), +FUNCTION (qup02_uart),FUNCTION (qup03), -FUNCTION (qup04), +FUNCTION (qup04_i2c), +FUNCTION (qup04_uart),FUNCTION (qup05),FUNCTION (qup10), -FUNCTION (qup11), +FUNCTION (qup11_i2c), +FUNCTION (qup11_uart),FUNCTION (qup12), -FUNCTION (qup13), +FUNCTION (qup13_i2c), +FUNCTION (qup13_uart),FUNCTION (qup14),FUNCTION (qup15), FUNCTION(sdc1_tb),
@@ -976,8 +996,8 @@ static const struct msm_pingroup sc7180_groups[] = { [3] = PINGROUP(3, SOUTH, qup01, sp_cmu, dbg_out, qdss_cti, _, _, _, _, _), [4] = PINGROUP(4, NORTH, sdc1_tb, _, qdss_cti, _, _, _, _, _, _), [5] = PINGROUP(5, NORTH, sdc2_tb, _, _, _, _, _, _, _, _), - [6] = PINGROUP(6, NORTH, qup11, qup11, _, _, _, _, _, _, _), - [7] = PINGROUP(7, NORTH, qup11, qup11, ddr_bist, _, _, _, _, _, _), + [6] = PINGROUP(6, NORTH, qup11_i2c, qup11_uart, _, _, _, _, _, _, _), + [7] = PINGROUP(7, NORTH, qup11_i2c, qup11_uart, ddr_bist, _, _, _, _, _, _), [8] = PINGROUP(8, NORTH, gp_pdm1, ddr_bist, _, phase_flag, qdss_cti, _, _, _, _), [9] = PINGROUP(9, NORTH, ddr_bist, _, phase_flag, qdss_cti, _, _, _, _, _), [10] = PINGROUP(10, NORTH, mdp_vsync, ddr_bist, _, _, _, _, _, _, _),
@@ -985,8 +1005,8 @@ static const struct msm_pingroup sc7180_groups[] = { [12] = PINGROUP(12, SOUTH, mdp_vsync, m_voc, qup01, _, phase_flag, wlan2_adc0, atest_usb10, ddr_pxi3, _), [13] = PINGROUP(13, SOUTH, cam_mclk, pll_bypassnl, qdss, _, _, _, _, _, _), [14] = PINGROUP(14, SOUTH, cam_mclk, pll_reset, qdss, _, _, _, _, _, _), - [15] = PINGROUP(15, SOUTH, cam_mclk, qup02, qup02, qdss, _, _, _, _, _), - [16] = PINGROUP(16, SOUTH, cam_mclk, qup02, qup02, qdss, _, _, _, _, _), + [15] = PINGROUP(15, SOUTH, cam_mclk, qup02_i2c, qup02_uart, qdss, _, _, _, _, _), + [16] = PINGROUP(16, SOUTH, cam_mclk, qup02_i2c, qup02_uart, qdss, _, _, _, _, _), [17] = PINGROUP(17, SOUTH, cci_i2c, _, phase_flag, qdss, _, wlan1_adc0, atest_usb12, ddr_pxi1, atest_char), [18] = PINGROUP(18, SOUTH, cci_i2c, agera_pll, _, phase_flag, qdss, vsense_trigger, ddr_pxi0, atest_char3, _), [19] = PINGROUP(19, SOUTH, cci_i2c, _, phase_flag, qdss, atest_char2, _, _, _, _),
@@ -1016,8 +1036,8 @@ static const struct msm_pingroup sc7180_groups[] = { [43] = PINGROUP(43, NORTH, qup12, _, _, _, _, _, _, _, _), [44] = PINGROUP(44, NORTH, qup12, _, phase_flag, qdss_cti, wlan1_adc1, atest_usb13, ddr_pxi1, _, _), [45] = PINGROUP(45, NORTH, qup12, qdss_cti, _, _, _, _, _, _, _), - [46] = PINGROUP(46, NORTH, qup13, qup13, _, _, _, _, _, _, _), - [47] = PINGROUP(47, NORTH, qup13, qup13, _, _, _, _, _, _, _), + [46] = PINGROUP(46, NORTH, qup13_i2c, qup13_uart, _, _, _, _, _, _, _), + [47] = PINGROUP(47, NORTH, qup13_i2c, qup13_uart, _, _, _, _, _, _, _), [48] = PINGROUP(48, NORTH, gcc_gp1, _, _, _, _, _, _, _, _), [49] = PINGROUP(49, WEST, mi2s_1, btfm_slimbus, _, _, _, _, _, _, _), [50] = PINGROUP(50, WEST, mi2s_1, btfm_slimbus, gp_pdm1, _, _, _, _, _, _),
@@ -1085,8 +1105,8 @@ static const struct msm_pingroup sc7180_groups[] = { [112] = PINGROUP(112, NORTH, _, _, _, _, _, _, _, _, _), [113] = PINGROUP(113, NORTH, _, _, _, _, _, _, _, _, _), [114] = PINGROUP(114, NORTH, _, _, _, _, _, _, _, _, _), - [115] = PINGROUP(115, WEST, qup04, qup04, _, _, _, _, _, _, _), - [116] = PINGROUP(116, WEST, qup04, qup04, _, _, _, _, _, _, _), + [115] = PINGROUP(115, WEST, qup04_i2c, qup04_uart, _, _, _, _, _, _, _), + [116] = PINGROUP(116, WEST, qup04_i2c, qup04_uart, _, _, _, _, _, _, _), [117] = PINGROUP(117, WEST, dp_hot, _, _, _, _, _, _, _, _), [118] = PINGROUP(118, WEST, _, _, _, _, _, _, _, _, _), [119] = UFS_RESET(ufs_reset, 0x7f000),
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
A message that is not in the archive (sent off-list or not yet received): 0101016ef36a9118-f2919277-effa-4cd5-adf8-bbc8016f31df-000000@us-west-2.amazonses.com
Bjorn Andersson
Reviewed-byQuoted 9 lines · Rajendra Nayak
on sc7180 we have cases where multiple functions from the same qup instance share the same pin. This is true for qup02/04/11 and qup13. Add new function names to distinguish which qup function to use.
The device tree files for this platform haven't landed in mainline yet, so there aren't any users upstream who should break with this change in function names, however, anyone using the devicetree files that were posted on the lists and using these specific function names will need to update their changes.
I don't think this paragraph adds value to the git log, but the patch looks good.
Quoted 3 lines
Reported-by Stephen Boyd <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>
Regards,
Bjorn
Quoted 150 lines
--- drivers/pinctrl/qcom/pinctrl-sc7180.c | 60 +++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 20 deletions(-)drivers/pinctrl/qcom/pinctrl-sc7180.c +40
-20@@ -456,14 +456,18 @@ enum sc7180_functions { msm_mux_qspi_data, msm_mux_qup00, msm_mux_qup01, - msm_mux_qup02, + msm_mux_qup02_i2c, + msm_mux_qup02_uart, msm_mux_qup03, - msm_mux_qup04, + msm_mux_qup04_i2c, + msm_mux_qup04_uart, msm_mux_qup05, msm_mux_qup10, - msm_mux_qup11, + msm_mux_qup11_i2c, + msm_mux_qup11_uart, msm_mux_qup12, - msm_mux_qup13, + msm_mux_qup13_i2c, + msm_mux_qup13_uart, msm_mux_qup14, msm_mux_qup15, msm_mux_sdc1_tb,@@ -543,7 +547,10 @@ static const char * const sdc1_tb_groups[] = {static const char *const sdc2_tb_groups[] = {"gpio5" , }; -static const char *const qup11_groups[] = { +static const char *const qup11_i2c_groups[] = { +"gpio6" ,"gpio7" , +}; +static const char *const qup11_uart_groups[] = {"gpio6" ,"gpio7" , };static const char *const ddr_bist_groups[] = {@@ -593,7 +600,10 @@ static const char * const qdss_groups[] = {static const char *const pll_reset_groups[] = {"gpio14" , }; -static const char *const qup02_groups[] = { +static const char *const qup02_i2c_groups[] = { +"gpio15" ,"gpio16" , +}; +static const char *const qup02_uart_groups[] = {"gpio15" ,"gpio16" , };static const char *const cci_i2c_groups[] = {@@ -698,7 +708,10 @@ static const char * const wlan1_adc1_groups[] = {static const char *const atest_usb13_groups[] = {"gpio44" , }; -static const char *const qup13_groups[] = { +static const char *const qup13_i2c_groups[] = { +"gpio46" ,"gpio47" , +}; +static const char *const qup13_uart_groups[] = {"gpio46" ,"gpio47" , };static const char *const gcc_gp1_groups[] = {@@ -848,7 +861,10 @@ static const char * const usb_phy_groups[] = {static const char *const mss_lte_groups[] = {"gpio108" ,"gpio109" , }; -static const char *const qup04_groups[] = { +static const char *const qup04_i2c_groups[] = { +"gpio115" ,"gpio116" , +}; +static const char *const qup04_uart_groups[] = {"gpio115" ,"gpio116" , };@@ -929,14 +945,18 @@ static const struct msm_function sc7180_functions[] = {FUNCTION (qspi_data),FUNCTION (qup00),FUNCTION (qup01), -FUNCTION (qup02), +FUNCTION (qup02_i2c), +FUNCTION (qup02_uart),FUNCTION (qup03), -FUNCTION (qup04), +FUNCTION (qup04_i2c), +FUNCTION (qup04_uart),FUNCTION (qup05),FUNCTION (qup10), -FUNCTION (qup11), +FUNCTION (qup11_i2c), +FUNCTION (qup11_uart),FUNCTION (qup12), -FUNCTION (qup13), +FUNCTION (qup13_i2c), +FUNCTION (qup13_uart),FUNCTION (qup14),FUNCTION (qup15), FUNCTION(sdc1_tb),@@ -976,8 +996,8 @@ static const struct msm_pingroup sc7180_groups[] = { [3] = PINGROUP(3, SOUTH, qup01, sp_cmu, dbg_out, qdss_cti, _, _, _, _, _), [4] = PINGROUP(4, NORTH, sdc1_tb, _, qdss_cti, _, _, _, _, _, _), [5] = PINGROUP(5, NORTH, sdc2_tb, _, _, _, _, _, _, _, _), - [6] = PINGROUP(6, NORTH, qup11, qup11, _, _, _, _, _, _, _), - [7] = PINGROUP(7, NORTH, qup11, qup11, ddr_bist, _, _, _, _, _, _), + [6] = PINGROUP(6, NORTH, qup11_i2c, qup11_uart, _, _, _, _, _, _, _), + [7] = PINGROUP(7, NORTH, qup11_i2c, qup11_uart, ddr_bist, _, _, _, _, _, _), [8] = PINGROUP(8, NORTH, gp_pdm1, ddr_bist, _, phase_flag, qdss_cti, _, _, _, _), [9] = PINGROUP(9, NORTH, ddr_bist, _, phase_flag, qdss_cti, _, _, _, _, _), [10] = PINGROUP(10, NORTH, mdp_vsync, ddr_bist, _, _, _, _, _, _, _),@@ -985,8 +1005,8 @@ static const struct msm_pingroup sc7180_groups[] = { [12] = PINGROUP(12, SOUTH, mdp_vsync, m_voc, qup01, _, phase_flag, wlan2_adc0, atest_usb10, ddr_pxi3, _), [13] = PINGROUP(13, SOUTH, cam_mclk, pll_bypassnl, qdss, _, _, _, _, _, _), [14] = PINGROUP(14, SOUTH, cam_mclk, pll_reset, qdss, _, _, _, _, _, _), - [15] = PINGROUP(15, SOUTH, cam_mclk, qup02, qup02, qdss, _, _, _, _, _), - [16] = PINGROUP(16, SOUTH, cam_mclk, qup02, qup02, qdss, _, _, _, _, _), + [15] = PINGROUP(15, SOUTH, cam_mclk, qup02_i2c, qup02_uart, qdss, _, _, _, _, _), + [16] = PINGROUP(16, SOUTH, cam_mclk, qup02_i2c, qup02_uart, qdss, _, _, _, _, _), [17] = PINGROUP(17, SOUTH, cci_i2c, _, phase_flag, qdss, _, wlan1_adc0, atest_usb12, ddr_pxi1, atest_char), [18] = PINGROUP(18, SOUTH, cci_i2c, agera_pll, _, phase_flag, qdss, vsense_trigger, ddr_pxi0, atest_char3, _), [19] = PINGROUP(19, SOUTH, cci_i2c, _, phase_flag, qdss, atest_char2, _, _, _, _),@@ -1016,8 +1036,8 @@ static const struct msm_pingroup sc7180_groups[] = { [43] = PINGROUP(43, NORTH, qup12, _, _, _, _, _, _, _, _), [44] = PINGROUP(44, NORTH, qup12, _, phase_flag, qdss_cti, wlan1_adc1, atest_usb13, ddr_pxi1, _, _), [45] = PINGROUP(45, NORTH, qup12, qdss_cti, _, _, _, _, _, _, _), - [46] = PINGROUP(46, NORTH, qup13, qup13, _, _, _, _, _, _, _), - [47] = PINGROUP(47, NORTH, qup13, qup13, _, _, _, _, _, _, _), + [46] = PINGROUP(46, NORTH, qup13_i2c, qup13_uart, _, _, _, _, _, _, _), + [47] = PINGROUP(47, NORTH, qup13_i2c, qup13_uart, _, _, _, _, _, _, _), [48] = PINGROUP(48, NORTH, gcc_gp1, _, _, _, _, _, _, _, _), [49] = PINGROUP(49, WEST, mi2s_1, btfm_slimbus, _, _, _, _, _, _, _), [50] = PINGROUP(50, WEST, mi2s_1, btfm_slimbus, gp_pdm1, _, _, _, _, _, _),@@ -1085,8 +1105,8 @@ static const struct msm_pingroup sc7180_groups[] = { [112] = PINGROUP(112, NORTH, _, _, _, _, _, _, _, _, _), [113] = PINGROUP(113, NORTH, _, _, _, _, _, _, _, _, _), [114] = PINGROUP(114, NORTH, _, _, _, _, _, _, _, _, _), - [115] = PINGROUP(115, WEST, qup04, qup04, _, _, _, _, _, _, _), - [116] = PINGROUP(116, WEST, qup04, qup04, _, _, _, _, _, _, _), + [115] = PINGROUP(115, WEST, qup04_i2c, qup04_uart, _, _, _, _, _, _, _), + [116] = PINGROUP(116, WEST, qup04_i2c, qup04_uart, _, _, _, _, _, _, _), [117] = PINGROUP(117, WEST, dp_hot, _, _, _, _, _, _, _, _), [118] = PINGROUP(118, WEST, _, _, _, _, _, _, _, _, _), [119] = UFS_RESET(ufs_reset, 0x7f000),Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Quoted 6 lines · Bjorn Andersson
Quoted 4 lines · Rajendra Nayak
on sc7180 we have cases where multiple functions from the same qup instance share the same pin. This is true for qup02/04/11 and qup13. Add new function names to distinguish which qup function to use.
Quoted 8 lines
Quoted 5 lines
The device tree files for this platform haven't landed in mainline yet, so there aren't any users upstream who should break with this change in function names, however, anyone using the devicetree files that were posted on the lists and using these specific function names will need to update their changes.
I don't think this paragraph adds value to the git log, but the patch looks good.
Right, I should have mentioned that bit after the --- so its not in the changelog :/
Linus, do you want me to resend with that paragraph moved below --- ?
Quoted 159 lines
Quoted 3 lines
Reported-by Stephen Boyd <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>Reviewed-by Bjorn Andersson <[email protected]>Regards,
BjornQuoted 150 lines
--- drivers/pinctrl/qcom/pinctrl-sc7180.c | 60 +++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 20 deletions(-)drivers/pinctrl/qcom/pinctrl-sc7180.c +40
-20@@ -456,14 +456,18 @@ enum sc7180_functions { msm_mux_qspi_data, msm_mux_qup00, msm_mux_qup01, - msm_mux_qup02, + msm_mux_qup02_i2c, + msm_mux_qup02_uart, msm_mux_qup03, - msm_mux_qup04, + msm_mux_qup04_i2c, + msm_mux_qup04_uart, msm_mux_qup05, msm_mux_qup10, - msm_mux_qup11, + msm_mux_qup11_i2c, + msm_mux_qup11_uart, msm_mux_qup12, - msm_mux_qup13, + msm_mux_qup13_i2c, + msm_mux_qup13_uart, msm_mux_qup14, msm_mux_qup15, msm_mux_sdc1_tb,@@ -543,7 +547,10 @@ static const char * const sdc1_tb_groups[] = {static const char *const sdc2_tb_groups[] = {"gpio5" , }; -static const char *const qup11_groups[] = { +static const char *const qup11_i2c_groups[] = { +"gpio6" ,"gpio7" , +}; +static const char *const qup11_uart_groups[] = {"gpio6" ,"gpio7" , };static const char *const ddr_bist_groups[] = {@@ -593,7 +600,10 @@ static const char * const qdss_groups[] = {static const char *const pll_reset_groups[] = {"gpio14" , }; -static const char *const qup02_groups[] = { +static const char *const qup02_i2c_groups[] = { +"gpio15" ,"gpio16" , +}; +static const char *const qup02_uart_groups[] = {"gpio15" ,"gpio16" , };static const char *const cci_i2c_groups[] = {@@ -698,7 +708,10 @@ static const char * const wlan1_adc1_groups[] = {static const char *const atest_usb13_groups[] = {"gpio44" , }; -static const char *const qup13_groups[] = { +static const char *const qup13_i2c_groups[] = { +"gpio46" ,"gpio47" , +}; +static const char *const qup13_uart_groups[] = {"gpio46" ,"gpio47" , };static const char *const gcc_gp1_groups[] = {@@ -848,7 +861,10 @@ static const char * const usb_phy_groups[] = {static const char *const mss_lte_groups[] = {"gpio108" ,"gpio109" , }; -static const char *const qup04_groups[] = { +static const char *const qup04_i2c_groups[] = { +"gpio115" ,"gpio116" , +}; +static const char *const qup04_uart_groups[] = {"gpio115" ,"gpio116" , };@@ -929,14 +945,18 @@ static const struct msm_function sc7180_functions[] = {FUNCTION (qspi_data),FUNCTION (qup00),FUNCTION (qup01), -FUNCTION (qup02), +FUNCTION (qup02_i2c), +FUNCTION (qup02_uart),FUNCTION (qup03), -FUNCTION (qup04), +FUNCTION (qup04_i2c), +FUNCTION (qup04_uart),FUNCTION (qup05),FUNCTION (qup10), -FUNCTION (qup11), +FUNCTION (qup11_i2c), +FUNCTION (qup11_uart),FUNCTION (qup12), -FUNCTION (qup13), +FUNCTION (qup13_i2c), +FUNCTION (qup13_uart),FUNCTION (qup14),FUNCTION (qup15), FUNCTION(sdc1_tb),@@ -976,8 +996,8 @@ static const struct msm_pingroup sc7180_groups[] = { [3] = PINGROUP(3, SOUTH, qup01, sp_cmu, dbg_out, qdss_cti, _, _, _, _, _), [4] = PINGROUP(4, NORTH, sdc1_tb, _, qdss_cti, _, _, _, _, _, _), [5] = PINGROUP(5, NORTH, sdc2_tb, _, _, _, _, _, _, _, _), - [6] = PINGROUP(6, NORTH, qup11, qup11, _, _, _, _, _, _, _), - [7] = PINGROUP(7, NORTH, qup11, qup11, ddr_bist, _, _, _, _, _, _), + [6] = PINGROUP(6, NORTH, qup11_i2c, qup11_uart, _, _, _, _, _, _, _), + [7] = PINGROUP(7, NORTH, qup11_i2c, qup11_uart, ddr_bist, _, _, _, _, _, _), [8] = PINGROUP(8, NORTH, gp_pdm1, ddr_bist, _, phase_flag, qdss_cti, _, _, _, _), [9] = PINGROUP(9, NORTH, ddr_bist, _, phase_flag, qdss_cti, _, _, _, _, _), [10] = PINGROUP(10, NORTH, mdp_vsync, ddr_bist, _, _, _, _, _, _, _),@@ -985,8 +1005,8 @@ static const struct msm_pingroup sc7180_groups[] = { [12] = PINGROUP(12, SOUTH, mdp_vsync, m_voc, qup01, _, phase_flag, wlan2_adc0, atest_usb10, ddr_pxi3, _), [13] = PINGROUP(13, SOUTH, cam_mclk, pll_bypassnl, qdss, _, _, _, _, _, _), [14] = PINGROUP(14, SOUTH, cam_mclk, pll_reset, qdss, _, _, _, _, _, _), - [15] = PINGROUP(15, SOUTH, cam_mclk, qup02, qup02, qdss, _, _, _, _, _), - [16] = PINGROUP(16, SOUTH, cam_mclk, qup02, qup02, qdss, _, _, _, _, _), + [15] = PINGROUP(15, SOUTH, cam_mclk, qup02_i2c, qup02_uart, qdss, _, _, _, _, _), + [16] = PINGROUP(16, SOUTH, cam_mclk, qup02_i2c, qup02_uart, qdss, _, _, _, _, _), [17] = PINGROUP(17, SOUTH, cci_i2c, _, phase_flag, qdss, _, wlan1_adc0, atest_usb12, ddr_pxi1, atest_char), [18] = PINGROUP(18, SOUTH, cci_i2c, agera_pll, _, phase_flag, qdss, vsense_trigger, ddr_pxi0, atest_char3, _), [19] = PINGROUP(19, SOUTH, cci_i2c, _, phase_flag, qdss, atest_char2, _, _, _, _),@@ -1016,8 +1036,8 @@ static const struct msm_pingroup sc7180_groups[] = { [43] = PINGROUP(43, NORTH, qup12, _, _, _, _, _, _, _, _), [44] = PINGROUP(44, NORTH, qup12, _, phase_flag, qdss_cti, wlan1_adc1, atest_usb13, ddr_pxi1, _, _), [45] = PINGROUP(45, NORTH, qup12, qdss_cti, _, _, _, _, _, _, _), - [46] = PINGROUP(46, NORTH, qup13, qup13, _, _, _, _, _, _, _), - [47] = PINGROUP(47, NORTH, qup13, qup13, _, _, _, _, _, _, _), + [46] = PINGROUP(46, NORTH, qup13_i2c, qup13_uart, _, _, _, _, _, _, _), + [47] = PINGROUP(47, NORTH, qup13_i2c, qup13_uart, _, _, _, _, _, _, _), [48] = PINGROUP(48, NORTH, gcc_gp1, _, _, _, _, _, _, _, _), [49] = PINGROUP(49, WEST, mi2s_1, btfm_slimbus, _, _, _, _, _, _, _), [50] = PINGROUP(50, WEST, mi2s_1, btfm_slimbus, gp_pdm1, _, _, _, _, _, _),@@ -1085,8 +1105,8 @@ static const struct msm_pingroup sc7180_groups[] = { [112] = PINGROUP(112, NORTH, _, _, _, _, _, _, _, _, _), [113] = PINGROUP(113, NORTH, _, _, _, _, _, _, _, _, _), [114] = PINGROUP(114, NORTH, _, _, _, _, _, _, _, _, _), - [115] = PINGROUP(115, WEST, qup04, qup04, _, _, _, _, _, _, _), - [116] = PINGROUP(116, WEST, qup04, qup04, _, _, _, _, _, _, _), + [115] = PINGROUP(115, WEST, qup04_i2c, qup04_uart, _, _, _, _, _, _, _), + [116] = PINGROUP(116, WEST, qup04_i2c, qup04_uart, _, _, _, _, _, _, _), [117] = PINGROUP(117, WEST, dp_hot, _, _, _, _, _, _, _, _), [118] = PINGROUP(118, WEST, _, _, _, _, _, _, _, _, _), [119] = UFS_RESET(ufs_reset, 0x7f000),Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
A message that is not in the archive (sent off-list or not yet received): 0101016ef3c8e061-462507db-9d6f-4ead-8740-73b08ed97574-000000@us-west-2.amazonses.com
Doug Anderson
Reviewed-byHi,
Quoted 14 lines · Rajendra Nayak
Quoted 12 lines · Bjorn Andersson
Quoted 9 lines · Rajendra Nayak
on sc7180 we have cases where multiple functions from the same qup instance share the same pin. This is true for qup02/04/11 and qup13. Add new function names to distinguish which qup function to use.
The device tree files for this platform haven't landed in mainline yet, so there aren't any users upstream who should break with this change in function names, however, anyone using the devicetree files that were posted on the lists and using these specific function names will need to update their changes.
Quoted 7 lines
Quoted 2 lines
I don't think this paragraph adds value to the git log, but the patch looks good.
Right, I should have mentioned that bit after the --- so its not in the changelog :/
Linus, do you want me to resend with that paragraph moved below --- ?
Personally I find this type of info useful even in the changelog itself. Without it someone inspecting this change would wonder why it was OK to change the device tree bindings without an attempt at backward compatibility. I suppose they could always go back to the mailing list and track down the history, but why is it bad to be in the changelog?
In any case, if everyone hates it in the change log I won't stand in the way, so regardless of which way folks go on that:
Quoted 4 lines · Rajendra Nayak
on sc7180 we have cases where multiple functions from the same qup instance share the same pin. This is true for qup02/04/11 and qup13. Add new function names to distinguish which qup function to use.
Quoted 8 lines
The device tree files for this platform haven't landed in mainline yet, so there aren't any users upstream who should break with this change in function names, however, anyone using the devicetree files that were posted on the lists and using these specific function names will need to update their changes.
Reported-by Stephen Boyd <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>
Patch applied with the ACKs. Thanks!
Yours,
Linus Walleij
A message that is not in the archive (sent off-list or not yet received): 0101016ef36a90e5-678f09f2-8fcd-4fe9-8e1f-3f1622ad0c5e-000000@us-west-2.amazonses.com
Stephen Boyd
Reviewed-byQuoting Rajendra Nayak (2019-12-10 21:24:37)
Quoted 10 lines
on sc7180 we have cases where multiple functions from the same qup instance share the same pin. This is true for qup02/04/11 and qup13. Add new function names to distinguish which qup function to use.
The device tree files for this platform haven't landed in mainline yet, so there aren't any users upstream who should break with this change in function names, however, anyone using the devicetree files that were posted on the lists and using these specific function names will need to update their changes.
Quoted 3 lines
Reported-by Stephen Boyd <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>---