* [GIT PULL 1/5] ARM: arm-soc: device tree conversions and enablement
2012-12-13 1:55 [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests Olof Johansson
@ 2012-12-13 1:56 ` Olof Johansson
2012-12-13 1:56 ` [GIT PULL 2/5] ARM: arm-soc: multiplatform conversion patches Olof Johansson
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-12-13 1:56 UTC (permalink / raw)
To: linux-arm-kernel
Continued device tree conversion and enablement across a number of
platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
smaller series as well.
ux500 has seen continued conversion for platforms. Several platforms have
seen pinctrl-via-devicetree conversions for simpler multiplatform. Tegra
is adding data for new devices/drivers, and Exynos has a bunch of new
bindings and devices added as well.
So, pretty much the same progression in the right direction as the last
few releases.
Conflicts seen with this merge:
arch/arm/Kconfig:
Add/add. Keep both.
arch/arm/boot/dts/Makefile:
For the exynos entries, add 4412-smdk and 5250-snow to the HEAD version.
For highbank, keep the new version with two entries.
arch/arm/boot/dts/at91sam9263.dtsi:
arch/arm/boot/dts/at91sam9g45.dtsi:
arch/arm/boot/dts/dbx5x0.dtsi:
arch/arm/boot/dts/imx51.dtsi:
Add/add. Keep both and terminate properly
arch/arm/boot/dts/imx6q.dtsi:
Keep the name with the prefix from the branch, but the new properties
from HEAD.
arch/arm/boot/dts/snowball.dts:
arch/arm/mach-exynos/mach-exynos4-dt.c:
Add/add. Keep both
arch/arm/mach-kirkwood/board-lsxl.c
Take out linux/gpio.h include.
arch/arm/mach-ux500/cpu-db8500.c:
Keep linux/random.h from HEAD version, take out plat/gpio-nomadik.h from the
branch version but keep the rest from there.
Remove the cpufreq platform device registration.
drivers/clk/Makefile:
Add/add. Keep both.
drivers/usb/host/ehci-orion.c:
__dev* removal conflict. Keep branch version, remove annotation.
----------------------------------------------------------------
The following changes since commit cf4af01221579a4e895f43dbfc47598fbfc5a731:
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/dt
for you to fetch changes up to 64507dd7028e3e0145077e73b8374bd75aea117c:
Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
----------------------------------------------------------------
Alban Bedel (1):
ARM: LPC32xx: Add the motor PWM to base dts file
Amit Daniel Kachhap (2):
ARM: EXYNOS: Add devicetree node for TMU driver for exynos4
ARM: EXYNOS: Add devicetree node for TMU driver for exynos5
Andrew Lunn (21):
ARM: Kirkwood: ehci-orion: Add device tree binding
ARM: Kirkwood: Convert all DT boards to EHCI via DT.
ARM: Kirkwood: Convert DNSKW to use gpio-poweroff.
ARM: Kirkwood: Convert IB62x0 to use gpio-poweroff.
ARM: Kirkwood: Enable regulator and fixed regulators.
ARM: Kirkwood: Convert DNSKW to use regulators
ARM: Kirkwood: Convert Dockstar to use regulators
ARM: Kirkwood: Convert GoFlexNet to use regulators
ARM: Kirkwood: Convert LSXL to use regulators
GPIO: mvebu: Allow all plat-orion platforms.
ARM: Kirkwood: Make use of mvebu pincltl and gpio drivers
ARM: Kirkwood: Add DTSI files for pinctrl
ARM: Kirkwood: Convert TS219 to pinctrl.
ARM: Kirkwood: Convert iConnect to pinctrl.
ARM: Kirkwood: Convert dnskw to pinctrl
ARM: Kirkwood: Convert dockstar to pinctrl.
ARM: Kirkwood: Convert dreamplug to pinctrl.
ARM: Kirkwood: Convert GoFlex Net to pinctrl.
ARM: Kirkwood: Convert ib62x0 to pinctrl.
ARM: Kirkwood: Convert lsxl boards to pinctrl.
ARM: Kirkwood: Convert IX2-200 to pinctrl.
Arnd Bergmann (8):
Merge branch 'omap/headers4' into next/dt
Merge tag 'omap-for-v3.8/dt-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/dt From Tony Lindgren <tony@atomide.com>:
Merge branch 'omap/cleanup-prcm-part2' into next/dt
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/dt
Merge tag 'mxs-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge tag 'imx-dt-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Arun Kumar K (1):
ARM: EXYNOS: Add MFC device tree support
Axel Lin (1):
pinctrl: mvebu: Fix dove_audio1_ctrl_set function
Doug Anderson (3):
ARM: dts: Move the dwmmc aliases from smdk5250 dts to exynos
ARM: dts: Add board dts file for Snow board (ARM Chromebook)
ARM: dts: Add aliases for i2c controller for exynos4
Fabio Baltieri (1):
ARM: dts: add missing ux500 device trees
Fabio Estevam (7):
ARM: dts: imx28-evk: Use pinctrl for gpio-led
ARM: dts: imx23-olinuxino: Remove unneeded "default-on"
ARM: dts: imx23-olinuxino: Use pinctrl for gpio-led
ARM: dts: imx53-qsb: Use pinctrl for gpio-led
ARM: dts: imx53-qsb: Make DA9053 regulator functional
ARM: dts: imx6q-sabreauto: Add basic support
ARM: mxs_defconfig: Improve USB related support
Fabio Porcedda (4):
ARM: at91: dt: evk-pro3: enable uart0 and uart2
watchdog: at91sam9_wdt: add device tree support
ARM: at91/dts: add at91sam9_wdt driver to at91sam926x, at91sam9g45
ARM: at91/dts: evk-pro3: enable watchdog
Fadil Berisha (1):
ARM: imx23-olinuxino: Add spi support
Gwenhael Goavec-Merou (5):
ARM: mxs: Add support for the Armadeus Systems APF28Dev docking board
ARM: dts: mxs: Add 16 bits LCD screen muxing options for I.MX28
ARM: mxs: apf28dev: Add pinctrl and gpios
ARM: mxs: apf28dev: Add LCD and backlight support
ARM: mxs: apf28dev: Add I2C and SPI support
Jamie Lentin (2):
ARM: kirkwood: Increase NAND chip-delay for DNS-32[05]
power: Add simple poweroff-gpio driver
Jason Cooper (2):
Merge commit '06763c7' into orion/dt2
ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
Josh Cartwright (6):
ARM: zynq: move arm-specific sys_timer out of ttc
ARM: zynq: dts: add description of the second uart
ARM: zynq: dts: split up device tree
clk: Add support for fundamental zynq clks
ARM: zynq: use zynq clk bindings
ARM: zynq: add clk binding support to the ttc
Julien Boibessot (2):
ARM: mxs: Add support for the Armadeus Systems APF28 module
ARM: dts: mxs: Add PWM3 muxing options for i.MX28
Kukjin Kim (2):
Merge branch 'next/pinctrl-samsung' into next/dt-exynos4x12
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
Laxman Dewangan (3):
ARM: tegra: dts: add slink controller dt entry
ARM: tegra: dts: cardhu: enable SLINK4
ARM: tegra: dts: add sflash controller dt entry
Lee Jones (42):
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Fix initialisation order for UIBs
ARM: ux500: Elaborate on SDI device node names in Device Tree
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Correct Snowball's external SD/MMC slot's bus width
ARM: ux500: Create a DTS hierarchy for ST-Ericsson's HREF boards
ARM: ux500: Create a Device Tree for early HREFs
ARM: ux500: Add support for gpio-keys and Proximity Sensor for HREF
ARM: ux500: Remove platform specific device registration when DT is enabled
ARM: ux500: Move all Device Tree booting into cpu-db8500
ARM: ux500: Strip out duplicate touch screen platform information
Documentation: Detail permitted DT properties for the BU21013 Touch Screen
ARM: ux500: Create a new Device Tree include file for boards supporting STUIBs
ARM: ux500: Stop calling the UIB init function when using Device Tree
ARM: ux500: Add all bu21013 touch screen components to supported Device Trees
ARM: ux500: Stop informing the regulator subsystem that we have full constraints
ARM: ux500: Apply a Device Tree node for the STMPE MFD
ARM: ux500: Supply the STMPE keypad Device Tree node to the STUIB DT
ARM: ux500: Remove unused board compatible string
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add support for ST-Ericsson's u9540 SoC
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Rename references to the ccu9540 dev board accordingly
ARM: ux500: Remove duplicate DT_MACHINE_START - make u8500 for generic
ARM: ux500: List DT compatibility using platform names rather than by board
ARM: ux500: Add node for the MMC GPIO regulator
ARM: ux500: Change the type of interrupt to something compatible
ARM: ux500: CONFIG: Enable GPIO Regulators
ARM: ux500: Convert DT_MACHINE_START to use SMP operations
ARM: ux500: Move regulator-name properties out to board DTS files
ARM: ux500: Add SDI (MMC) support to the HREF Device Tree
ARM: ux500: Add skeleton DTS file for the u9540
ARM: ux500: Add UART support to the u9540 Device Tree
ARM: ux500: Enable SDI4 port on the u9540 when booting with Device Tree
ARM: ux500: Enable all MMC devices on the u9540 when booting with DT
ARM: ux500: Describe UART platform registering issues more accurately
ARM: ux500: Disable the MMCI gpio-regulator by default
ARM: ux500: Move board specific GPIO info out to subordinate DTS files
ARM: ux500: Stop registering the PCM driver from platform code
ARM: ux500: Rename dbx500 cpufreq code to be more generic
Liu Ying (1):
ARM: dts: imx6q-sabresd: add volume up/down gpio keys
Marek Vasut (2):
ARM: mx28: Skip OCOTP FEC MAC setup if in DT
ARM: mxs: Add SchulerControl SPS1 DTS file
Mark Zhang (1):
ARM: dt: tegra: ventana: define pinmux for ddc
Maxime Ripard (5):
ARM: dts: cfa10049: Add FEC to the CFA-10049 expansion board
ARM: dts: cfa10049: Add the DH2228FV DAC to the DTS
ARM: dts: cfa10036: Use pinctrl for power led
ARM: dts: mxs: Add hog pins to Crystalfontz boards
ARM: dts: mxs: add oled support for the cfa-10036
Nick Bowler (1):
ARM: zynq: Allow UART1 to be used as DEBUG_LL console.
Nobuhiro Iwamatsu (5):
ARM: kirkwood: Add support DT of second I2C bus
ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
ARM: Kirkwood: Add support LED of OpenBlocks A6
Olof Johansson (15):
Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
Merge tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
ARM: davinci: move dtb targets to common location
Merge tag 'at91-for-next-dt' of git://github.com/at91linux/linux-at91 into next/dt
Merge tag 'tegra-for-3.8-dt' of git://git.kernel.org/.../swarren/linux-tegra into next/dt
Merge tag 'lpc32xx-dts-for-3.7' of git://git.antcom.de/linux-2.6 into next/dt
Merge branch 'ste-dt-for-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt
ARM: EXYNOS: add all i2c busses to auxdata for DT
Merge branch 'next/hdmi-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
Merge branch 'next/dt-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
Merge tag 'mxs-dt-3.8-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt
Merge branch 'next/dt-samsung-2' of git://git.kernel.org/.../kgene/linux-samsung into next/dt
Merge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux into next/dt
Merge branch 'orion/cleanup' into orion/dt
Merge branch 'orion/dt' into next/dt
Philippe Reynes (1):
Add device tree file for the armadeus apf27
Rahul Sharma (6):
ARM: dts: add device tree support for exynos5 hdmi
ARM: dts: add device tree support for exynos5 mixer
ARM: dts: add device tree support for exynos5 hdmiphy
ARM: dts: add device tree support for exynos5 hdmiddc
ARM: EXYNOS: add clocks for exynos5 hdmi
ARM: EXYNOS: removing exynos-drm device registration from non-dt platforms
Roland Stigge (1):
ARM: dts: imx53: pinctl update
Sascha Hauer (7):
Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt
ARM i.MX25: Add missing clock gates
ARM i.MX25: Add devicetree support
ARM i.MX25: Add devicetree
ARM i.MX: Add Ka-Ro TX25 devicetree
ARM i.MX dtsi: Add default bus-width property for esdhc controller
ARM i.MX dts: Consistently add labels to devicenodes
Sebastian Hesselbarth (3):
pinctrl: mvebu: fix iomem pointer for dove pinctrl
ARM: Dove: Convert to DT GPIO and pinctrl
ARM: Dove: Add CuBox pinhog for led
Shawn Guo (5):
ARM: imx6q: let users input debug uart port number
ARM: dts: imx6q: enable snvs lp rtc
ARM: imx: enable cpufreq for imx6q
ARM: imx6q: print silicon version on boot
ARM: imx6q: select ARM and PL310 errata
Stanislav Meduna (1):
ARM: mxs: Setup scheduler clock
Stefan Peter (1):
ARM: kirkwood: Convert mplcec4 board to pinctrl
Stephen Warren (3):
ARM: tegra: trimslice: enable SPI flash
ARM: tegra: harmony: enable HDMI port
ARM: tegra: whistler: enable HDMI port
Thierry Reding (11):
ARM: tegra: tamonten: Add DDC/PTA pinmux
ARM: tegra: tec: Remove redundant DT properties
ARM: tegra: harmony: Add ADT7641 temperature sensor
ARM: tegra: tamonten: Add NCT1008 temperature sensor
ARM: tegra: ventana: Add NCT1008 temperature sensor
ARM: tegra: Add Tegra20 host1x support
ARM: tegra: Add Tegra30 host1x support
ARM: tegra: trimslice: enable HDMI port
ARM: tegra: tamonten: Add host1x support
ARM: tegra: plutux: Enable HDMI output
ARM: tegra: tec: Enable HDMI output
Thomas Abraham (1):
ARM: dts: add board dts file for EXYNOS4412 based SMDK board
Tomasz Figa (20):
ARM: dts: Enable serial controllers on Origen and SMDKV310
ARM: dts: Add support for EXYNOS4X12 SoCs
ARM: EXYNOS: Skip wakeup-int setup if pinctrl driver is used on EXYNOS4X12
gpio: samsung: Skip registration if pinctrl driver is present on EXYNOS4X12
ARM: dts: Add nodes for pin controllers for exynos4x12
ARM: dts: Update for pinctrl-samsung driver for exynos4210-trats
ARM: dts: Add nodes for GPIO keys available on Trats
ARM: dts: Add node for i2c3 bus for exynos4210-trats
ARM: dts: Add node for touchscreen voltage regulator for exynos4210-trats
ARM: dts: Add node for touchscreen for exynos4210-trats
ARM: dts: Remove broken-voltage property from sdhci node for exynos4210-trats
ARM: dts: Split memory sections for exynos4210-origen
ARM: dts: Update for pinctrl-samsung driver for exynos4210-origen
ARM: dts: Update sdhci nodes for current bindings for exynos4210-origen
ARM: dts: Add vmmc fixed voltage regulator for exynos4210-origen
ARM: EXYNOS: Detect power domain state on registration from DT
ARM: EXYNOS: Fix power domain name initialization
ARM: EXYNOS: Bind devices to power domains using DT
ARM: dts: Set up power domains for exynos4
ARM: dts: Use drive strength 3 for SD pins for exynos4
Valentin Longchamp (2):
ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
ARM: Kirkwood: Convert km_kirkwood to pinctrl
Vasanth Ananthan (1):
ARM: EXYNOS: DT Support for SATA and SATA PHY
Wei Ni (3):
ARM: dt: t20 seaboard: turn on the power for wlan
ARM: dt: t20 ventana: set pinmux and power for wlan
ARM: dt: t30 cardhu: set pinmux and power for wlan
.../bindings/arm/exynos/power_domain.txt | 15 +-
Documentation/devicetree/bindings/arm/fsl.txt | 4 +
.../devicetree/bindings/ata/exynos-sata-phy.txt | 14 +
.../devicetree/bindings/ata/exynos-sata.txt | 17 +
.../devicetree/bindings/clock/imx25-clock.txt | 162 ++++
.../devicetree/bindings/clock/zynq-7000.txt | 55 ++
.../devicetree/bindings/drm/exynos/hdmi.txt | 22 +
.../devicetree/bindings/drm/exynos/hdmiddc.txt | 12 +
.../devicetree/bindings/drm/exynos/hdmiphy.txt | 12 +
.../devicetree/bindings/drm/exynos/mixer.txt | 15 +
.../devicetree/bindings/gpio/gpio-poweroff.txt | 22 +
.../bindings/input/touchscreen/bu21013.txt | 28 +
.../devicetree/bindings/media/s5p-mfc.txt | 23 +
.../pinctrl/marvell,kirkwood-pinctrl.txt | 39 +
.../devicetree/bindings/usb/ehci-orion.txt | 15 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
.../devicetree/bindings/watchdog/atmel-wdt.txt | 15 +
arch/arm/Kconfig | 6 +
arch/arm/Kconfig.debug | 43 +-
arch/arm/boot/dts/Makefile | 14 +-
arch/arm/boot/dts/at91sam9260.dtsi | 6 +
arch/arm/boot/dts/at91sam9263.dtsi | 5 +
arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
arch/arm/boot/dts/ccu9540.dts | 72 ++
arch/arm/boot/dts/cros5250-common.dtsi | 184 ++++
arch/arm/boot/dts/dbx5x0.dtsi | 56 +-
arch/arm/boot/dts/dove-cubox.dts | 10 +
arch/arm/boot/dts/dove.dtsi | 19 +-
arch/arm/boot/dts/evk-pro3.dts | 12 +
arch/arm/boot/dts/exynos4.dtsi | 54 +-
arch/arm/boot/dts/exynos4210-origen.dts | 70 +-
arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 56 +-
arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 +
arch/arm/boot/dts/exynos4210-trats.dts | 87 +-
arch/arm/boot/dts/exynos4210.dtsi | 12 +
arch/arm/boot/dts/exynos4212.dtsi | 28 +
arch/arm/boot/dts/exynos4412-smdk4412.dts | 45 +
arch/arm/boot/dts/exynos4412.dtsi | 28 +
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 965 +++++++++++++++++++
arch/arm/boot/dts/exynos4x12.dtsi | 69 ++
arch/arm/boot/dts/exynos5250-smdk5250.dts | 56 +-
arch/arm/boot/dts/exynos5250-snow.dts | 43 +
arch/arm/boot/dts/exynos5250.dtsi | 62 +-
arch/arm/boot/dts/href.dtsi | 273 ++++++
arch/arm/boot/dts/hrefprev60.dts | 48 +
arch/arm/boot/dts/hrefv60plus.dts | 217 ++++-
arch/arm/boot/dts/imx23-olinuxino.dts | 23 +-
arch/arm/boot/dts/imx23.dtsi | 13 +
arch/arm/boot/dts/imx25-karo-tx25.dts | 44 +
arch/arm/boot/dts/imx25.dtsi | 515 ++++++++++
arch/arm/boot/dts/imx27-apf27.dts | 89 ++
arch/arm/boot/dts/imx27.dtsi | 5 +-
arch/arm/boot/dts/imx28-apf28.dts | 85 ++
arch/arm/boot/dts/imx28-apf28dev.dts | 154 +++
arch/arm/boot/dts/imx28-cfa10036.dts | 46 +
arch/arm/boot/dts/imx28-cfa10049.dts | 33 +
arch/arm/boot/dts/imx28-evk.dts | 13 +-
arch/arm/boot/dts/imx28-sps1.dts | 169 ++++
arch/arm/boot/dts/imx28.dtsi | 35 +
arch/arm/boot/dts/imx51.dtsi | 43 +-
arch/arm/boot/dts/imx53-qsb.dts | 62 +-
arch/arm/boot/dts/imx53.dtsi | 92 +-
arch/arm/boot/dts/imx6q-sabreauto.dts | 64 ++
arch/arm/boot/dts/imx6q-sabresd.dts | 18 +
arch/arm/boot/dts/imx6q.dtsi | 114 ++-
arch/arm/boot/dts/kirkwood-6281.dtsi | 44 +
arch/arm/boot/dts/kirkwood-6282.dtsi | 45 +
arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 31 +
arch/arm/boot/dts/kirkwood-dnskw.dtsi | 140 +++
arch/arm/boot/dts/kirkwood-dockstar.dts | 37 +
arch/arm/boot/dts/kirkwood-dreamplug.dts | 21 +
arch/arm/boot/dts/kirkwood-goflexnet.dts | 73 ++
arch/arm/boot/dts/kirkwood-ib62x0.dts | 40 +
arch/arm/boot/dts/kirkwood-iconnect.dts | 51 +
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 89 ++
arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 17 +
arch/arm/boot/dts/kirkwood-lsxl.dtsi | 95 ++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 59 ++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 59 ++
arch/arm/boot/dts/kirkwood-ts219-6281.dts | 31 +
arch/arm/boot/dts/kirkwood-ts219-6282.dts | 31 +
arch/arm/boot/dts/kirkwood.dtsi | 17 +-
arch/arm/boot/dts/lpc32xx.dtsi | 7 +
arch/arm/boot/dts/snowball.dts | 140 ++-
arch/arm/boot/dts/stuib.dtsi | 78 ++
arch/arm/boot/dts/tegra20-harmony.dts | 25 +-
arch/arm/boot/dts/tegra20-plutux.dts | 6 +
arch/arm/boot/dts/tegra20-seaboard.dts | 6 +
arch/arm/boot/dts/tegra20-tamonten.dtsi | 88 +-
arch/arm/boot/dts/tegra20-tec.dts | 9 +-
arch/arm/boot/dts/tegra20-trimslice.dts | 54 +-
arch/arm/boot/dts/tegra20-ventana.dts | 90 +-
arch/arm/boot/dts/tegra20-whistler.dts | 21 +-
arch/arm/boot/dts/tegra20.dtsi | 137 +++
arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 +
arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 +
arch/arm/boot/dts/tegra30-cardhu.dtsi | 37 +
arch/arm/boot/dts/tegra30.dtsi | 147 +++
arch/arm/boot/dts/u9540.dts | 72 ++
arch/arm/boot/dts/zynq-7000.dtsi | 166 ++++
arch/arm/boot/dts/zynq-ep107.dts | 63 --
arch/arm/boot/dts/zynq-zc702.dts | 44 +
arch/arm/configs/mxs_defconfig | 6 +
arch/arm/configs/u8500_defconfig | 1 +
arch/arm/include/debug/imx.S | 20 +-
arch/arm/mach-davinci/Makefile.boot | 2 -
arch/arm/mach-exynos/Kconfig | 1 +
arch/arm/mach-exynos/Makefile | 1 -
arch/arm/mach-exynos/clock-exynos4.c | 4 +
arch/arm/mach-exynos/clock-exynos5.c | 21 +-
arch/arm/mach-exynos/common.c | 7 +-
arch/arm/mach-exynos/dev-drm.c | 29 -
arch/arm/mach-exynos/include/mach/irqs.h | 3 +
arch/arm/mach-exynos/include/mach/map.h | 2 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 4 +
arch/arm/mach-exynos/mach-exynos5-dt.c | 42 +
arch/arm/mach-exynos/mach-nuri.c | 3 -
arch/arm/mach-exynos/mach-origen.c | 3 -
arch/arm/mach-exynos/mach-smdk4x12.c | 3 -
arch/arm/mach-exynos/mach-smdkv310.c | 3 -
arch/arm/mach-exynos/mach-universal_c210.c | 3 -
arch/arm/mach-exynos/pm_domains.c | 93 +-
arch/arm/mach-imx/Kconfig | 18 +
arch/arm/mach-imx/Makefile | 1 +
arch/arm/mach-imx/clk-imx25.c | 119 ++-
arch/arm/mach-imx/clk-imx6q.c | 1 +
arch/arm/mach-imx/common.h | 1 +
arch/arm/mach-imx/imx25-dt.c | 48 +
arch/arm/mach-imx/lluart.c | 28 +-
arch/arm/mach-imx/mach-imx6q.c | 35 +
arch/arm/mach-imx/mx6q.h | 4 -
arch/arm/mach-kirkwood/Kconfig | 5 +
arch/arm/mach-kirkwood/board-dnskw.c | 54 --
arch/arm/mach-kirkwood/board-dockstar.c | 16 -
arch/arm/mach-kirkwood/board-dreamplug.c | 15 -
arch/arm/mach-kirkwood/board-goflexnet.c | 24 -
arch/arm/mach-kirkwood/board-ib62x0.c | 35 -
arch/arm/mach-kirkwood/board-iconnect.c | 18 -
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 26 -
arch/arm/mach-kirkwood/board-km_kirkwood.c | 13 -
arch/arm/mach-kirkwood/board-lsxl.c | 28 -
arch/arm/mach-kirkwood/board-mplcec4.c | 36 -
arch/arm/mach-kirkwood/board-ns2.c | 1 -
arch/arm/mach-kirkwood/board-nsa310.c | 4 -
arch/arm/mach-kirkwood/board-openblocks_a6.c | 5 +-
arch/arm/mach-kirkwood/board-ts219.c | 26 -
arch/arm/mach-kirkwood/board-usi_topkick.c | 1 -
arch/arm/mach-mxs/mach-mxs.c | 56 ++
arch/arm/mach-mxs/timer.c | 10 +-
arch/arm/mach-ux500/board-mop500-audio.c | 16 -
arch/arm/mach-ux500/board-mop500-stuib.c | 22 +-
arch/arm/mach-ux500/board-mop500.c | 146 +--
arch/arm/mach-ux500/board-mop500.h | 10 +-
arch/arm/mach-ux500/cpu-db8500.c | 110 ++-
arch/arm/mach-ux500/cpu.c | 3 +
arch/arm/mach-zynq/common.c | 33 +-
arch/arm/mach-zynq/common.h | 4 +-
arch/arm/mach-zynq/include/mach/zynq_soc.h | 16 +-
arch/arm/mach-zynq/timer.c | 297 +++---
arch/arm/plat-orion/irq.c | 6 +-
arch/arm/plat-samsung/devs.c | 1 +
arch/arm/plat-samsung/include/plat/devs.h | 2 -
arch/arm/plat-samsung/include/plat/mfc.h | 11 +
arch/arm/plat-samsung/s5p-dev-mfc.c | 34 +
drivers/clk/Makefile | 1 +
drivers/clk/clk-zynq.c | 383 ++++++++
drivers/gpio/Kconfig | 2 +-
drivers/gpio/gpio-samsung.c | 43 +-
drivers/pinctrl/mvebu/pinctrl-dove.c | 22 +-
drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 568 +++++------
drivers/power/Kconfig | 3 +
drivers/power/Makefile | 1 +
drivers/power/reset/Kconfig | 15 +
drivers/power/reset/Makefile | 1 +
drivers/power/reset/gpio-poweroff.c | 129 +++
drivers/usb/host/ehci-orion.c | 38 +-
drivers/watchdog/at91sam9_wdt.c | 11 +
include/linux/clk/zynq.h | 24 +
178 files changed, 8119 insertions(+), 1443 deletions(-)
create mode 100644 Documentation/devicetree/bindings/ata/exynos-sata-phy.txt
create mode 100644 Documentation/devicetree/bindings/ata/exynos-sata.txt
create mode 100644 Documentation/devicetree/bindings/clock/imx25-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/zynq-7000.txt
create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmi.txt
create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt
create mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt
create mode 100644 Documentation/devicetree/bindings/drm/exynos/mixer.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-poweroff.txt
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
create mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt
create mode 100644 Documentation/devicetree/bindings/usb/ehci-orion.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-wdt.txt
create mode 100644 arch/arm/boot/dts/ccu9540.dts
create mode 100644 arch/arm/boot/dts/cros5250-common.dtsi
create mode 100644 arch/arm/boot/dts/exynos4212.dtsi
create mode 100644 arch/arm/boot/dts/exynos4412-smdk4412.dts
create mode 100644 arch/arm/boot/dts/exynos4412.dtsi
create mode 100644 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
create mode 100644 arch/arm/boot/dts/exynos4x12.dtsi
create mode 100644 arch/arm/boot/dts/exynos5250-snow.dts
create mode 100644 arch/arm/boot/dts/href.dtsi
create mode 100644 arch/arm/boot/dts/hrefprev60.dts
create mode 100644 arch/arm/boot/dts/imx25-karo-tx25.dts
create mode 100644 arch/arm/boot/dts/imx25.dtsi
create mode 100644 arch/arm/boot/dts/imx27-apf27.dts
create mode 100644 arch/arm/boot/dts/imx28-apf28.dts
create mode 100644 arch/arm/boot/dts/imx28-apf28dev.dts
create mode 100644 arch/arm/boot/dts/imx28-sps1.dts
create mode 100644 arch/arm/boot/dts/imx6q-sabreauto.dts
create mode 100644 arch/arm/boot/dts/kirkwood-6281.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-6282.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-98dx4122.dtsi
create mode 100644 arch/arm/boot/dts/stuib.dtsi
create mode 100644 arch/arm/boot/dts/u9540.dts
create mode 100644 arch/arm/boot/dts/zynq-7000.dtsi
delete mode 100644 arch/arm/boot/dts/zynq-ep107.dts
create mode 100644 arch/arm/boot/dts/zynq-zc702.dts
delete mode 100644 arch/arm/mach-exynos/dev-drm.c
create mode 100644 arch/arm/mach-imx/imx25-dt.c
create mode 100644 drivers/clk/clk-zynq.c
create mode 100644 drivers/power/reset/Kconfig
create mode 100644 drivers/power/reset/Makefile
create mode 100644 drivers/power/reset/gpio-poweroff.c
create mode 100644 include/linux/clk/zynq.h
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 2/5] ARM: arm-soc: multiplatform conversion patches
2012-12-13 1:55 [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests Olof Johansson
2012-12-13 1:56 ` [GIT PULL 1/5] ARM: arm-soc: device tree conversions and enablement Olof Johansson
@ 2012-12-13 1:56 ` Olof Johansson
2012-12-13 1:57 ` [GIT PULL 3/5] ARM: arm-soc: power management and clock changes Olof Johansson
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-12-13 1:56 UTC (permalink / raw)
To: linux-arm-kernel
Here are more patches in the progression towards multiplatform, sparse
irq conversions in particular.
Tegra has a handful of cleanups and general groundwork, but is
not quite there yet on full enablement.
Platforms that are enabled through this branch are VT8500 and Zynq. note
that i.MX was converted in one of the earlier cleanup branches as
well (before we started a separate topic for multiplatform). And both
new platforms for this merge window, sunxi and bcm, were merged with
multiplatform support enabled.
Conflicts seen with this merge:
arch/arm/Kconfig.debug:
Add/add. Keep both.
arch/arm/mach-nomadik/board-nhk8815.c:
arch/arm/mach-ux500/board-mop500-audio.c:
arch/arm/mach-ux500/board-mop500.c:
Looks like one branch got rebased, so the auto-resolve works poorly here.
Keep the versions from the branch in this file, not from HEAD.
arch/arm/mach-ux500/cpu-db8500.c:
Keep the version from HEAD + the two platform_data includes
drivers/clocksource/Kconfig:
Add/add. Keep both.
drivers/pinctrl/pinctrl-nomadik.c:
Keep version from branch but take out the #ifdef CONFIG_ARCH_U8500 block.
----------------------------------------------------------------
The following changes since commit 167be309858a109413302f87c51fa21b69c7c7bd:
Merge branch 'next/dt' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/multiplatform
for you to fetch changes up to 3f54db784a6af9a6d53396949cbecf62edbad247:
Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze into next/multiplatform
----------------------------------------------------------------
Arnd Bergmann (2):
Merge tag 'armsoc-for-3.8' of git://server.prisktech.co.nz/git/linuxwmt into next/multiplatform
Merge tag 'mtu-clk-for-arm-soc' of git://git.kernel.org/.../linusw/linux-stericsson into next/multiplatform
Josh Cartwright (3):
ARM: zynq: remove TTC early mapping
ARM: zynq: make use of debug_ll_io_init()
ARM: zynq: add support for ARCH_MULTIPLATFORM
Linus Walleij (10):
pinctrl/nomadik: move the platform data header
pinctrl/nomadik: merge old pincfg header
clk/ux500: explicitly include register header
ARM: plat-nomadik: pass IRQ to timer driver
ARM: plat-nomadik: use DIV_ROUND_CLOSEST()
ARM: plat-nomadik: move DMA40 header to <linux/platform_data>
ARM: plat-nomadik: move MTU, kill plat-nomadik
mfd/ab8500-core: use irq_domain_add_simple()
mfd/db8500-prcmu: use the irq_domain_add_simple()
ARM: plat-nomadik: convert platforms to SPARSE_IRQ
Michal Simek (2):
Merge branch 'devel/debug_ll_init' into zynq/multiplatform
ARM: zynq: Remove all unused mach headers
Olof Johansson (4):
Merge branch 'devel/debug_ll_init' into next/multiplatform
Merge tag 'kill-plat-sparse-irq' of git://git.kernel.org/.../linusw/linux-pinctrl into next/multiplatform
Merge tag 'tegra-for-3.8-single-zimage' of git://git.kernel.org/.../swarren/linux-tegra into next/multiplatform
Merge branch 'zynq/multiplatform' of git://git.monstr.eu/linux-2.6-microblaze into next/multiplatform
Stephen Warren (12):
Merge remote-tracking branch 'korg_arm-soc/devel/debug_ll_init' into for-3.8/single-zimage
ARM: tegra: define DT bindings for and instantiate timer
ARM: tegra: define DT bindings for and instantiate RTC
ARM: tegra: add TWD to device tree
ARM: timer: fix checkpatch warnings
ARM: tegra: enhance timer.c to get IRQ info from device tree
ARM: tegra: enhance timer.c to get IO address from device tree
ARM: tegra: select SPARSE_IRQ
ARM: tegra: simplify DEBUG_LL UART selection options
ARM: tegra: decouple uncompress.h and debug-macro.S
ARM: tegra: don't include iomap.h from debug-macro.S
ARM: tegra: move debug-macro.S to include/debug
Tony Prisk (2):
arm: vt8500: Convert irq.c for multiplatform integration
ARM: vt8500: Convert arch-vt8500 to multiplatform
Ulf Hansson (2):
clk: ux500: Register mtu apb_pclocks
clocksource/mtu-nomadik: use apb_pclk
.../bindings/rtc/nvidia,tegra20-rtc.txt | 19 ++
.../bindings/timer/nvidia,tegra20-timer.txt | 21 ++
.../bindings/timer/nvidia,tegra30-timer.txt | 23 ++
arch/arm/Kconfig | 24 +-
arch/arm/Kconfig.debug | 39 ++++
arch/arm/Makefile | 1 -
arch/arm/boot/dts/tegra20.dtsi | 21 ++
arch/arm/boot/dts/tegra30.dtsi | 23 ++
arch/arm/include/debug/tegra.S | 223 +++++++++++++++++++
.../mach/debug-macro.S => include/debug/zynq.S} | 23 +-
arch/arm/mach-nomadik/Kconfig | 2 +-
arch/arm/mach-nomadik/board-nhk8815.c | 10 +-
arch/arm/mach-nomadik/include/mach/irqs.h | 2 +-
arch/arm/mach-tegra/Kconfig | 51 -----
arch/arm/mach-tegra/common.c | 9 +-
arch/arm/mach-tegra/include/mach/debug-macro.S | 100 ---------
arch/arm/mach-tegra/include/mach/irqs.h | 182 ---------------
arch/arm/mach-tegra/include/mach/uncompress.h | 65 +-----
arch/arm/mach-tegra/io.c | 1 +
arch/arm/mach-tegra/iomap.h | 14 --
arch/arm/mach-tegra/irammap.h | 9 -
arch/arm/mach-tegra/pcie.c | 3 +
arch/arm/mach-tegra/timer.c | 78 ++++---
arch/arm/mach-ux500/Kconfig | 2 +-
arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
arch/arm/mach-ux500/board-mop500-sdi.c | 2 +-
arch/arm/mach-ux500/board-mop500.c | 3 +-
arch/arm/mach-ux500/cpu-db8500.c | 3 +
arch/arm/mach-ux500/devices-common.c | 1 +
arch/arm/mach-ux500/devices-db8500.c | 4 +-
arch/arm/mach-ux500/devices-db8500.h | 1 +
arch/arm/mach-ux500/include/mach/irqs.h | 2 +-
arch/arm/mach-ux500/include/mach/msp.h | 2 +-
arch/arm/mach-ux500/timer.c | 5 +-
arch/arm/mach-ux500/usb.c | 4 +-
arch/arm/mach-vt8500/Kconfig | 12 +
arch/arm/mach-vt8500/common.h | 3 +
arch/arm/mach-vt8500/include/mach/entry-macro.S | 26 ---
arch/arm/mach-vt8500/include/mach/irqs.h | 22 --
arch/arm/mach-vt8500/irq.c | 108 +++++----
arch/arm/mach-vt8500/vt8500.c | 1 +
arch/arm/mach-zynq/Kconfig | 13 ++
arch/arm/mach-zynq/common.c | 38 +---
arch/arm/mach-zynq/include/mach/hardware.h | 18 --
arch/arm/mach-zynq/include/mach/irqs.h | 21 --
arch/arm/mach-zynq/include/mach/timex.h | 23 --
arch/arm/mach-zynq/include/mach/uart.h | 25 ---
arch/arm/mach-zynq/include/mach/uncompress.h | 51 -----
arch/arm/mach-zynq/include/mach/zynq_soc.h | 53 -----
arch/arm/mach-zynq/timer.c | 1 -
arch/arm/plat-nomadik/Kconfig | 29 ---
arch/arm/plat-nomadik/Makefile | 5 -
drivers/char/hw_random/Kconfig | 2 +-
drivers/clk/ux500/u8500_clk.c | 11 +-
drivers/clocksource/Kconfig | 17 +-
drivers/clocksource/Makefile | 1 +
.../clocksource/nomadik-mtu.c | 19 +-
drivers/crypto/ux500/cryp/cryp_core.c | 3 +-
drivers/dma/ste_dma40.c | 3 +-
drivers/dma/ste_dma40_ll.c | 2 +-
drivers/input/keyboard/Kconfig | 2 +-
drivers/mfd/ab8500-core.c | 13 +-
drivers/mfd/db8500-prcmu.c | 12 +-
drivers/mtd/nand/Kconfig | 2 +-
drivers/pinctrl/pinctrl-nomadik.c | 2 +
.../platform_data/clocksource-nomadik-mtu.h | 2 +-
include/linux/platform_data/crypto-ux500.h | 2 +-
.../linux/platform_data/dma-ste-dma40.h | 0
sound/soc/ux500/ux500_pcm.c | 3 +-
69 files changed, 656 insertions(+), 864 deletions(-)
create mode 100644 Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt
create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt
create mode 100644 Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt
create mode 100644 arch/arm/include/debug/tegra.S
rename arch/arm/{mach-zynq/include/mach/debug-macro.S => include/debug/zynq.S} (61%)
delete mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
create mode 100644 arch/arm/mach-vt8500/Kconfig
delete mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S
delete mode 100644 arch/arm/mach-vt8500/include/mach/irqs.h
create mode 100644 arch/arm/mach-zynq/Kconfig
delete mode 100644 arch/arm/mach-zynq/include/mach/hardware.h
delete mode 100644 arch/arm/mach-zynq/include/mach/irqs.h
delete mode 100644 arch/arm/mach-zynq/include/mach/timex.h
delete mode 100644 arch/arm/mach-zynq/include/mach/uart.h
delete mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h
delete mode 100644 arch/arm/plat-nomadik/Kconfig
delete mode 100644 arch/arm/plat-nomadik/Makefile
rename arch/arm/plat-nomadik/timer.c => drivers/clocksource/nomadik-mtu.c (93%)
rename arch/arm/plat-nomadik/include/plat/mtu.h => include/linux/platform_data/clocksource-nomadik-mtu.h (71%)
rename arch/arm/plat-nomadik/include/plat/ste_dma40.h => include/linux/platform_data/dma-ste-dma40.h (100%)
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 3/5] ARM: arm-soc: power management and clock changes
2012-12-13 1:55 [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests Olof Johansson
2012-12-13 1:56 ` [GIT PULL 1/5] ARM: arm-soc: device tree conversions and enablement Olof Johansson
2012-12-13 1:56 ` [GIT PULL 2/5] ARM: arm-soc: multiplatform conversion patches Olof Johansson
@ 2012-12-13 1:57 ` Olof Johansson
2012-12-13 1:57 ` [GIT PULL 4/5] ARM: arm-soc: driver specific changes Olof Johansson
2012-12-13 1:57 ` [GIT PULL 5/5] ARM: arm-soc board updates, take 2 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-12-13 1:57 UTC (permalink / raw)
To: linux-arm-kernel
This branch contains a largeish set of updates of power management and
clock setup. The bulk of it is for OMAP/AM33xx platforms, but also a
few around hotplug/suspend/resume on Exynos.
It includes a split-up of some of the OMAP clock data into separate
files which adds to the diffstat, but gross delta is fairly reasonable.
Conflicts seen with this merge:
None
----------------------------------------------------------------
The following changes since commit 348064b46c96ab3012427a080340e81f617a94f5:
Merge branch 'next/multiplatform' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/pm-merge
for you to fetch changes up to 9c7466b217af784280d9fc841bbd559ef3bf33e9:
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
----------------------------------------------------------------
Abhilash Kesavan (3):
ARM: EXYNOS: fix the hotplug for Cortex-A15
ARM: EXYNOS: Remove scu_enable from cpuidle
ARM: EXYNOS: Add flush_cache_all in suspend finisher
Arnd Bergmann (3):
Merge tag 'omap-for-v3.8/pm-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Merge tag 'omap-for-v3.8/clock-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/clk
Merge tag 'omap-for-v3.8/pm-part2-v3-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/pm
Inderpal Singh (2):
ARM: EXYNOS: Add support for rtc wakeup
ARM: EXYNOS: Fix soft reboot hang after suspend/resume
Jean Pihet (2):
ARM: OMAP: hwmod: align the SmartReflex fck names
ARM: OMAP: SmartReflex: pass device dependent data via platform data
Kevin Hilman (1):
ARM: OMAP2+: voltage: fixup oscillator handling when CONFIG_PM=n
Mike Turquette (3):
ARM: OMAP4: clock: Convert to common clk
ARM: OMAP2+: clockdomain: bypass clockdomain handling when disabling unused clks
ARM: OMAP2+: clock: Cleanup !CONFIG_COMMON_CLK parts
Nishanth Menon (2):
ARM: OMAP2+: PM: VP: minor pr_warn updates
ARM: OMAP3+: PM: VP: use uV for max and min voltage limits
Olof Johansson (7):
Merge branch 'next/cleanup' into next/pm2
Merge branch 'next/dt' into next/pm2
Merge tag 'omap-for-v3.8/devel-prcm-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/pm2
Merge branch 'next/pm-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/pm
Merge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/pm2
ARM: arm-soc: Merge branch 'next/clk' into next/pm
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Paul Walmsley (8):
ARM: OMAP2xxx: clock: add APLL rate recalculation functions
ARM: OMAP2+: clock: add OMAP CCF convenience macros to mach-omap2/clock.h
ARM: OMAP44xx: clock: drop obsolete clock data
ARM: OMAP3xxx: clk: drop obsolete clock data
ARM: AM33xx: clock: drop obsolete clock data
ARM: OMAP3+: DPLL: drop !CONFIG_COMMON_CLK sections
ARM: OMAP2xxx: clock: drop obsolete clock data
ARM: OMAP2+: PRM: initialize some PRM functions early
Peter Ujfalusi (2):
ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
ARM: OMAP2+: omap_device: Correct resource handling for DT boot
Rajendra Nayak (17):
ARM: OMAP4: suspend: Program all domains to retention
ARM: OMAP: clock: Nuke plat/clock.c & reuse struct clk as clk_hw_omap
ARM: OMAP: hwmod: Fix up hwmod based clkdm accesses
ARM: OMAP3: clock: Convert to common clk
ARM: OMAP2: clock: Convert to common clk
ARM: OMAP: clock: list all clk_hw_omap clks to enable/disable autoidle
ARM: OMAP: clock: Define a function to enable clocks at init
ARM: OMAP: clock: Get rid of some clkdm assocations within clks
ARM: OMAP4: clock: Add 44xx data using common struct clk
ARM: OMAP3: clock: Add 3xxx data using common struct clk
ARM: OMAP2: clock: Add 24xx data using common struct clk
ARM: OMAP: clock: Switch to COMMON clk
ARM: OMAP: hwmod: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP4: clock: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP3: clock: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP2: clock: Cleanup !CONFIG_COMMON_CLK parts
ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
Tero Kristo (14):
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
ARM: OMAP4: USB: power down MUSB PHY during boot
Tony Lindgren (12):
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
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/clock
Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/clock
Merge tag 'for_3.8-pm-omap4-core-ret' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm-part2
Merge branch 'omap-for-v3.8/pm' into omap-for-v3.8/pm-part2
Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/devel-pcrm
Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
watchdog: OMAP: fixup for ARM multiplatform support
ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
Vaibhav Hiremath (2):
ARM: OMAP2+: hwmod: Invoke init_clkdm before other init functions
ARM: AM33XX: clock: add clock data in common clock format
Vishwanath Sripathy (1):
ARM: OMAP4: OPP: add OMAP4460 definitions
arch/arm/mach-exynos/common.c | 2 +
arch/arm/mach-exynos/cpuidle.c | 3 +-
arch/arm/mach-exynos/hotplug.c | 45 +-
arch/arm/mach-exynos/pm.c | 7 +
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/lcd_dma.c | 2 +-
arch/arm/mach-omap1/mcbsp.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/Kconfig | 5 +
arch/arm/mach-omap2/Makefile | 10 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/cclock2420_data.c | 1950 ++++++++++
arch/arm/mach-omap2/cclock2430_data.c | 2065 ++++++++++
arch/arm/mach-omap2/cclock33xx_data.c | 961 +++++
arch/arm/mach-omap2/cclock3xxx_data.c | 3595 +++++++++++++++++
arch/arm/mach-omap2/cclock44xx_data.c | 1987 ++++++++++
arch/arm/mach-omap2/clkt2xxx_apll.c | 62 +-
arch/arm/mach-omap2/clkt2xxx_dpll.c | 8 +-
arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 13 +-
arch/arm/mach-omap2/clkt2xxx_osc.c | 13 +-
arch/arm/mach-omap2/clkt2xxx_sys.c | 7 +-
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 9 +-
arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 8 +-
arch/arm/mach-omap2/clkt_clksel.c | 194 +-
arch/arm/mach-omap2/clkt_dpll.c | 28 +-
arch/arm/mach-omap2/clkt_iclk.c | 30 +-
arch/arm/mach-omap2/clock.c | 910 ++---
arch/arm/mach-omap2/clock.h | 329 +-
arch/arm/mach-omap2/clock2420_data.c | 1972 ----------
arch/arm/mach-omap2/clock2430.c | 8 +-
arch/arm/mach-omap2/clock2430_data.c | 2071 ----------
arch/arm/mach-omap2/clock2xxx.c | 1 +
arch/arm/mach-omap2/clock2xxx.h | 41 +-
arch/arm/mach-omap2/clock33xx_data.c | 1109 ------
arch/arm/mach-omap2/clock34xx.c | 51 +-
arch/arm/mach-omap2/clock3517.c | 24 +-
arch/arm/mach-omap2/clock36xx.c | 22 +-
arch/arm/mach-omap2/clock36xx.h | 2 +-
arch/arm/mach-omap2/clock3xxx.c | 6 +-
arch/arm/mach-omap2/clock3xxx.h | 6 +-
arch/arm/mach-omap2/clock3xxx_data.c | 3613 ------------------
arch/arm/mach-omap2/clock44xx_data.c | 3398 ----------------
arch/arm/mach-omap2/clock_common_data.c | 22 +-
arch/arm/mach-omap2/clockdomain.c | 89 +-
arch/arm/mach-omap2/cm-regbits-24xx.h | 5 +
arch/arm/mach-omap2/cm-regbits-34xx.h | 31 +
arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 +
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/dpll3xxx.c | 183 +-
arch/arm/mach-omap2/dpll44xx.c | 21 +-
arch/arm/mach-omap2/io.c | 18 +-
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/omap_device.c | 87 +-
arch/arm/mach-omap2/omap_hwmod.c | 145 +-
arch/arm/mach-omap2/omap_hwmod.h | 12 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 4 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 4 +-
.../omap_hwmod_2xxx_3xxx_ipblock_data.c | 3 +-
.../mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +-
arch/arm/mach-omap2/omap_opp_data.h | 9 +-
arch/arm/mach-omap2/omap_phy_internal.c | 32 +
arch/arm/mach-omap2/omap_twl.c | 73 +-
arch/arm/mach-omap2/opp4xxx_data.c | 98 +-
arch/arm/mach-omap2/pm.c | 32 +
arch/arm/mach-omap2/pm.h | 10 +
arch/arm/mach-omap2/pm24xx.c | 6 +-
arch/arm/mach-omap2/pm34xx.c | 3 +-
arch/arm/mach-omap2/pm44xx.c | 7 -
arch/arm/mach-omap2/prm-regbits-24xx.h | 2 +
arch/arm/mach-omap2/prm-regbits-34xx.h | 1 +
arch/arm/mach-omap2/prm.h | 11 +-
arch/arm/mach-omap2/prm2xxx.c | 3 +-
arch/arm/mach-omap2/prm2xxx.h | 3 +-
arch/arm/mach-omap2/prm2xxx_3xxx.h | 1 +
arch/arm/mach-omap2/prm3xxx.c | 17 +-
arch/arm/mach-omap2/prm3xxx.h | 1 +
arch/arm/mach-omap2/prm44xx.c | 49 +-
arch/arm/mach-omap2/prm44xx.h | 1 +
arch/arm/mach-omap2/prm_common.c | 45 +
arch/arm/mach-omap2/scrm44xx.h | 2 +
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/mach-omap2/sr_device.c | 13 +
arch/arm/mach-omap2/vc.c | 453 ++-
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 | 25 +-
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 +
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/include/plat-omap/dma-omap.h | 377 --
arch/arm/plat-samsung/include/plat/pm.h | 2 +
drivers/crypto/omap-aes.c | 2 +-
drivers/crypto/omap-sham.c | 2 +-
drivers/dma/omap-dma.c | 2 -
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 2 +-
drivers/media/platform/omap3isp/ispstat.h | 2 +-
.../media/platform/soc_camera/omap1_camera.c | 2 +-
drivers/mtd/nand/omap2.c | 1 -
drivers/mtd/onenand/omap2.c | 2 +-
drivers/power/avs/smartreflex.c | 54 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/musb/tusb6010_omap.c | 2 +-
drivers/video/omap/lcdc.c | 2 +-
drivers/video/omap/omapfb_main.c | 2 +-
drivers/video/omap/sossi.c | 2 +-
drivers/watchdog/omap_wdt.c | 2 -
include/linux/omap-dma.h | 366 ++
include/linux/power/smartreflex.h | 14 +-
sound/soc/omap/mcbsp.c | 4 +-
sound/soc/omap/mcbsp.h | 6 +
sound/soc/omap/omap-mcbsp.c | 5 +-
131 files changed, 13015 insertions(+), 14135 deletions(-)
create mode 100644 arch/arm/mach-omap2/cclock2420_data.c
create mode 100644 arch/arm/mach-omap2/cclock2430_data.c
create mode 100644 arch/arm/mach-omap2/cclock33xx_data.c
create mode 100644 arch/arm/mach-omap2/cclock3xxx_data.c
create mode 100644 arch/arm/mach-omap2/cclock44xx_data.c
delete mode 100644 arch/arm/mach-omap2/clock2420_data.c
delete mode 100644 arch/arm/mach-omap2/clock2430_data.c
delete mode 100644 arch/arm/mach-omap2/clock33xx_data.c
delete mode 100644 arch/arm/mach-omap2/clock3xxx_data.c
delete mode 100644 arch/arm/mach-omap2/clock44xx_data.c
delete mode 100644 arch/arm/plat-omap/include/plat-omap/dma-omap.h
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 4/5] ARM: arm-soc: driver specific changes
2012-12-13 1:55 [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests Olof Johansson
` (2 preceding siblings ...)
2012-12-13 1:57 ` [GIT PULL 3/5] ARM: arm-soc: power management and clock changes Olof Johansson
@ 2012-12-13 1:57 ` Olof Johansson
2012-12-13 1:57 ` [GIT PULL 5/5] ARM: arm-soc board updates, take 2 Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-12-13 1:57 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
A collection of mostly SoC-specific driver updates:
- a handful of pincontrol and setup changes
- new drivers for hwmon and reset controller for vexpress
- timing support updates for OMAP (gpmc and other interfaces)
- + a collection of smaller cleanups
Conflicts seen with this merge:
None
----------------------------------------------------------------
The following changes since commit 93dd6e875a23bb2b41b527d869dbbd0d9595760d:
Merge branch 'next/pm-merge' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/drivers
for you to fetch changes up to 4aa7cf79b1f760b5751d1686329351c2e060791b:
Merge branch 'next/gpio-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
----------------------------------------------------------------
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
Arnd Bergmann (6):
Merge branch 'vexpress-drivers' of git://git.linaro.org/people/pawelmoll/linux into next/drivers
Merge tag 'ux500-pins-for-arm-soc' of http://git.kernel.org/.../linusw/linux-stericsson into next/drivers
Merge branch 'omap/headers4' into next/drivers
Merge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/drivers
Merge branch 'omap/dt' into next/drivers
Merge tag 'omap-for-v3.8/timer-signed' of git://git.kernel.org/.../tmlind/linux-omap into next/drivers
Eunki Kim (2):
ARM: SAMSUNG: Insert bitmap_gpio_int member in samsung_gpio_chip
gpio: samsung: Fix input mode setting function for GPIO int
Jean-Nicolas Graux (1):
ARM: ux500: add STM pin configuration
Jingoo Han (1):
gpio: samsung: use pr_* instead of printk
Jorgen Jonsson (1):
ARM: ux500: fixup magnetometer pins
Linus Walleij (2):
ARM: ux500: delete duplicate macro
ARM: ux500: fix pin warning
Olof Johansson (1):
Merge branch 'next/gpio-samsung' of git://git.kernel.org/.../kgene/linux-samsung into next/drivers
Patrice Chotard (6):
ARM: ux500: 8500: register LCD VSI pinctrl table
ARM: ux500: 8500: add IDLE pin configuration for SPI
ARM: ux500: 8500: update SKE keypad pinctrl table
ARM: ux500: 8500: define SDI sleep states
ARM: ux500: cosmetic fixups for uart0
ARM: ux500: 8500: add pinctrl support for uart1 and uart2
Pawel Moll (2):
hwmon: Versatile Express hwmon driver
ARM: vexpress: Reset driver
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 ++++++
.../devicetree/bindings/hwmon/vexpress.txt | 23 +
Documentation/hwmon/vexpress | 34 ++
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 ++------
arch/arm/mach-ux500/board-mop500-pins.c | 425 ++++++++++++++++---
arch/arm/mach-vexpress/reset.c | 141 ++++++
arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +
arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +-
drivers/gpio/gpio-samsung.c | 25 +-
drivers/hwmon/Kconfig | 8 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/vexpress.c | 229 ++++++++++
17 files changed, 1525 insertions(+), 372 deletions(-)
create mode 100644 Documentation/bus-devices/ti-gpmc.txt
create mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt
create mode 100644 Documentation/hwmon/vexpress
create mode 100644 arch/arm/mach-vexpress/reset.c
create mode 100644 drivers/hwmon/vexpress.c
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 5/5] ARM: arm-soc board updates, take 2
2012-12-13 1:55 [GIT PULL 0/5] ARM: arm-soc: Second batch of pull requests Olof Johansson
` (3 preceding siblings ...)
2012-12-13 1:57 ` [GIT PULL 4/5] ARM: arm-soc: driver specific changes Olof Johansson
@ 2012-12-13 1:57 ` Olof Johansson
4 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-12-13 1:57 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
This branch contains board updates for shmobile that had dependencies
on earlier branches past the first driver branch, and thus are merged
separately.
Most of these are to enable audio and USB on shmobile. They contain a
dependent ASoC branch that has been coordinated with Mark Brown.
Conflict seen with this merge:
None
----------------------------------------------------------------
The following changes since commit 370cdda68eb40e69a7a8950abec230976e5d9117:
Merge branch 'next/drivers' into HEAD
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/boards2
for you to fetch changes up to d7460f4a3d75469deb1c6c028961da69608d02d9:
Merge branch 'boards3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2
----------------------------------------------------------------
Arnd Bergmann (3):
Merge branches 'depends/asoc', 'renesas/boards' and 'renesas/soc' into next/boards2
Merge branches 'depends/asoc', 'renesas/boards', 'renesas/soc' and 'renesas/soc2' into next/boards2
Merge branch 'boards' of git://git.kernel.org/.../horms/renesas into next/boards2
Bastian Hecht (1):
ARM: shmobile: mackerel: Add FLCTL IRQ resource
Kuninori Morimoto (12):
ASoC: fsi: fixup channels_min/max
ASoC: fsi: use devm_request_irq()
ASoC: fsi: fsi_set_master_clk() was called from fsi_hw_xxx() only
ASoC: fsi: care fsi_hw_start/stop() return value
ASoC: fsi: add master clock control functions
ARM: shmobile: marzen: add USB phy support
ARM: shmobile: marzen: add USB EHCI driver support
ARM: shmobile: marzen: add USB OHCI driver support
ARM: shmobile: mackerel: enable DMAEngine on USB Host
ARM: shmobile: use FSI driver's audio clock on armadillo800eva
ARM: shmobile: use FSI driver's audio clock on mackerel
ARM: shmobile: use FSI driver's audio clock on ap4evb
Olof Johansson (1):
Merge branch 'boards3' of git://git.kernel.org/.../horms/renesas into next/boards2
Simon Horman (1):
Merge branch 'soc' into boards
arch/arm/configs/marzen_defconfig | 14 +-
arch/arm/mach-shmobile/Kconfig | 2 +
arch/arm/mach-shmobile/board-ap4evb.c | 139 +-----
arch/arm/mach-shmobile/board-armadillo800eva.c | 38 +-
arch/arm/mach-shmobile/board-mackerel.c | 80 +---
arch/arm/mach-shmobile/board-marzen.c | 186 ++++++++-
include/sound/sh_fsi.h | 6 +
sound/soc/sh/fsi.c | 441 ++++++++++++++++++--
8 files changed, 617 insertions(+), 289 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread