* [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window @ 2014-09-11 23:28 Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 2/5] omap soc changes " Tony Lindgren ` (4 more replies) 0 siblings, 5 replies; 10+ messages in thread From: Tony Lindgren @ 2014-09-11 23:28 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f: Linux 3.17-rc3 (2014-08-31 18:23:04 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/fixes-v3.18-not-urgent for you to fetch changes up to 31957609db529d401658adc2e91ef7df7ea42699: ARM: OMAP2+: make of_device_ids const (2014-09-11 12:37:23 -0700) ---------------------------------------------------------------- Fixes for omaps that were not considered urgent enough for the -rc cycle: - Fixes for .dts files to differentiate panda and beaglebone versions - Powerdomain fixes from Nishant Menon mostly for newer omaps - Fixes for __initconst and of_device_ids const usage ---------------------------------------------------------------- Nishanth Menon (9): ARM: dts: omap4-panda: Fix model and SoC family details ARM: dts: am335x-bone*: Fix model name and update compatibility information ARM: OMAP: DRA7: powerdomain data: fix powerdomain powerstate ARM: OMAP5: powerdomain data: fix powerdomain powerstate ARM: OMAP2+: powerdomain: pwrdm_for_each_clkdm iterate only valid clkdms ARM: OMAP2+: powerdomain: introduce logic for finding valid power domain ARM: OMAP4+: PM: Make logic state programmable ARM: OMAP4+: PM: use only valid low power state for suspend ARM: OMAP4+: PM: Use only valid low power state for CPU hotplug Tony Lindgren (1): Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent Uwe Kleine-K??nig (2): ARM: omap2: make arrays containing machine compatible strings const ARM: OMAP2+: make of_device_ids const arch/arm/boot/dts/am335x-bone-common.dtsi | 3 -- arch/arm/boot/dts/am335x-bone.dts | 5 ++ arch/arm/boot/dts/am335x-boneblack.dts | 5 ++ arch/arm/boot/dts/omap4-panda-common.dtsi | 3 -- arch/arm/boot/dts/omap4-panda-es.dts | 5 ++ arch/arm/boot/dts/omap4-panda.dts | 5 ++ arch/arm/mach-omap2/board-generic.c | 26 +++++----- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/gpmc.c | 2 +- arch/arm/mach-omap2/irq.c | 2 +- arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 ++ arch/arm/mach-omap2/pdata-quirks.c | 2 +- arch/arm/mach-omap2/pm44xx.c | 9 +++- arch/arm/mach-omap2/powerdomain.c | 79 ++++++++++++++++++++++++++++- arch/arm/mach-omap2/powerdomain.h | 4 ++ arch/arm/mach-omap2/powerdomains54xx_data.c | 12 ++--- arch/arm/mach-omap2/powerdomains7xx_data.c | 14 ++--- arch/arm/mach-omap2/prm_common.c | 2 +- arch/arm/mach-omap2/timer.c | 6 +-- 19 files changed, 147 insertions(+), 43 deletions(-) ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 2/5] omap soc changes for v3.18 merge window 2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren @ 2014-09-11 23:28 ` Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 3/5] omap intc " Tony Lindgren ` (3 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2014-09-11 23:28 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) ---------------------------------------------------------------- SoC related changes for omaps for v3.18 merge window: - PM changes to make the code easier to use on newer SoCs - PM changes for newer SoCs suspend and resume and wake-up events - Minor clean-up to remove dead Kconfig options Note that these have a dependency to the fixes-v3.18-not-urgent tag and is based on a commit in that series. ---------------------------------------------------------------- Keerthy (1): ARM: AM437x: use pdata quirks for pinctrl information Mark Brown (1): ARM: omap: Remove stray ARCH_HAS_OPP references Nishanth Menon (10): ARM: OMAP4+: prminst: provide function to find prm_dev instance offset ARM: OMAP4: PRM: use the generic prm_inst to allow logic to be abstracted ARM: OMAP4+: PRM: register interrupt information from DT ARM: OMAP4+: PRM: remove "wkup" event ARM: OMAP4+: PRM: Enable wakeup capability for OMAP5, DRA7 ARM: OMAP3+: PRM: register interrupt information from DT ARM: OMAP5: use pdata quirks for pinctrl information ARM: DRA7: use pdata quirks for pinctrl information ARM: dts: OMAP3+: Add PRM interrupt ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 Rajendra Nayak (3): ARM: OMAP5 / DRA7: PM: Avoid all SAR saves ARM: OMAP5 / DRA7: Enable CPU RET on suspend ARM: DRA7: Add hook in SoC initcalls to enable pm initialization Santosh Shilimkar (6): ARM: OMAP5 / DRA7: PM: Update CPU context register offset ARM: OMAP5 / DRA7: PM: Set MPUSS-EMIF clock-domain static dependency ARM: OMAP5 / DRA7: PM / wakeupgen: Enables ES2 PM mode by default ARM: OMAP5 / DRA7: PM: Enable Mercury retention mode on CPUx powerdomains ARM: OMAP5 / DRA7: PM: Provide a dummy startup function for CPU hotplug ARM: OMAP5: Add hook in SoC initcalls to enable pm initialization Tony Lindgren (1): Merge branch 'pull/v3.18/for-omap-soc' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/soc arch/arm/boot/dts/dra7.dtsi | 1 + arch/arm/boot/dts/omap3.dtsi | 1 + arch/arm/boot/dts/omap4.dtsi | 1 + arch/arm/boot/dts/omap5.dtsi | 1 + arch/arm/mach-omap2/Kconfig | 5 -- arch/arm/mach-omap2/Makefile | 12 ++-- arch/arm/mach-omap2/common.h | 2 +- arch/arm/mach-omap2/io.c | 6 ++ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 102 +++++++++++++++++++++--------- arch/arm/mach-omap2/omap-secure.h | 1 + arch/arm/mach-omap2/omap-wakeupgen.c | 20 +++++- arch/arm/mach-omap2/omap-wakeupgen.h | 1 + arch/arm/mach-omap2/pdata-quirks.c | 10 +++ arch/arm/mach-omap2/pm.h | 1 + arch/arm/mach-omap2/pm44xx.c | 48 ++++++++++++-- arch/arm/mach-omap2/prm3xxx.c | 18 ++++++ arch/arm/mach-omap2/prm44xx.c | 90 ++++++++++++++++++++++---- arch/arm/mach-omap2/prminst44xx.c | 40 +++++++----- arch/arm/mach-omap2/prminst44xx.h | 3 + 19 files changed, 290 insertions(+), 73 deletions(-) ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 3/5] omap intc changes for v3.18 merge window 2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 2/5] omap soc changes " Tony Lindgren @ 2014-09-11 23:28 ` Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 4/5] omap mailbox " Tony Lindgren ` (2 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2014-09-11 23:28 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit 176da6c766ce3d5d8c88a7afdaefcc5fd6d8afac: arm: omap: irq: make omap_irq_base global (2014-09-11 13:03:30 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/intc-for-v3.18 for you to fetch changes up to 55601c9f24670ba926ebdd4d712ac3b177232330: arm: omap: intc: switch over to linear irq domain (2014-09-11 13:05:50 -0700) ---------------------------------------------------------------- Interrupt code related clean-up for omap2 and 3 to make it ready to move to drivers/irqchip. Note that this series does not yet move the interrupt code to drivers, that will be posted separately as a follow-up series. Note that this branch has a dependency to patches both in fixes-v3.18-not-urgent and soc-for-v3.18 and is based on a merge. Without doing the merge, off-idle would not work properly for git bisect. ---------------------------------------------------------------- Felipe Balbi (28): arm: omap: irq: define INTC_ILR0 register arm: omap: irq: start to remove irq_banks array arm: omap: irq: add a global omap_nr_irqs variable arm: omap: irq: remove rest of irq_banks usage arm: omap: irq: remove unused macro arm: omap: irq: switch over to intc_readl on omap_intc_handle_irq arm: omap: irq: remove unnecessary base_addr argument arm: omap: irq: rename omap3_intc_regs arm: omap: irq: always define omap3 support arm: omap: irq: reorganize code a little bit arm: omap: irq: make intc_of_init static arm: omap: irq: call set_handle_irq() from intc_of_init arm: omap: irq: use IRQCHIP_DECLARE macro arm: omap: irq: drop .handle_irq and .init_irq fields arm: omap: irq: add specific compatibles for omap3 and am33xx devices arm: omap: irq: use compatible flag to figure out number of IRQ lines arm: boot: dts: am33xx/omap3: fix intc compatible flag arm: omap: irq: drop ti,intc-size support arm: boot: dts: omap2/3/am33xx: drop ti,intc-size arm: omap: irq: move some more code around arm: omap: irq: call set_handle_irq() from .init_irq arm: omap: irq: drop omap3_intc_handle_irq() arm: omap: irq: drop omap2_intc_handle_irq() arm: omap: irq: remove unnecessary header arm: omap: irq: remove nr_irqs argument arm: omap: irq: introduce omap_nr_pending arm: omap: irq: get rid of ifdef hack arm: omap: intc: switch over to linear irq domain arch/arm/boot/dts/am33xx.dtsi | 3 +- arch/arm/boot/dts/omap2.dtsi | 1 - arch/arm/boot/dts/omap3.dtsi | 3 +- arch/arm/mach-omap2/board-3430sdp.c | 1 - arch/arm/mach-omap2/board-am3517crane.c | 1 - arch/arm/mach-omap2/board-am3517evm.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 2 - arch/arm/mach-omap2/board-cm-t3517.c | 1 - arch/arm/mach-omap2/board-devkit8000.c | 1 - arch/arm/mach-omap2/board-generic.c | 14 - arch/arm/mach-omap2/board-ldp.c | 1 - arch/arm/mach-omap2/board-omap3beagle.c | 1 - arch/arm/mach-omap2/board-omap3logic.c | 2 - arch/arm/mach-omap2/board-omap3pandora.c | 1 - arch/arm/mach-omap2/board-omap3stalker.c | 1 - arch/arm/mach-omap2/board-omap3touchbook.c | 1 - arch/arm/mach-omap2/board-overo.c | 1 - arch/arm/mach-omap2/board-rx51.c | 1 - arch/arm/mach-omap2/common.h | 13 - arch/arm/mach-omap2/irq.c | 409 +++++++++++++++-------------- 20 files changed, 213 insertions(+), 246 deletions(-) ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 4/5] omap mailbox changes for v3.18 merge window 2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 2/5] omap soc changes " Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 3/5] omap intc " Tony Lindgren @ 2014-09-11 23:28 ` Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 5/5] omap dts " Tony Lindgren [not found] ` <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com> 4 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2014-09-11 23:28 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f: Linux 3.17-rc3 (2014-08-31 18:23:04 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/mailbox-for-v3.18 for you to fetch changes up to 75288cc66dc478b32e43970dd6913396526504ae: mailbox/omap: add support for parsing dt devices (2014-09-11 11:39:14 -0700) ---------------------------------------------------------------- Mailbox related changes for omaps to get it to work with device tree. ---------------------------------------------------------------- Suman Anna (2): Documentation: dt: add omap mailbox bindings mailbox/omap: add support for parsing dt devices .../devicetree/bindings/mailbox/omap-mailbox.txt | 108 ++++++++++++++ drivers/mailbox/omap-mailbox.c | 156 +++++++++++++++++---- 2 files changed, 240 insertions(+), 24 deletions(-) create mode 100644 Documentation/devicetree/bindings/mailbox/omap-mailbox.txt ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 5/5] omap dts changes for v3.18 merge window 2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren ` (2 preceding siblings ...) 2014-09-11 23:28 ` [GIT PULL 4/5] omap mailbox " Tony Lindgren @ 2014-09-11 23:28 ` Tony Lindgren 2014-09-18 20:15 ` Tony Lindgren [not found] ` <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com> 4 siblings, 1 reply; 10+ messages in thread From: Tony Lindgren @ 2014-09-11 23:28 UTC (permalink / raw) To: linux-arm-kernel The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f: Linux 3.17-rc3 (2014-08-31 18:23:04 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/dt-for-v3.18 for you to fetch changes up to d27704d1ec2f9ba06247b402c58a6f2febecef78: ARM: dts: OMAP2+: Add sub mailboxes device node information (2014-09-11 11:46:30 -0700) ---------------------------------------------------------------- Changes for .dts files for omaps for v3.18 merge window: - Updates for gta04 to add gta04a3 model - Add support for Tehnexion TAO3530 boards - Regulator names for beaglebone - Pinctrl related updates for omap5, dra7 and am437 - Model name fix for sbc-t54 - Enable mailbox for various omaps ---------------------------------------------------------------- Dmitry Lifshitz (1): ARM: dts: sbc-t54: fix model property Keerthy J (2): ARM: dts: dra72-evm: Enable I2C1 node ARM: dts: dra72-evm: Add tps65917 PMIC node Marek Belisko (10): ARM: dts: omap3-gta04: Add nand support ARM: dts: omap3-gta04: Fix magnetometer model ARM: dts: omap3-gta04: Add wifi reset node ARM: dts: omap3-gta04: Move spi gpio pins to pmx_core2 ARM: dts: omap3-gta04: Add USB host support ARM: dts: omap3-gta04: Add display alias ARM: dts: omap3-gta04: Add twl4030 regulators parameters ARM: dts: omap3-gta04: Rename gta04.dts to gta04.dtsi and add a4 model ARM: dts: Add gta04a3 model ARM: dts: Add gta04a5 model Mark Brown (1): ARM: dts: am335x-boneblack: Add names for remaining regulators Nishanth Menon (6): ARM: OMAP2+: board-generic: add support for AM57xx family ARM: dts: OMAP5: switch to compatible pinctrl ARM: dts: DRA7: switch to compatible pinctrl ARM: dts: AM437x: switch to compatible pinctrl ARM: dts: OMAP5 / DRA7: switch over to interrupts-extended property for UART ARM: dts: dra7-evm: Mark uart1 rxd as wakeup capable Stefan Roese (4): ARM: OMAP2+: tao3530: Add pdata-quirk for the mmc2 internal clock ARM: dts: omap3: Add Technexion TAO3530 SOM omap3-tao3530.dtsi ARM: dts: omap3: Add Technexion Thunder support (TAO3530 SOM based) ARM: dts: omap3: Add HEAD acoustics omap3-ha.dts and omap3-ha-lcd.dts (TAO3530 based) Suman Anna (1): ARM: dts: OMAP2+: Add sub mailboxes device node information Tomi Valkeinen (1): ARM: dts: omap5.dtsi: add DSS RFBI node Tony Lindgren (2): Merge branch 'omap-for-v3.17/dt' into omap-for-v3.18/dt Merge branch 'pull/v3.18/for-dt-pinctrl-updates' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/dt .../devicetree/bindings/arm/omap/omap.txt | 12 + arch/arm/boot/dts/Makefile | 7 +- arch/arm/boot/dts/am335x-bone-common.dtsi | 5 + arch/arm/boot/dts/am33xx.dtsi | 4 + arch/arm/boot/dts/am4372.dtsi | 8 +- arch/arm/boot/dts/dra7-evm.dts | 2 + arch/arm/boot/dts/dra7.dtsi | 24 +- arch/arm/boot/dts/dra72-evm.dts | 120 ++++++++ arch/arm/boot/dts/omap2420.dtsi | 8 + arch/arm/boot/dts/omap2430.dtsi | 4 + .../boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} | 150 ++++++++- arch/arm/boot/dts/omap3-gta04a3.dts | 48 +++ arch/arm/boot/dts/omap3-gta04a4.dts | 13 + arch/arm/boot/dts/omap3-gta04a5.dts | 17 ++ arch/arm/boot/dts/omap3-ha-common.dtsi | 88 ++++++ arch/arm/boot/dts/omap3-ha-lcd.dts | 165 ++++++++++ arch/arm/boot/dts/omap3-ha.dts | 28 ++ arch/arm/boot/dts/omap3-tao3530.dtsi | 337 +++++++++++++++++++++ arch/arm/boot/dts/omap3-thunder.dts | 129 ++++++++ arch/arm/boot/dts/omap3.dtsi | 4 + arch/arm/boot/dts/omap4.dtsi | 8 + arch/arm/boot/dts/omap5-sbc-t54.dts | 4 +- arch/arm/boot/dts/omap5.dtsi | 37 ++- arch/arm/mach-omap2/board-generic.c | 4 + arch/arm/mach-omap2/pdata-quirks.c | 6 + 25 files changed, 1204 insertions(+), 28 deletions(-) rename arch/arm/boot/dts/{omap3-gta04.dts => omap3-gta04.dtsi} (67%) create mode 100644 arch/arm/boot/dts/omap3-gta04a3.dts create mode 100644 arch/arm/boot/dts/omap3-gta04a4.dts create mode 100644 arch/arm/boot/dts/omap3-gta04a5.dts create mode 100644 arch/arm/boot/dts/omap3-ha-common.dtsi create mode 100644 arch/arm/boot/dts/omap3-ha-lcd.dts create mode 100644 arch/arm/boot/dts/omap3-ha.dts create mode 100644 arch/arm/boot/dts/omap3-tao3530.dtsi create mode 100644 arch/arm/boot/dts/omap3-thunder.dts ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 5/5] omap dts changes for v3.18 merge window 2014-09-11 23:28 ` [GIT PULL 5/5] omap dts " Tony Lindgren @ 2014-09-18 20:15 ` Tony Lindgren 2014-09-24 5:13 ` Olof Johansson 0 siblings, 1 reply; 10+ messages in thread From: Tony Lindgren @ 2014-09-18 20:15 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [140911 16:29]: > The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f: > > Linux 3.17-rc3 (2014-08-31 18:23:04 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/dt-for-v3.18 > > for you to fetch changes up to d27704d1ec2f9ba06247b402c58a6f2febecef78: > > ARM: dts: OMAP2+: Add sub mailboxes device node information (2014-09-11 11:46:30 -0700) > > ---------------------------------------------------------------- > Changes for .dts files for omaps for v3.18 merge window: > > - Updates for gta04 to add gta04a3 model > - Add support for Tehnexion TAO3530 boards > - Regulator names for beaglebone > - Pinctrl related updates for omap5, dra7 and am437 > - Model name fix for sbc-t54 > - Enable mailbox for various omaps This can cause a minor merge conflict, here's the merge resolution for reference. Regards, Tony --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@@ -226,7 -240,9 +226,9 @@@ MACHINE_EN #endif #ifdef CONFIG_SOC_DRA7XX -static const char *dra74x_boards_compat[] __initconst = { +static const char *const dra74x_boards_compat[] __initconst = { + "ti,am5728", + "ti,am5726", "ti,dra742", "ti,dra7", NULL, @@@ -245,7 -261,9 +247,9 @@@ DT_MACHINE_START(DRA74X_DT, "Generic DR .restart = omap44xx_restart, MACHINE_END -static const char *dra72x_boards_compat[] __initconst = { +static const char *const dra72x_boards_compat[] __initconst = { + "ti,am5718", + "ti,am5716", "ti,dra722", NULL, }; ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 5/5] omap dts changes for v3.18 merge window 2014-09-18 20:15 ` Tony Lindgren @ 2014-09-24 5:13 ` Olof Johansson 0 siblings, 0 replies; 10+ messages in thread From: Olof Johansson @ 2014-09-24 5:13 UTC (permalink / raw) To: linux-arm-kernel On Thu, Sep 18, 2014 at 01:15:08PM -0700, Tony Lindgren wrote: > * Tony Lindgren <tony@atomide.com> [140911 16:29]: > > The following changes since commit 69e273c0b0a3c337a521d083374c918dc52c666f: > > > > Linux 3.17-rc3 (2014-08-31 18:23:04 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/dt-for-v3.18 > > > > for you to fetch changes up to d27704d1ec2f9ba06247b402c58a6f2febecef78: > > > > ARM: dts: OMAP2+: Add sub mailboxes device node information (2014-09-11 11:46:30 -0700) > > > > ---------------------------------------------------------------- > > Changes for .dts files for omaps for v3.18 merge window: > > > > - Updates for gta04 to add gta04a3 model > > - Add support for Tehnexion TAO3530 boards > > - Regulator names for beaglebone > > - Pinctrl related updates for omap5, dra7 and am437 > > - Model name fix for sbc-t54 > > - Enable mailbox for various omaps > > This can cause a minor merge conflict, here's the > merge resolution for reference. Thanks, merged all branches now. -Olof ^ permalink raw reply [flat|nested] 10+ messages in thread
[parent not found: <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com>]
* [GIT PULL 2/5] omap soc changes for v3.18 merge window [not found] ` <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com> @ 2014-09-24 5:07 ` Olof Johansson 2014-09-24 15:23 ` Nishanth Menon 0 siblings, 1 reply; 10+ messages in thread From: Olof Johansson @ 2014-09-24 5:07 UTC (permalink / raw) To: linux-arm-kernel On Thu, Sep 11, 2014 at 04:28:55PM -0700, Tony Lindgren wrote: > The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: > > Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 > > for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: > > ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) > > ---------------------------------------------------------------- > SoC related changes for omaps for v3.18 merge window: > > - PM changes to make the code easier to use on newer SoCs > - PM changes for newer SoCs suspend and resume and wake-up events > - Minor clean-up to remove dead Kconfig options > > Note that these have a dependency to the fixes-v3.18-not-urgent > tag and is based on a commit in that series. Merged. Note that this also has a fresh conflict with the latest fixes, so please check that I resolved it correctly. -Olof ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 2/5] omap soc changes for v3.18 merge window 2014-09-24 5:07 ` [GIT PULL 2/5] omap soc " Olof Johansson @ 2014-09-24 15:23 ` Nishanth Menon 2014-09-24 15:46 ` Tony Lindgren 0 siblings, 1 reply; 10+ messages in thread From: Nishanth Menon @ 2014-09-24 15:23 UTC (permalink / raw) To: linux-arm-kernel On 22:07-20140923, Olof Johansson wrote: > On Thu, Sep 11, 2014 at 04:28:55PM -0700, Tony Lindgren wrote: > > The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: > > > > Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 > > > > for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: > > > > ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) > > > > ---------------------------------------------------------------- > > SoC related changes for omaps for v3.18 merge window: > > > > - PM changes to make the code easier to use on newer SoCs > > - PM changes for newer SoCs suspend and resume and wake-up events > > - Minor clean-up to remove dead Kconfig options > > > > Note that these have a dependency to the fixes-v3.18-not-urgent > > tag and is based on a commit in that series. > > Merged. Note that this also has a fresh conflict with the latest fixes, > so please check that I resolved it correctly. > Looks fine to me.. also, Used a couple of out of tree patches for testing and all looks good from test perspective: am335x-evm: Boot PASS: http://slexy.org/raw/s21ul7EaiK am335x-sk: Boot PASS: http://slexy.org/raw/s2xxG7b5t7 am3517-evm: Boot PASS: http://slexy.org/raw/s21we13Ebk am37x-evm: Boot PASS: http://slexy.org/raw/s209iOnepY am43xx-epos: Boot PASS: http://slexy.org/raw/s28GrriVvz am5728-evm: Boot PASS: http://slexy.org/raw/s2wRllyrn2 BeagleBoard-XM: Boot PASS: http://slexy.org/raw/s2JPCJPebZ beagleboard-vanilla: Boot PASS: http://slexy.org/raw/s2n4Pum58s beaglebone-black: Boot PASS: http://slexy.org/raw/s20yDlR4eu craneboard: Boot PASS: http://slexy.org/raw/s21DECJfEs dra72x-evm: Boot PASS: http://slexy.org/raw/s2WgDuVxXj dra7xx-evm: Boot PASS: http://slexy.org/raw/s2wOi9Okyk OMAP3430-Labrador(LDP): Boot PASS: http://slexy.org/raw/s20qOiwY38 n900: Boot PASS: http://slexy.org/raw/s2j6hBxA2b omap5-evm: Boot PASS: http://slexy.org/raw/s20Of1TCt4 pandaboard-es: Boot PASS: http://slexy.org/raw/s20P0IWXJX pandaboard-vanilla: Boot PASS: http://slexy.org/raw/s20QWs7BP9 sdp2430: Boot PASS: http://slexy.org/raw/s2fXgpekEa sdp3430: Boot PASS: http://slexy.org/raw/s21GW1utPn -- Regards, Nishanth Menon ^ permalink raw reply [flat|nested] 10+ messages in thread
* [GIT PULL 2/5] omap soc changes for v3.18 merge window 2014-09-24 15:23 ` Nishanth Menon @ 2014-09-24 15:46 ` Tony Lindgren 0 siblings, 0 replies; 10+ messages in thread From: Tony Lindgren @ 2014-09-24 15:46 UTC (permalink / raw) To: linux-arm-kernel * Nishanth Menon <nm@ti.com> [140924 08:24]: > On 22:07-20140923, Olof Johansson wrote: > > On Thu, Sep 11, 2014 at 04:28:55PM -0700, Tony Lindgren wrote: > > > The following changes since commit d7eb67f7fef9c046f27a975118da2324de65a90c: > > > > > > Merge branch 'pull/v3.18/powerdomain-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/fixes-not-urgent (2014-09-08 15:04:24 -0700) > > > > > > are available in the git repository at: > > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/soc-for-v3.18 > > > > > > for you to fetch changes up to 377fb3f5d9a34b2913939e0620c1c585b5913bab: > > > > > > ARM: OMAP5+: Reuse OMAP4 PM code for OMAP5 and DRA7 (2014-09-09 19:13:41 -0700) > > > > > > ---------------------------------------------------------------- > > > SoC related changes for omaps for v3.18 merge window: > > > > > > - PM changes to make the code easier to use on newer SoCs > > > - PM changes for newer SoCs suspend and resume and wake-up events > > > - Minor clean-up to remove dead Kconfig options > > > > > > Note that these have a dependency to the fixes-v3.18-not-urgent > > > tag and is based on a commit in that series. > > > > Merged. Note that this also has a fresh conflict with the latest fixes, > > so please check that I resolved it correctly. > > > > Looks fine to me.. also, Used a couple of out of tree patches for > testing and all looks good from test perspective: > > am335x-evm: Boot PASS: http://slexy.org/raw/s21ul7EaiK > am335x-sk: Boot PASS: http://slexy.org/raw/s2xxG7b5t7 > am3517-evm: Boot PASS: http://slexy.org/raw/s21we13Ebk > am37x-evm: Boot PASS: http://slexy.org/raw/s209iOnepY > am43xx-epos: Boot PASS: http://slexy.org/raw/s28GrriVvz > am5728-evm: Boot PASS: http://slexy.org/raw/s2wRllyrn2 > BeagleBoard-XM: Boot PASS: http://slexy.org/raw/s2JPCJPebZ > beagleboard-vanilla: Boot PASS: http://slexy.org/raw/s2n4Pum58s > beaglebone-black: Boot PASS: http://slexy.org/raw/s20yDlR4eu > craneboard: Boot PASS: http://slexy.org/raw/s21DECJfEs > dra72x-evm: Boot PASS: http://slexy.org/raw/s2WgDuVxXj > dra7xx-evm: Boot PASS: http://slexy.org/raw/s2wOi9Okyk > OMAP3430-Labrador(LDP): Boot PASS: http://slexy.org/raw/s20qOiwY38 > n900: Boot PASS: http://slexy.org/raw/s2j6hBxA2b > omap5-evm: Boot PASS: http://slexy.org/raw/s20Of1TCt4 > pandaboard-es: Boot PASS: http://slexy.org/raw/s20P0IWXJX > pandaboard-vanilla: Boot PASS: http://slexy.org/raw/s20QWs7BP9 > sdp2430: Boot PASS: http://slexy.org/raw/s2fXgpekEa > sdp3430: Boot PASS: http://slexy.org/raw/s21GW1utPn OK thanks looks good to me also. Regards, Tony ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-09-24 15:46 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-09-11 23:28 [GIT PULL 1/5] non-urgent omap fixes for v3.18 merge window Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 2/5] omap soc changes " Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 3/5] omap intc " Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 4/5] omap mailbox " Tony Lindgren 2014-09-11 23:28 ` [GIT PULL 5/5] omap dts " Tony Lindgren 2014-09-18 20:15 ` Tony Lindgren 2014-09-24 5:13 ` Olof Johansson [not found] ` <5412304a.04a8440a.56eb.ffff9329SMTPIN_ADDED_BROKEN@mx.google.com> 2014-09-24 5:07 ` [GIT PULL 2/5] omap soc " Olof Johansson 2014-09-24 15:23 ` Nishanth Menon 2014-09-24 15:46 ` Tony Lindgren
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).