| Message ID | 4F793C56.2030605@st.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Apr 4, 2012 at 4:59 PM, viresh kumar <viresh.linux@gmail.com> wrote: > On Apr 2, 2012 11:15 AM, "Viresh Kumar" <viresh.kumar@st.com> wrote: >> >> Hi Arnd/Olof, >> >> The following changes since commit >> dd775ae2549217d3ae09363e3edb305d0fa19928: >> >> Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) >> >> are available in the git repository at: >> >> git://git.stlinux.com/spear/linux-2.6.git spear-dt >> >> for you to fetch changes up to 8f21ec99c7b78c3f0baf6bbf2e438da68da3dc08: >> >> SPEAr: Update defconfigs (2012-04-02 09:03:59 +0530) > > Arnd, > > I don't exactly know how it works, but Linus > would require this pull before he applies pinctrl patches. Will there be conflicts between this patch set and the stuff you're submitting for pinctrl? Or is it just runtime problems? The ARM SoC and pinctrl are not on top of each other or anything like that, they are merged in parallell. Yours, Linus Walleij
On 4/10/2012 2:12 PM, Linus Walleij wrote: > Will there be conflicts between this patch set and the stuff you're > submitting for pinctrl? Or is it just runtime problems? Yes. There will be conflicts. I have touched dts files in pinctrl patches that got added in this patchset.
On Mon, Apr 2, 2012 at 7:42 AM, Viresh Kumar <viresh.kumar@st.com> wrote: > The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: > > Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) > > are available in the git repository at: > > git://git.stlinux.com/spear/linux-2.6.git spear-dt > > for you to fetch changes up to 8f21ec99c7b78c3f0baf6bbf2e438da68da3dc08: > Viresh Kumar (8): > SPI/Pl022: Include types.h to remove compilation warnings This patch should go through Grant's SPI tree I think? Especially since it is eligible for -rc:s... Yours, Linus Walleij
On Tue, Apr 10, 2012 at 11:18 AM, Viresh Kumar <viresh.kumar@st.com> wrote: > On 4/10/2012 2:12 PM, Linus Walleij wrote: >> Will there be conflicts between this patch set and the stuff you're >> submitting for pinctrl? Or is it just runtime problems? > > Yes. There will be conflicts. I have touched dts files in pinctrl patches > that got added in this patchset. Hm, then we should maybe consider mergeing all that pinctrl stuff through ARM SoC later as well. I can probably provide the necessary ACKs. Yours, Linus Walleij
On 4/11/2012 1:46 PM, Linus Walleij wrote: >> > Viresh Kumar (8): >> > SPI/Pl022: Include types.h to remove compilation warnings > This patch should go through Grant's SPI tree I think? Especially > since it is eligible for -rc:s... I knew about this issue and was almost sure, it wouldn't be acceptable. :) When i sent this pull request, this patch wasn't there in linux-next and so i required it for basic compilation. Without it, compilation was breaking. I couldn't think of a way to handle it other than waiting for this patch to come to linux-next.
On 4/11/2012 1:47 PM, Linus Walleij wrote: > Hm, then we should maybe consider mergeing all that pinctrl stuff > through ARM SoC later as well. I can probably provide the > necessary ACKs. That would be much better. Just to know who should update these Acks in commits. If it isn't a pull request, Arnd will do it. But if it is, then probably i am required to update this?
On Wed, Apr 11, 2012 at 10:24 AM, Viresh Kumar <viresh.kumar@st.com> wrote: > On 4/11/2012 1:47 PM, Linus Walleij wrote: >> Hm, then we should maybe consider mergeing all that pinctrl stuff >> through ARM SoC later as well. I can probably provide the >> necessary ACKs. > > That would be much better. Just to know who should update these Acks > in commits. If it isn't a pull request, Arnd will do it. But if it is, > then probably i am required to update this? Yeah you can send this pull request and then Arnd or Olof will put it on some topic branch like "topic-spear" and then you base your further work on top of that and then send a new pull request to be merged into that same branch, with the pinctrl stuff. And include the ACK:s directly in the patches (git rebase -i is your friend...) Yours, Linus Walleij
On 4/11/2012 2:13 PM, Linus Walleij wrote: > Yeah you can send this pull request and then Arnd or Olof will put it > on some topic branch like "topic-spear" and then you base your > further work on top of that and then send a new pull request to be > merged into that same branch, with the pinctrl stuff. And include the > ACK:s directly in the patches (git rebase -i is your friend...) git rebase -i is an old friend, but it seem i don't know him completely :( How does it help in adding Acked-by automatically? Is there anything more than marking all of them as "rework" and add these Acks manually?
On Wed, Apr 11, 2012 at 10:47 AM, Viresh Kumar <viresh.kumar@st.com> wrote: > On 4/11/2012 2:13 PM, Linus Walleij wrote: >> Yeah you can send this pull request and then Arnd or Olof will put it >> on some topic branch like "topic-spear" and then you base your >> further work on top of that and then send a new pull request to be >> merged into that same branch, with the pinctrl stuff. And include the >> ACK:s directly in the patches (git rebase -i is your friend...) > > git rebase -i is an old friend, but it seem i don't know him completely :( > How does it help in adding Acked-by automatically? Is there anything more > than marking all of them as "rework" and add these Acks manually? Not that I'm aware of ... That's how I do it atleast. Linus Walleij
On Wed, Apr 11, 2012 at 04:54:01PM +0800, Linus Walleij wrote: > On Wed, Apr 11, 2012 at 10:47 AM, Viresh Kumar <viresh.kumar@st.com> wrote: > > On 4/11/2012 2:13 PM, Linus Walleij wrote: > >> Yeah you can send this pull request and then Arnd or Olof will put it > >> on some topic branch like "topic-spear" and then you base your > >> further work on top of that and then send a new pull request to be > >> merged into that same branch, with the pinctrl stuff. And include the > >> ACK:s directly in the patches (git rebase -i is your friend...) > > > > git rebase -i is an old friend, but it seem i don't know him completely :( > > How does it help in adding Acked-by automatically? Is there anything more > > than marking all of them as "rework" and add these Acks manually? > > Not that I'm aware of ... That's how I do it atleast. In your 'git party' I remember, someone mentioning about 'git filter-branch' which can help on this. Perhaps we need to go through the help pages. -- regards Shiraz
On 4/11/2012 11:00 PM, Arnd Bergmann wrote: > Hi Viresh, > > I've played around with spear myself, based on your patches. Please > consider adding this patch, or a variation of it. > > 8<--- > ARM: spear: remove most mach/*.h header contents > > The register and irq definitions in mach/*.h for spear3xx and > spear6xx are now mostly obsolete, after the platforms have been > converted to device tree based probing and the data is now > part of the device tree files. > > The misc_regs.h contents are moved into clock.c because that is > the only user, aside from the DMA_CHN_CFG that should eventually > get handled differently. Some of the contents of mach/spear.h > still remain, because they are used to set up the static map table, > timer, uart and auxdata tables, but almost everything got removed. > We might remove everything but the map table as the DT conversion > completes, but that is not a priority. I've also made sure to > make both copies of spear.h more or less identical so we can > eventually combine them. > > The spear3?0.h files were only used by the spear3?0.c files, so I > merged the contents in there and removed the bits that were unused. > This is something that should still be looked at. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks Arnd for this. I have applied it in my local branch with minor fixes. I will add this to my pull branch: spear-dt, once i get Acks by linus for pinctrl stuff. This branch will contain following: - SPEAr3xx DT patches - SPEAr Pinctrl Patches (with Acks from Linus) - Your rework patch. Will send you pull request again, as soon i as get feedback on pinctrl stuff.
Hi Arnd/Olof, The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928: Linux 3.4-rc1 (2012-03-31 16:24:09 -0700) are available in the git repository at: git://git.stlinux.com/spear/linux-2.6.git spear-dt for you to fetch changes up to 8f21ec99c7b78c3f0baf6bbf2e438da68da3dc08: SPEAr: Update defconfigs (2012-04-02 09:03:59 +0530) ---------------------------------------------------------------- Stefan Roese (1): ARM: SPEAr600: Change FSMC and SMI clock names Viresh Kumar (8): SPI/Pl022: Include types.h to remove compilation warnings SPEAr: Use CLKDEV_INIT for defining clk_lookups SPEAr3xx: Add clock instance of usb hosts - ehci and ohci 0 and 1 SPEAr6xx: Add compilation support for dtbs using 'make dtbs' SPEAr3xx: Replace printk() with pr_*() ARM: SPEAr3xx: Add device-tree support to SPEAr3xx architecture SPEAr: Add PL080 DMA support for 3xx and 6xx SPEAr: Update defconfigs Documentation/arm/SPEAr/overview.txt | 13 +- Documentation/devicetree/bindings/arm/spear.txt | 18 ++ arch/arm/boot/dts/spear300-evb.dts | 183 +++++++++++ arch/arm/boot/dts/spear300.dtsi | 72 +++++ arch/arm/boot/dts/spear310-evb.dts | 111 +++++++ arch/arm/boot/dts/spear310.dtsi | 75 +++++ arch/arm/boot/dts/spear320-evb.dts | 112 +++++++ arch/arm/boot/dts/spear320.dtsi | 90 ++++++ arch/arm/boot/dts/spear3xx.dtsi | 144 +++++++++ arch/arm/boot/dts/spear600-evb.dts | 4 + arch/arm/boot/dts/spear600.dtsi | 8 + arch/arm/configs/spear3xx_defconfig | 52 +++- arch/arm/configs/spear6xx_defconfig | 41 ++- arch/arm/mach-spear3xx/Kconfig | 34 +-- arch/arm/mach-spear3xx/Makefile | 13 +- arch/arm/mach-spear3xx/Makefile.boot | 4 + arch/arm/mach-spear3xx/clock.c | 182 +++++++----- arch/arm/mach-spear3xx/include/mach/generic.h | 31 +-- arch/arm/mach-spear3xx/include/mach/hardware.h | 3 - arch/arm/mach-spear3xx/include/mach/spear.h | 9 +- arch/arm/mach-spear3xx/spear300.c | 294 ++++++++++++++++-- arch/arm/mach-spear3xx/spear300_evb.c | 75 ----- arch/arm/mach-spear3xx/spear310.c | 329 +++++++++++++++++++-- arch/arm/mach-spear3xx/spear310_evb.c | 81 ----- arch/arm/mach-spear3xx/spear320.c | 328 +++++++++++++++++++-- arch/arm/mach-spear3xx/spear320_evb.c | 79 ----- arch/arm/mach-spear3xx/spear3xx.c | 148 +++++---- arch/arm/mach-spear6xx/Makefile.boot | 2 + arch/arm/mach-spear6xx/clock.c | 80 +++--- arch/arm/mach-spear6xx/spear6xx.c | 372 ++++++++++++++++++++++- arch/arm/plat-spear/Kconfig | 3 +- arch/arm/plat-spear/Makefile | 2 +- arch/arm/plat-spear/include/plat/pl080.h | 21 ++ arch/arm/plat-spear/pl080.c | 79 +++++ include/linux/amba/pl022.h | 2 + 35 files changed, 2507 insertions(+), 587 deletions(-) create mode 100644 arch/arm/boot/dts/spear300-evb.dts create mode 100644 arch/arm/boot/dts/spear300.dtsi create mode 100644 arch/arm/boot/dts/spear310-evb.dts create mode 100644 arch/arm/boot/dts/spear310.dtsi create mode 100644 arch/arm/boot/dts/spear320-evb.dts create mode 100644 arch/arm/boot/dts/spear320.dtsi create mode 100644 arch/arm/boot/dts/spear3xx.dtsi delete mode 100644 arch/arm/mach-spear3xx/spear300_evb.c delete mode 100644 arch/arm/mach-spear3xx/spear310_evb.c delete mode 100644 arch/arm/mach-spear3xx/spear320_evb.c create mode 100644 arch/arm/plat-spear/include/plat/pl080.h create mode 100644 arch/arm/plat-spear/pl080.c