On 26/06/2019 16:42, Jeffrey Hugo wrote:
> On Wed, Jun 26, 2019 at 8:40 AM Marc Gonzalez <marc.w.gonzalez@xxxxxxx> wrote:
>
>> Preamble: Rename tsif1 to tsif0, tsif2 to tsif1.
>> Squash tsif0 pins into a single function. Same for tsif1.
>>
>> Signed-off-by: Marc Gonzalez <marc.w.gonzalez@xxxxxxx>
>> ---
>> .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 19 ++---
>> drivers/pinctrl/qcom/pinctrl-msm8998.c | 76 +++++--------------
>> 2 files changed, 24 insertions(+), 71 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
>> index 00174f08ba1d..47b0f30a39e9 100644
>> --- a/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
>> +++ b/Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt
>> @@ -124,9 +124,8 @@ to specify in a pin configuration subnode:
>> qlink_request, qua_mi2s, sd_card, sd_write, sdc40, sdc41,
>> sdc42, sdc43, sdc4_clk, sdc4_cmd, sec_mi2s, sp_cmu,
>> spkr_i2s, ssbi1, ssc_irq, ter_mi2s, tgu_ch0, tgu_ch1,
>> - tsense_pwm1, tsense_pwm2, tsif1_clk, tsif1_data, tsif1_en,
>> - tsif1_error, tsif1_sync, tsif2_clk, tsif2_data, tsif2_en,
>> - tsif2_error, tsif2_sync, uim1_clk, uim1_data, uim1_present,
>> + tsense_pwm1, tsense_pwm2, tsif0, tsif1,
>> + uim1_clk, uim1_data, uim1_present,
>> uim1_reset, uim2_clk, uim2_data, uim2_present, uim2_reset,
>> uim_batt, usb_phy, vfr_1, vsense_clkout, vsense_data0,
>> vsense_data1, vsense_mode, wlan1_adc0, wlan1_adc1,
>> @@ -179,15 +178,9 @@ Example:
>> #interrupt-cells = <2>;
>>
>> uart_console_active: uart_console_active {
>> - mux {
>> - pins = "gpio4", "gpio5";
>> - function = "blsp_uart8_a";
>> - };
>> -
>> - config {
>> - pins = "gpio4", "gpio5";
>> - drive-strength = <2>;
>> - bias-disable;
>> - };
>> + pins = "gpio4", "gpio5";
>> + function = "blsp_uart8_a";
>> + drive-strength = <2>;
>> + bias-disable;
>> };
>
> Whats with these "uart" changes? Modernizing the example? Doesn't
> seem related to the commit text...
Good point. I squashed one commit too many. I'll drop that hunk
in v2. (Yes, I meant to document the syntax recommended by Bjorn.)
Regards.
