* [GIT PULL] Renesas ARM-based platforms updates for v3.5 @ 2012-05-11 18:59 Rafael J. Wysocki 2012-05-12 5:29 ` Olof Johansson 0 siblings, 1 reply; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-11 18:59 UTC (permalink / raw) To: linux-arm-kernel Hi, Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 Linux 3.4-rc6 with top-most commit 5658c94096c16e769203b6dea5e5f04e7ff12633 Merge branch 'renesas-kzm9g' into renesas-soc-new from the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-new to receive new Renesas ARM-based platforms material for v3.5. Included are: * Urgent regression and SMP fixes (also included in the fixes branch that I've just sent a separate pull request for in the hope it is still possible to push them for v3.4). Two of those fixes are duplicated in the renesas-sh7372 branch, which is because I learned that they were fixes for recent regressions after they had gone to that branch. Sorry about that. * Updates for boards based on the sh7372 and r8a7740 SoCs. * Support for 2 new boards, armadillo800eva and KZM-A9-GT. Thanks! arch/arm/boot/dts/sh7372.dtsi | 21 + arch/arm/configs/armadillo800eva_defconfig | 142 +++++ arch/arm/configs/kzm9g_defconfig | 139 +++++ arch/arm/mach-shmobile/Kconfig | 16 +- arch/arm/mach-shmobile/Makefile | 2 + arch/arm/mach-shmobile/board-ag5evm.c | 22 +- arch/arm/mach-shmobile/board-ap4evb.c | 2 + arch/arm/mach-shmobile/board-armadillo800eva.c | 778 ++++++++++++++++++++++++ arch/arm/mach-shmobile/board-bonito.c | 2 +- arch/arm/mach-shmobile/board-kzm9g.c | 454 ++++++++++++++ arch/arm/mach-shmobile/board-mackerel.c | 38 +- arch/arm/mach-shmobile/clock-r8a7740.c | 128 ++++- arch/arm/mach-shmobile/headsmp.S | 56 ++- arch/arm/mach-shmobile/include/mach/common.h | 4 +- arch/arm/mach-shmobile/include/mach/intc.h | 44 ++ arch/arm/mach-shmobile/include/mach/irqs.h | 2 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/arm/mach-shmobile/include/mach/sh73a0.h | 3 + arch/arm/mach-shmobile/intc-sh7372.c | 34 +- arch/arm/mach-shmobile/pfc-r8a7740.c | 39 ++ arch/arm/mach-shmobile/pfc-sh73a0.c | 4 +- arch/arm/mach-shmobile/platsmp.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 19 +- arch/arm/mach-shmobile/setup-r8a7779.c | 4 + arch/arm/mach-shmobile/setup-sh7372.c | 58 ++ arch/arm/mach-shmobile/setup-sh73a0.c | 4 + arch/arm/mach-shmobile/smp-r8a7779.c | 8 +- arch/arm/mach-shmobile/smp-sh73a0.c | 7 +- arch/arm/mach-shmobile/timer.c | 27 +- 29 files changed, 1978 insertions(+), 83 deletions(-) --------------- Bastian Hecht (1): ARM: sh-mobile: mackerel: Add error IRQ resource Guennadi Liakhovetski (3): ARM: mach-shmobile: sh7372 CEU supports up to 8188x8188 images ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper Kuninori Morimoto (38): ARM: mach-shmobile: sh7372: Add FSI DMAEngine support ARM: mach-shmobile: mackerel: Add FSI DMAEngine support ARM: mach-shmobile: bonito: make sure static function ARM: mach-shmobile: r8a7740: add gpio_irq support ARM: mach-shmobile: add armadillo800eva board support. ARM: mach-shmobile: armadillo800eva: add defconfig ARM: mach-shmobile: armadillo800eva: add support LCDC0 ARM: mach-shmobile: armadillo800eva: add support gpio_key ARM: mach-shmobile: armadillo800eva: add support sh_eth ARM: mach-shmobile: armadillo800eva: add support ST1232 ARM: mach-shmobile: r8a7740: cleanup I2C workaround method ARM: mach-shmobile: clock-r8a7740: add FSI clock ARM: mach-shmobile: clock-r8a7740: add USB clock ARM: mach-shmobile: clock-r8a7740: add SDHI clock ARM: mach-shmobile: clock-r8a7740: add MMCIF clock ARM: mach-shmobile: armadillo800eva: add USB function support ARM: mach-shmobile: armadillo800eva: add SDHI0 support ARM: mach-shmobile: armadillo800eva: add SDHI1 support ARM: mach-shmobile: armadillo800eva: add MMCIF support ARM: mach-shmobile: r8a7740: reserve DMA memory for the frame buffer ARM: mach-shmobile: add KZM-A9-GT board support ARM: mach-shmobile: kzm9g: add defconfig ARM: mach-shmobile: kzm9g: add SMSC 9221 support ARM: mach-shmobile: kzm9g: add external USB Host support ARM: mach-shmobile: kzm9g: add LCDC support ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3 ARM: mach-shmobile: sh73a0.h: add GPIO_NR ARM: mach-shmobile: kzm9g: correct screen direction ARM: mach-shmobile: kzm9g: add MMCIF support ARM: mach-shmobile: kzm9g: add SDHI support ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key ARM: mach-shmobile: clock-r8a7740: add sh-eth clock ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s ARM: mach-shmobile: kzm9g: defconfig update ARM: mach-shmobile: armadillo800eva: defconfig update ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix ARM: mach-shmobile: kzm9g: enable SMP boot Magnus Damm (9): ARM: mach-shmobile: Introduce shmobile_setup_delay() ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H ARM: mach-shmobile: Use 0x3400 as INTCS vector offset ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372 ARM: mach-shmobile: Rework sh7372 INTCS demuxer V2 ARM: mach-shmobile: sh7372 generic board support via DT V2 ARM / mach-shmobile: Use preset_lpj with calibrate_delay() ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix ARM / mach-shmobile: Invalidate caches when booting secondary cores ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms updates for v3.5 2012-05-11 18:59 [GIT PULL] Renesas ARM-based platforms updates for v3.5 Rafael J. Wysocki @ 2012-05-12 5:29 ` Olof Johansson 2012-05-12 19:58 ` Rafael J. Wysocki 2012-05-12 21:07 ` [GIT PULL] Renesas ARM-based platforms: core SoC " Rafael J. Wysocki 0 siblings, 2 replies; 20+ messages in thread From: Olof Johansson @ 2012-05-12 5:29 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 11, 2012 at 12:01 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > Hi, > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > Linux 3.4-rc6 > > with top-most commit 5658c94096c16e769203b6dea5e5f04e7ff12633 > > Merge branch 'renesas-kzm9g' into renesas-soc-new > > from the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-new > > to receive new Renesas ARM-based platforms material for v3.5. Included are: > > * Urgent regression and SMP fixes (also included in the fixes branch that I've > just sent a separate pull request for in the hope it is still possible to > push them for v3.4). Two of those fixes are duplicated in the renesas-sh7372 > branch, which is because I learned that they were fixes for recent > regressions after they had gone to that branch. Sorry about that. > > * Updates for boards based on the sh7372 and r8a7740 SoCs. > > * Support for 2 new boards, armadillo800eva and KZM-A9-GT. Hi Rafael, If you take a look at how the other ARM subarch maintainers organize the patches that they feed up to us, you'll see that they group them either per functional topic, or more commonly per subject such as "core soc updates", "soc driver updates", "board updates", "device tree updates", "cleanup", and so on. That fits the model we've been having on arm-soc as well, since we split our tree up per category like that, and send those cross-section branches between different vendors (but same categories) up to Linus that way. So, would you mind taking a look at what you have in the new-soc branch and reshuffling things a bit? Looking at the history of the new-soc branch and the rest of the repo, it seems that you're already more or less organizing your tree the way I am asking for, it's just that you merged them all together before sending this pull request. Thanks! -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms updates for v3.5 2012-05-12 5:29 ` Olof Johansson @ 2012-05-12 19:58 ` Rafael J. Wysocki 2012-05-12 20:17 ` Rafael J. Wysocki 2012-05-12 23:04 ` Olof Johansson 2012-05-12 21:07 ` [GIT PULL] Renesas ARM-based platforms: core SoC " Rafael J. Wysocki 1 sibling, 2 replies; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-12 19:58 UTC (permalink / raw) To: linux-arm-kernel On Saturday, May 12, 2012, Olof Johansson wrote: > On Fri, May 11, 2012 at 12:01 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > > Hi, > > > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > > > Linux 3.4-rc6 > > > > with top-most commit 5658c94096c16e769203b6dea5e5f04e7ff12633 > > > > Merge branch 'renesas-kzm9g' into renesas-soc-new > > > > from the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-new > > > > to receive new Renesas ARM-based platforms material for v3.5. Included are: > > > > * Urgent regression and SMP fixes (also included in the fixes branch that I've > > just sent a separate pull request for in the hope it is still possible to > > push them for v3.4). Two of those fixes are duplicated in the renesas-sh7372 > > branch, which is because I learned that they were fixes for recent > > regressions after they had gone to that branch. Sorry about that. > > > > * Updates for boards based on the sh7372 and r8a7740 SoCs. > > > > * Support for 2 new boards, armadillo800eva and KZM-A9-GT. > > Hi Rafael, > > If you take a look at how the other ARM subarch maintainers organize > the patches that they feed up to us, you'll see that they group them > either per functional topic, or more commonly per subject such as > "core soc updates", "soc driver updates", "board updates", "device > tree updates", "cleanup", and so on. > > That fits the model we've been having on arm-soc as well, since we > split our tree up per category like that, and send those cross-section > branches between different vendors (but same categories) up to Linus > that way. > > > So, would you mind taking a look at what you have in the new-soc > branch and reshuffling things a bit? Looking at the history of the > new-soc branch and the rest of the repo, it seems that you're already > more or less organizing your tree the way I am asking for, it's just > that you merged them all together before sending this pull request. Well. I'd prefer not to rebase any branches and move commits around if that's what you're talking about, because I have a rule that my branches are not rebased, except for the next one. Now, there are three categories of commits in the soc-new branch, "core soc updates", "board updates" and "new board support". However, "board updates" depend on "core soc updates" and go together with them in two branches, "sh7372" and "r8a7740" (branch names are after SoC names and each branch contains updates for the given SoC and boards based on it). I can send a pull request to you separately for each of those branches, if you prefer, or I can merge them together and send a pull request for the whole (it actually is a separate branch in my tree, called "soc"). The new board support stuff is just that - commits adding support for new boards. Those things, however, depend on the "core soc updates" and "board updates", so they are based on the "soc" branch (honestly, I don't think they will work without the "core" changes). So, while I could send separate pull requests for the "armadillo800eva" and "kzm9g" branches, I don't think that merging them without the changes in the "soc" branch will do any good. Thanks, Rafael ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms updates for v3.5 2012-05-12 19:58 ` Rafael J. Wysocki @ 2012-05-12 20:17 ` Rafael J. Wysocki 2012-05-12 23:04 ` Olof Johansson 1 sibling, 0 replies; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-12 20:17 UTC (permalink / raw) To: linux-arm-kernel On Saturday, May 12, 2012, Rafael J. Wysocki wrote: > On Saturday, May 12, 2012, Olof Johansson wrote: > > On Fri, May 11, 2012 at 12:01 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > > > Hi, > > > > > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > > > > > Linux 3.4-rc6 > > > > > > with top-most commit 5658c94096c16e769203b6dea5e5f04e7ff12633 > > > > > > Merge branch 'renesas-kzm9g' into renesas-soc-new > > > > > > from the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-new > > > > > > to receive new Renesas ARM-based platforms material for v3.5. Included are: > > > > > > * Urgent regression and SMP fixes (also included in the fixes branch that I've > > > just sent a separate pull request for in the hope it is still possible to > > > push them for v3.4). Two of those fixes are duplicated in the renesas-sh7372 > > > branch, which is because I learned that they were fixes for recent > > > regressions after they had gone to that branch. Sorry about that. > > > > > > * Updates for boards based on the sh7372 and r8a7740 SoCs. > > > > > > * Support for 2 new boards, armadillo800eva and KZM-A9-GT. > > > > Hi Rafael, > > > > If you take a look at how the other ARM subarch maintainers organize > > the patches that they feed up to us, you'll see that they group them > > either per functional topic, or more commonly per subject such as > > "core soc updates", "soc driver updates", "board updates", "device > > tree updates", "cleanup", and so on. > > > > That fits the model we've been having on arm-soc as well, since we > > split our tree up per category like that, and send those cross-section > > branches between different vendors (but same categories) up to Linus > > that way. > > > > > > So, would you mind taking a look at what you have in the new-soc > > branch and reshuffling things a bit? Looking at the history of the > > new-soc branch and the rest of the repo, it seems that you're already > > more or less organizing your tree the way I am asking for, it's just > > that you merged them all together before sending this pull request. > > Well. > > I'd prefer not to rebase any branches and move commits around if that's > what you're talking about, because I have a rule that my branches are not > rebased, except for the next one. I will have to rebase the whole thing anyway because of the changes in "fixes", so I think I'll just create new branches and send pull requests again. Thanks, Rafael ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms updates for v3.5 2012-05-12 19:58 ` Rafael J. Wysocki 2012-05-12 20:17 ` Rafael J. Wysocki @ 2012-05-12 23:04 ` Olof Johansson 1 sibling, 0 replies; 20+ messages in thread From: Olof Johansson @ 2012-05-12 23:04 UTC (permalink / raw) To: linux-arm-kernel Hi, On Sat, May 12, 2012 at 12:58 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > On Saturday, May 12, 2012, Olof Johansson wrote: >> On Fri, May 11, 2012 at 12:01 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: >> > Hi, >> > >> > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 >> > >> > Linux 3.4-rc6 >> > >> > with top-most commit 5658c94096c16e769203b6dea5e5f04e7ff12633 >> > >> > Merge branch 'renesas-kzm9g' into renesas-soc-new >> > >> > from the git repository at: >> > >> > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-new >> > >> > to receive new Renesas ARM-based platforms material for v3.5. Included are: >> > >> > * Urgent regression and SMP fixes (also included in the fixes branch that I've >> > just sent a separate pull request for in the hope it is still possible to >> > push them for v3.4). Two of those fixes are duplicated in the renesas-sh7372 >> > branch, which is because I learned that they were fixes for recent >> > regressions after they had gone to that branch. Sorry about that. >> > >> > * Updates for boards based on the sh7372 and r8a7740 SoCs. >> > >> > * Support for 2 new boards, armadillo800eva and KZM-A9-GT. >> >> Hi Rafael, >> >> If you take a look at how the other ARM subarch maintainers organize >> the patches that they feed up to us, you'll see that they group them >> either per functional topic, or more commonly per subject such as >> "core soc updates", "soc driver updates", "board updates", "device >> tree updates", "cleanup", and so on. >> >> That fits the model we've been having on arm-soc as well, since we >> split our tree up per category like that, and send those cross-section >> branches between different vendors (but same categories) up to Linus >> that way. >> >> >> So, would you mind taking a look at what you have in the new-soc >> branch and reshuffling things a bit? Looking at the history of the >> new-soc branch and the rest of the repo, it seems that you're already >> more or less organizing your tree the way I am asking for, it's just >> that you merged them all together before sending this pull request. > > Well. > > I'd prefer not to rebase any branches and move commits around if that's > what you're talking about, because I have a rule that my branches are not > rebased, except for the next one. Yeah, sorry for not giving you a heads up on this before. Hopefully it's just a bootstrap issue this first merge window that you're sending things through our tree. > Now, there are three categories of commits in the soc-new branch, > "core soc updates", "board updates" and "new board support". However, > "board updates" depend on "core soc updates" and go together with them > in two branches, "sh7372" and "r8a7740" (branch names are after SoC names > and each branch contains updates for the given SoC and boards based on it). > I can send a pull request to you separately for each of those branches, > if you prefer, or I can merge them together and send a pull request for > the whole (it actually is a separate branch in my tree, called "soc"). In general we don't mind seeing each branch separately, and having dependencies between them is perfectly fine. Other subarch trees do this all the time. So having the core updates as a prereq (and included in) the two SoC names is perfectly fine, the dependencies will carry over to how we merge them into our next/* branches in arm-soc. > The new board support stuff is just that - commits adding support for > new boards. Those things, however, depend on the "core soc updates" and > "board updates", so they are based on the "soc" branch (honestly, I don't > think they will work without the "core" changes). So, while I could > send separate pull requests for the "armadillo800eva" and "kzm9g" branches, > I don't think that merging them without the changes in the "soc" branch will > do any good. Again, that's fine. We have a "waterfall" of dependencies through the arm-soc next/* branches and this will normally fit right in. To see how we organize (and document) the branches we have pulled in, take a look at arch/arm/arm-soc-for-next-contents.txt in the for-next branch of the arm-soc tree: http://git.kernel.org/?p=linux/kernel/git/arm/arm-soc.git;a=blob;f=arch/arm/arm-soc-for-next-contents.txt;hŒa6bef667fa81c355a0a9200804d20c16173f2d;hb=refs/heads/for-next In general, the document is sorted such that the prerequisites for later branches are listed above. In some cases it means that we need to have more than one topic branch due to otherwise circular or awkward dependencies, for example next/dt and next/dt2. General organization and order tends to start out as: * cleanups * fixes * device tree updates * core soc support (new socs, etc) * soc drivers and soc-related items. This time we split them up a bit (pm, pinctrl, clock, drivers) * boards (generally very limited new board introductions, mostly updates) But over time order can be somewhat reshuffled due to added dependencies. The for-next and next/* branches are not guaranteed to be stable, since we have in the past had to drop branches and rebuild them. In general, downstream developers should be basing their work on the specific subarch trees and not on arm-soc. There are a few exceptions for tree-wide cleanups but even then, basing it on regular mainline makes much more sense. -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* [GIT PULL] Renesas ARM-based platforms: core SoC updates for v3.5 @ 2012-05-12 21:07 ` Rafael J. Wysocki 2012-05-12 21:18 ` [GIT PULL] Renesas ARM-based platforms: board support " Rafael J. Wysocki ` (2 more replies) 0 siblings, 3 replies; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-12 21:07 UTC (permalink / raw) To: linux-sh Hi, Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 Linux 3.4-rc6 with top-most commit c8241085e8606a14ef48e6d99556133c48aaddaf ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s from the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-core to receive updates of the Renesas ARM-based platforms core code for v3.5. Included are: * Shared delay calibration code update from Magnus Damm. * The addition of FSI DMAEngine support for the sh7372 SoC from Kuninori Morimoto. * Muliple updates of the r8a7740 SoC support code from Kuninori Morimoto. This is based on the Renesas DT updates that have been merged into arm-soc already and on the urgent fixes I've sent a separate pull request for. Thanks! arch/arm/boot/dts/sh7372.dtsi | 21 +++++ arch/arm/mach-shmobile/board-ag5evm.c | 22 +---- arch/arm/mach-shmobile/board-mackerel.c | 22 +---- arch/arm/mach-shmobile/clock-r8a7740.c | 125 +++++++++++++++++++++++++- arch/arm/mach-shmobile/headsmp.S | 56 +++++++++++- arch/arm/mach-shmobile/include/mach/common.h | 4 +- arch/arm/mach-shmobile/include/mach/intc.h | 44 +++++++++ arch/arm/mach-shmobile/include/mach/irqs.h | 2 +- arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + arch/arm/mach-shmobile/intc-sh7372.c | 34 +++++--- arch/arm/mach-shmobile/pfc-r8a7740.c | 39 ++++++++ arch/arm/mach-shmobile/setup-r8a7740.c | 12 ++-- arch/arm/mach-shmobile/setup-r8a7779.c | 4 + arch/arm/mach-shmobile/setup-sh7372.c | 58 ++++++++++++ arch/arm/mach-shmobile/setup-sh73a0.c | 4 + arch/arm/mach-shmobile/smp-r8a7779.c | 8 ++- arch/arm/mach-shmobile/smp-sh73a0.c | 7 ++- arch/arm/mach-shmobile/timer.c | 27 ++++-- 18 files changed, 417 insertions(+), 74 deletions(-) --------------- Guennadi Liakhovetski (2): ARM: mach-shmobile: convert mackerel to use the generic MMC GPIO hotplug helper ARM: mach-shmobile: convert ag5evm to use the generic MMC GPIO hotplug helper Kuninori Morimoto (9): ARM / mach-shmobile: sh73a0 SMP TWD boot regression fix ARM: mach-shmobile: sh7372: Add FSI DMAEngine support ARM: mach-shmobile: r8a7740: add gpio_irq support ARM: mach-shmobile: r8a7740: cleanup I2C workaround method ARM: mach-shmobile: clock-r8a7740: add FSI clock ARM: mach-shmobile: clock-r8a7740: add USB clock ARM: mach-shmobile: clock-r8a7740: add SDHI clock ARM: mach-shmobile: clock-r8a7740: add MMCIF clock ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s Magnus Damm (9): ARM: mach-shmobile: Introduce shmobile_setup_delay() ARM: mach-shmobile: Introduce INTC_IRQ_PINS_16H ARM: mach-shmobile: Use 0x3400 as INTCS vector offset ARM: mach-shmobile: Use INTC_IRQ_PINS_16H on sh7372 ARM: mach-shmobile: Rework sh7372 INTCS demuxer V2 ARM: mach-shmobile: sh7372 generic board support via DT V2 ARM / mach-shmobile: r8a7779 SMP TWD boot regression fix ARM / mach-shmobile: Invalidate caches when booting secondary cores ARM / mach-shmobile: Use preset_lpj with calibrate_delay() ^ permalink raw reply [flat|nested] 20+ messages in thread
* [GIT PULL] Renesas ARM-based platforms: board support updates for v3.5 2012-05-12 21:07 ` [GIT PULL] Renesas ARM-based platforms: core SoC " Rafael J. Wysocki @ 2012-05-12 21:18 ` Rafael J. Wysocki 2012-05-13 4:24 ` Olof Johansson 2012-05-12 21:23 ` [GIT PULL] Renesas ARM-based platforms: new boards support " Rafael J. Wysocki 2012-05-12 23:29 ` [GIT PULL] Renesas ARM-based platforms: core SoC updates " Olof Johansson 2 siblings, 1 reply; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-12 21:18 UTC (permalink / raw) To: linux-sh Hi, Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 Linux 3.4-rc6 with top-most commit 8823e2b38bd0ee45346ebd3613f47ddb2a3a208a ARM: mach-shmobile: bonito: make sure static function from the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board to receive updates of the Renesas ARM-based boards support code for v3.5. Included are: * FSI DMAEngine support for the Mackerel board from Kuninori Morimoto. * sh7372 CEU extension for the Mackere and AP4EVB boards from Guennadi Liakhovetski. * Bonito board code fix from Kuninori Morimoto. This is based on the Renesas core SoC code updates I've sent a separate pull request for. Thanks! arch/arm/mach-shmobile/board-ap4evb.c | 2 ++ arch/arm/mach-shmobile/board-bonito.c | 2 +- arch/arm/mach-shmobile/board-mackerel.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) --------------- Guennadi Liakhovetski (1): ARM: mach-shmobile: sh7372 CEU supports up to 8188x8188 images Kuninori Morimoto (2): ARM: mach-shmobile: mackerel: Add FSI DMAEngine support ARM: mach-shmobile: bonito: make sure static function ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms: board support updates for v3.5 2012-05-12 21:18 ` [GIT PULL] Renesas ARM-based platforms: board support " Rafael J. Wysocki @ 2012-05-13 4:24 ` Olof Johansson 0 siblings, 0 replies; 20+ messages in thread From: Olof Johansson @ 2012-05-13 4:24 UTC (permalink / raw) To: linux-arm-kernel On Sat, May 12, 2012 at 2:18 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > Hi, > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > Linux 3.4-rc6 > > with top-most commit 8823e2b38bd0ee45346ebd3613f47ddb2a3a208a > > ARM: mach-shmobile: bonito: make sure static function > > from the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board Thanks, pulled. -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* [GIT PULL] Renesas ARM-based platforms: new boards support for v3.5 2012-05-12 21:07 ` [GIT PULL] Renesas ARM-based platforms: core SoC " Rafael J. Wysocki 2012-05-12 21:18 ` [GIT PULL] Renesas ARM-based platforms: board support " Rafael J. Wysocki @ 2012-05-12 21:23 ` Rafael J. Wysocki 2012-05-13 6:29 ` Olof Johansson 2012-05-14 21:43 ` [GIT PULL][Update] " Rafael J. Wysocki 2012-05-12 23:29 ` [GIT PULL] Renesas ARM-based platforms: core SoC updates " Olof Johansson 2 siblings, 2 replies; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-12 21:23 UTC (permalink / raw) To: linux-sh Hi, Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 Linux 3.4-rc6 with top-most commit a515be1ca7df947db0f6018a174f49507affcdbc Merge branch 'renesas-kzm9g' into renesas-board-new from the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new to receive updates of the Renesas ARM-based boards support code for v3.5. Included are: * Support for the KZM-A9-GT board from Kuninori Morimoto. * Support for the armadillo800eva board from Kuninori Morimoto. This is based on the Renesas core SoC code updates I've sent a separate pull request for. Thanks! arch/arm/configs/armadillo800eva_defconfig | 142 +++++ arch/arm/configs/kzm9g_defconfig | 139 +++++ arch/arm/mach-shmobile/Kconfig | 16 +- arch/arm/mach-shmobile/Makefile | 2 + arch/arm/mach-shmobile/board-armadillo800eva.c | 778 ++++++++++++++++++++++++ arch/arm/mach-shmobile/board-kzm9g.c | 454 ++++++++++++++ arch/arm/mach-shmobile/clock-r8a7740.c | 3 + arch/arm/mach-shmobile/include/mach/sh73a0.h | 3 + arch/arm/mach-shmobile/pfc-sh73a0.c | 4 +- arch/arm/mach-shmobile/platsmp.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 7 + 11 files changed, 1545 insertions(+), 5 deletions(-) --------------- Kuninori Morimoto (27): ARM: mach-shmobile: add armadillo800eva board support. ARM: mach-shmobile: armadillo800eva: add defconfig ARM: mach-shmobile: armadillo800eva: add support LCDC0 ARM: mach-shmobile: armadillo800eva: add support gpio_key ARM: mach-shmobile: armadillo800eva: add support sh_eth ARM: mach-shmobile: armadillo800eva: add support ST1232 ARM: mach-shmobile: armadillo800eva: add USB function support ARM: mach-shmobile: armadillo800eva: add SDHI0 support ARM: mach-shmobile: armadillo800eva: add SDHI1 support ARM: mach-shmobile: armadillo800eva: add MMCIF support ARM: mach-shmobile: r8a7740: reserve DMA memory for the frame buffer ARM: mach-shmobile: clock-r8a7740: add sh-eth clock ARM: mach-shmobile: armadillo800eva: defconfig update ARM: mach-shmobile: add KZM-A9-GT board support ARM: mach-shmobile: kzm9g: add defconfig ARM: mach-shmobile: kzm9g: add SMSC 9221 support ARM: mach-shmobile: kzm9g: add external USB Host support ARM: mach-shmobile: kzm9g: add LCDC support ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3 ARM: mach-shmobile: sh73a0.h: add GPIO_NR ARM: mach-shmobile: kzm9g: correct screen direction ARM: mach-shmobile: kzm9g: add MMCIF support ARM: mach-shmobile: kzm9g: add SDHI support ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key ARM: mach-shmobile: kzm9g: defconfig update ARM: mach-shmobile: kzm9g: enable SMP boot ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms: new boards support for v3.5 2012-05-12 21:23 ` [GIT PULL] Renesas ARM-based platforms: new boards support " Rafael J. Wysocki @ 2012-05-13 6:29 ` Olof Johansson 2012-05-14 7:13 ` Magnus Damm 2012-05-14 21:43 ` [GIT PULL][Update] " Rafael J. Wysocki 1 sibling, 1 reply; 20+ messages in thread From: Olof Johansson @ 2012-05-13 6:29 UTC (permalink / raw) To: linux-arm-kernel On Sat, May 12, 2012 at 2:23 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > Hi, > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > Linux 3.4-rc6 > > with top-most commit a515be1ca7df947db0f6018a174f49507affcdbc > > Merge branch 'renesas-kzm9g' into renesas-board-new > > from the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new > > to receive updates of the Renesas ARM-based boards support code for v3.5. > Included are: > > * Support for the KZM-A9-GT board from Kuninori Morimoto. > > * Support for the armadillo800eva board from Kuninori Morimoto. > > This is based on the Renesas core SoC code updates I've sent a separate pull > request for. Hi Rafael and Magnus, I know Renesas is very active in adding support for new ARM platforms upstream, and that's great. But we also need to figure out how it can best be done while still keeping a bound on platform complexity. This adds two new board files and two new defconfigs to the arm subtree. We have in general said that we are OK with the occasional new board file if the vendor is actively working on reducing the rest of the subdirectory contents and consolidating over into device tree based platforms. But we have also agreed that new (v7+) SoCs/boards should be targeting DT board files from introduction nowadays. Both these SoCs and boards seem to be A9-based, so they would match that requirement. The good news is that meeting the basic requirements for device tree probing is easy; using a DT_MACHINE_START() stanza and adding a small dts file is really all it takes for the real simple case. Building a zImage with the device tree appended (and ARM_ATAG_DTB_COMPAT=y) means you can use the same firmware as before and not modify it to handle device trees, if that is a limitation you have for your environments. Also, I would prefer to only see one or a couple of defconfigs that can provide full build coverage for the various SoCs and boards, that would contain the superset of the required drivers to boot the supported boards, etc. So, I'm going to hold off pulling in this branch right now until we can sort out some of the above items. Regards, -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms: new boards support for v3.5 2012-05-13 6:29 ` Olof Johansson @ 2012-05-14 7:13 ` Magnus Damm 2012-05-15 19:58 ` Arnd Bergmann 0 siblings, 1 reply; 20+ messages in thread From: Magnus Damm @ 2012-05-14 7:13 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 13, 2012 at 3:29 PM, Olof Johansson <olof@lixom.net> wrote: > On Sat, May 12, 2012 at 2:23 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: >> Hi, >> >> Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 >> >> Linux 3.4-rc6 >> >> with top-most commit a515be1ca7df947db0f6018a174f49507affcdbc >> >> Merge branch 'renesas-kzm9g' into renesas-board-new >> >> from the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new >> >> to receive updates of the Renesas ARM-based boards support code for v3.5. >> Included are: >> >> * Support for the KZM-A9-GT board from Kuninori Morimoto. >> >> * Support for the armadillo800eva board from Kuninori Morimoto. >> >> This is based on the Renesas core SoC code updates I've sent a separate pull >> request for. > > > Hi Rafael and Magnus, Hej Olof! > I know Renesas is very active in adding support for new ARM platforms > upstream, and that's great. But we also need to figure out how it can > best be done while still keeping a bound on platform complexity. > > This adds two new board files and two new defconfigs to the arm > subtree. We have in general said that we are OK with the occasional > new board file if the vendor is actively working on reducing the rest > of the subdirectory contents and consolidating over into device tree > based platforms. But we have also agreed that new (v7+) SoCs/boards > should be targeting DT board files from introduction nowadays. > > Both these SoCs and boards seem to be A9-based, so they would match > that requirement. First of all, I'm glad to hear that you are positive to our work. This means a lot to us. I personally agree with the DT direction and to move things along we are multiple people working on improving both our own situation (drivers, soc) and infrastructure that everyone in the kernel community can use (PM, kexec). So I believe we are doing our fair share there. At the same time we also need to provide some kind of base code that is working as-is. Regarding the new boards, you are correct that they are using Cortex A9. I'm not sure if your policy considers other IP that is tied to the ARM block, but in our case we have custom interrupt controllers. On r8a7740 it's a A9 with our INTC used instead of the GIC, and on sh73a0 we make use of the GIC but we have our own cascaded interrupt controllers. Unfortunately we don't have any long term DT solution ready. I wrote a prototype myself to get other people started, but the long term part is still being worked on by Paul Mundt - this since we share the interrupt controller code with the SH architecture. > The good news is that meeting the basic requirements for device tree > probing is easy; using a DT_MACHINE_START() stanza and adding a small > dts file is really all it takes for the real simple case. Building a > zImage with the device tree appended (and ARM_ATAG_DTB_COMPAT=y) means > you can use the same firmware as before and not modify it to handle > device trees, if that is a limitation you have for your environments. I'd be happy to add a DT_MACHINE_START() implementation for each SoC if that make it easier for you guys to merge our code. From a usability point of view, I'm quite certain that all our U-boot based boards take uImages instead of zImage as kernel image format. I prefer zImage myself, but unfortunately it is not my call. I believe an uImage on ARM is basically a wrapped zImage. Unfortunately I have not been able to find some simple way of including DTB in the uImage. So to be able to use these kernels on our existing boards that take uImage it seems that I will have to patch the kernel locally somehow? I am fine using ARM_ATAG_DTB_COMPAT=y during development - actually it is my preferred way - but I'm not so comfortable asking our customers to patch their kernel source just to be able to build an uImage. Do you have any recommendation for me? > Also, I would prefer to only see one or a couple of defconfigs that > can provide full build coverage for the various SoCs and boards, that > would contain the superset of the required drivers to boot the > supported boards, etc. I can check with my superiors if we can phase our sh7367 support. If so then we have only A8 and A9 in tree which should be easy to support with a single kernel configuration. Does that sound like something that would simplify things for you? > So, I'm going to hold off pulling in this branch right now until we > can sort out some of the above items. Ok. When can we retry? Thanks, / magnus ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms: new boards support for v3.5 2012-05-14 7:13 ` Magnus Damm @ 2012-05-15 19:58 ` Arnd Bergmann 2012-05-16 6:17 ` Olof Johansson 0 siblings, 1 reply; 20+ messages in thread From: Arnd Bergmann @ 2012-05-15 19:58 UTC (permalink / raw) To: linux-arm-kernel On Monday 14 May 2012, Magnus Damm wrote: > > Also, I would prefer to only see one or a couple of defconfigs that > > can provide full build coverage for the various SoCs and boards, that > > would contain the superset of the required drivers to boot the > > supported boards, etc. > > I can check with my superiors if we can phase our sh7367 support. If > so then we have only A8 and A9 in tree which should be easy to support > with a single kernel configuration. Does that sound like something > that would simplify things for you? I think there is no need to go that far. Just providing a defconfig for all boards that can already run a common image would be a good step forward. Is there a technical reason why you cannot build sh7367 together with the ARMv7 based machines? Most other platforms that have both ARMv6 and ARMv7 just build them together, you just can't combine them with any ARMv4/v5 platform. Arnd ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms: new boards support for v3.5 2012-05-15 19:58 ` Arnd Bergmann @ 2012-05-16 6:17 ` Olof Johansson 0 siblings, 0 replies; 20+ messages in thread From: Olof Johansson @ 2012-05-16 6:17 UTC (permalink / raw) To: linux-arm-kernel On Tue, May 15, 2012 at 12:58 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Monday 14 May 2012, Magnus Damm wrote: >> > Also, I would prefer to only see one or a couple of defconfigs that >> > can provide full build coverage for the various SoCs and boards, that >> > would contain the superset of the required drivers to boot the >> > supported boards, etc. >> >> I can check with my superiors if we can phase our sh7367 support. If >> so then we have only A8 and A9 in tree which should be easy to support >> with a single kernel configuration. Does that sound like something >> that would simplify things for you? > > I think there is no need to go that far. Just providing a defconfig for > all boards that can already run a common image would be a good step > forward. > > Is there a technical reason why you cannot build sh7367 together with > the ARMv7 based machines? Most other platforms that have both ARMv6 and > ARMv7 just build them together, you just can't combine them with any > ARMv4/v5 platform. Sorry for the delay in answer, Magnus -- agree with Arnd here. To clarify; I wasn't asking for you to remove the non-v7 platforms, just to see if you could trim down the shmobile defconfigs to a smaller number by creating a superset of the supported boards in one or two configs. -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
* [GIT PULL][Update] Renesas ARM-based platforms: new boards support for v3.5 @ 2012-05-14 21:43 ` Rafael J. Wysocki 2012-05-15 8:40 ` Arnd Bergmann 0 siblings, 1 reply; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-14 21:43 UTC (permalink / raw) To: linux-sh Hi, Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 Linux 3.4-rc6 with top-most commit 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f Merge branch 'renesas-kzm9g' into renesas-board-new from the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new to receive updates of the Renesas ARM-based boards support code for v3.5. Included are: * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm. * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm. This is based on the Renesas core SoC code updates I've sent a separate pull request for. Thanks! arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 22 + arch/arm/boot/dts/sh73a0-kzm9g.dts | 22 + arch/arm/configs/armadillo800eva_defconfig | 142 +++++ arch/arm/configs/kzm9g_defconfig | 139 +++++ arch/arm/mach-shmobile/Kconfig | 18 +- arch/arm/mach-shmobile/Makefile | 2 + arch/arm/mach-shmobile/board-armadillo800eva.c | 784 ++++++++++++++++++++++++ arch/arm/mach-shmobile/board-kzm9g.c | 460 ++++++++++++++ arch/arm/mach-shmobile/clock-r8a7740.c | 3 + arch/arm/mach-shmobile/include/mach/sh73a0.h | 3 + arch/arm/mach-shmobile/pfc-sh73a0.c | 4 +- arch/arm/mach-shmobile/platsmp.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 7 + 13 files changed, 1603 insertions(+), 5 deletions(-) --------------- Kuninori Morimoto (27): ARM: mach-shmobile: add armadillo800eva board support. ARM: mach-shmobile: armadillo800eva: add defconfig ARM: mach-shmobile: armadillo800eva: add support LCDC0 ARM: mach-shmobile: armadillo800eva: add support gpio_key ARM: mach-shmobile: armadillo800eva: add support sh_eth ARM: mach-shmobile: armadillo800eva: add support ST1232 ARM: mach-shmobile: armadillo800eva: add USB function support ARM: mach-shmobile: armadillo800eva: add SDHI0 support ARM: mach-shmobile: armadillo800eva: add SDHI1 support ARM: mach-shmobile: armadillo800eva: add MMCIF support ARM: mach-shmobile: r8a7740: reserve DMA memory for the frame buffer ARM: mach-shmobile: clock-r8a7740: add sh-eth clock ARM: mach-shmobile: armadillo800eva: defconfig update ARM: mach-shmobile: add KZM-A9-GT board support ARM: mach-shmobile: kzm9g: add defconfig ARM: mach-shmobile: kzm9g: add SMSC 9221 support ARM: mach-shmobile: kzm9g: add external USB Host support ARM: mach-shmobile: kzm9g: add LCDC support ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3 ARM: mach-shmobile: sh73a0.h: add GPIO_NR ARM: mach-shmobile: kzm9g: correct screen direction ARM: mach-shmobile: kzm9g: add MMCIF support ARM: mach-shmobile: kzm9g: add SDHI support ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key ARM: mach-shmobile: kzm9g: defconfig update ARM: mach-shmobile: kzm9g: enable SMP boot Magnus Damm (2): ARM: mach-shmobile: Use DT_MACHINE for KZM9G ARM: mach-shmobile: Use DT_MACHINE for armadillo 800 eva ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL][Update] Renesas ARM-based platforms: new boards support for v3.5 2012-05-14 21:43 ` [GIT PULL][Update] " Rafael J. Wysocki @ 2012-05-15 8:40 ` Arnd Bergmann 2012-05-15 15:30 ` Arnd Bergmann 2012-05-15 15:50 ` Rafael J. Wysocki 0 siblings, 2 replies; 20+ messages in thread From: Arnd Bergmann @ 2012-05-15 8:40 UTC (permalink / raw) To: linux-arm-kernel On Monday 14 May 2012, Rafael J. Wysocki wrote: > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > Linux 3.4-rc6 > > with top-most commit 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f > > Merge branch 'renesas-kzm9g' into renesas-board-new > > from the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new > > to receive updates of the Renesas ARM-based boards support code for v3.5. > Included are: > > * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm. > > * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm. > > This is based on the Renesas core SoC code updates I've sent a separate pull > request for. > Pulled into next/boards Thanks, Arnd ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL][Update] Renesas ARM-based platforms: new boards support for v3.5 2012-05-15 8:40 ` Arnd Bergmann @ 2012-05-15 15:30 ` Arnd Bergmann 2012-05-15 15:49 ` Rafael J. Wysocki 2012-05-15 15:50 ` Rafael J. Wysocki 1 sibling, 1 reply; 20+ messages in thread From: Arnd Bergmann @ 2012-05-15 15:30 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 15 May 2012, Arnd Bergmann wrote: > On Monday 14 May 2012, Rafael J. Wysocki wrote: > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > > > Linux 3.4-rc6 > > > > with top-most commit 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f > > > > Merge branch 'renesas-kzm9g' into renesas-board-new > > > > from the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new > > > > to receive updates of the Renesas ARM-based boards support code for v3.5. > > Included are: > > > > * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm. > > > > * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm. > > > > This is based on the Renesas core SoC code updates I've sent a separate pull > > request for. I got build errors with the new version now because machine_is_kzm9g is no longer defined: /home/arnd/linux-arm/arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count': /home/arnd/linux-arm/arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible' [-Werror=implicit-function-declaration] I'd apply the patch below, unless someone has a better solution Arnd diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts index ed1bae5..bcb9119 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts @@ -13,7 +13,7 @@ / { model = "KZM-A9-GT"; - compatible = "renesas,kzm9g"; + compatible = "renesas,kzm9g", "renesas,sh73a0"; memory { device_type = "memory"; diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index d959f07..2946214 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c @@ -20,7 +20,8 @@ #include <asm/mach-types.h> #include <mach/common.h> -#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g()) +#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \ + of_machine_is_compatible("renesas,sh73a0")) #define is_r8a7779() machine_is_marzen() static unsigned int __init shmobile_smp_get_core_count(void) ^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [GIT PULL][Update] Renesas ARM-based platforms: new boards support for v3.5 2012-05-15 15:30 ` Arnd Bergmann @ 2012-05-15 15:49 ` Rafael J. Wysocki 2012-05-15 20:03 ` Arnd Bergmann 0 siblings, 1 reply; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-15 15:49 UTC (permalink / raw) To: linux-arm-kernel On Tuesday, May 15, 2012, Arnd Bergmann wrote: > On Tuesday 15 May 2012, Arnd Bergmann wrote: > > On Monday 14 May 2012, Rafael J. Wysocki wrote: > > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > > > > > Linux 3.4-rc6 > > > > > > with top-most commit 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f > > > > > > Merge branch 'renesas-kzm9g' into renesas-board-new > > > > > > from the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new > > > > > > to receive updates of the Renesas ARM-based boards support code for v3.5. > > > Included are: > > > > > > * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm. > > > > > > * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm. > > > > > > This is based on the Renesas core SoC code updates I've sent a separate pull > > > request for. > > I got build errors with the new version now because machine_is_kzm9g is no longer > defined: > > /home/arnd/linux-arm/arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count': > /home/arnd/linux-arm/arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible' [-Werror=implicit-function-declaration] > > I'd apply the patch below, unless someone has a better solution Please apply and thanks for the fix! Rafael > diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts > index ed1bae5..bcb9119 100644 > --- a/arch/arm/boot/dts/sh73a0-kzm9g.dts > +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts > @@ -13,7 +13,7 @@ > > / { > model = "KZM-A9-GT"; > - compatible = "renesas,kzm9g"; > + compatible = "renesas,kzm9g", "renesas,sh73a0"; > > memory { > device_type = "memory"; > diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c > index d959f07..2946214 100644 > --- a/arch/arm/mach-shmobile/platsmp.c > +++ b/arch/arm/mach-shmobile/platsmp.c > @@ -20,7 +20,8 @@ > #include <asm/mach-types.h> > #include <mach/common.h> > > -#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g()) > +#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \ > + of_machine_is_compatible("renesas,sh73a0")) > #define is_r8a7779() machine_is_marzen() > > static unsigned int __init shmobile_smp_get_core_count(void) > > ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL][Update] Renesas ARM-based platforms: new boards support for v3.5 2012-05-15 15:49 ` Rafael J. Wysocki @ 2012-05-15 20:03 ` Arnd Bergmann 0 siblings, 0 replies; 20+ messages in thread From: Arnd Bergmann @ 2012-05-15 20:03 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 15 May 2012, Rafael J. Wysocki wrote: > On Tuesday, May 15, 2012, Arnd Bergmann wrote: > > On Tuesday 15 May 2012, Arnd Bergmann wrote: > > > On Monday 14 May 2012, Rafael J. Wysocki wrote: > > I got build errors with the new version now because machine_is_kzm9g is no longer > > defined: > > > > /home/arnd/linux-arm/arch/arm/mach-shmobile/platsmp.c: In function 'shmobile_smp_get_core_count': > > /home/arnd/linux-arm/arch/arm/mach-shmobile/platsmp.c:29:2: error: implicit declaration of function 'of_machine_is_compatible' [-Werror=implicit-function-declaration] > > > > I'd apply the patch below, unless someone has a better solution > > Please apply and thanks for the fix! > Ok, applied now. Arnd ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL][Update] Renesas ARM-based platforms: new boards support for v3.5 2012-05-15 8:40 ` Arnd Bergmann 2012-05-15 15:30 ` Arnd Bergmann @ 2012-05-15 15:50 ` Rafael J. Wysocki 1 sibling, 0 replies; 20+ messages in thread From: Rafael J. Wysocki @ 2012-05-15 15:50 UTC (permalink / raw) To: linux-arm-kernel On Tuesday, May 15, 2012, Arnd Bergmann wrote: > On Monday 14 May 2012, Rafael J. Wysocki wrote: > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > > > Linux 3.4-rc6 > > > > with top-most commit 4fc5e65cdbf736a5311b07aa54a916ccaa91ab5f > > > > Merge branch 'renesas-kzm9g' into renesas-board-new > > > > from the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git board-new > > > > to receive updates of the Renesas ARM-based boards support code for v3.5. > > Included are: > > > > * Support for the KZM-A9-GT board from Kuninori Morimoto and Magnus Damm. > > > > * Support for the armadillo800eva board from Kuninori Morimoto and Magnus Damm. > > > > This is based on the Renesas core SoC code updates I've sent a separate pull > > request for. > > > > Pulled into next/boards Many thanks! Rafael ^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [GIT PULL] Renesas ARM-based platforms: core SoC updates for v3.5 2012-05-12 21:07 ` [GIT PULL] Renesas ARM-based platforms: core SoC " Rafael J. Wysocki 2012-05-12 21:18 ` [GIT PULL] Renesas ARM-based platforms: board support " Rafael J. Wysocki 2012-05-12 21:23 ` [GIT PULL] Renesas ARM-based platforms: new boards support " Rafael J. Wysocki @ 2012-05-12 23:29 ` Olof Johansson 2 siblings, 0 replies; 20+ messages in thread From: Olof Johansson @ 2012-05-12 23:29 UTC (permalink / raw) To: linux-arm-kernel On Sat, May 12, 2012 at 2:07 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote: > Hi, > > Please pull changes since commit d48b97b403d23f6df0b990cee652bdf9a52337a3 > > Linux 3.4-rc6 > > with top-most commit c8241085e8606a14ef48e6d99556133c48aaddaf > > ARM: mach-shmobile: clock-r8a7740: use followparent_recalc on usb24s > > from the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas.git soc-core > > to receive updates of the Renesas ARM-based platforms core code for v3.5. > Included are: > > * Shared delay calibration code update from Magnus Damm. > > * The addition of FSI DMAEngine support for the sh7372 SoC from Kuninori Morimoto. > > * Muliple updates of the r8a7740 SoC support code from Kuninori Morimoto. > > This is based on the Renesas DT updates that have been merged into arm-soc already > and on the urgent fixes I've sent a separate pull request for. > > Thanks! Rafael, This looks good, thanks for splitting things up. I will pull it in a little later today when I get a few minutes of quiet. If you start using signed tags, feel free to add the above description into there for our convenience. :-) Also, the diffstat below includes the dependent branches. Feel free to send only the delta, but either way works. -Olof ^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2012-05-16 6:17 UTC | newest] Thread overview: 20+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-05-11 18:59 [GIT PULL] Renesas ARM-based platforms updates for v3.5 Rafael J. Wysocki 2012-05-12 5:29 ` Olof Johansson 2012-05-12 19:58 ` Rafael J. Wysocki 2012-05-12 20:17 ` Rafael J. Wysocki 2012-05-12 23:04 ` Olof Johansson 2012-05-12 21:07 ` [GIT PULL] Renesas ARM-based platforms: core SoC " Rafael J. Wysocki 2012-05-12 21:18 ` [GIT PULL] Renesas ARM-based platforms: board support " Rafael J. Wysocki 2012-05-13 4:24 ` Olof Johansson 2012-05-12 21:23 ` [GIT PULL] Renesas ARM-based platforms: new boards support " Rafael J. Wysocki 2012-05-13 6:29 ` Olof Johansson 2012-05-14 7:13 ` Magnus Damm 2012-05-15 19:58 ` Arnd Bergmann 2012-05-16 6:17 ` Olof Johansson 2012-05-14 21:43 ` [GIT PULL][Update] " Rafael J. Wysocki 2012-05-15 8:40 ` Arnd Bergmann 2012-05-15 15:30 ` Arnd Bergmann 2012-05-15 15:49 ` Rafael J. Wysocki 2012-05-15 20:03 ` Arnd Bergmann 2012-05-15 15:50 ` Rafael J. Wysocki 2012-05-12 23:29 ` [GIT PULL] Renesas ARM-based platforms: core SoC updates " Olof Johansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).