| Message ID | 1431526427-13340-1-git-send-email-sjg@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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. Is the change above correct, or do we need to propagate this change from the kernel DT into tegra-pinmux-scripts, and hence also into the U-Boot pinmux setup table? My understanding of how these pins are generally used is that open-drain is likely correct. I have no idea whether Tegra should supply the pullup for these pins, or whether the board has a pullup resistor in which case Tegra doesn't need to pull up.
Hi Stephen, On 13 May 2015 at 08:45, Stephen Warren <swarren@wwwdotorg.org> 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) OK, I'll try to remember to use patman -m. > >> 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. Yes I saw that, but assumed that the tool was doing the right thing. Is the tool wrong? > >> 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. Is the change above > correct, or do we need to propagate this change from the kernel DT into > tegra-pinmux-scripts, and hence also into the U-Boot pinmux setup table? > > My understanding of how these pins are generally used is that open-drain is > likely correct. I have no idea whether Tegra should supply the pullup for > these pins, or whether the board has a pullup resistor in which case Tegra > doesn't need to pull up. Regards, Simon
On 13 May 2015 at 16:45, Stephen Warren <swarren@wwwdotorg.org> 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. > Is the change above > correct, or do we need to propagate this change from the kernel DT into > tegra-pinmux-scripts, and hence also into the U-Boot pinmux setup table? > > My understanding of how these pins are generally used is that open-drain is > likely correct. I have no idea whether Tegra should supply the pullup for > these pins, or whether the board has a pullup resistor in which case Tegra > doesn't need to pull up. From what Andrew (added to CC) said when these changes were discussed, it shouldn't matter as a fixed regulator is used to drive those pins high. Regards, Tomeu > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 05/14/2015 07:09 AM, Tomeu Vizoso wrote: > On 13 May 2015 at 16:45, Stephen Warren <swarren@wwwdotorg.org> 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? >> Is the change above >> correct, or do we need to propagate this change from the kernel DT into >> tegra-pinmux-scripts, and hence also into the U-Boot pinmux setup table? >> >> My understanding of how these pins are generally used is that open-drain is >> likely correct. I have no idea whether Tegra should supply the pullup for >> these pins, or whether the board has a pullup resistor in which case Tegra >> doesn't need to pull up. > > From what Andrew (added to CC) said when these changes were discussed, > it shouldn't matter as a fixed regulator is used to drive those pins > high. It looks like nyan-big and nyan-blaze configure these pins differently, which may be incorrect if the boards are truly almost identical. Is that expected? Nyan-big sets them both to open-drain but Nyan-blaze sets them to push-pull. The pull-up enable is different too. Typically these pins are open-drain, because there's often a current sensor chip on the USB port power rail which asserts (pulls low in open-drain mode) these signals to turn off the power when an over-current condition is detected. Not all boards do this though, so the difference may be perfectly expected; someone with access to the schematics would have to check.
On 05/13/2015 09:22 AM, Simon Glass wrote: > Hi Stephen, > > On 13 May 2015 at 08:45, Stephen Warren <swarren@wwwdotorg.org> 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) > > OK, I'll try to remember to use patman -m. > >> >>> 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. > > Yes I saw that, but assumed that the tool was doing the right thing. > Is the tool wrong? Well, it includes the outer node to make it obvious where to put the generated data, but since this one line doesn't exactly match what's in some of the kernel DTs, it's probably just confusing. I've sent a patch to remove that one line from the generated output of the tool; find it on the linux-tegra mailing list.
Hi Stephen, On 14 May 2015 at 08:11, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 05/14/2015 07:09 AM, Tomeu Vizoso wrote: >> >> On 13 May 2015 at 16:45, Stephen Warren <swarren@wwwdotorg.org> 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. > >>> Is the change above >>> correct, or do we need to propagate this change from the kernel DT into >>> tegra-pinmux-scripts, and hence also into the U-Boot pinmux setup table? >>> >>> My understanding of how these pins are generally used is that open-drain >>> is >>> likely correct. I have no idea whether Tegra should supply the pullup for >>> these pins, or whether the board has a pullup resistor in which case >>> Tegra >>> doesn't need to pull up. >> >> >> From what Andrew (added to CC) said when these changes were discussed, >> it shouldn't matter as a fixed regulator is used to drive those pins >> high. > > > It looks like nyan-big and nyan-blaze configure these pins differently, > which may be incorrect if the boards are truly almost identical. Is that > expected? Nyan-big sets them both to open-drain but Nyan-blaze sets them to > push-pull. The pull-up enable is different too. Typically these pins are > open-drain, because there's often a current sensor chip on the USB port > power rail which asserts (pulls low in open-drain mode) these signals to > turn off the power when an over-current condition is detected. Not all > boards do this though, so the difference may be perfectly expected; someone > with access to the schematics would have to check. Regards, Simon
On 05/14/2015 08:28 AM, Simon Glass wrote: > Hi Stephen, > > On 14 May 2015 at 08:11, Stephen Warren <swarren@wwwdotorg.org> wrote: >> On 05/14/2015 07:09 AM, Tomeu Vizoso wrote: >>> >>> On 13 May 2015 at 16:45, Stephen Warren <swarren@wwwdotorg.org> 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? When I re-generate the DT using commit 39af, I don't get any changes to usb_vbus_en*.
Hi Stephen, On 14 May 2015 at 09:47, Stephen Warren <swarren@wwwdotorg.org> wrote: > > On 05/14/2015 08:28 AM, Simon Glass wrote: >> >> Hi Stephen, >> >> On 14 May 2015 at 08:11, Stephen Warren <swarren@wwwdotorg.org> wrote: >>> >>> On 05/14/2015 07:09 AM, Tomeu Vizoso wrote: >>>> >>>> >>>> On 13 May 2015 at 16:45, Stephen Warren <swarren@wwwdotorg.org> 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. Regards, Simon
Hi, On 14 May 2015 at 10:30, Simon Glass <sjg@chromium.org> wrote: > Hi Stephen, > > On 14 May 2015 at 09:47, Stephen Warren <swarren@wwwdotorg.org> wrote: >> >> On 05/14/2015 08:28 AM, Simon Glass wrote: >>> >>> Hi Stephen, >>> >>> On 14 May 2015 at 08:11, Stephen Warren <swarren@wwwdotorg.org> wrote: >>>> >>>> On 05/14/2015 07:09 AM, Tomeu Vizoso wrote: >>>>> >>>>> >>>>> On 13 May 2015 at 16:45, Stephen Warren <swarren@wwwdotorg.org> 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
diff --git a/arch/arm/boot/dts/tegra124-nyan-big.dts b/arch/arm/boot/dts/tegra124-nyan-big.dts index 2d21253..0eb2b0f 100644 --- a/arch/arm/boot/dts/tegra124-nyan-big.dts +++ b/arch/arm/boot/dts/tegra124-nyan-big.dts @@ -30,7 +30,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinmux_default>; - pinmux_default: common { + state_default: pinmux { clk_32k_out_pa0 { nvidia,pins = "clk_32k_out_pa0"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; @@ -1098,19 +1098,19 @@ }; cam_i2c_scl_pbb1 { nvidia,pins = "cam_i2c_scl_pbb1"; - nvidia,function = "rsvd3"; - nvidia,pull = <TEGRA_PIN_PULL_DOWN>; - nvidia,tristate = <TEGRA_PIN_ENABLE>; - nvidia,enable-input = <TEGRA_PIN_DISABLE>; - nvidia,open-drain = <TEGRA_PIN_DISABLE>; + nvidia,function = "i2c3"; + nvidia,pull = <TEGRA_PIN_PULL_NONE>; + nvidia,tristate = <TEGRA_PIN_DISABLE>; + nvidia,enable-input = <TEGRA_PIN_ENABLE>; + nvidia,open-drain = <TEGRA_PIN_ENABLE>; }; cam_i2c_sda_pbb2 { nvidia,pins = "cam_i2c_sda_pbb2"; - nvidia,function = "rsvd3"; - nvidia,pull = <TEGRA_PIN_PULL_DOWN>; - nvidia,tristate = <TEGRA_PIN_ENABLE>; - nvidia,enable-input = <TEGRA_PIN_DISABLE>; - nvidia,open-drain = <TEGRA_PIN_DISABLE>; + nvidia,function = "i2c3"; + nvidia,pull = <TEGRA_PIN_PULL_NONE>; + nvidia,tristate = <TEGRA_PIN_DISABLE>; + nvidia,enable-input = <TEGRA_PIN_ENABLE>; + nvidia,open-drain = <TEGRA_PIN_ENABLE>; }; pbb3 { nvidia,pins = "pbb3"; diff --git a/arch/arm/boot/dts/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/tegra124-nyan-blaze.dts index 0d30c51..1fc0da9 100644 --- a/arch/arm/boot/dts/tegra124-nyan-blaze.dts +++ b/arch/arm/boot/dts/tegra124-nyan-blaze.dts @@ -26,7 +26,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinmux_default>; - pinmux_default: common { + state_default: pinmux { clk_32k_out_pa0 { nvidia,pins = "clk_32k_out_pa0"; nvidia,pull = <TEGRA_PIN_PULL_NONE>; @@ -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>; }; hdmi_int_pn7 { nvidia,pins = "hdmi_int_pn7"; @@ -1094,19 +1094,19 @@ }; cam_i2c_scl_pbb1 { nvidia,pins = "cam_i2c_scl_pbb1"; - nvidia,function = "rsvd3"; - nvidia,pull = <TEGRA_PIN_PULL_DOWN>; - nvidia,tristate = <TEGRA_PIN_ENABLE>; - nvidia,enable-input = <TEGRA_PIN_DISABLE>; - nvidia,open-drain = <TEGRA_PIN_DISABLE>; + nvidia,function = "i2c3"; + nvidia,pull = <TEGRA_PIN_PULL_NONE>; + nvidia,tristate = <TEGRA_PIN_DISABLE>; + nvidia,enable-input = <TEGRA_PIN_ENABLE>; + nvidia,open-drain = <TEGRA_PIN_ENABLE>; }; cam_i2c_sda_pbb2 { nvidia,pins = "cam_i2c_sda_pbb2"; - nvidia,function = "rsvd3"; - nvidia,pull = <TEGRA_PIN_PULL_DOWN>; - nvidia,tristate = <TEGRA_PIN_ENABLE>; - nvidia,enable-input = <TEGRA_PIN_DISABLE>; - nvidia,open-drain = <TEGRA_PIN_DISABLE>; + nvidia,function = "i2c3"; + nvidia,pull = <TEGRA_PIN_PULL_NONE>; + nvidia,tristate = <TEGRA_PIN_DISABLE>; + nvidia,enable-input = <TEGRA_PIN_ENABLE>; + nvidia,open-drain = <TEGRA_PIN_ENABLE>; }; pbb3 { nvidia,pins = "pbb3";
Regenerate the pinmux from the latest tegra-pinmux-scripts. Signed-off-by: Simon Glass <sjg@chromium.org> --- arch/arm/boot/dts/tegra124-nyan-big.dts | 22 +++++++++++----------- arch/arm/boot/dts/tegra124-nyan-blaze.dts | 30 +++++++++++++++--------------- 2 files changed, 26 insertions(+), 26 deletions(-)