* [GIT PULL 2/6] omap prcm cleanup for v3.8 merge window, part2
[not found] <pull-1352828737-887235>
@ 2012-11-13 19:07 ` Tony Lindgren
2012-11-13 19:10 ` [GIT PULL 3/6] omap device tree updates for v3.8 merge window Tony Lindgren
` (4 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 19:07 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
The following changes since commit 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part2-signed
for you to fetch changes up to cc4b1e24b93dd529b1d49258bee044d319b5b129:
ARM: OMAP2: Fix compillation error in cm_common (2012-11-12 13:42:46 -0800)
----------------------------------------------------------------
More PRCM cleanups via Paul Walmsley <paul@pwsan.com>:
Second set of OMAP PRCM cleanups for 3.8.
These patches remove the use of omap_prcm_get_reset_sources() from the
OMAP watchdog driver, and remove mach-omap2/prcm.c and
plat-omap/include/plat/prcm.h.
Basic test logs for this branch on top of Tony's cleanup-prcm branch
at commit 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 are here:
http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/
However, cleanup-prcm at 7fc54fd3 does not include some fixes
that are needed for a successful test. With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:
http://www.pwsan.com/omap/testlogs/TEST_prcm_cleanup_b_3.8/20121108151930/
which indicate that the series tests cleanly.
This second pull request updates one of the patches which broke
with rmk's allnoconfigs, and also updates the tag description to
indicate that 7fc54fd3 is building cleanly here.
----------------------------------------------------------------
Paul Walmsley (17):
ARM: OMAP1: CGRM: fix omap1_get_reset_sources() return type
ARM: OMAP2+: WDT: move init; add read_reset_sources pdata function pointer
watchdog: OMAP: use standard GETBOOTSTATUS interface; use platform_data fn ptr
ARM: OMAP2+: PRCM: remove omap_prcm_get_reset_sources()
ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code
ARM: OMAP2/3: PRM: add SoC reset functions (using the CORE DPLL method)
ARM: OMAP2xxx: clock: remove global 'dclk' variable
ARM: OMAP2xxx: clock: move virt_prcm_set code into clkt2xxx_virt_prcm_set.c
ARM: OMAP2+: PRCM: create SoC-specific chip restart functions
ARM: OMAP2+: board files: use SoC-specific system restart functions
ARM: OMAP2xxx: APLL/CM: convert to use omap2_cm_wait_module_ready()
ARM: OMAP2+: CM/clock: convert _omap2_module_wait_ready() to use SoC-independent CM functions
ARM: OMAP2+: PRCM: remove omap2_cm_wait_idlest()
ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup
ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros
ARM: OMAP2+: hwmod: call to _omap4_disable_module() should use the SoC-specific call
ARM: OMAP2+: PRCM: remove obsolete prcm.[ch]
Peter Ujfalusi (1):
ARM: OMAP2: Fix compillation error in cm_common
Tony Lindgren (1):
Merge tag 'omap-cleanup-b2-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
arch/arm/mach-omap1/common.h | 2 +-
arch/arm/mach-omap1/devices.c | 21 ++-
arch/arm/mach-omap1/reset.c | 9 +-
arch/arm/mach-omap2/Makefile | 7 +-
arch/arm/mach-omap2/am33xx.h | 1 +
arch/arm/mach-omap2/board-2430sdp.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-3630sdp.c | 2 +-
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/board-am3517crane.c | 2 +-
arch/arm/mach-omap2/board-am3517evm.c | 2 +-
arch/arm/mach-omap2/board-apollon.c | 2 +-
arch/arm/mach-omap2/board-cm-t35.c | 18 +--
arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
arch/arm/mach-omap2/board-devkit8000.c | 2 +-
arch/arm/mach-omap2/board-generic.c | 10 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 4 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-n8x0.c | 6 +-
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 4 +-
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
arch/arm/mach-omap2/board-omap4panda.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 2 +-
arch/arm/mach-omap2/board-rm680.c | 4 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/board-ti8168evm.c | 4 +-
arch/arm/mach-omap2/board-zoom.c | 4 +-
arch/arm/mach-omap2/clkt2xxx_apll.c | 57 ++------
arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 36 ++++-
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 70 ++++++++--
arch/arm/mach-omap2/clkt_iclk.c | 1 -
arch/arm/mach-omap2/clock.c | 57 +++++++-
arch/arm/mach-omap2/clock.h | 28 ----
arch/arm/mach-omap2/clock2420_data.c | 26 +---
arch/arm/mach-omap2/clock2430_data.c | 26 +---
arch/arm/mach-omap2/clock2xxx.c | 16 ---
arch/arm/mach-omap2/clock2xxx.h | 9 +-
arch/arm/mach-omap2/cm-regbits-24xx.h | 2 +
arch/arm/mach-omap2/cm.h | 20 ++-
arch/arm/mach-omap2/cm2xxx.c | 128 +++++++++++++++++-
arch/arm/mach-omap2/cm2xxx.h | 4 +
arch/arm/mach-omap2/cm2xxx_3xxx.h | 8 +-
arch/arm/mach-omap2/cm3xxx.c | 66 ++++++++++
arch/arm/mach-omap2/cm3xxx.h | 5 +
arch/arm/mach-omap2/cm_common.c | 71 +++++++++-
arch/arm/mach-omap2/cminst44xx.h | 2 +
arch/arm/mach-omap2/common.c | 183 --------------------------
arch/arm/mach-omap2/common.h | 133 +++++--------------
arch/arm/mach-omap2/control.c | 10 +-
arch/arm/mach-omap2/control.h | 2 +
arch/arm/mach-omap2/cpuidle34xx.c | 1 -
arch/arm/mach-omap2/devices.c | 26 ----
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/hdq1w.c | 4 +-
arch/arm/mach-omap2/i2c.c | 6 +-
arch/arm/mach-omap2/id.c | 7 +-
arch/arm/mach-omap2/io.c | 86 +++++++++---
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/msdi.c | 4 +-
arch/arm/mach-omap2/omap2-restart.c | 65 +++++++++
arch/arm/mach-omap2/omap3-restart.c | 36 +++++
arch/arm/mach-omap2/omap4-common.c | 19 +++
arch/arm/mach-omap2/omap_hwmod.c | 8 +-
arch/arm/mach-omap2/pm34xx.c | 1 -
arch/arm/mach-omap2/powerdomain.c | 2 -
arch/arm/mach-omap2/prcm-common.h | 22 ----
arch/arm/mach-omap2/prcm.c | 189 ---------------------------
arch/arm/mach-omap2/prcm_mpu44xx.c | 17 +++
arch/arm/mach-omap2/prcm_mpu44xx.h | 9 +-
arch/arm/mach-omap2/prm.h | 24 +++-
arch/arm/mach-omap2/prm2xxx.c | 15 ++-
arch/arm/mach-omap2/prm2xxx.h | 2 +
arch/arm/mach-omap2/prm2xxx_3xxx.h | 7 -
arch/arm/mach-omap2/prm3xxx.c | 16 ++-
arch/arm/mach-omap2/prm3xxx.h | 2 +
arch/arm/mach-omap2/prm44xx.c | 1 -
arch/arm/mach-omap2/prm_common.c | 16 ++-
arch/arm/mach-omap2/prminst44xx.h | 2 +
arch/arm/mach-omap2/sdrc.c | 8 +-
arch/arm/mach-omap2/sdrc.h | 2 +
arch/arm/mach-omap2/ti81xx.h | 9 ++
arch/arm/mach-omap2/wd_timer.c | 40 +++++-
arch/arm/plat-omap/include/plat/prcm.h | 37 ------
drivers/watchdog/omap_wdt.c | 26 ++--
include/linux/platform_data/omap-wd-timer.h | 38 ++++++
90 files changed, 992 insertions(+), 851 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap2-restart.c
create mode 100644 arch/arm/mach-omap2/omap3-restart.c
delete mode 100644 arch/arm/mach-omap2/prcm.c
delete mode 100644 arch/arm/plat-omap/include/plat/prcm.h
create mode 100644 include/linux/platform_data/omap-wd-timer.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 3/6] omap device tree updates for v3.8 merge window
[not found] <pull-1352828737-887235>
2012-11-13 19:07 ` [GIT PULL 2/6] omap prcm cleanup for v3.8 merge window, part2 Tony Lindgren
@ 2012-11-13 19:10 ` Tony Lindgren
2012-11-13 19:11 ` [GIT PULL 4/6] omap pm " Tony Lindgren
` (3 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 19:10 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/dt-signed
for you to fetch changes up to d308ba50a1234b299a00e63a95e61fdeb2f1a2df:
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt (2012-11-09 14:58:34 -0800)
----------------------------------------------------------------
Device tree related changes for omaps updating the
various .dts files, and timer related changes to allow
configuring the timer via device tree.
----------------------------------------------------------------
Afzal Mohammed (2):
ARM: dts: AM33XX: Add rtc node
usb: musb: dsps: dt binding - add resources, example
Ajay Kumar Gupta (1):
ARM: dts: AM33XX: Add usbss node
AnilKumar Ch (18):
ARM: dts: AM33XX: Add device tree OPP table
ARM: dts: AM33XX: Add basic pinctrl device tree data
ARM: dts: AM33XX: Add D_CAN device tree data
ARM: dts: AM33XX: Add lis331dlh device tree data to am335x-evm
ARM: dts: AM33XX: Add temperature sensor device tree data to am335x-evm
ARM: dts: AM33XX: Add tsl2550 ambient light sensor DT data
ARM: dts: Add am335x-evmsk.dts
Documentation: dt: i2c: Update trivial-devices list
ARM: dts: AM33XX: Add pinmux configuration for matrix keypad to EVM
ARM: dts: AM33XX: Add matrix keypad device tree data to am335x-evm
ARM: dts: AM33XX: Add pinmux configuration for volume-keys to EVM
ARM: dts: AM33XX: Add volume-keys device tree data to am335x-evm
ARM: dts: AM33XX: Add pinmux configuration for user-leds to BONE
ARM: dts: AM33XX: Add user-leds device tree data to am335x-bone
ARM: dts: AM33XX: Add pinmux configuration for gpio-leds to EVMSK
ARM: dts: AM33XX: Add user-leds device tree data to am335x-evmsk
ARM: dts: AM33XX: Add pinmux configuration for gpio-keys to EVMSK
ARM: dts: AM33XX: Add push-buttons device tree data to am335x-evmsk
Benoit Cousson (3):
ARM: dts: OMAP: Move interrupt-parent to the root node to avoid duplication
ARM: dts: OMAP: Rename pandaES and var_som for consistency
ARM: dts: Makefile: Add the am335x-evmsk target in dtbs list
Jon Hunter (11):
ARM: dts: Add omap3-beagle.dts
ARM: dts: OMAP: Add timer nodes
ARM: dts: OMAP: Add counter-32k nodes
ARM: dts: OMAP4: Update timer addresses
ARM: dts: OMAP5: Add timer nodes
ARM: dts: OMAP5: Add counter node
ARM: OMAP3: Dynamically disable secure timer nodes for secure devices
ARM: OMAP: Add function to request a timer by capability
ARM: OMAP3: Add generic machine descriptor for boards with OMAP3 GP devices
ARM: OMAP: Add DT support for timer driver
ARM: OMAP2+: Add device-tree support for 32kHz counter
Kishon Vijay Abraham I (3):
ARM: dts: Add twl6030-usb data
ARM: dts: Add twl4030-usb data
ARM: dts: OMAP4: add *reg* property for ocp2scp
Lokesh Vutla (3):
ARM: dts: omap5-evm: Fix size of memory defined for EVM
ARM: dts: omap5: EMIF device tree data for OMAP5 boards
ARM: dts: omap5-evm: LPDDR2 memory device details for EVM
Philip, Avinash (1):
ARM: dts: AM33XX: Add SPI node
Ricardo Neri (2):
ARM: dts: omap4-panda: Add pinmux configuration for HDMI
ARM: dts: omap4-sdp: Add pinmux configuration for HDMI
Sebastien Guiriec (4):
ARM: dts: omap5: Update GPIO with address space and interrupts
ARM: dts: omap5: Update I2C with address space and interrupts
ARM: dts: omap5: Update UART with address space and interrupts
ARM: dts: omap5: Update MMC with address space and interrupts
Tony Lindgren (5):
Merge branch 'for_3.8/dts' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.8/dt
Merge branch 'dev-dt-timer' of github.com:jonhunter/linux into omap-for-v3.8/dt
Merge branch 'for_3.8/dts_part2' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.8/dt
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
.../devicetree/bindings/arm/omap/counter.txt | 15 ++
.../devicetree/bindings/arm/omap/timer.txt | 31 +++
.../devicetree/bindings/bus/omap-ocp2scp.txt | 18 ++
.../devicetree/bindings/i2c/trivial-devices.txt | 2 +
.../devicetree/bindings/usb/am33xx-usb.txt | 21 ++
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/am335x-bone.dts | 50 +++++
arch/arm/boot/dts/am335x-evm.dts | 118 ++++++++++
arch/arm/boot/dts/am335x-evmsk.dts | 250 +++++++++++++++++++++
arch/arm/boot/dts/am33xx.dtsi | 156 +++++++++++--
arch/arm/boot/dts/omap2.dtsi | 86 +++++++
arch/arm/boot/dts/omap2420.dtsi | 16 +-
arch/arm/boot/dts/omap2430.dtsi | 19 +-
arch/arm/boot/dts/omap3-beagle-xm.dts | 6 -
arch/arm/boot/dts/omap3-beagle.dts | 67 ++++++
arch/arm/boot/dts/omap3.dtsi | 107 ++++++++-
arch/arm/boot/dts/omap4-panda-a4.dts | 17 ++
.../dts/{omap4-pandaES.dts => omap4-panda-es.dts} | 9 +
arch/arm/boot/dts/omap4-panda.dts | 22 ++
arch/arm/boot/dts/omap4-sdp-es23plus.dts | 17 ++
arch/arm/boot/dts/omap4-sdp.dts | 22 ++
.../dts/{omap4-var_som.dts => omap4-var-som.dts} | 0
arch/arm/boot/dts/omap4.dtsi | 105 ++++++++-
arch/arm/boot/dts/omap5-evm.dts | 13 +-
arch/arm/boot/dts/omap5.dtsi | 178 ++++++++++++++-
arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 67 ++++++
arch/arm/boot/dts/twl4030.dtsi | 27 +++
arch/arm/boot/dts/twl6030.dtsi | 5 +
arch/arm/mach-omap2/board-generic.c | 17 ++
arch/arm/mach-omap2/timer.c | 203 ++++++++++++++---
arch/arm/plat-omap/dmtimer.c | 95 +++++++-
arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
32 files changed, 1675 insertions(+), 91 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/omap/counter.txt
create mode 100644 Documentation/devicetree/bindings/arm/omap/timer.txt
create mode 100644 arch/arm/boot/dts/am335x-evmsk.dts
create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
create mode 100644 arch/arm/boot/dts/omap4-panda-a4.dts
rename arch/arm/boot/dts/{omap4-pandaES.dts => omap4-panda-es.dts} (70%)
create mode 100644 arch/arm/boot/dts/omap4-sdp-es23plus.dts
rename arch/arm/boot/dts/{omap4-var_som.dts => omap4-var-som.dts} (100%)
create mode 100644 arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 4/6] omap pm updates for v3.8 merge window
[not found] <pull-1352828737-887235>
2012-11-13 19:07 ` [GIT PULL 2/6] omap prcm cleanup for v3.8 merge window, part2 Tony Lindgren
2012-11-13 19:10 ` [GIT PULL 3/6] omap device tree updates for v3.8 merge window Tony Lindgren
@ 2012-11-13 19:11 ` Tony Lindgren
2012-11-13 19:12 ` [GIT PULL 5/6] omap board changes " Tony Lindgren
` (2 subsequent siblings)
5 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 19:11 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/pm-signed
for you to fetch changes up to 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91:
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm (2012-11-06 17:06:37 -0800)
----------------------------------------------------------------
PM updates for omaps via Kevin Hilman <khilman@deeprootsystems.com>:
- Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
- OMAP: SmartReflex: pass device-independent data via platform_data
- OMAP voltage layer updates towards supporting auto-retention/auto-off
----------------------------------------------------------------
Jean Pihet (2):
ARM: OMAP: hwmod: align the SmartReflex fck names
ARM: OMAP: SmartReflex: pass device dependent data via platform data
Nishanth Menon (2):
ARM: OMAP2+: PM: VP: minor pr_warn updates
ARM: OMAP3+: PM: VP: use uV for max and min voltage limits
Tero Kristo (13):
ARM: OMAP: voltage: renamed vp_vddmin and vp_vddmax fields
ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains
ARM: OMAP3: VC: calculate ramp times
ARM: OMAP4: voltage: add support for VOLTSETUP_x_OFF register
ARM: OMAP4: VC: calculate ramp times
ARM: OMAP: add support for oscillator setup
ARM: OMAP3+: vp: use new vp_params for calculating vddmin and vddmax
ARM: OMAP3+: voltage: use oscillator data to calculate setup times
ARM: OMAP: TWL: change the vddmin / vddmax voltages to spec
ARM: OMAP3+: voltage: remove unused volt_setup_time parameter
ARM: OMAP4: vc: fix channel configuration
ARM: OMAP4: VC: setup I2C parameters based on board data
ARM: OMAP4: TWL: enable high speed mode for PMIC communication
Tony Lindgren (3):
Merge tag 'for_3.8-cleanup-pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm
Merge tag 'for_3.8-pm-sr' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm
Vishwanath Sripathy (1):
ARM: OMAP4: OPP: add OMAP4460 definitions
arch/arm/mach-omap2/clock33xx_data.c | 12 +-
arch/arm/mach-omap2/clock3xxx_data.c | 12 +-
arch/arm/mach-omap2/clock44xx_data.c | 6 +-
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 +-
arch/arm/mach-omap2/omap_opp_data.h | 9 +-
arch/arm/mach-omap2/omap_twl.c | 73 +----
arch/arm/mach-omap2/opp4xxx_data.c | 98 +++++-
arch/arm/mach-omap2/pm.c | 30 ++
arch/arm/mach-omap2/pm.h | 10 +
arch/arm/mach-omap2/sr_device.c | 13 +
arch/arm/mach-omap2/vc.c | 451 ++++++++++++++++++++++++--
arch/arm/mach-omap2/vc.h | 8 +-
arch/arm/mach-omap2/vc3xxx_data.c | 22 ++
arch/arm/mach-omap2/vc44xx_data.c | 28 ++
arch/arm/mach-omap2/voltage.h | 44 ++-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 5 +
arch/arm/mach-omap2/voltagedomains44xx_data.c | 23 +-
arch/arm/mach-omap2/vp.c | 19 +-
arch/arm/mach-omap2/vp.h | 7 +
arch/arm/mach-omap2/vp3xxx_data.c | 10 +
arch/arm/mach-omap2/vp44xx_data.c | 15 +
drivers/power/avs/smartreflex.c | 54 +--
include/linux/power/smartreflex.h | 14 +-
24 files changed, 792 insertions(+), 180 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 5/6] omap board changes for v3.8 merge window
[not found] <pull-1352828737-887235>
` (2 preceding siblings ...)
2012-11-13 19:11 ` [GIT PULL 4/6] omap pm " Tony Lindgren
@ 2012-11-13 19:12 ` Tony Lindgren
2012-11-13 19:13 ` [GIT PULL 6/6] omap gpmc " Tony Lindgren
2012-11-15 16:27 ` [GIT PULL 1/6] omap cleanup fixes " Arnd Bergmann
5 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 19:12 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/board-v2-signed
for you to fetch changes up to 0449410b0b8aeafa9b7e8bb719e4eeda8a5623fd:
ARM: OMAP1: use BUG_ON where possible (2012-11-12 15:20:44 -0800)
----------------------------------------------------------------
Board updates for omaps mostly to deal with enabling
display support with device tree until the bindings
are ready.
----------------------------------------------------------------
Pavel Machek (1):
ARM: OMAP2+: Nokia N9/N900/N950 -- mention product names
Sasha Levin (1):
ARM: OMAP1: use BUG_ON where possible
Tomi Valkeinen (3):
OMAP: panda: move display init from board file to dss-common.c
OMAP: omap4sdp: move display init from board file to dss-common.c
OMAP: board-generic: enable DSS for panda & sdp boards
arch/arm/mach-omap1/board-fsample.c | 3 +-
arch/arm/mach-omap1/board-h2.c | 3 +-
arch/arm/mach-omap1/board-h3.c | 3 +-
arch/arm/mach-omap1/board-perseus2.c | 3 +-
arch/arm/mach-omap2/Kconfig | 4 +-
arch/arm/mach-omap2/Makefile | 2 +-
arch/arm/mach-omap2/board-4430sdp.c | 157 +------------------
arch/arm/mach-omap2/board-generic.c | 10 ++
arch/arm/mach-omap2/board-omap4panda.c | 68 +-------
arch/arm/mach-omap2/board-rm680.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/dss-common.c | 276 +++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/dss-common.h | 14 ++
13 files changed, 311 insertions(+), 236 deletions(-)
create mode 100644 arch/arm/mach-omap2/dss-common.c
create mode 100644 arch/arm/mach-omap2/dss-common.h
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 6/6] omap gpmc changes for v3.8 merge window
[not found] <pull-1352828737-887235>
` (3 preceding siblings ...)
2012-11-13 19:12 ` [GIT PULL 5/6] omap board changes " Tony Lindgren
@ 2012-11-13 19:13 ` Tony Lindgren
2012-11-15 16:27 ` [GIT PULL 1/6] omap cleanup fixes " Arnd Bergmann
5 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 19:13 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
The following changes since commit 6ba54ab4a49bbad736b0254aa6bdf0cb83013815:
ARM: OMAP: Remove omap_init_consistent_dma_size() (2012-11-06 16:01:19 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/gpmc-signed
for you to fetch changes up to 86983087096c072214a229ccad614536d55e483f:
Merge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/gpmc (2012-11-12 15:28:11 -0800)
----------------------------------------------------------------
omap GPMC (General Purpose Memory Controller) updates via Afzal Mohammed <afzal@ti.com>:
These changes provide a generic gpmc timing calculation method,
migrates existing peripherals that makes use of custom gpmc timing
calculation method to use the new generic one.
The generic timing routine has been tested with onenand, smsc911x,
and tusb6010 devices connected to GPMC in addition to simulating
other devices support in the mainline kernel.
----------------------------------------------------------------
Afzal Mohammed (6):
ARM: OMAP2+: nand: remove redundant rounding
ARM: OMAP2+: gpmc: handle additional timings
ARM: OMAP2+: gpmc: generic timing calculation
ARM: OMAP2+: onenand: generic timing calculation
ARM: OMAP2+: smc91x: generic timing calculation
ARM: OMAP2+: tusb6010: generic timing calculation
Tony Lindgren (1):
Merge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/gpmc
Documentation/bus-devices/ti-gpmc.txt | 122 +++++++++++
arch/arm/mach-omap2/gpmc-nand.c | 26 +--
arch/arm/mach-omap2/gpmc-onenand.c | 143 ++++---------
arch/arm/mach-omap2/gpmc-smc91x.c | 43 ++--
arch/arm/mach-omap2/gpmc.c | 373 ++++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/gpmc.h | 113 ++++++++--
arch/arm/mach-omap2/usb-tusb6010.c | 181 ++++-------------
7 files changed, 709 insertions(+), 292 deletions(-)
create mode 100644 Documentation/bus-devices/ti-gpmc.txt
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
[not found] <pull-1352828737-887235>
` (4 preceding siblings ...)
2012-11-13 19:13 ` [GIT PULL 6/6] omap gpmc " Tony Lindgren
@ 2012-11-15 16:27 ` Arnd Bergmann
5 siblings, 0 replies; 11+ messages in thread
From: Arnd Bergmann @ 2012-11-15 16:27 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Olof Johansson, linux-arm-kernel, linux-omap
On Tuesday 13 November 2012, Tony Lindgren wrote:
> The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
>
> Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-fixes-signed
Pulled all six branches from this series, thanks!
I'll have a look at the other five next, but might not get to that today.
Arnd
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
2012-11-13 17:44 ` Tony Lindgren
@ 2012-11-13 19:03 ` Tony Lindgren
0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 19:03 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
* Tony Lindgren <tony@atomide.com> [121113 09:46]:
> * Tony Lindgren <tony@atomide.com> [121112 17:07]:
> > * Tony Lindgren <ton@atomide.com> [121112 17:01]:
Ah, I have a typo ^^^ in my script..
> Hmm looks like requests 2 - 6 never made it to the lists
> for whatever reason. I'll resend these, no changes have been
> made to the pull requests.
..which probably causes the rest of the thread to be blocked
by the mailing lists. I'll post the missing pull requests
manually to the second attempt which also has the typo in
the first message. Sorry for the spam.
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
@ 2012-11-13 17:45 Tony Lindgren
0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 17:45 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-arm-kernel, linux-omap
The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-fixes-signed
for you to fetch changes up to e05cf58d50e3ce3601ebf753728eee0df759e38f:
ARM: OMAP2+: remove duplicated include from board-overo.c (2012-11-12 14:02:48 -0800)
----------------------------------------------------------------
Minor fixes to the clean-up done for ARM common multi-platform
support for omaps.
----------------------------------------------------------------
Benoit Cousson (1):
ARM: OMAP: debug-leds: Use resource_size instead of hard coded macro
Wei Yongjun (1):
ARM: OMAP2+: remove duplicated include from board-overo.c
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/plat-omap/debug-leds.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
2012-11-13 1:05 ` Tony Lindgren
@ 2012-11-13 17:44 ` Tony Lindgren
2012-11-13 19:03 ` Tony Lindgren
0 siblings, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 17:44 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
* Tony Lindgren <tony@atomide.com> [121112 17:07]:
> * Tony Lindgren <ton@atomide.com> [121112 17:01]:
> > The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
> >
> > Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-fixes-signed
> >
> > for you to fetch changes up to e05cf58d50e3ce3601ebf753728eee0df759e38f:
> >
> > ARM: OMAP2+: remove duplicated include from board-overo.c (2012-11-12 14:02:48 -0800)
> >
> > ----------------------------------------------------------------
> > Minor fixes to the clean-up done for ARM common multi-platform
> > support for omaps.
>
> FYI, some of the pull requests after this one may break
> compile for omap2plus_defconfig when merging them in.
>
> I suggest you pull requests 2 - 6 with --no-commit option and
> make sure it builds after each pull if you have a chance.
> Or I can follow up with fixes if needed.
>
> If in doubt, I've pushded omap-for-v3.8/tmp-merge that's a
> merge of v3.7-rc5 + recently pulled omap fixes + these pull
> requests merged together for reference.
Hmm looks like requests 2 - 6 never made it to the lists
for whatever reason. I'll resend these, no changes have been
made to the pull requests.
Regards,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
[not found] <pull-1352768345-815774>
@ 2012-11-13 1:05 ` Tony Lindgren
2012-11-13 17:44 ` Tony Lindgren
0 siblings, 1 reply; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 1:05 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-arm-kernel, linux-omap
* Tony Lindgren <ton@atomide.com> [121112 17:01]:
> The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
>
> Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-fixes-signed
>
> for you to fetch changes up to e05cf58d50e3ce3601ebf753728eee0df759e38f:
>
> ARM: OMAP2+: remove duplicated include from board-overo.c (2012-11-12 14:02:48 -0800)
>
> ----------------------------------------------------------------
> Minor fixes to the clean-up done for ARM common multi-platform
> support for omaps.
FYI, some of the pull requests after this one may break
compile for omap2plus_defconfig when merging them in.
I suggest you pull requests 2 - 6 with --no-commit option and
make sure it builds after each pull if you have a chance.
Or I can follow up with fixes if needed.
If in doubt, I've pushded omap-for-v3.8/tmp-merge that's a
merge of v3.7-rc5 + recently pulled omap fixes + these pull
requests merged together for reference.
Cheers,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
* [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
@ 2012-11-13 0:59 Tony Lindgren
0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2012-11-13 0:59 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-arm-kernel, linux-omap
The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-fixes-signed
for you to fetch changes up to e05cf58d50e3ce3601ebf753728eee0df759e38f:
ARM: OMAP2+: remove duplicated include from board-overo.c (2012-11-12 14:02:48 -0800)
----------------------------------------------------------------
Minor fixes to the clean-up done for ARM common multi-platform
support for omaps.
----------------------------------------------------------------
Benoit Cousson (1):
ARM: OMAP: debug-leds: Use resource_size instead of hard coded macro
Wei Yongjun (1):
ARM: OMAP2+: remove duplicated include from board-overo.c
arch/arm/mach-omap2/board-overo.c | 1 -
arch/arm/plat-omap/debug-leds.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2012-11-15 16:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <pull-1352828737-887235>
2012-11-13 19:07 ` [GIT PULL 2/6] omap prcm cleanup for v3.8 merge window, part2 Tony Lindgren
2012-11-13 19:10 ` [GIT PULL 3/6] omap device tree updates for v3.8 merge window Tony Lindgren
2012-11-13 19:11 ` [GIT PULL 4/6] omap pm " Tony Lindgren
2012-11-13 19:12 ` [GIT PULL 5/6] omap board changes " Tony Lindgren
2012-11-13 19:13 ` [GIT PULL 6/6] omap gpmc " Tony Lindgren
2012-11-15 16:27 ` [GIT PULL 1/6] omap cleanup fixes " Arnd Bergmann
2012-11-13 17:45 Tony Lindgren
[not found] <pull-1352768345-815774>
2012-11-13 1:05 ` Tony Lindgren
2012-11-13 17:44 ` Tony Lindgren
2012-11-13 19:03 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-11-13 0:59 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).