Hi, On 14 May 2015 at 10:30, Simon Glass <sjg@xxxxxxxxxxxx> wrote: > Hi Stephen, > > On 14 May 2015 at 09:47, Stephen Warren <swarren@xxxxxxxxxxxxx> wrote: >> >> On 05/14/2015 08:28 AM, Simon Glass wrote: >>> >>> Hi Stephen, >>> >>> On 14 May 2015 at 08:11, Stephen Warren <swarren@xxxxxxxxxxxxx> wrote: >>>> >>>> On 05/14/2015 07:09 AM, Tomeu Vizoso wrote: >>>>> >>>>> >>>>> On 13 May 2015 at 16:45, Stephen Warren <swarren@xxxxxxxxxxxxx> wrote: >>>>>> >>>>>> >>>>>> On 05/13/2015 08:13 AM, Simon Glass wrote: >>>>>>> >>>>>>> >>>>>>> >>>>>>> Regenerate the pinmux from the latest tegra-pinmux-scripts. >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> (Dropping most CCs; DT maintainers and lists generally don't get CC'd on >>>>>> simple DT content changes but rather on schema adds/changes and perhaps >>>>>> major DT content changes depending on context) >>>>>> >>>>>>> diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts >>>>>>> b/arch/arm/boot/dts/tegra124-nyan-big.dts >>>>>> >>>>>> >>>>>> >>>>>> >>>>>>> pinctrl-names = "default"; >>>>>>> pinctrl-0 = <&pinmux_default>; >>>>>>> >>>>>>> - pinmux_default: common { >>>>>>> + state_default: pinmux { >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> This change will break compilation, since it changes the label name, yet >>>>>> the >>>>>> old name is still referenced in pinctrl-0 above. Same applies in the >>>>>> other >>>>>> file too. >>>>>> >>>>>>> diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts >>>>>>> b/arch/arm/boot/dts/tegra124-nyan-blaze.dts >>>>>> >>>>>> >>>>>> >>>>>> >>>>>>> @@ -437,18 +437,18 @@ >>>>>>> usb_vbus_en0_pn4 { >>>>>>> nvidia,pins = "usb_vbus_en0_pn4"; >>>>>>> nvidia,function = "usb"; >>>>>>> - nvidia,pull = <TEGRA_PIN_PULL_UP>; >>>>>>> + nvidia,pull = <TEGRA_PIN_PULL_NONE>; >>>>>>> nvidia,tristate = <TEGRA_PIN_DISABLE>; >>>>>>> nvidia,enable-input = >>>>>>> <TEGRA_PIN_ENABLE>; >>>>>>> - nvidia,open-drain = <TEGRA_PIN_DISABLE>; >>>>>>> + nvidia,open-drain = <TEGRA_PIN_ENABLE>; >>>>>>> }; >>>>>>> usb_vbus_en1_pn5 { >>>>>>> nvidia,pins = "usb_vbus_en1_pn5"; >>>>>>> nvidia,function = "usb"; >>>>>>> - nvidia,pull = <TEGRA_PIN_PULL_UP>; >>>>>>> + nvidia,pull = <TEGRA_PIN_PULL_NONE>; >>>>>>> nvidia,tristate = <TEGRA_PIN_DISABLE>; >>>>>>> nvidia,enable-input = >>>>>>> <TEGRA_PIN_ENABLE>; >>>>>>> - nvidia,open-drain = <TEGRA_PIN_DISABLE>; >>>>>>> + nvidia,open-drain = <TEGRA_PIN_ENABLE>; >>>>>>> }; >>>>>> >>>>>> >>>>>> >>>>>> >>>>>> Tomeu, can you comment on those changes? Evidently the pinmux >>>>>> configuration >>>>>> that's you added to the kernel doesn't exactly match the pinmux >>>>>> configuration that you added to tegra-pinmux-scripts. >>>>> >>>>> >>>>> >>>>> Are you sure? Just checked and what tegra-pinmux-scripts currently >>>>> generates matches what is currently in the kernel, for both nyans. >>>> >>>> >>>> >>>> My apologies; you're correct. >>>> >>>> This patch to the kernel DTs includes changes that aren't generated by >>>> either current tegra-pinmux-scripts, nor by tegra-pinmux-scripts with >>>> Simon's "[pinmux scripts PATCH] Support TPM on nyan boards" applied. Simon, >>>> can you double-check you didn't have any local patches to >>>> tegra-pinmux-scripts applied when you generated the DT content for this >>>> patch? >>> >>> >>> Yes. Apart from my patch the top commit is 39af. >> >> >> OK, did you paste the same DT content into both DTs then, instead of generating each DT separately? >> > > Not intentionally, but I wonder if I failed to change the board parameter? > >> When I re-generate the DT using commit 39af, I don't get any changes to usb_vbus_en*. > > I can't explain that. I'll try it again when I get a chance. It doesn't seem to happen now, I must have done something wrong. I'll send a v2 patch. Regards, Simon -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html