* [GIT PULL] ARM: tegra: dt2 branch
@ 2012-05-14 17:20 Stephen Warren
2012-05-14 18:54 ` Arnd Bergmann
[not found] ` <1337016017-30537-2-git-send-email-swarren@wwwdotorg.org>
0 siblings, 2 replies; 10+ messages in thread
From: Stephen Warren @ 2012-05-14 17:20 UTC (permalink / raw)
To: linux-arm-kernel
This is some late device tree additions and cleanup for Tegra.
This branch is based on the merge of the following branches from the
Tegra repo, which are all already pulled into arm-soc:
for-3.5/tegra30-audio
for-3.5/usb-ulpi
for-3.5/dt
... which are all based on for-3.5/gpio-pinmux
----------------------------------------------------------------
The following changes since commit 4b7e870590f65f4e8bb3cdb7f382e1a9dd17dad5:
Merge branch 'for-3.5/dt' into for-3.5/dt2-new
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/dt2
for you to fetch changes up to 2a5fdc9adde8476751b63a795e3d66ae2ee3979d:
ARM: dt: tegra: invert status=disable vs status=okay
----------------------------------------------------------------
arch/arm/boot/dts/tegra-cardhu.dts | 77 +++++---
arch/arm/boot/dts/tegra-harmony.dts | 100 +++++-----
arch/arm/boot/dts/tegra-paz00.dts | 112 ++++++-----
arch/arm/boot/dts/tegra-seaboard.dts | 176 +++++++++--------
arch/arm/boot/dts/tegra-trimslice.dts | 71 ++++---
arch/arm/boot/dts/tegra-ventana.dts | 90 +++++----
arch/arm/boot/dts/tegra20.dtsi | 275 ++++++++++++---------------
arch/arm/boot/dts/tegra30.dtsi | 292 ++++++++++++----------------
8 files changed, 588 insertions(+), 605 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread* [GIT PULL] ARM: tegra: dt2 branch 2012-05-14 17:20 [GIT PULL] ARM: tegra: dt2 branch Stephen Warren @ 2012-05-14 18:54 ` Arnd Bergmann 2012-05-14 19:04 ` Stephen Warren [not found] ` <1337016017-30537-2-git-send-email-swarren@wwwdotorg.org> 1 sibling, 1 reply; 10+ messages in thread From: Arnd Bergmann @ 2012-05-14 18:54 UTC (permalink / raw) To: linux-arm-kernel On Monday 14 May 2012, Stephen Warren wrote: > This is some late device tree additions and cleanup for Tegra. Hi Stephen, The log you sent there does not match what I got. These are the changes I got from pulling your tree: ARM: dt: tegra: invert status=disable vs status=okay ARM: dt: tegra: consistent basic property ordering ARM: dt: tegra: sort nodes based on bus order ARM: dt: tegra: remove duplicate device_type property ARM: dt: tegra: consistenly use lower-case for hex constants ARM: dt: tegra: format regs properties consistently ARM: dt: tegra: gpio comment cleanup ARM: dt: tegra: remove unnecessary unit addresses ARM: dt: tegra: whitespace cleanup ARM: dt: tegra cardhu: fix typo in SDHCI node name ARM: dt: tegra: cardhu: register core regulator tps62361 ARM: dt: tegra30.dtsi: Add SMMU node ARM: dt: tegra20.dtsi: Add GART node ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes ARM: dt: tegra: Add device tree support for AHB arch/arm/boot/dts/tegra-cardhu.dts | 77 +++++++----------- arch/arm/boot/dts/tegra-harmony.dts | 100 +++++++++++------------ arch/arm/boot/dts/tegra-paz00.dts | 112 ++++++++++++------------- arch/arm/boot/dts/tegra-seaboard.dts | 176 +++++++++++++++++++--------------------- arch/arm/boot/dts/tegra-trimslice.dts | 71 +++++++--------- arch/arm/boot/dts/tegra-ventana.dts | 90 ++++++++++----------- arch/arm/boot/dts/tegra20.dtsi | 275 +++++++++++++++++++++++++++++++++++--------------------------- arch/arm/boot/dts/tegra30.dtsi | 292 ++++++++++++++++++++++++++++++++++++++---------------------------- 8 files changed, 605 insertions(+), 588 deletions(-) I can't see anything wrong with your commits but please check again that it all makes sense and let me know if I should really pull this version. Arnd ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-14 18:54 ` Arnd Bergmann @ 2012-05-14 19:04 ` Stephen Warren 2012-05-14 20:37 ` Arnd Bergmann 0 siblings, 1 reply; 10+ messages in thread From: Stephen Warren @ 2012-05-14 19:04 UTC (permalink / raw) To: linux-arm-kernel On 05/14/2012 12:54 PM, Arnd Bergmann wrote: > On Monday 14 May 2012, Stephen Warren wrote: >> This is some late device tree additions and cleanup for Tegra. > > Hi Stephen, > > The log you sent there does not match what I got. These are the changes I got > from pulling your tree: > > ARM: dt: tegra: invert status=disable vs status=okay > ARM: dt: tegra: consistent basic property ordering > ARM: dt: tegra: sort nodes based on bus order > ARM: dt: tegra: remove duplicate device_type property > ARM: dt: tegra: consistenly use lower-case for hex constants > ARM: dt: tegra: format regs properties consistently > ARM: dt: tegra: gpio comment cleanup > ARM: dt: tegra: remove unnecessary unit addresses > ARM: dt: tegra: whitespace cleanup > ARM: dt: tegra cardhu: fix typo in SDHCI node name > ARM: dt: tegra: cardhu: register core regulator tps62361 > ARM: dt: tegra30.dtsi: Add SMMU node > ARM: dt: tegra20.dtsi: Add GART node > ARM: dt: tegra30.dtsi: Add Memory Controller(MC) nodes > ARM: dt: tegra20.dtsi: Add Memory Controller(MC) nodes > ARM: dt: tegra: Add device tree support for AHB Those look good. I assume the problem is in the diffstat not the log... > arch/arm/boot/dts/tegra-cardhu.dts | 77 +++++++----------- > arch/arm/boot/dts/tegra-harmony.dts | 100 +++++++++++------------ > arch/arm/boot/dts/tegra-paz00.dts | 112 ++++++++++++------------- > arch/arm/boot/dts/tegra-seaboard.dts | 176 +++++++++++++++++++--------------------- > arch/arm/boot/dts/tegra-trimslice.dts | 71 +++++++--------- > arch/arm/boot/dts/tegra-ventana.dts | 90 ++++++++++----------- > arch/arm/boot/dts/tegra20.dtsi | 275 +++++++++++++++++++++++++++++++++++--------------------------- > arch/arm/boot/dts/tegra30.dtsi | 292 ++++++++++++++++++++++++++++++++++++++---------------------------- > 8 files changed, 605 insertions(+), 588 deletions(-) > > I can't see anything wrong with your commits but please check again that it all makes > sense and let me know if I should really pull this version. I think that looks OK. I probably just generated the diffstat backwards. I ran: git diff -M --stat=75 --summary $TIP_SHA..$BASE_SHA Perhaps I should have run: git diff -M --stat=75 --summary $BASE_SHA..$TIP_SHA where BASE_SHA is the merge the branch was based on, and TIP_SHA is the latest commit in the branch. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-14 19:04 ` Stephen Warren @ 2012-05-14 20:37 ` Arnd Bergmann 2012-05-14 20:54 ` Stephen Warren 0 siblings, 1 reply; 10+ messages in thread From: Arnd Bergmann @ 2012-05-14 20:37 UTC (permalink / raw) To: linux-arm-kernel On Monday 14 May 2012, Stephen Warren wrote: > On 05/14/2012 12:54 PM, Arnd Bergmann wrote: > > > > I can't see anything wrong with your commits but please check again that it all makes > > sense and let me know if I should really pull this version. > > I think that looks OK. I probably just generated the diffstat backwards. Ok, thanks for the confirmation. I've pulled it into next/dt2 now. In order to merge this with the drivers/mmc branch that contains the common mmc binding, I used the complex resolution below, adding bus-width properties to both the dtsi and the dts files. Arnd diff --cc arch/arm/boot/dts/tegra-cardhu.dts index e14bb45,67c6511..0000000 --- a/arch/arm/boot/dts/tegra-cardhu.dts +++ b/arch/arm/boot/dts/tegra-cardhu.dts @@@ -139,32 -54,19 +139,34 @@@ cd-gpios = <&gpio 69 0>; /* gpio PI5 */ wp-gpios = <&gpio 155 0>; /* gpio PT3 */ power-gpios = <&gpio 31 0>; /* gpio PD7 */ + bus-width = <4>; }; - sdhci at 78000200 { - status = "disable"; - }; - - sdhci at 78000400 { - status = "disable"; - }; - - sdhci at 78000400 { + sdhci at 78000600 { + status = "okay"; support-8bit; + bus-width = <8>; }; + + sound { + compatible = "nvidia,tegra-audio-wm8903-cardhu", + "nvidia,tegra-audio-wm8903"; + nvidia,model = "NVIDIA Tegra Cardhu"; + + nvidia,audio-routing = + "Headphone Jack", "HPOUTR", + "Headphone Jack", "HPOUTL", + "Int Spk", "ROP", + "Int Spk", "RON", + "Int Spk", "LOP", + "Int Spk", "LON", + "Mic Jack", "MICBIAS", + "IN1L", "Mic Jack"; + + nvidia,i2s-controller = <&tegra_i2s1>; + nvidia,audio-codec = <&wm8903>; + + nvidia,spkr-en-gpios = <&wm8903 2 0>; + nvidia,hp-det-gpios = <&gpio 178 0>; /* gpio PW2 */ + }; }; diff --cc arch/arm/boot/dts/tegra-harmony.dts index 6bcdad3,e9cae68..0000000 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts @@@ -277,36 -44,8 +277,38 @@@ clock-frequency = <400000>; }; - i2s at 70002a00 { - status = "disable"; + pmc { + nvidia,invert-interrupt; + }; + + usb at c5000000 { + status = "okay"; + }; + + usb at c5004000 { + status = "okay"; + nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ + }; + + usb at c5008000 { + status = "okay"; + }; + + sdhci at c8000200 { + status = "okay"; + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ + power-gpios = <&gpio 155 0>; /* gpio PT3 */ ++ bus-width = <4>; + }; + + sdhci at c8000600 { + status = "okay"; + cd-gpios = <&gpio 58 0>; /* gpio PH2 */ + wp-gpios = <&gpio 59 0>; /* gpio PH3 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ + support-8bit; ++ bus-width = <8>; }; sound { diff --cc arch/arm/boot/dts/tegra-ventana.dts index 15d8fdb,29e54c7..0000000 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts @@@ -291,29 -40,8 +291,31 @@@ clock-frequency = <400000>; }; - i2s at 70002a00 { - status = "disable"; + usb at c5000000 { + status = "okay"; + }; + + usb at c5004000 { + status = "okay"; + nvidia,phy-reset-gpio = <&gpio 169 0>; /* gpio PV1 */ + }; + + usb at c5008000 { + status = "okay"; + }; + + sdhci at c8000400 { + status = "okay"; + cd-gpios = <&gpio 69 0>; /* gpio PI5 */ + wp-gpios = <&gpio 57 0>; /* gpio PH1 */ + power-gpios = <&gpio 70 0>; /* gpio PI6 */ ++ bus-width = <4>; + }; + + sdhci at c8000600 { + status = "okay"; + support-8bit; ++ bus-width = <8>; }; sound { diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts index 6fc52af..9de5636 100644 --- a/arch/arm/boot/dts/tegra-trimslice.dts +++ b/arch/arm/boot/dts/tegra-trimslice.dts @@ -288,12 +288,14 @@ sdhci at c8000000 { status = "okay"; + bus-width = <4>; }; sdhci at c8000600 { status = "okay"; cd-gpios = <&gpio 121 0>; /* gpio PP1 */ wp-gpios = <&gpio 122 0>; /* gpio PP2 */ + bus-width = <4>; }; sound { diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index c417d67..26f4299 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi @@ -214,6 +214,7 @@ reg = <0xc8000000 0x200>; interrupts = <0 14 0x04>; status = "disable"; + bus-width = <4>; }; sdhci at c8000200 { @@ -221,6 +222,7 @@ reg = <0xc8000200 0x200>; interrupts = <0 15 0x04>; status = "disable"; + bus-width = <4>; }; sdhci at c8000400 { @@ -228,6 +230,7 @@ reg = <0xc8000400 0x200>; interrupts = <0 19 0x04>; status = "disable"; + bus-width = <4>; }; sdhci at c8000600 { @@ -235,6 +238,7 @@ reg = <0xc8000600 0x200>; interrupts = <0 31 0x04>; status = "disable"; + bus-width = <4>; }; pmu { diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi index 2dcc09e..95fa6e3c 100644 --- a/arch/arm/boot/dts/tegra30.dtsi +++ b/arch/arm/boot/dts/tegra30.dtsi @@ -238,6 +238,7 @@ reg = <0x78000000 0x200>; interrupts = <0 14 0x04>; status = "disable"; + bus-width = <4>; }; sdhci at 78000200 { @@ -245,6 +246,7 @@ reg = <0x78000200 0x200>; interrupts = <0 15 0x04>; status = "disable"; + bus-width = <4>; }; sdhci at 78000400 { @@ -252,6 +254,7 @@ reg = <0x78000400 0x200>; interrupts = <0 19 0x04>; status = "disable"; + bus-width = <4>; }; sdhci at 78000600 { @@ -259,6 +262,7 @@ reg = <0x78000600 0x200>; interrupts = <0 31 0x04>; status = "disable"; + bus-width = <4>; }; pmu { ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-14 20:37 ` Arnd Bergmann @ 2012-05-14 20:54 ` Stephen Warren 2012-05-15 11:43 ` Arnd Bergmann 0 siblings, 1 reply; 10+ messages in thread From: Stephen Warren @ 2012-05-14 20:54 UTC (permalink / raw) To: linux-arm-kernel On 05/14/2012 02:37 PM, Arnd Bergmann wrote: > On Monday 14 May 2012, Stephen Warren wrote: >> On 05/14/2012 12:54 PM, Arnd Bergmann wrote: > >>> >>> I can't see anything wrong with your commits but please check again that it all makes >>> sense and let me know if I should really pull this version. >> >> I think that looks OK. I probably just generated the diffstat backwards. > > Ok, thanks for the confirmation. > > I've pulled it into next/dt2 now. In order to merge this with the drivers/mmc branch > that contains the common mmc binding, I used the complex resolution below, adding > bus-width properties to both the dtsi and the dts files. Yeah, sorry about those conflicts. Thanks for fixing them up. The changes to tegra-*.dts look fine. I wonder if the changes to tegra-*.dtsi shouldn't just be dropped? I'd personally err on the side of requiring board files to add this property, rather than having things accidentally work because the .dtsi file included a default. BTW, I assume that in 3.6, I should plan to remove the support-8bit properties and associated Tegra SDHCI driver code that handles them, and rely on the SDHCI core handling this from now on? ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-14 20:54 ` Stephen Warren @ 2012-05-15 11:43 ` Arnd Bergmann 2012-05-15 16:15 ` Stephen Warren 0 siblings, 1 reply; 10+ messages in thread From: Arnd Bergmann @ 2012-05-15 11:43 UTC (permalink / raw) To: linux-arm-kernel On Monday 14 May 2012, Stephen Warren wrote: > I wonder if the changes to tegra-*.dtsi shouldn't just be dropped? I'd > personally err on the side of requiring board files to add this > property, rather than having things accidentally work because the .dtsi > file included a default. I ended up redoing the merge because I found an embarrasing typo in my patch and now dropped the property for the dtsi files. > BTW, I assume that in 3.6, I should plan to remove the support-8bit > properties and associated Tegra SDHCI driver code that handles them, and > rely on the SDHCI core handling this from now on? I think we can't drop it from the driver because of existing powerpc machines providing the property, but it would be ok if you drop it from your .dts files. Arnd ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-15 11:43 ` Arnd Bergmann @ 2012-05-15 16:15 ` Stephen Warren 2012-05-15 19:15 ` Arnd Bergmann 0 siblings, 1 reply; 10+ messages in thread From: Stephen Warren @ 2012-05-15 16:15 UTC (permalink / raw) To: linux-arm-kernel On 05/15/2012 05:43 AM, Arnd Bergmann wrote: > On Monday 14 May 2012, Stephen Warren wrote: >> I wonder if the changes to tegra-*.dtsi shouldn't just be dropped? I'd >> personally err on the side of requiring board files to add this >> property, rather than having things accidentally work because the .dtsi >> file included a default. > > I ended up redoing the merge because I found an embarrasing typo in my patch > and now dropped the property for the dtsi files. > >> BTW, I assume that in 3.6, I should plan to remove the support-8bit >> properties and associated Tegra SDHCI driver code that handles them, and >> rely on the SDHCI core handling this from now on? > > I think we can't drop it from the driver because of existing powerpc machines > providing the property, but it would be ok if you drop it from your .dts > files. support-8bit is parsed by the Tegra driver only, and only appears in tegra-*.dts across all arch/*/boot.dts. I assume you were talking about some other property, although I can't tell which from a very quick look at arch/powerpc/boot/dts/*. ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-15 16:15 ` Stephen Warren @ 2012-05-15 19:15 ` Arnd Bergmann 2012-05-15 19:24 ` Stephen Warren 0 siblings, 1 reply; 10+ messages in thread From: Arnd Bergmann @ 2012-05-15 19:15 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 15 May 2012, Stephen Warren wrote: > > I think we can't drop it from the driver because of existing powerpc machines > > providing the property, but it would be ok if you drop it from your .dts > > files. > > support-8bit is parsed by the Tegra driver only, and only appears in > tegra-*.dts across all arch/*/boot.dts. I assume you were talking about > some other property, although I can't tell which from a very quick look > at arch/powerpc/boot/dts/*. Right, my mistake. I guess we could have just removed it right away then. Arnd ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL] ARM: tegra: dt2 branch 2012-05-15 19:15 ` Arnd Bergmann @ 2012-05-15 19:24 ` Stephen Warren 0 siblings, 0 replies; 10+ messages in thread From: Stephen Warren @ 2012-05-15 19:24 UTC (permalink / raw) To: linux-arm-kernel On 05/15/2012 01:15 PM, Arnd Bergmann wrote: > On Tuesday 15 May 2012, Stephen Warren wrote: >>> I think we can't drop it from the driver because of existing powerpc machines >>> providing the property, but it would be ok if you drop it from your .dts >>> files. >> >> support-8bit is parsed by the Tegra driver only, and only appears in >> tegra-*.dts across all arch/*/boot.dts. I assume you were talking about >> some other property, although I can't tell which from a very quick look >> at arch/powerpc/boot/dts/*. > > Right, my mistake. > > I guess we could have just removed it right away then. No worries. I'll take an action to do this in 3.6. Thanks for cleaning up the bindings. ^ permalink raw reply [flat|nested] 10+ messages in thread
[parent not found: <1337016017-30537-2-git-send-email-swarren@wwwdotorg.org>]
* [GIT PULL] ARM: tegra: defconfig2 branch [not found] ` <1337016017-30537-2-git-send-email-swarren@wwwdotorg.org> @ 2012-05-14 18:56 ` Arnd Bergmann 0 siblings, 0 replies; 10+ messages in thread From: Arnd Bergmann @ 2012-05-14 18:56 UTC (permalink / raw) To: linux-arm-kernel On Monday 14 May 2012, Stephen Warren wrote: > A late tegra_defconfig change to add a regulator for Cardhu. > > This is based on the for-3.5/defconfig branch in the Tegra repo, which > is already merged into arm-soc. > > ---------------------------------------------------------------- > > The following changes since commit c6b556a53970c262571b2cf60661a33ddeb1a651: > > ARM: tegra: update defconfig > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git for-3.5/defconfig2 > > for you to fetch changes up to 06d96e1e6dbdcc88d20b21cc54ee8388c074f47f: > Pulled, thanks! Arnd ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2012-05-15 19:24 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-14 17:20 [GIT PULL] ARM: tegra: dt2 branch Stephen Warren
2012-05-14 18:54 ` Arnd Bergmann
2012-05-14 19:04 ` Stephen Warren
2012-05-14 20:37 ` Arnd Bergmann
2012-05-14 20:54 ` Stephen Warren
2012-05-15 11:43 ` Arnd Bergmann
2012-05-15 16:15 ` Stephen Warren
2012-05-15 19:15 ` Arnd Bergmann
2012-05-15 19:24 ` Stephen Warren
[not found] ` <1337016017-30537-2-git-send-email-swarren@wwwdotorg.org>
2012-05-14 18:56 ` [GIT PULL] ARM: tegra: defconfig2 branch Arnd Bergmann
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox