From b6b1b0ac5217a77a468a01097e8a01ed4d096a36 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 11 Dec 2012 18:27:34 +0100 Subject: [PATCH] --- yaml --- r: 347315 b: refs/heads/master c: 028014c81e3f8a5e8b5f161dceac5e6e5d6314ec h: refs/heads/master i: 347313: 5c0c712fb85275fd48a7875f8d145ff485d2fa3b 347311: faad94349d7e9bfb1e824f010730841cb3712836 v: v3 --- [refs] | 2 +- .../obsolete/sysfs-driver-hid-roccat-koneplus | 38 - .../obsolete/sysfs-driver-hid-roccat-kovaplus | 66 - .../ABI/obsolete/sysfs-driver-hid-roccat-pyra | 73 - .../ABI/stable/sysfs-driver-ib_srp | 156 - .../ABI/stable/sysfs-transport-srp | 19 - trunk/Documentation/ABI/testing/dev-kmsg | 2 +- trunk/Documentation/ABI/testing/sysfs-bus-pci | 34 - .../ABI/testing/sysfs-devices-power | 2 +- .../ABI/testing/sysfs-driver-hid-roccat-isku | 8 - .../testing/sysfs-driver-hid-roccat-koneplus | 48 +- .../testing/sysfs-driver-hid-roccat-kovaplus | 69 +- .../ABI/testing/sysfs-driver-hid-roccat-lua | 7 - .../ABI/testing/sysfs-driver-hid-roccat-pyra | 76 +- .../ABI/testing/sysfs-driver-hid-roccat-savu | 3 +- .../ABI/testing/sysfs-driver-ppi | 2 +- .../Documentation/ABI/testing/sysfs-profiling | 6 +- .../DocBook/media/v4l/compat.xml | 7 - trunk/Documentation/DocBook/media/v4l/io.xml | 188 +- .../Documentation/DocBook/media/v4l/v4l2.xml | 1 - .../DocBook/media/v4l/vidioc-create-bufs.xml | 16 +- .../DocBook/media/v4l/vidioc-expbuf.xml | 212 - .../DocBook/media/v4l/vidioc-qbuf.xml | 17 - .../DocBook/media/v4l/vidioc-reqbufs.xml | 47 +- .../DocBook/writing-an-alsa-driver.tmpl | 85 +- trunk/Documentation/HOWTO | 2 +- trunk/Documentation/PCI/pci-iov-howto.txt | 48 +- trunk/Documentation/accounting/getdelays.c | 1 + trunk/Documentation/bus-devices/ti-gpmc.txt | 122 - trunk/Documentation/cgroups/cpusets.txt | 2 +- .../bindings/arm/exynos/power_domain.txt | 15 +- .../devicetree/bindings/arm/fsl.txt | 4 - .../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 - .../bindings/drm/exynos/hdmiddc.txt | 12 - .../bindings/drm/exynos/hdmiphy.txt | 12 - .../devicetree/bindings/drm/exynos/mixer.txt | 15 - .../bindings/gpio/gpio-poweroff.txt | 22 - .../devicetree/bindings/hwmon/vexpress.txt | 23 - .../bindings/input/touchscreen/bu21013.txt | 28 - .../devicetree/bindings/media/s5p-mfc.txt | 23 - .../devicetree/bindings/mfd/ab8500.txt | 27 +- .../devicetree/bindings/misc/atmel-ssc.txt | 15 - .../pinctrl/marvell,kirkwood-pinctrl.txt | 39 - .../bindings/power_supply/ab8500/btemp.txt | 16 - .../bindings/power_supply/ab8500/chargalg.txt | 16 - .../bindings/power_supply/ab8500/charger.txt | 25 - .../bindings/power_supply/ab8500/fg.txt | 58 - .../bindings/regulator/gpio-regulator.txt | 37 - .../bindings/regulator/max8925-regulator.txt | 40 - .../bindings/regulator/max8997-regulator.txt | 146 - .../bindings/regulator/vexpress.txt | 32 - .../bindings/rtc/nvidia,tegra20-rtc.txt | 19 - .../devicetree/bindings/sound/ak4104.txt | 22 - .../atmel-at91sam9g20ek-wm8731-audio.txt | 26 - .../devicetree/bindings/sound/cs4271.txt | 2 - .../bindings/sound/omap-abe-twl6040.txt | 4 +- .../bindings/spi/nvidia,tegra20-sflash.txt | 26 - .../bindings/spi/nvidia,tegra20-slink.txt | 26 - .../devicetree/bindings/spi/omap-spi.txt | 4 +- .../devicetree/bindings/spi/spi-bus.txt | 22 - .../bindings/timer/nvidia,tegra20-timer.txt | 21 - .../bindings/timer/nvidia,tegra30-timer.txt | 23 - .../devicetree/bindings/usb/ehci-orion.txt | 15 - .../devicetree/bindings/vendor-prefixes.txt | 1 - .../bindings/watchdog/atmel-wdt.txt | 15 - trunk/Documentation/dma-buf-sharing.txt | 4 +- trunk/Documentation/dontdiff | 1 + .../fault-injection/notifier-error-inject.txt | 4 +- trunk/Documentation/hid/uhid.txt | 2 +- trunk/Documentation/hwmon/pmbus | 2 +- trunk/Documentation/hwmon/vexpress | 34 - trunk/Documentation/input/alps.txt | 2 +- trunk/Documentation/input/event-codes.txt | 11 - trunk/Documentation/kbuild/modules.txt | 2 +- trunk/Documentation/kernel-doc-nano-HOWTO.txt | 13 +- trunk/Documentation/memory-hotplug.txt | 5 +- .../misc-devices/mei/mei-amt-version.c | 4 +- .../power/power_supply_class.txt | 3 - trunk/Documentation/scsi/hptiop.txt | 69 +- .../sound/alsa/ALSA-Configuration.txt | 3 + trunk/Documentation/video4linux/bttv/Cards | 2 +- .../Documentation/video4linux/bttv/Sound-FAQ | 2 +- trunk/Documentation/virtual/kvm/api.txt | 140 +- trunk/Documentation/vm/frontswap.txt | 2 +- trunk/Documentation/vm/transhuge.txt | 19 +- trunk/MAINTAINERS | 262 +- trunk/README | 4 - trunk/arch/alpha/include/asm/mmzone.h | 2 +- trunk/arch/alpha/kernel/pci_iommu.c | 12 +- trunk/arch/arm/Kconfig | 27 +- trunk/arch/arm/Kconfig.debug | 82 +- trunk/arch/arm/Makefile | 1 + trunk/arch/arm/boot/dts/Makefile | 17 +- trunk/arch/arm/boot/dts/at91sam9260.dtsi | 14 - trunk/arch/arm/boot/dts/at91sam9263.dtsi | 22 - .../arm/boot/dts/at91sam9g20ek_common.dtsi | 32 +- trunk/arch/arm/boot/dts/at91sam9g45.dtsi | 22 - trunk/arch/arm/boot/dts/at91sam9x5.dtsi | 8 - trunk/arch/arm/boot/dts/ccu9540.dts | 72 - trunk/arch/arm/boot/dts/cros5250-common.dtsi | 184 - trunk/arch/arm/boot/dts/dbx5x0.dtsi | 84 +- trunk/arch/arm/boot/dts/dove-cubox.dts | 10 - trunk/arch/arm/boot/dts/dove.dtsi | 19 +- trunk/arch/arm/boot/dts/evk-pro3.dts | 12 - trunk/arch/arm/boot/dts/exynos4.dtsi | 54 +- trunk/arch/arm/boot/dts/exynos4210-origen.dts | 70 +- .../arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 56 +- .../arch/arm/boot/dts/exynos4210-smdkv310.dts | 16 - trunk/arch/arm/boot/dts/exynos4210-trats.dts | 87 +- trunk/arch/arm/boot/dts/exynos4210.dtsi | 12 - trunk/arch/arm/boot/dts/exynos4212.dtsi | 28 - .../arch/arm/boot/dts/exynos4412-smdk4412.dts | 45 - trunk/arch/arm/boot/dts/exynos4412.dtsi | 28 - .../arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 965 -- trunk/arch/arm/boot/dts/exynos4x12.dtsi | 69 - .../arch/arm/boot/dts/exynos5250-smdk5250.dts | 56 +- trunk/arch/arm/boot/dts/exynos5250-snow.dts | 43 - trunk/arch/arm/boot/dts/exynos5250.dtsi | 62 +- trunk/arch/arm/boot/dts/href.dtsi | 273 - trunk/arch/arm/boot/dts/hrefprev60.dts | 48 - trunk/arch/arm/boot/dts/hrefv60plus.dts | 217 +- trunk/arch/arm/boot/dts/imx23-olinuxino.dts | 23 +- trunk/arch/arm/boot/dts/imx23.dtsi | 13 - trunk/arch/arm/boot/dts/imx25-karo-tx25.dts | 44 - trunk/arch/arm/boot/dts/imx25.dtsi | 515 -- trunk/arch/arm/boot/dts/imx27-apf27.dts | 89 - trunk/arch/arm/boot/dts/imx27.dtsi | 5 +- trunk/arch/arm/boot/dts/imx28-apf28.dts | 85 - trunk/arch/arm/boot/dts/imx28-apf28dev.dts | 154 - trunk/arch/arm/boot/dts/imx28-cfa10036.dts | 46 - trunk/arch/arm/boot/dts/imx28-cfa10049.dts | 33 - trunk/arch/arm/boot/dts/imx28-evk.dts | 13 +- trunk/arch/arm/boot/dts/imx28-sps1.dts | 169 - trunk/arch/arm/boot/dts/imx28.dtsi | 35 - trunk/arch/arm/boot/dts/imx51.dtsi | 43 +- trunk/arch/arm/boot/dts/imx53-qsb.dts | 62 +- trunk/arch/arm/boot/dts/imx53.dtsi | 92 +- trunk/arch/arm/boot/dts/imx6q-sabreauto.dts | 64 - trunk/arch/arm/boot/dts/imx6q-sabresd.dts | 18 - trunk/arch/arm/boot/dts/imx6q.dtsi | 114 +- trunk/arch/arm/boot/dts/kirkwood-6281.dtsi | 44 - trunk/arch/arm/boot/dts/kirkwood-6282.dtsi | 45 - .../arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 31 - trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi | 140 - trunk/arch/arm/boot/dts/kirkwood-dockstar.dts | 37 - .../arch/arm/boot/dts/kirkwood-dreamplug.dts | 21 - .../arch/arm/boot/dts/kirkwood-goflexnet.dts | 73 - trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts | 40 - trunk/arch/arm/boot/dts/kirkwood-iconnect.dts | 51 - .../arm/boot/dts/kirkwood-iomega_ix2_200.dts | 89 - .../arm/boot/dts/kirkwood-km_kirkwood.dts | 17 - trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi | 95 - trunk/arch/arm/boot/dts/kirkwood-mplcec4.dts | 59 - .../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 - trunk/arch/arm/boot/dts/kirkwood.dtsi | 17 +- trunk/arch/arm/boot/dts/lpc32xx.dtsi | 7 - trunk/arch/arm/boot/dts/snowball.dts | 140 +- trunk/arch/arm/boot/dts/stuib.dtsi | 78 - trunk/arch/arm/boot/dts/tegra20-harmony.dts | 25 +- trunk/arch/arm/boot/dts/tegra20-plutux.dts | 6 - trunk/arch/arm/boot/dts/tegra20-seaboard.dts | 6 - trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi | 88 +- trunk/arch/arm/boot/dts/tegra20-tec.dts | 9 +- trunk/arch/arm/boot/dts/tegra20-trimslice.dts | 54 +- trunk/arch/arm/boot/dts/tegra20-ventana.dts | 90 +- trunk/arch/arm/boot/dts/tegra20-whistler.dts | 21 +- trunk/arch/arm/boot/dts/tegra20.dtsi | 158 - .../arch/arm/boot/dts/tegra30-cardhu-a02.dts | 6 - .../arch/arm/boot/dts/tegra30-cardhu-a04.dts | 6 - trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi | 37 - trunk/arch/arm/boot/dts/tegra30.dtsi | 170 - trunk/arch/arm/boot/dts/u9540.dts | 72 - trunk/arch/arm/boot/dts/zynq-7000.dtsi | 166 - trunk/arch/arm/boot/dts/zynq-ep107.dts | 63 + trunk/arch/arm/boot/dts/zynq-zc702.dts | 44 - trunk/arch/arm/configs/marzen_defconfig | 14 +- trunk/arch/arm/configs/mxs_defconfig | 6 - trunk/arch/arm/configs/u8500_defconfig | 1 - trunk/arch/arm/include/asm/xen/interface.h | 1 - trunk/arch/arm/include/debug/imx.S | 20 +- trunk/arch/arm/include/debug/tegra.S | 223 - trunk/arch/arm/kernel/kprobes-test.c | 2 +- trunk/arch/arm/mach-at91/at91rm9200.c | 9 +- trunk/arch/arm/mach-at91/at91rm9200_devices.c | 6 +- trunk/arch/arm/mach-at91/at91sam9260.c | 3 +- .../arch/arm/mach-at91/at91sam9260_devices.c | 2 +- trunk/arch/arm/mach-at91/at91sam9261.c | 9 +- .../arch/arm/mach-at91/at91sam9261_devices.c | 6 +- trunk/arch/arm/mach-at91/at91sam9263.c | 6 +- .../arch/arm/mach-at91/at91sam9263_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9g45.c | 6 +- .../arch/arm/mach-at91/at91sam9g45_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9rl.c | 6 +- trunk/arch/arm/mach-at91/at91sam9rl_devices.c | 4 +- trunk/arch/arm/mach-at91/at91sam9x5.c | 1 - trunk/arch/arm/mach-at91/board-sam9g20ek.c | 11 - trunk/arch/arm/mach-davinci/Makefile.boot | 2 + trunk/arch/arm/mach-davinci/board-da850-evm.c | 24 +- trunk/arch/arm/mach-exynos/Kconfig | 1 - trunk/arch/arm/mach-exynos/Makefile | 1 + trunk/arch/arm/mach-exynos/clock-exynos4.c | 4 - trunk/arch/arm/mach-exynos/clock-exynos5.c | 21 +- trunk/arch/arm/mach-exynos/common.c | 9 +- trunk/arch/arm/mach-exynos/cpuidle.c | 3 +- trunk/arch/arm/mach-exynos/dev-drm.c | 29 + trunk/arch/arm/mach-exynos/hotplug.c | 45 +- .../arch/arm/mach-exynos/include/mach/irqs.h | 3 - trunk/arch/arm/mach-exynos/include/mach/map.h | 2 - trunk/arch/arm/mach-exynos/mach-armlex4210.c | 1 + trunk/arch/arm/mach-exynos/mach-exynos4-dt.c | 4 - trunk/arch/arm/mach-exynos/mach-exynos5-dt.c | 42 - trunk/arch/arm/mach-exynos/mach-nuri.c | 3 + trunk/arch/arm/mach-exynos/mach-origen.c | 3 + trunk/arch/arm/mach-exynos/mach-smdk4x12.c | 3 + trunk/arch/arm/mach-exynos/mach-smdkv310.c | 4 + .../arm/mach-exynos/mach-universal_c210.c | 3 + trunk/arch/arm/mach-exynos/pm.c | 7 - trunk/arch/arm/mach-exynos/pm_domains.c | 93 +- trunk/arch/arm/mach-imx/Kconfig | 18 - trunk/arch/arm/mach-imx/Makefile | 1 - trunk/arch/arm/mach-imx/clk-imx25.c | 119 +- trunk/arch/arm/mach-imx/clk-imx6q.c | 1 - trunk/arch/arm/mach-imx/common.h | 1 - trunk/arch/arm/mach-imx/imx25-dt.c | 48 - trunk/arch/arm/mach-imx/lluart.c | 28 +- trunk/arch/arm/mach-imx/mach-imx6q.c | 35 - trunk/arch/arm/mach-imx/mx6q.h | 4 + trunk/arch/arm/mach-kirkwood/Kconfig | 5 - trunk/arch/arm/mach-kirkwood/board-dnskw.c | 54 + trunk/arch/arm/mach-kirkwood/board-dockstar.c | 16 + .../arch/arm/mach-kirkwood/board-dreamplug.c | 15 + .../arch/arm/mach-kirkwood/board-goflexnet.c | 24 + trunk/arch/arm/mach-kirkwood/board-ib62x0.c | 35 + trunk/arch/arm/mach-kirkwood/board-iconnect.c | 18 + .../arm/mach-kirkwood/board-iomega_ix2_200.c | 26 + .../arm/mach-kirkwood/board-km_kirkwood.c | 13 + trunk/arch/arm/mach-kirkwood/board-lsxl.c | 28 + trunk/arch/arm/mach-kirkwood/board-mplcec4.c | 36 + trunk/arch/arm/mach-kirkwood/board-ns2.c | 1 + trunk/arch/arm/mach-kirkwood/board-nsa310.c | 4 + .../arm/mach-kirkwood/board-openblocks_a6.c | 5 +- trunk/arch/arm/mach-kirkwood/board-ts219.c | 26 + .../arm/mach-kirkwood/board-usi_topkick.c | 1 + trunk/arch/arm/mach-mxs/mach-mxs.c | 56 - trunk/arch/arm/mach-mxs/timer.c | 10 +- trunk/arch/arm/mach-netx/xc.c | 2 +- trunk/arch/arm/mach-nomadik/Kconfig | 2 +- trunk/arch/arm/mach-nomadik/board-nhk8815.c | 10 +- .../arch/arm/mach-nomadik/include/mach/irqs.h | 2 +- trunk/arch/arm/mach-omap1/board-h2.c | 2 +- trunk/arch/arm/mach-omap1/board-h3.c | 2 +- trunk/arch/arm/mach-omap1/board-palmte.c | 2 +- trunk/arch/arm/mach-omap1/board-palmtt.c | 2 +- trunk/arch/arm/mach-omap1/board-palmz71.c | 2 +- trunk/arch/arm/mach-omap1/board-sx1.c | 2 +- trunk/arch/arm/mach-omap1/dma.c | 2 +- trunk/arch/arm/mach-omap1/io.c | 2 +- trunk/arch/arm/mach-omap1/lcd_dma.c | 2 +- trunk/arch/arm/mach-omap1/mcbsp.c | 2 +- trunk/arch/arm/mach-omap1/pm.c | 2 +- trunk/arch/arm/mach-omap2/Kconfig | 5 - trunk/arch/arm/mach-omap2/Makefile | 10 +- trunk/arch/arm/mach-omap2/board-3430sdp.c | 2 +- trunk/arch/arm/mach-omap2/board-h4.c | 2 +- .../arm/mach-omap2/board-rx51-peripherals.c | 2 +- trunk/arch/arm/mach-omap2/board-rx51.c | 2 +- trunk/arch/arm/mach-omap2/cclock2420_data.c | 1950 ---- trunk/arch/arm/mach-omap2/cclock2430_data.c | 2065 ----- trunk/arch/arm/mach-omap2/cclock33xx_data.c | 961 -- trunk/arch/arm/mach-omap2/cclock3xxx_data.c | 3595 -------- trunk/arch/arm/mach-omap2/cclock44xx_data.c | 1987 ---- trunk/arch/arm/mach-omap2/clkt2xxx_apll.c | 62 +- trunk/arch/arm/mach-omap2/clkt2xxx_dpll.c | 8 +- trunk/arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 13 +- trunk/arch/arm/mach-omap2/clkt2xxx_osc.c | 13 +- trunk/arch/arm/mach-omap2/clkt2xxx_sys.c | 7 +- .../arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 9 +- trunk/arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 8 +- trunk/arch/arm/mach-omap2/clkt_clksel.c | 194 +- trunk/arch/arm/mach-omap2/clkt_dpll.c | 28 +- trunk/arch/arm/mach-omap2/clkt_iclk.c | 30 +- trunk/arch/arm/mach-omap2/clock.c | 910 +- trunk/arch/arm/mach-omap2/clock.h | 329 +- trunk/arch/arm/mach-omap2/clock2420_data.c | 1972 ++++ trunk/arch/arm/mach-omap2/clock2430.c | 8 +- trunk/arch/arm/mach-omap2/clock2430_data.c | 2071 +++++ trunk/arch/arm/mach-omap2/clock2xxx.c | 1 - trunk/arch/arm/mach-omap2/clock2xxx.h | 41 +- trunk/arch/arm/mach-omap2/clock33xx_data.c | 1109 +++ trunk/arch/arm/mach-omap2/clock34xx.c | 51 +- trunk/arch/arm/mach-omap2/clock3517.c | 24 +- trunk/arch/arm/mach-omap2/clock36xx.c | 22 +- trunk/arch/arm/mach-omap2/clock36xx.h | 2 +- trunk/arch/arm/mach-omap2/clock3xxx.c | 6 +- trunk/arch/arm/mach-omap2/clock3xxx.h | 6 +- trunk/arch/arm/mach-omap2/clock3xxx_data.c | 3613 ++++++++ trunk/arch/arm/mach-omap2/clock44xx_data.c | 3398 +++++++ trunk/arch/arm/mach-omap2/clock_common_data.c | 22 +- trunk/arch/arm/mach-omap2/clockdomain.c | 89 +- trunk/arch/arm/mach-omap2/cm-regbits-24xx.h | 5 - trunk/arch/arm/mach-omap2/cm-regbits-34xx.h | 31 - trunk/arch/arm/mach-omap2/cm2xxx_3xxx.h | 1 - trunk/arch/arm/mach-omap2/control.h | 1 - trunk/arch/arm/mach-omap2/devices.c | 12 +- trunk/arch/arm/mach-omap2/dma.c | 2 +- trunk/arch/arm/mach-omap2/dpll3xxx.c | 183 +- trunk/arch/arm/mach-omap2/dpll44xx.c | 21 +- trunk/arch/arm/mach-omap2/gpmc-nand.c | 26 +- trunk/arch/arm/mach-omap2/gpmc-onenand.c | 143 +- trunk/arch/arm/mach-omap2/gpmc-smc91x.c | 43 +- trunk/arch/arm/mach-omap2/gpmc.c | 373 - trunk/arch/arm/mach-omap2/gpmc.h | 113 +- trunk/arch/arm/mach-omap2/io.c | 18 +- trunk/arch/arm/mach-omap2/mcbsp.c | 2 +- trunk/arch/arm/mach-omap2/omap_device.c | 87 +- trunk/arch/arm/mach-omap2/omap_hwmod.c | 145 +- trunk/arch/arm/mach-omap2/omap_hwmod.h | 12 +- .../arm/mach-omap2/omap_hwmod_2420_data.c | 4 +- .../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 +- .../arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- .../arm/mach-omap2/omap_hwmod_44xx_data.c | 3 +- trunk/arch/arm/mach-omap2/omap_opp_data.h | 9 +- trunk/arch/arm/mach-omap2/omap_phy_internal.c | 32 - trunk/arch/arm/mach-omap2/omap_twl.c | 73 +- trunk/arch/arm/mach-omap2/opp4xxx_data.c | 98 +- trunk/arch/arm/mach-omap2/pm.c | 32 - trunk/arch/arm/mach-omap2/pm.h | 10 - trunk/arch/arm/mach-omap2/pm24xx.c | 6 +- trunk/arch/arm/mach-omap2/pm34xx.c | 3 +- trunk/arch/arm/mach-omap2/pm44xx.c | 7 + trunk/arch/arm/mach-omap2/prm-regbits-24xx.h | 2 - trunk/arch/arm/mach-omap2/prm-regbits-34xx.h | 1 - trunk/arch/arm/mach-omap2/prm.h | 11 +- trunk/arch/arm/mach-omap2/prm2xxx.c | 3 +- trunk/arch/arm/mach-omap2/prm2xxx.h | 3 +- trunk/arch/arm/mach-omap2/prm2xxx_3xxx.h | 1 - trunk/arch/arm/mach-omap2/prm3xxx.c | 17 +- trunk/arch/arm/mach-omap2/prm3xxx.h | 1 - trunk/arch/arm/mach-omap2/prm44xx.c | 49 +- trunk/arch/arm/mach-omap2/prm44xx.h | 1 - trunk/arch/arm/mach-omap2/prm_common.c | 45 - trunk/arch/arm/mach-omap2/scrm44xx.h | 2 - trunk/arch/arm/mach-omap2/serial.c | 2 +- trunk/arch/arm/mach-omap2/sr_device.c | 13 - trunk/arch/arm/mach-omap2/usb-tusb6010.c | 181 +- trunk/arch/arm/mach-omap2/vc.c | 453 +- trunk/arch/arm/mach-omap2/vc.h | 8 +- trunk/arch/arm/mach-omap2/vc3xxx_data.c | 22 - trunk/arch/arm/mach-omap2/vc44xx_data.c | 28 - trunk/arch/arm/mach-omap2/voltage.h | 44 +- .../arm/mach-omap2/voltagedomains3xxx_data.c | 5 - .../arm/mach-omap2/voltagedomains44xx_data.c | 25 +- trunk/arch/arm/mach-omap2/vp.c | 19 +- trunk/arch/arm/mach-omap2/vp.h | 7 - trunk/arch/arm/mach-omap2/vp3xxx_data.c | 10 - trunk/arch/arm/mach-omap2/vp44xx_data.c | 15 - trunk/arch/arm/mach-pxa/pcm990-baseboard.c | 6 - .../arm/mach-s3c24xx/include/mach/bast-map.h | 2 +- .../arch/arm/mach-s3c24xx/include/mach/dma.h | 2 +- .../mach-s3c24xx/include/mach/vr1000-map.h | 2 +- trunk/arch/arm/mach-s3c24xx/mach-gta02.c | 1 + trunk/arch/arm/mach-s3c24xx/mach-h1940.c | 1 + trunk/arch/arm/mach-s3c24xx/mach-mini2440.c | 1 + trunk/arch/arm/mach-s3c24xx/mach-rx1950.c | 1 + trunk/arch/arm/mach-s3c24xx/pm.c | 2 +- trunk/arch/arm/mach-s3c64xx/mach-crag6410.c | 1 + trunk/arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + trunk/arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 + trunk/arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 + trunk/arch/arm/mach-s5pc100/mach-smdkc100.c | 1 + trunk/arch/arm/mach-s5pv210/mach-smdkc110.c | 1 + trunk/arch/arm/mach-s5pv210/mach-smdkv210.c | 1 + trunk/arch/arm/mach-shmobile/Kconfig | 2 - trunk/arch/arm/mach-shmobile/board-ap4evb.c | 139 +- .../arm/mach-shmobile/board-armadillo800eva.c | 38 +- trunk/arch/arm/mach-shmobile/board-mackerel.c | 80 +- trunk/arch/arm/mach-shmobile/board-marzen.c | 186 +- trunk/arch/arm/mach-tegra/Kconfig | 53 +- trunk/arch/arm/mach-tegra/common.c | 9 +- .../arm/mach-tegra/include/mach/debug-macro.S | 100 + trunk/arch/arm/mach-tegra/include/mach/irqs.h | 182 + .../arm/mach-tegra/include/mach/uncompress.h | 65 +- trunk/arch/arm/mach-tegra/io.c | 1 - trunk/arch/arm/mach-tegra/iomap.h | 14 + trunk/arch/arm/mach-tegra/irammap.h | 9 + trunk/arch/arm/mach-tegra/pcie.c | 3 - trunk/arch/arm/mach-tegra/timer.c | 78 +- trunk/arch/arm/mach-ux500/Kconfig | 2 +- .../arch/arm/mach-ux500/board-mop500-audio.c | 19 +- trunk/arch/arm/mach-ux500/board-mop500-pins.c | 425 +- trunk/arch/arm/mach-ux500/board-mop500-sdi.c | 2 +- .../arch/arm/mach-ux500/board-mop500-stuib.c | 22 +- trunk/arch/arm/mach-ux500/board-mop500.c | 149 +- trunk/arch/arm/mach-ux500/board-mop500.h | 10 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 110 +- trunk/arch/arm/mach-ux500/cpu.c | 3 - trunk/arch/arm/mach-ux500/devices-common.c | 1 - trunk/arch/arm/mach-ux500/devices-db8500.c | 4 +- trunk/arch/arm/mach-ux500/devices-db8500.h | 1 - trunk/arch/arm/mach-ux500/include/mach/irqs.h | 2 +- trunk/arch/arm/mach-ux500/include/mach/msp.h | 2 +- trunk/arch/arm/mach-ux500/timer.c | 5 +- trunk/arch/arm/mach-ux500/usb.c | 4 +- trunk/arch/arm/mach-vexpress/reset.c | 141 - trunk/arch/arm/mach-vt8500/Kconfig | 12 - trunk/arch/arm/mach-vt8500/common.h | 3 - .../mach-vt8500/include/mach/entry-macro.S | 26 + .../arm/mach-vt8500/include/mach/irqs.h} | 12 +- trunk/arch/arm/mach-vt8500/irq.c | 108 +- trunk/arch/arm/mach-vt8500/vt8500.c | 1 - trunk/arch/arm/mach-zynq/Kconfig | 13 - trunk/arch/arm/mach-zynq/common.c | 63 +- trunk/arch/arm/mach-zynq/common.h | 4 +- .../include/mach/debug-macro.S} | 23 +- .../arm/mach-zynq/include/mach/hardware.h | 18 + trunk/arch/arm/mach-zynq/include/mach/irqs.h | 21 + trunk/arch/arm/mach-zynq/include/mach/timex.h | 23 + trunk/arch/arm/mach-zynq/include/mach/uart.h | 25 + .../arm/mach-zynq/include/mach/uncompress.h | 51 + .../arm/mach-zynq/include/mach/zynq_soc.h | 47 + trunk/arch/arm/mach-zynq/timer.c | 298 +- trunk/arch/arm/plat-nomadik/Kconfig | 29 + trunk/arch/arm/plat-nomadik/Makefile | 5 + .../arm/plat-nomadik/include/plat/mtu.h} | 2 +- .../plat-nomadik/include/plat/ste_dma40.h} | 0 .../arm/plat-nomadik/timer.c} | 19 +- trunk/arch/arm/plat-omap/dma.c | 2 +- .../plat-omap/include/plat-omap/dma-omap.h | 377 + trunk/arch/arm/plat-orion/irq.c | 6 +- trunk/arch/arm/plat-s3c24xx/dma.c | 2 +- trunk/arch/arm/plat-samsung/devs.c | 10 +- .../arch/arm/plat-samsung/include/plat/devs.h | 3 + .../arm/plat-samsung/include/plat/gpio-core.h | 2 - .../arch/arm/plat-samsung/include/plat/mfc.h | 11 - trunk/arch/arm/plat-samsung/include/plat/pm.h | 2 - trunk/arch/arm/plat-samsung/s5p-dev-mfc.c | 34 - trunk/arch/arm/plat-samsung/s5p-irq-gpioint.c | 8 +- trunk/arch/arm/xen/enlighten.c | 123 +- trunk/arch/blackfin/mach-bf609/Kconfig | 2 +- trunk/arch/blackfin/mm/sram-alloc.c | 2 +- trunk/arch/cris/include/arch-v10/arch/irq.h | 2 +- trunk/arch/cris/include/arch-v32/arch/irq.h | 2 +- trunk/arch/frv/mm/pgalloc.c | 2 +- trunk/arch/ia64/kvm/kvm-ia64.c | 9 +- trunk/arch/m68k/Kconfig.bus | 4 +- trunk/arch/m68k/Kconfig.cpu | 3 +- trunk/arch/m68k/Kconfig.debug | 2 +- trunk/arch/m68k/Kconfig.devices | 6 +- trunk/arch/m68k/include/asm/Kbuild | 4 - trunk/arch/m68k/include/asm/hw_irq.h | 6 + trunk/arch/m68k/include/asm/shmparam.h | 6 + trunk/arch/m68k/include/asm/spinlock.h | 6 + trunk/arch/m68k/include/asm/termios.h | 50 + trunk/arch/m68k/include/uapi/asm/Kbuild | 17 +- trunk/arch/m68k/include/uapi/asm/auxvec.h | 4 + trunk/arch/m68k/include/uapi/asm/msgbuf.h | 31 + trunk/arch/m68k/include/uapi/asm/sembuf.h | 25 + trunk/arch/m68k/include/uapi/asm/shmbuf.h | 42 + trunk/arch/m68k/include/uapi/asm/socket.h | 73 + trunk/arch/m68k/include/uapi/asm/sockios.h | 13 + trunk/arch/m68k/include/uapi/asm/termbits.h | 201 + trunk/arch/m68k/include/uapi/asm/termios.h | 44 + trunk/arch/m68k/kernel/traps.c | 2 +- trunk/arch/m68k/math-emu/fp_log.c | 2 +- trunk/arch/m68k/mm/init.c | 224 +- trunk/arch/m68k/mm/init_mm.c | 176 + trunk/arch/m68k/mm/init_no.c | 145 + trunk/arch/m68k/mm/mcfmmu.c | 4 + trunk/arch/m68k/mm/motorola.c | 14 + trunk/arch/m68k/mm/sun3mmu.c | 4 + trunk/arch/m68k/sun3/sun3ints.c | 29 +- trunk/arch/mips/include/asm/pgtable.h | 11 +- trunk/arch/mips/txx9/generic/pci.c | 2 +- trunk/arch/mn10300/mm/pgtable.c | 2 +- trunk/arch/openrisc/Kconfig | 2 +- trunk/arch/powerpc/include/asm/Kbuild | 1 + trunk/arch/powerpc/include/asm/epapr_hcalls.h | 83 +- trunk/arch/powerpc/include/asm/fsl_hcalls.h | 36 +- trunk/arch/powerpc/include/asm/kvm_asm.h | 1 - trunk/arch/powerpc/include/asm/kvm_book3s.h | 12 +- .../arch/powerpc/include/asm/kvm_book3s_64.h | 33 +- .../powerpc/include/asm/kvm_booke_hv_asm.h | 29 +- trunk/arch/powerpc/include/asm/kvm_host.h | 68 +- trunk/arch/powerpc/include/asm/kvm_para.h | 15 +- trunk/arch/powerpc/include/asm/kvm_ppc.h | 87 +- trunk/arch/powerpc/include/asm/mmu-book3e.h | 2 +- trunk/arch/powerpc/include/asm/mmu-hash64.h | 10 - .../arch/powerpc/include/asm/oprofile_impl.h | 2 +- .../arch/powerpc/include/asm/pte-hash64-64k.h | 2 +- trunk/arch/powerpc/include/asm/reg.h | 1 - trunk/arch/powerpc/include/asm/reg_booke.h | 7 - trunk/arch/powerpc/include/asm/smp.h | 8 - trunk/arch/powerpc/include/asm/smu.h | 4 +- trunk/arch/powerpc/include/uapi/asm/Kbuild | 1 - .../powerpc/include/uapi/asm/epapr_hcalls.h | 98 - trunk/arch/powerpc/include/uapi/asm/kvm.h | 86 - .../arch/powerpc/include/uapi/asm/kvm_para.h | 7 +- trunk/arch/powerpc/kernel/asm-offsets.c | 4 +- trunk/arch/powerpc/kernel/epapr_hcalls.S | 28 - trunk/arch/powerpc/kernel/epapr_paravirt.c | 11 +- trunk/arch/powerpc/kernel/kvm.c | 2 +- trunk/arch/powerpc/kernel/legacy_serial.c | 2 +- trunk/arch/powerpc/kernel/of_platform.c | 2 +- trunk/arch/powerpc/kernel/ppc_ksyms.c | 5 - trunk/arch/powerpc/kernel/signal_64.c | 2 +- trunk/arch/powerpc/kernel/smp.c | 46 - trunk/arch/powerpc/kvm/44x.c | 1 - trunk/arch/powerpc/kvm/44x_emulate.c | 112 +- trunk/arch/powerpc/kvm/Kconfig | 4 - trunk/arch/powerpc/kvm/Makefile | 5 +- trunk/arch/powerpc/kvm/book3s.c | 125 - trunk/arch/powerpc/kvm/book3s_32_mmu_host.c | 3 +- trunk/arch/powerpc/kvm/book3s_64_mmu_host.c | 3 +- trunk/arch/powerpc/kvm/book3s_64_mmu_hv.c | 474 +- trunk/arch/powerpc/kvm/book3s_emulate.c | 16 +- trunk/arch/powerpc/kvm/book3s_exports.c | 3 + trunk/arch/powerpc/kvm/book3s_hv.c | 655 +- trunk/arch/powerpc/kvm/book3s_hv_builtin.c | 4 +- trunk/arch/powerpc/kvm/book3s_hv_ras.c | 144 - trunk/arch/powerpc/kvm/book3s_hv_rm_mmu.c | 143 +- trunk/arch/powerpc/kvm/book3s_hv_rmhandlers.S | 142 +- trunk/arch/powerpc/kvm/book3s_mmu_hpte.c | 5 + trunk/arch/powerpc/kvm/book3s_pr.c | 294 +- trunk/arch/powerpc/kvm/book3s_rmhandlers.S | 18 +- trunk/arch/powerpc/kvm/booke.c | 346 +- trunk/arch/powerpc/kvm/booke.h | 1 - trunk/arch/powerpc/kvm/booke_emulate.c | 36 +- trunk/arch/powerpc/kvm/bookehv_interrupts.S | 145 +- trunk/arch/powerpc/kvm/e500.h | 11 +- trunk/arch/powerpc/kvm/e500_emulate.c | 14 +- trunk/arch/powerpc/kvm/e500_tlb.c | 132 +- trunk/arch/powerpc/kvm/emulate.c | 221 +- trunk/arch/powerpc/kvm/powerpc.c | 187 +- trunk/arch/powerpc/kvm/trace.h | 200 +- trunk/arch/powerpc/mm/fault.c | 27 +- trunk/arch/powerpc/mm/slice.c | 2 +- .../arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- trunk/arch/powerpc/platforms/Kconfig | 1 - trunk/arch/powerpc/platforms/cell/iommu.c | 2 +- .../arch/powerpc/platforms/cell/spider-pic.c | 6 +- trunk/arch/powerpc/platforms/powermac/pic.c | 2 +- trunk/arch/powerpc/sysdev/fsl_msi.c | 9 +- trunk/arch/powerpc/sysdev/fsl_soc.c | 2 - trunk/arch/s390/Kbuild | 1 - trunk/arch/s390/Kconfig | 70 +- trunk/arch/s390/Makefile | 1 - trunk/arch/s390/crypto/aes_s390.c | 18 +- trunk/arch/s390/crypto/des_s390.c | 12 +- trunk/arch/s390/crypto/ghash_s390.c | 21 +- trunk/arch/s390/crypto/sha_common.c | 9 +- trunk/arch/s390/include/asm/bitops.h | 81 - trunk/arch/s390/include/asm/ccwdev.h | 6 +- trunk/arch/s390/include/asm/ccwgroup.h | 3 - trunk/arch/s390/include/asm/clp.h | 28 - trunk/arch/s390/include/asm/dma-mapping.h | 76 - trunk/arch/s390/include/asm/dma.h | 19 +- trunk/arch/s390/include/asm/hw_irq.h | 22 - trunk/arch/s390/include/asm/io.h | 55 +- trunk/arch/s390/include/asm/irq.h | 12 - trunk/arch/s390/include/asm/isc.h | 1 - trunk/arch/s390/include/asm/page.h | 2 - trunk/arch/s390/include/asm/pci.h | 156 +- trunk/arch/s390/include/asm/pci_clp.h | 182 - trunk/arch/s390/include/asm/pci_dma.h | 196 - trunk/arch/s390/include/asm/pci_insn.h | 280 - trunk/arch/s390/include/asm/pci_io.h | 194 - trunk/arch/s390/include/asm/pgtable.h | 22 +- trunk/arch/s390/include/asm/sclp.h | 2 - trunk/arch/s390/include/asm/topology.h | 34 +- trunk/arch/s390/include/asm/vga.h | 6 - trunk/arch/s390/kernel/Makefile | 2 +- trunk/arch/s390/kernel/dis.c | 578 +- trunk/arch/s390/kernel/entry.S | 7 +- trunk/arch/s390/kernel/entry.h | 21 +- trunk/arch/s390/kernel/entry64.S | 36 +- trunk/arch/s390/kernel/head.S | 74 +- trunk/arch/s390/kernel/irq.c | 2 - trunk/arch/s390/kernel/pgm_check.S | 152 - trunk/arch/s390/kernel/setup.c | 39 +- trunk/arch/s390/kernel/signal.c | 2 - trunk/arch/s390/kernel/topology.c | 113 +- trunk/arch/s390/kernel/traps.c | 52 +- trunk/arch/s390/kvm/interrupt.c | 19 +- trunk/arch/s390/kvm/kvm-s390.c | 7 +- trunk/arch/s390/mm/Makefile | 12 +- trunk/arch/s390/mm/dump_pagetables.c | 7 +- trunk/arch/s390/mm/fault.c | 31 +- trunk/arch/s390/mm/init.c | 29 + trunk/arch/s390/mm/pageattr.c | 82 +- trunk/arch/s390/mm/pgtable.c | 16 + trunk/arch/s390/mm/vmem.c | 46 +- trunk/arch/s390/net/bpf_jit_comp.c | 28 - trunk/arch/s390/pci/Makefile | 6 - trunk/arch/s390/pci/pci.c | 1103 --- trunk/arch/s390/pci/pci_clp.c | 324 - trunk/arch/s390/pci/pci_dma.c | 506 - trunk/arch/s390/pci/pci_event.c | 93 - trunk/arch/s390/pci/pci_msi.c | 141 - trunk/arch/s390/pci/pci_sysfs.c | 86 - trunk/arch/sh/boards/board-espt.c | 2 +- trunk/arch/sh/mm/fault.c | 19 +- trunk/arch/x86/Kconfig | 1 - trunk/arch/x86/boot/.gitignore | 1 + trunk/arch/x86/boot/compressed/eboot.c | 118 - trunk/arch/x86/include/asm/bootparam.h | 1 - trunk/arch/x86/include/asm/clocksource.h | 1 - trunk/arch/x86/include/asm/cpufeature.h | 1 - trunk/arch/x86/include/asm/fixmap.h | 5 - trunk/arch/x86/include/asm/kexec.h | 3 - trunk/arch/x86/include/asm/kvm_guest.h | 6 - trunk/arch/x86/include/asm/kvm_host.h | 24 +- trunk/arch/x86/include/asm/msr-index.h | 1 - .../arch/x86/include/asm/numachip/numachip.h | 19 - trunk/arch/x86/include/asm/pci.h | 12 - trunk/arch/x86/include/asm/pvclock.h | 47 - trunk/arch/x86/include/asm/vmx.h | 3 +- trunk/arch/x86/include/asm/vsyscall.h | 20 - trunk/arch/x86/include/asm/xen/interface.h | 1 - trunk/arch/x86/kernel/apic/apic_numachip.c | 2 - trunk/arch/x86/kernel/cpu/mtrr/main.c | 2 +- trunk/arch/x86/kernel/crash.c | 32 - trunk/arch/x86/kernel/kvm.c | 20 +- trunk/arch/x86/kernel/kvmclock.c | 88 +- trunk/arch/x86/kernel/pvclock.c | 143 +- trunk/arch/x86/kernel/setup.c | 4 + trunk/arch/x86/kernel/vm86_32.c | 2 +- trunk/arch/x86/kvm/cpuid.c | 3 - trunk/arch/x86/kvm/cpuid.h | 8 - trunk/arch/x86/kvm/emulate.c | 5 +- trunk/arch/x86/kvm/lapic.c | 2 +- trunk/arch/x86/kvm/mmu.c | 65 +- trunk/arch/x86/kvm/paging_tmpl.h | 115 +- trunk/arch/x86/kvm/svm.c | 48 +- trunk/arch/x86/kvm/trace.h | 63 - trunk/arch/x86/kvm/vmx.c | 203 +- trunk/arch/x86/kvm/x86.c | 548 +- trunk/arch/x86/kvm/x86.h | 2 +- trunk/arch/x86/mm/fault.c | 23 +- trunk/arch/x86/mm/init_64.c | 4 +- trunk/arch/x86/mm/pgtable.c | 2 +- trunk/arch/x86/pci/Makefile | 1 - trunk/arch/x86/pci/acpi.c | 46 +- trunk/arch/x86/pci/common.c | 32 +- trunk/arch/x86/pci/numachip.c | 129 - trunk/arch/x86/vdso/vclock_gettime.c | 81 +- trunk/arch/x86/vdso/vgetcpu.c | 11 +- trunk/arch/x86/xen/Kconfig | 1 - trunk/arch/x86/xen/enlighten.c | 102 +- trunk/arch/x86/xen/mmu.c | 17 +- trunk/arch/x86/xen/suspend.c | 2 +- trunk/arch/x86/xen/xen-ops.h | 2 +- trunk/drivers/acpi/acpica/dsopcode.c | 2 +- trunk/drivers/acpi/pci_bind.c | 12 +- trunk/drivers/acpi/pci_irq.c | 17 +- trunk/drivers/acpi/pci_root.c | 165 +- trunk/drivers/base/dma-mapping.c | 4 +- trunk/drivers/base/node.c | 8 +- trunk/drivers/char/hw_random/Kconfig | 2 +- trunk/drivers/char/ipmi/ipmi_msghandler.c | 2 +- trunk/drivers/char/ipmi/ipmi_si_intf.c | 2 +- trunk/drivers/char/ppdev.c | 6 +- trunk/drivers/clk/Makefile | 1 - trunk/drivers/clk/clk-zynq.c | 383 - trunk/drivers/clk/ux500/u8500_clk.c | 11 +- trunk/drivers/clocksource/Kconfig | 17 +- trunk/drivers/clocksource/Makefile | 1 - trunk/drivers/crypto/omap-aes.c | 2 +- trunk/drivers/crypto/omap-sham.c | 2 +- trunk/drivers/crypto/ux500/cryp/cryp_core.c | 3 +- trunk/drivers/dma/omap-dma.c | 2 + trunk/drivers/dma/ste_dma40.c | 3 +- trunk/drivers/dma/ste_dma40_ll.c | 2 +- trunk/drivers/eisa/eisa.ids | 4 +- trunk/drivers/firewire/init_ohci1394_dma.c | 4 +- trunk/drivers/firewire/net.c | 15 +- trunk/drivers/firewire/ohci.c | 2 +- trunk/drivers/firewire/sbp2.c | 2 + trunk/drivers/gpio/Kconfig | 4 +- trunk/drivers/gpio/gpio-samsung.c | 68 +- trunk/drivers/gpu/drm/radeon/evergreen.c | 2 +- trunk/drivers/gpu/drm/radeon/ni.c | 4 +- trunk/drivers/gpu/drm/radeon/radeon_ring.c | 4 +- trunk/drivers/gpu/drm/radeon/si.c | 6 +- trunk/drivers/gpu/vga/Kconfig | 2 +- trunk/drivers/hid/Kconfig | 11 - trunk/drivers/hid/Makefile | 6 +- trunk/drivers/hid/hid-apple.c | 3 +- trunk/drivers/hid/hid-core.c | 61 +- trunk/drivers/hid/hid-icade.c | 259 - trunk/drivers/hid/hid-ids.h | 19 +- trunk/drivers/hid/hid-input.c | 97 +- trunk/drivers/hid/hid-multitouch.c | 109 +- trunk/drivers/hid/hid-picolcd_cir.c | 2 +- trunk/drivers/hid/hid-roccat-isku.c | 44 +- trunk/drivers/hid/hid-roccat-isku.h | 78 +- trunk/drivers/hid/hid-roccat-koneplus.c | 348 +- trunk/drivers/hid/hid-roccat-koneplus.h | 101 +- trunk/drivers/hid/hid-roccat-kovaplus.c | 237 +- trunk/drivers/hid/hid-roccat-kovaplus.h | 16 +- trunk/drivers/hid/hid-roccat-lua.c | 227 - trunk/drivers/hid/hid-roccat-lua.h | 29 - trunk/drivers/hid/hid-roccat-pyra.c | 342 +- trunk/drivers/hid/hid-roccat-pyra.h | 24 +- trunk/drivers/hid/hid-roccat-savu.c | 4 +- trunk/drivers/hid/hid-sensor-hub.c | 36 +- trunk/drivers/hid/hidraw.c | 16 +- trunk/drivers/hid/i2c-hid/Kconfig | 18 - trunk/drivers/hid/i2c-hid/Makefile | 5 - trunk/drivers/hid/i2c-hid/i2c-hid.c | 979 -- trunk/drivers/hid/usbhid/hid-quirks.c | 3 - trunk/drivers/hid/usbhid/hiddev.c | 10 +- trunk/drivers/hwmon/Kconfig | 8 - trunk/drivers/hwmon/Makefile | 1 - trunk/drivers/hwmon/vexpress.c | 229 - trunk/drivers/i2c/busses/i2c-nuc900.c | 2 +- trunk/drivers/i2c/busses/i2c-s3c2410.c | 4 +- trunk/drivers/infiniband/core/cma.c | 9 +- trunk/drivers/infiniband/hw/amso1100/c2_ae.c | 1 - trunk/drivers/infiniband/hw/cxgb3/iwch_cm.c | 6 +- trunk/drivers/infiniband/hw/cxgb4/cm.c | 6 +- .../infiniband/hw/ipath/ipath_init_chip.c | 10 + trunk/drivers/infiniband/hw/mlx4/cm.c | 4 +- trunk/drivers/infiniband/hw/mlx4/cq.c | 34 +- trunk/drivers/infiniband/hw/mlx4/main.c | 27 +- trunk/drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 - trunk/drivers/infiniband/hw/mlx4/user.h | 12 +- trunk/drivers/infiniband/hw/nes/nes.h | 1 - trunk/drivers/infiniband/hw/nes/nes_cm.c | 32 +- trunk/drivers/infiniband/hw/nes/nes_hw.c | 9 +- trunk/drivers/infiniband/hw/nes/nes_mgt.c | 42 +- trunk/drivers/infiniband/hw/nes/nes_nic.c | 13 +- trunk/drivers/infiniband/hw/nes/nes_verbs.c | 9 +- trunk/drivers/infiniband/ulp/srp/ib_srp.c | 314 +- trunk/drivers/infiniband/ulp/srp/ib_srp.h | 11 +- trunk/drivers/input/input-mt.c | 2 +- trunk/drivers/input/keyboard/Kconfig | 2 +- trunk/drivers/input/misc/Kconfig | 10 - trunk/drivers/input/misc/Makefile | 1 - trunk/drivers/input/misc/arizona-haptics.c | 255 - trunk/drivers/isdn/hisax/amd7930_fn.c | 2 +- trunk/drivers/isdn/hisax/isar.c | 2 +- trunk/drivers/isdn/mISDN/dsp_core.c | 3 +- trunk/drivers/md/md.c | 2 +- .../md/persistent-data/dm-block-manager.c | 4 +- trunk/drivers/md/persistent-data/dm-btree.h | 2 +- trunk/drivers/md/raid5.c | 2 +- trunk/drivers/media/common/Kconfig | 7 - trunk/drivers/media/common/b2c2/Kconfig | 5 + trunk/drivers/media/common/siano/Kconfig | 18 +- trunk/drivers/media/common/siano/Makefile | 6 +- trunk/drivers/media/common/siano/smscoreapi.c | 2 +- trunk/drivers/media/common/siano/smsir.c | 2 +- trunk/drivers/media/common/siano/smsir.h | 9 - trunk/drivers/media/dvb-core/dmxdev.c | 2 +- trunk/drivers/media/dvb-core/dmxdev.h | 1 - trunk/drivers/media/dvb-core/dvb-usb-ids.h | 1 - trunk/drivers/media/dvb-core/dvb_frontend.c | 10 + trunk/drivers/media/dvb-frontends/cx22700.c | 4 +- trunk/drivers/media/dvb-frontends/cx24123.c | 2 +- trunk/drivers/media/dvb-frontends/dib9000.h | 2 +- trunk/drivers/media/dvb-frontends/drxd_hard.c | 8 +- trunk/drivers/media/dvb-frontends/drxk_hard.c | 26 +- trunk/drivers/media/dvb-frontends/drxk_hard.h | 6 +- trunk/drivers/media/dvb-frontends/ds3000.c | 15 +- trunk/drivers/media/dvb-frontends/l64781.c | 4 +- trunk/drivers/media/dvb-frontends/mt312.c | 4 +- trunk/drivers/media/dvb-frontends/rtl2830.c | 6 +- trunk/drivers/media/dvb-frontends/rtl2832.c | 6 +- .../drivers/media/dvb-frontends/stb0899_drv.c | 2 +- trunk/drivers/media/dvb-frontends/stv0367.c | 19 +- trunk/drivers/media/dvb-frontends/tda10071.c | 6 +- .../media/dvb-frontends/tda18271c2dd.c | 1 - trunk/drivers/media/firewire/firedtv.h | 1 - trunk/drivers/media/i2c/adp1653.c | 4 +- trunk/drivers/media/i2c/adv7183.c | 13 +- trunk/drivers/media/i2c/adv7604.c | 16 +- .../drivers/media/i2c/cx25840/cx25840-core.c | 2 +- trunk/drivers/media/i2c/ir-kbd-i2c.c | 14 +- trunk/drivers/media/i2c/s5k4ecgx.c | 2 +- trunk/drivers/media/i2c/smiapp-pll.c | 219 +- trunk/drivers/media/i2c/smiapp-pll.h | 61 +- trunk/drivers/media/i2c/smiapp/smiapp-core.c | 74 +- .../drivers/media/i2c/smiapp/smiapp-limits.c | 2 +- .../drivers/media/i2c/smiapp/smiapp-limits.h | 2 +- trunk/drivers/media/i2c/smiapp/smiapp-quirk.c | 2 +- trunk/drivers/media/i2c/smiapp/smiapp-quirk.h | 2 +- .../media/i2c/smiapp/smiapp-reg-defs.h | 2 +- trunk/drivers/media/i2c/smiapp/smiapp-reg.h | 2 +- trunk/drivers/media/i2c/smiapp/smiapp-regs.c | 2 +- trunk/drivers/media/i2c/smiapp/smiapp-regs.h | 2 +- trunk/drivers/media/i2c/smiapp/smiapp.h | 2 +- trunk/drivers/media/i2c/soc_camera/mt9v022.c | 88 +- trunk/drivers/media/i2c/soc_camera/ov2640.c | 55 +- trunk/drivers/media/i2c/vs6624.c | 13 +- trunk/drivers/media/mmc/siano/Kconfig | 3 +- trunk/drivers/media/pci/bt8xx/bttv-driver.c | 7 +- trunk/drivers/media/pci/cx18/cx18-alsa-main.c | 2 +- trunk/drivers/media/pci/cx18/cx18-alsa-pcm.c | 1 - trunk/drivers/media/pci/cx18/cx18-i2c.c | 2 +- trunk/drivers/media/pci/cx18/cx18-streams.c | 2 +- trunk/drivers/media/pci/cx23885/altera-ci.c | 45 +- trunk/drivers/media/pci/cx23885/cimax2.c | 17 +- .../drivers/media/pci/cx23885/cx23885-alsa.c | 6 +- trunk/drivers/media/pci/cx23885/cx23885-av.c | 1 - .../drivers/media/pci/cx23885/cx23885-cards.c | 2 +- .../drivers/media/pci/cx23885/cx23885-core.c | 8 +- trunk/drivers/media/pci/cx23885/cx23885-dvb.c | 2 +- .../drivers/media/pci/cx23885/cx23885-f300.c | 1 - .../drivers/media/pci/cx23885/cx23885-input.c | 7 +- .../drivers/media/pci/cx23885/cx23885-input.h | 2 +- .../drivers/media/pci/cx23885/cx23885-ioctl.c | 2 - trunk/drivers/media/pci/cx23885/cx23885-ir.c | 1 - trunk/drivers/media/pci/cx23885/cx23888-ir.c | 1 - trunk/drivers/media/pci/cx23885/netup-init.c | 1 - .../pci/cx25821/cx25821-audio-upstream.c | 44 +- .../media/pci/cx25821/cx25821-biffuncs.h | 6 +- trunk/drivers/media/pci/cx25821/cx25821-i2c.c | 4 +- .../pci/cx25821/cx25821-video-upstream-ch2.c | 54 +- .../pci/cx25821/cx25821-video-upstream.c | 47 +- .../drivers/media/pci/cx25821/cx25821-video.c | 8 +- trunk/drivers/media/pci/cx88/cx88-alsa.c | 14 +- trunk/drivers/media/pci/cx88/cx88-blackbird.c | 7 +- trunk/drivers/media/pci/cx88/cx88-core.c | 12 +- trunk/drivers/media/pci/cx88/cx88-input.c | 8 +- trunk/drivers/media/pci/cx88/cx88-mpeg.c | 18 +- trunk/drivers/media/pci/cx88/cx88.h | 4 +- trunk/drivers/media/pci/dm1105/dm1105.c | 8 +- trunk/drivers/media/pci/ivtv/ivtv-alsa-main.c | 2 +- trunk/drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 6 +- trunk/drivers/media/pci/ivtv/ivtv-alsa-pcm.h | 4 + trunk/drivers/media/pci/ivtv/ivtv-firmware.c | 2 +- trunk/drivers/media/pci/ivtv/ivtv-i2c.c | 8 +- trunk/drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +- trunk/drivers/media/pci/mantis/mantis_input.c | 5 +- trunk/drivers/media/pci/mantis/mantis_uart.c | 2 +- .../drivers/media/pci/mantis/mantis_vp1033.c | 6 +- trunk/drivers/media/pci/meye/meye.c | 2 +- trunk/drivers/media/pci/ngene/ngene-cards.c | 4 +- trunk/drivers/media/pci/ngene/ngene-core.c | 7 +- .../drivers/media/pci/saa7134/saa7134-core.c | 3 +- .../drivers/media/pci/saa7134/saa7134-input.c | 2 +- .../drivers/media/pci/saa7134/saa7134-video.c | 2 +- trunk/drivers/media/pci/saa7164/saa7164-api.c | 26 +- trunk/drivers/media/pci/saa7164/saa7164-bus.c | 6 +- trunk/drivers/media/pci/saa7164/saa7164-cmd.c | 16 +- .../drivers/media/pci/saa7164/saa7164-core.c | 4 +- .../media/pci/saa7164/saa7164-encoder.c | 15 +- trunk/drivers/media/pci/saa7164/saa7164-fw.c | 8 +- trunk/drivers/media/pci/saa7164/saa7164-vbi.c | 6 +- trunk/drivers/media/pci/ttpci/av7110.h | 1 - trunk/drivers/media/pci/ttpci/budget-av.c | 4 +- trunk/drivers/media/platform/Kconfig | 12 - trunk/drivers/media/platform/Makefile | 1 - .../media/platform/blackfin/bfin_capture.c | 14 +- trunk/drivers/media/platform/coda.c | 4 +- trunk/drivers/media/platform/davinci/Kconfig | 2 +- .../media/platform/davinci/dm355_ccdc.c | 8 +- .../media/platform/davinci/dm644x_ccdc.c | 16 +- trunk/drivers/media/platform/davinci/isif.c | 5 +- trunk/drivers/media/platform/davinci/vpbe.c | 10 +- .../media/platform/davinci/vpbe_display.c | 303 +- .../drivers/media/platform/davinci/vpbe_osd.c | 9 +- trunk/drivers/media/platform/davinci/vpif.c | 8 +- .../media/platform/davinci/vpif_capture.c | 34 +- .../media/platform/davinci/vpif_display.c | 28 +- .../media/platform/exynos-gsc/gsc-core.c | 2 +- .../media/platform/exynos-gsc/gsc-m2m.c | 2 +- trunk/drivers/media/platform/fsl-viu.c | 6 +- .../drivers/media/platform/m2m-deinterlace.c | 24 +- .../drivers/media/platform/mem2mem_testdev.c | 4 +- trunk/drivers/media/platform/mx2_emmaprp.c | 16 +- trunk/drivers/media/platform/omap/omap_vout.c | 38 +- .../media/platform/omap/omap_vout_vrfb.c | 2 +- trunk/drivers/media/platform/omap3isp/isp.c | 83 +- trunk/drivers/media/platform/omap3isp/isp.h | 5 +- .../drivers/media/platform/omap3isp/ispcsi2.c | 6 +- .../media/platform/omap3isp/ispcsiphy.c | 227 +- .../media/platform/omap3isp/ispcsiphy.h | 10 + .../drivers/media/platform/omap3isp/isphist.c | 8 +- .../media/platform/omap3isp/isppreview.c | 41 +- .../drivers/media/platform/omap3isp/ispreg.h | 99 +- .../drivers/media/platform/omap3isp/ispstat.c | 5 +- .../drivers/media/platform/omap3isp/ispstat.h | 4 +- .../media/platform/omap3isp/ispvideo.c | 3 +- .../drivers/media/platform/s3c-camif/Makefile | 5 - .../media/platform/s3c-camif/camif-capture.c | 1672 ---- .../media/platform/s3c-camif/camif-core.c | 662 -- .../media/platform/s3c-camif/camif-core.h | 393 - .../media/platform/s3c-camif/camif-regs.c | 606 -- .../media/platform/s3c-camif/camif-regs.h | 269 - .../media/platform/s5p-fimc/fimc-capture.c | 11 +- .../media/platform/s5p-fimc/fimc-m2m.c | 16 +- .../media/platform/s5p-fimc/fimc-mdevice.c | 4 +- .../media/platform/s5p-mfc/s5p_mfc_dec.c | 14 - .../media/platform/s5p-mfc/s5p_mfc_enc.c | 16 +- .../media/platform/s5p-mfc/s5p_mfc_pm.c | 2 +- .../media/platform/s5p-tv/mixer_video.c | 13 +- .../drivers/media/platform/soc_camera/Kconfig | 1 - .../media/platform/soc_camera/omap1_camera.c | 2 +- .../media/platform/soc_camera/soc_camera.c | 14 +- trunk/drivers/media/platform/vivi.c | 8 +- trunk/drivers/media/radio/radio-aimslab.c | 2 +- trunk/drivers/media/radio/radio-cadet.c | 3 +- trunk/drivers/media/radio/radio-isa.c | 10 +- trunk/drivers/media/radio/radio-sf16fmi.c | 2 +- trunk/drivers/media/radio/radio-tea5764.c | 4 +- trunk/drivers/media/radio/si4713-i2c.c | 2 +- trunk/drivers/media/radio/wl128x/fmdrv.h | 2 +- .../drivers/media/radio/wl128x/fmdrv_common.c | 2 +- trunk/drivers/media/radio/wl128x/fmdrv_rx.c | 2 +- trunk/drivers/media/rc/ati_remote.c | 2 +- trunk/drivers/media/rc/ene_ir.c | 33 +- trunk/drivers/media/rc/fintek-cir.c | 6 +- trunk/drivers/media/rc/gpio-ir-recv.c | 2 +- trunk/drivers/media/rc/iguanair.c | 2 +- trunk/drivers/media/rc/imon.c | 40 +- trunk/drivers/media/rc/ir-jvc-decoder.c | 4 +- trunk/drivers/media/rc/ir-lirc-codec.c | 4 +- trunk/drivers/media/rc/ir-mce_kbd-decoder.c | 4 +- trunk/drivers/media/rc/ir-nec-decoder.c | 4 +- trunk/drivers/media/rc/ir-rc5-decoder.c | 14 +- trunk/drivers/media/rc/ir-rc5-sz-decoder.c | 6 +- trunk/drivers/media/rc/ir-rc6-decoder.c | 8 +- trunk/drivers/media/rc/ir-rx51.c | 13 +- trunk/drivers/media/rc/ir-sanyo-decoder.c | 4 +- trunk/drivers/media/rc/ir-sony-decoder.c | 17 +- trunk/drivers/media/rc/ite-cir.c | 6 +- trunk/drivers/media/rc/keymaps/rc-imon-mce.c | 2 +- trunk/drivers/media/rc/keymaps/rc-rc6-mce.c | 2 +- trunk/drivers/media/rc/mceusb.c | 2 +- trunk/drivers/media/rc/nuvoton-cir.c | 13 +- trunk/drivers/media/rc/nuvoton-cir.h | 1 + trunk/drivers/media/rc/rc-loopback.c | 2 +- trunk/drivers/media/rc/rc-main.c | 73 +- trunk/drivers/media/rc/redrat3.c | 2 +- trunk/drivers/media/rc/streamzap.c | 2 +- trunk/drivers/media/rc/ttusbir.c | 2 +- trunk/drivers/media/rc/winbond-cir.c | 113 +- trunk/drivers/media/tuners/fc2580.c | 61 +- trunk/drivers/media/tuners/max2165.c | 2 +- trunk/drivers/media/tuners/tua9001.c | 2 +- trunk/drivers/media/tuners/xc4000.c | 2 +- trunk/drivers/media/usb/au0828/au0828-cards.c | 2 +- trunk/drivers/media/usb/au0828/au0828-dvb.c | 5 +- trunk/drivers/media/usb/au0828/au0828-video.c | 16 +- .../media/usb/cx231xx/cx231xx-avcore.c | 9 +- .../drivers/media/usb/cx231xx/cx231xx-cards.c | 8 +- trunk/drivers/media/usb/cx231xx/cx231xx-i2c.c | 4 +- .../drivers/media/usb/cx231xx/cx231xx-input.c | 2 +- trunk/drivers/media/usb/dvb-usb-v2/af9015.c | 2 +- trunk/drivers/media/usb/dvb-usb-v2/af9035.c | 4 +- trunk/drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- trunk/drivers/media/usb/dvb-usb-v2/az6007.c | 2 +- trunk/drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +- .../media/usb/dvb-usb-v2/dvb_usb_core.c | 14 +- trunk/drivers/media/usb/dvb-usb-v2/it913x.c | 12 +- trunk/drivers/media/usb/dvb-usb-v2/lmedm04.c | 4 +- trunk/drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 6 +- trunk/drivers/media/usb/dvb-usb-v2/usb_urb.c | 8 +- trunk/drivers/media/usb/dvb-usb/az6027.c | 11 +- trunk/drivers/media/usb/dvb-usb/dib0700.h | 2 +- .../drivers/media/usb/dvb-usb/dib0700_core.c | 16 +- .../media/usb/dvb-usb/dib0700_devices.c | 146 +- trunk/drivers/media/usb/dvb-usb/dvb-usb.h | 2 +- trunk/drivers/media/usb/dvb-usb/pctv452e.c | 4 +- .../media/usb/dvb-usb/technisat-usb2.c | 2 +- trunk/drivers/media/usb/dvb-usb/ttusb2.c | 2 +- trunk/drivers/media/usb/dvb-usb/vp702x.c | 8 +- trunk/drivers/media/usb/em28xx/em28xx-cards.c | 15 +- trunk/drivers/media/usb/em28xx/em28xx-dvb.c | 84 +- trunk/drivers/media/usb/em28xx/em28xx-input.c | 16 +- trunk/drivers/media/usb/em28xx/em28xx.h | 1 - trunk/drivers/media/usb/gspca/gspca.c | 3 +- trunk/drivers/media/usb/gspca/gspca.h | 2 +- trunk/drivers/media/usb/gspca/jeilinj.c | 6 +- .../media/usb/gspca/m5602/m5602_s5k4aa.c | 6 - trunk/drivers/media/usb/gspca/pac7302.c | 62 +- trunk/drivers/media/usb/gspca/sonixb.c | 1 - trunk/drivers/media/usb/hdpvr/hdpvr-core.c | 2 - trunk/drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +- trunk/drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 6 +- .../media/usb/pvrusb2/pvrusb2-i2c-core.c | 4 +- .../drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +- trunk/drivers/media/usb/pwc/pwc-ctrl.c | 2 - trunk/drivers/media/usb/pwc/pwc-if.c | 8 +- trunk/drivers/media/usb/s2255/s2255drv.c | 2 +- trunk/drivers/media/usb/siano/Kconfig | 3 +- .../drivers/media/usb/sn9c102/sn9c102_core.c | 2 - trunk/drivers/media/usb/stk1160/stk1160-i2c.c | 2 +- .../drivers/media/usb/stk1160/stk1160-video.c | 23 +- trunk/drivers/media/usb/stk1160/stk1160.h | 5 +- .../drivers/media/usb/stkwebcam/stk-webcam.c | 5 +- trunk/drivers/media/usb/tlg2300/pd-dvb.c | 1 - trunk/drivers/media/usb/tlg2300/pd-video.c | 4 +- trunk/drivers/media/usb/tm6000/tm6000-input.c | 20 +- trunk/drivers/media/usb/tm6000/tm6000-video.c | 1 - trunk/drivers/media/usb/usbvision/usbvision.h | 2 +- trunk/drivers/media/usb/uvc/uvc_ctrl.c | 29 +- trunk/drivers/media/usb/uvc/uvc_driver.c | 10 - trunk/drivers/media/usb/uvc/uvc_entity.c | 2 - trunk/drivers/media/usb/uvc/uvc_queue.c | 2 +- trunk/drivers/media/usb/uvc/uvc_v4l2.c | 89 +- trunk/drivers/media/usb/uvc/uvc_video.c | 1 - trunk/drivers/media/usb/uvc/uvcvideo.h | 8 - trunk/drivers/media/usb/zr364xx/zr364xx.c | 3 +- trunk/drivers/media/v4l2-core/Kconfig | 3 - trunk/drivers/media/v4l2-core/v4l2-common.c | 3 +- .../media/v4l2-core/v4l2-compat-ioctl32.c | 19 - trunk/drivers/media/v4l2-core/v4l2-dev.c | 1 - trunk/drivers/media/v4l2-core/v4l2-event.c | 2 +- trunk/drivers/media/v4l2-core/v4l2-fh.c | 2 +- trunk/drivers/media/v4l2-core/v4l2-ioctl.c | 11 - trunk/drivers/media/v4l2-core/v4l2-mem2mem.c | 19 +- trunk/drivers/media/v4l2-core/v4l2-subdev.c | 22 +- trunk/drivers/media/v4l2-core/videobuf-core.c | 4 - .../drivers/media/v4l2-core/videobuf2-core.c | 300 +- .../media/v4l2-core/videobuf2-dma-contig.c | 700 +- .../media/v4l2-core/videobuf2-memops.c | 40 + .../media/v4l2-core/videobuf2-vmalloc.c | 56 - trunk/drivers/message/i2o/README.ioctl | 12 +- trunk/drivers/message/i2o/i2o_block.c | 2 +- trunk/drivers/message/i2o/i2o_config.c | 2 +- trunk/drivers/mfd/Kconfig | 1 + trunk/drivers/mfd/ab8500-core.c | 33 +- trunk/drivers/mfd/arizona-core.c | 2 - trunk/drivers/mfd/db8500-prcmu.c | 12 +- trunk/drivers/mfd/max8997.c | 73 +- trunk/drivers/mfd/tps6586x.c | 76 +- trunk/drivers/mfd/wm5102-tables.c | 3 - trunk/drivers/mfd/wm8994-core.c | 35 +- trunk/drivers/misc/atmel-ssc.c | 135 +- trunk/drivers/mmc/host/Kconfig | 2 +- trunk/drivers/mtd/maps/plat-ram.c | 2 +- trunk/drivers/mtd/nand/Kconfig | 2 +- trunk/drivers/mtd/nand/omap2.c | 1 + trunk/drivers/mtd/nand/s3c2410.c | 2 +- trunk/drivers/mtd/onenand/omap2.c | 2 +- trunk/drivers/net/bonding/bond_main.c | 2 + trunk/drivers/net/bonding/bonding.h | 2 +- .../net/can/sja1000/sja1000_of_platform.c | 2 +- trunk/drivers/net/ethernet/8390/ax88796.c | 2 +- .../net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 2 +- .../net/ethernet/chelsio/cxgb3/t3_hw.c | 2 +- .../net/ethernet/chelsio/cxgb4/cxgb4_main.c | 10 +- .../drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +- .../net/ethernet/chelsio/cxgb4/t4_hw.c | 20 +- .../net/ethernet/chelsio/cxgb4/t4_msg.h | 1 - .../net/ethernet/chelsio/cxgb4/t4_regs.h | 36 +- .../net/ethernet/chelsio/cxgb4/t4fw_api.h | 41 +- .../net/ethernet/chelsio/cxgb4vf/sge.c | 8 +- trunk/drivers/net/ethernet/emulex/benet/be.h | 2 +- .../net/ethernet/emulex/benet/be_cmds.c | 5 - .../net/ethernet/emulex/benet/be_main.c | 59 +- trunk/drivers/net/ethernet/freescale/Kconfig | 3 +- .../net/ethernet/intel/e1000/e1000_ethtool.c | 2 +- .../drivers/net/ethernet/mellanox/mlx4/cmd.c | 11 +- .../net/ethernet/mellanox/mlx4/en_cq.c | 2 +- .../net/ethernet/mellanox/mlx4/en_netdev.c | 1 - .../net/ethernet/mellanox/mlx4/en_rx.c | 5 +- .../net/ethernet/mellanox/mlx4/en_tx.c | 5 +- trunk/drivers/net/ethernet/mellanox/mlx4/eq.c | 38 +- trunk/drivers/net/ethernet/mellanox/mlx4/fw.c | 30 +- trunk/drivers/net/ethernet/mellanox/mlx4/fw.h | 1 - .../drivers/net/ethernet/mellanox/mlx4/main.c | 38 +- .../net/ethernet/mellanox/mlx4/mlx4_en.h | 1 - trunk/drivers/net/ethernet/micrel/ksz884x.c | 2 +- .../myri10ge/myri10ge_mcp_gen_header.h | 2 +- .../net/ethernet/stmicro/stmmac/stmmac.h | 6 +- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 22 +- trunk/drivers/net/ethernet/ti/cpts.c | 2 + trunk/drivers/net/sungem_phy.c | 8 +- trunk/drivers/net/tun.c | 87 +- trunk/drivers/net/usb/cdc_ether.c | 35 +- trunk/drivers/net/usb/qmi_wwan.c | 14 - trunk/drivers/net/wimax/i2400m/debugfs.c | 1 - trunk/drivers/net/wimax/i2400m/i2400m-usb.h | 3 - trunk/drivers/net/wimax/i2400m/usb.c | 6 - trunk/drivers/net/wireless/ath/ath9k/pci.c | 8 +- trunk/drivers/net/wireless/atmel.c | 2 +- trunk/drivers/net/wireless/ipw2x00/ipw2100.h | 2 +- trunk/drivers/net/wireless/iwlegacy/4965.h | 4 + trunk/drivers/net/wireless/iwlegacy/common.c | 10 +- trunk/drivers/net/wireless/iwlegacy/common.h | 12 + .../drivers/net/wireless/iwlwifi/pcie/trans.c | 8 +- trunk/drivers/net/wireless/rt2x00/rt2x00dev.c | 8 + trunk/drivers/net/wireless/zd1211rw/zd_chip.c | 2 +- trunk/drivers/of/Kconfig | 2 +- trunk/drivers/pci/bus.c | 5 - trunk/drivers/pci/hotplug/Kconfig | 11 - trunk/drivers/pci/hotplug/Makefile | 1 - trunk/drivers/pci/hotplug/s390_pci_hpc.c | 252 - trunk/drivers/pci/ioapic.c | 2 - trunk/drivers/pci/iov.c | 87 +- trunk/drivers/pci/irq.c | 10 +- trunk/drivers/pci/msi.c | 6 - trunk/drivers/pci/pci-driver.c | 73 +- trunk/drivers/pci/pci-stub.c | 2 +- trunk/drivers/pci/pci-sysfs.c | 172 +- trunk/drivers/pci/pci.c | 48 +- trunk/drivers/pci/pci.h | 8 +- trunk/drivers/pci/pcie/aer/aerdrv.h | 5 +- trunk/drivers/pci/pcie/aer/aerdrv_core.c | 22 +- trunk/drivers/pci/pcie/aspm.c | 18 +- trunk/drivers/pci/pcie/portdrv_core.c | 3 +- trunk/drivers/pci/probe.c | 42 +- trunk/drivers/pci/quirks.c | 39 - trunk/drivers/pci/remove.c | 36 - trunk/drivers/pci/rom.c | 11 +- trunk/drivers/pci/setup-bus.c | 22 +- trunk/drivers/pci/xen-pcifront.c | 5 +- trunk/drivers/pinctrl/mvebu/pinctrl-dove.c | 22 +- .../drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 568 +- trunk/drivers/pinctrl/pinctrl-nomadik.c | 3 +- trunk/drivers/power/Kconfig | 25 +- trunk/drivers/power/Makefile | 5 +- trunk/drivers/power/ab8500_bmdata.c | 521 -- trunk/drivers/power/ab8500_btemp.c | 77 +- trunk/drivers/power/ab8500_charger.c | 84 +- trunk/drivers/power/ab8500_fg.c | 82 +- trunk/drivers/power/abx500_chargalg.c | 56 +- trunk/drivers/power/avs/smartreflex.c | 54 +- trunk/drivers/power/bq2415x_charger.c | 1670 ---- trunk/drivers/power/bq27x00_battery.c | 8 - trunk/drivers/power/ds2782_battery.c | 4 +- trunk/drivers/power/generic-adc-battery.c | 5 +- trunk/drivers/power/jz4740-battery.c | 45 +- trunk/drivers/power/lp8788-charger.c | 75 +- trunk/drivers/power/max17042_battery.c | 3 +- trunk/drivers/power/max8925_power.c | 51 +- trunk/drivers/power/power_supply_core.c | 96 - trunk/drivers/power/power_supply_sysfs.c | 2 - trunk/drivers/power/reset/Kconfig | 15 - trunk/drivers/power/reset/Makefile | 1 - trunk/drivers/power/reset/gpio-poweroff.c | 129 - trunk/drivers/power/rx51_battery.c | 251 - trunk/drivers/power/twl4030_charger.c | 12 +- trunk/drivers/regulator/88pm8607.c | 6 +- trunk/drivers/regulator/Kconfig | 54 - trunk/drivers/regulator/Makefile | 6 - trunk/drivers/regulator/aat2870-regulator.c | 4 +- trunk/drivers/regulator/ab3100.c | 6 +- trunk/drivers/regulator/ab8500.c | 12 +- trunk/drivers/regulator/ad5398.c | 6 +- trunk/drivers/regulator/anatop-regulator.c | 34 +- trunk/drivers/regulator/arizona-ldo1.c | 136 +- trunk/drivers/regulator/arizona-micsupp.c | 8 +- trunk/drivers/regulator/as3711-regulator.c | 369 - trunk/drivers/regulator/core.c | 42 +- trunk/drivers/regulator/da903x.c | 6 +- trunk/drivers/regulator/da9052-regulator.c | 16 +- trunk/drivers/regulator/da9055-regulator.c | 641 -- trunk/drivers/regulator/db8500-prcmu.c | 6 +- trunk/drivers/regulator/dbx500-prcmu.c | 4 +- trunk/drivers/regulator/dummy.c | 2 +- trunk/drivers/regulator/fan53555.c | 6 +- trunk/drivers/regulator/fixed.c | 6 +- trunk/drivers/regulator/gpio-regulator.c | 112 +- trunk/drivers/regulator/isl6271a-regulator.c | 6 +- trunk/drivers/regulator/lp3971.c | 8 +- trunk/drivers/regulator/lp3972.c | 8 +- trunk/drivers/regulator/lp872x.c | 4 +- trunk/drivers/regulator/lp8788-buck.c | 24 +- trunk/drivers/regulator/lp8788-ldo.c | 25 +- trunk/drivers/regulator/max1586.c | 50 +- trunk/drivers/regulator/max77686.c | 170 +- trunk/drivers/regulator/max8649.c | 6 +- trunk/drivers/regulator/max8660.c | 6 +- trunk/drivers/regulator/max8907-regulator.c | 6 +- trunk/drivers/regulator/max8925-regulator.c | 78 +- trunk/drivers/regulator/max8952.c | 6 +- trunk/drivers/regulator/max8973-regulator.c | 505 - trunk/drivers/regulator/max8997.c | 187 +- trunk/drivers/regulator/max8998.c | 6 +- trunk/drivers/regulator/mc13783-regulator.c | 6 +- trunk/drivers/regulator/mc13892-regulator.c | 6 +- .../regulator/mc13xxx-regulator-core.c | 4 +- trunk/drivers/regulator/palmas-regulator.c | 166 +- trunk/drivers/regulator/pcap-regulator.c | 6 +- trunk/drivers/regulator/pcf50633-regulator.c | 182 +- trunk/drivers/regulator/rc5t583-regulator.c | 6 +- trunk/drivers/regulator/s2mps11.c | 16 +- trunk/drivers/regulator/s5m8767.c | 46 +- trunk/drivers/regulator/tps51632-regulator.c | 342 - trunk/drivers/regulator/tps6105x-regulator.c | 6 +- trunk/drivers/regulator/tps62360-regulator.c | 8 +- trunk/drivers/regulator/tps65023-regulator.c | 6 +- trunk/drivers/regulator/tps6507x-regulator.c | 6 +- trunk/drivers/regulator/tps65090-regulator.c | 254 +- trunk/drivers/regulator/tps65217-regulator.c | 6 +- trunk/drivers/regulator/tps6524x-regulator.c | 4 +- trunk/drivers/regulator/tps6586x-regulator.c | 189 +- trunk/drivers/regulator/tps65910-regulator.c | 13 +- trunk/drivers/regulator/tps65912-regulator.c | 6 +- trunk/drivers/regulator/tps80031-regulator.c | 788 -- trunk/drivers/regulator/twl-regulator.c | 6 +- trunk/drivers/regulator/vexpress.c | 147 - trunk/drivers/regulator/virtual.c | 6 +- trunk/drivers/regulator/wm831x-dcdc.c | 31 +- trunk/drivers/regulator/wm831x-isink.c | 6 +- trunk/drivers/regulator/wm831x-ldo.c | 18 +- trunk/drivers/regulator/wm8400-regulator.c | 6 +- trunk/drivers/regulator/wm8994-regulator.c | 6 +- .../remoteproc/remoteproc_elf_loader.c | 4 +- trunk/drivers/rtc/rtc-isl1208.c | 2 +- trunk/drivers/rtc/rtc-s3c.c | 2 +- trunk/drivers/s390/block/dasd.c | 97 +- trunk/drivers/s390/block/dasd_devmap.c | 36 +- trunk/drivers/s390/block/dasd_eckd.c | 92 +- trunk/drivers/s390/block/dasd_fba.c | 23 +- trunk/drivers/s390/block/dasd_int.h | 2 - trunk/drivers/s390/block/dasd_ioctl.c | 11 +- trunk/drivers/s390/char/sclp.h | 3 +- trunk/drivers/s390/char/sclp_cmd.c | 81 +- trunk/drivers/s390/cio/ccwgroup.c | 26 +- trunk/drivers/s390/cio/chsc.c | 156 +- trunk/drivers/s390/cio/device.c | 11 + trunk/drivers/s390/cio/device.h | 2 + trunk/drivers/s390/cio/device_ops.c | 17 +- trunk/drivers/s390/cio/device_pgid.c | 10 +- trunk/drivers/s390/cio/qdio_main.c | 52 +- trunk/drivers/s390/cio/qdio_setup.c | 9 +- trunk/drivers/s390/cio/qdio_thinint.c | 2 + trunk/drivers/s390/crypto/zcrypt_msgtype50.c | 68 +- trunk/drivers/s390/crypto/zcrypt_msgtype50.h | 2 - trunk/drivers/scsi/Kconfig | 2 - trunk/drivers/scsi/Makefile | 2 - trunk/drivers/scsi/aacraid/aachba.c | 87 +- trunk/drivers/scsi/aacraid/aacraid.h | 2 +- trunk/drivers/scsi/be2iscsi/be.h | 7 +- trunk/drivers/scsi/be2iscsi/be_cmds.c | 236 +- trunk/drivers/scsi/be2iscsi/be_cmds.h | 93 +- trunk/drivers/scsi/be2iscsi/be_iscsi.c | 124 +- trunk/drivers/scsi/be2iscsi/be_iscsi.h | 2 +- trunk/drivers/scsi/be2iscsi/be_main.c | 1059 +-- trunk/drivers/scsi/be2iscsi/be_main.h | 152 +- trunk/drivers/scsi/be2iscsi/be_mgmt.c | 424 +- trunk/drivers/scsi/be2iscsi/be_mgmt.h | 23 +- trunk/drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 +- trunk/drivers/scsi/bnx2i/bnx2i.h | 2 +- trunk/drivers/scsi/bnx2i/bnx2i_init.c | 43 +- trunk/drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- trunk/drivers/scsi/csiostor/Kconfig | 19 - trunk/drivers/scsi/csiostor/Makefile | 11 - trunk/drivers/scsi/csiostor/csio_attr.c | 796 -- trunk/drivers/scsi/csiostor/csio_defs.h | 121 - trunk/drivers/scsi/csiostor/csio_hw.c | 4395 --------- trunk/drivers/scsi/csiostor/csio_hw.h | 665 -- trunk/drivers/scsi/csiostor/csio_init.c | 1274 --- trunk/drivers/scsi/csiostor/csio_init.h | 158 - trunk/drivers/scsi/csiostor/csio_isr.c | 624 -- trunk/drivers/scsi/csiostor/csio_lnode.c | 2135 ----- trunk/drivers/scsi/csiostor/csio_lnode.h | 255 - trunk/drivers/scsi/csiostor/csio_mb.c | 1750 ---- trunk/drivers/scsi/csiostor/csio_mb.h | 278 - trunk/drivers/scsi/csiostor/csio_rnode.c | 913 -- trunk/drivers/scsi/csiostor/csio_rnode.h | 141 - trunk/drivers/scsi/csiostor/csio_scsi.c | 2555 ------ trunk/drivers/scsi/csiostor/csio_scsi.h | 342 - trunk/drivers/scsi/csiostor/csio_wr.c | 1632 ---- trunk/drivers/scsi/csiostor/csio_wr.h | 512 -- trunk/drivers/scsi/csiostor/t4fw_api_stor.h | 578 -- trunk/drivers/scsi/hptiop.c | 413 +- trunk/drivers/scsi/hptiop.h | 72 +- trunk/drivers/scsi/libsas/sas_expander.c | 2 +- trunk/drivers/scsi/lpfc/lpfc.h | 2 - trunk/drivers/scsi/lpfc/lpfc_attr.c | 85 - trunk/drivers/scsi/lpfc/lpfc_crtn.h | 1 - trunk/drivers/scsi/lpfc/lpfc_ct.c | 2 +- trunk/drivers/scsi/lpfc/lpfc_els.c | 8 +- trunk/drivers/scsi/lpfc/lpfc_hw4.h | 3 - trunk/drivers/scsi/lpfc/lpfc_init.c | 57 +- trunk/drivers/scsi/lpfc/lpfc_scsi.c | 19 +- trunk/drivers/scsi/lpfc/lpfc_sli.c | 16 +- trunk/drivers/scsi/lpfc/lpfc_sli.h | 4 +- trunk/drivers/scsi/lpfc/lpfc_sli4.h | 3 - trunk/drivers/scsi/lpfc/lpfc_version.h | 2 +- trunk/drivers/scsi/mpt3sas/Kconfig | 67 - trunk/drivers/scsi/mpt3sas/Makefile | 8 - trunk/drivers/scsi/mpt3sas/mpi/mpi2.h | 1164 --- trunk/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 3323 ------- trunk/drivers/scsi/mpt3sas/mpi/mpi2_init.h | 560 -- trunk/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 1665 ---- trunk/drivers/scsi/mpt3sas/mpi/mpi2_raid.h | 346 - trunk/drivers/scsi/mpt3sas/mpi/mpi2_sas.h | 295 - trunk/drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 437 - trunk/drivers/scsi/mpt3sas/mpi/mpi2_type.h | 56 - trunk/drivers/scsi/mpt3sas/mpt3sas_base.c | 4840 ---------- trunk/drivers/scsi/mpt3sas/mpt3sas_base.h | 1139 --- trunk/drivers/scsi/mpt3sas/mpt3sas_config.c | 1650 ---- trunk/drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3297 ------- trunk/drivers/scsi/mpt3sas/mpt3sas_ctl.h | 418 - trunk/drivers/scsi/mpt3sas/mpt3sas_debug.h | 219 - trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c | 8167 ----------------- .../drivers/scsi/mpt3sas/mpt3sas_transport.c | 2128 ----- .../scsi/mpt3sas/mpt3sas_trigger_diag.c | 434 - .../scsi/mpt3sas/mpt3sas_trigger_diag.h | 193 - trunk/drivers/scsi/mvsas/mv_94xx.h | 14 +- trunk/drivers/scsi/mvsas/mv_sas.h | 2 +- trunk/drivers/scsi/osd/osd_uld.c | 28 - trunk/drivers/scsi/qla2xxx/qla_attr.c | 3 +- trunk/drivers/scsi/qla2xxx/qla_bsg.c | 72 +- trunk/drivers/scsi/qla2xxx/qla_dbg.c | 8 +- trunk/drivers/scsi/qla2xxx/qla_def.h | 4 +- trunk/drivers/scsi/qla2xxx/qla_fw.h | 21 - trunk/drivers/scsi/qla2xxx/qla_gbl.h | 3 +- trunk/drivers/scsi/qla2xxx/qla_gs.c | 6 - trunk/drivers/scsi/qla2xxx/qla_init.c | 153 +- trunk/drivers/scsi/qla2xxx/qla_iocb.c | 15 +- trunk/drivers/scsi/qla2xxx/qla_isr.c | 42 +- trunk/drivers/scsi/qla2xxx/qla_mbx.c | 6 +- trunk/drivers/scsi/qla2xxx/qla_nx.c | 83 +- trunk/drivers/scsi/qla2xxx/qla_os.c | 57 +- trunk/drivers/scsi/qla2xxx/qla_target.c | 14 +- trunk/drivers/scsi/qla2xxx/qla_version.h | 2 +- trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 +- trunk/drivers/scsi/scsi_pm.c | 98 +- trunk/drivers/scsi/scsi_sysfs.c | 11 +- trunk/drivers/scsi/scsi_transport_sas.c | 1 - trunk/drivers/scsi/scsi_transport_srp.c | 51 +- trunk/drivers/scsi/sd.c | 35 +- trunk/drivers/scsi/virtio_scsi.c | 2 - trunk/drivers/spi/Kconfig | 31 +- trunk/drivers/spi/Makefile | 5 +- trunk/drivers/spi/spi-altera.c | 6 +- trunk/drivers/spi/spi-ath79.c | 6 +- trunk/drivers/spi/spi-atmel.c | 4 +- trunk/drivers/spi/spi-bcm63xx.c | 22 +- trunk/drivers/spi/spi-bfin-sport.c | 8 +- trunk/drivers/spi/spi-bfin5xx.c | 4 +- trunk/drivers/spi/spi-bitbang.c | 27 +- trunk/drivers/spi/spi-clps711x.c | 296 - trunk/drivers/spi/spi-coldfire-qspi.c | 6 +- trunk/drivers/spi/spi-davinci.c | 6 +- trunk/drivers/spi/spi-dw-mmio.c | 6 +- trunk/drivers/spi/spi-dw-pci.c | 6 +- trunk/drivers/spi/spi-dw.c | 6 +- trunk/drivers/spi/spi-ep93xx.c | 6 +- trunk/drivers/spi/spi-falcon.c | 6 +- trunk/drivers/spi/spi-fsl-espi.c | 8 +- trunk/drivers/spi/spi-fsl-lib.c | 4 +- trunk/drivers/spi/spi-fsl-spi.c | 14 +- trunk/drivers/spi/spi-gpio.c | 13 +- trunk/drivers/spi/spi-imx.c | 6 +- trunk/drivers/spi/spi-mpc512x-psc.c | 10 +- trunk/drivers/spi/spi-mpc52xx-psc.c | 8 +- trunk/drivers/spi/spi-mpc52xx.c | 8 +- trunk/drivers/spi/spi-mxs.c | 6 +- trunk/drivers/spi/spi-nuc900.c | 6 +- trunk/drivers/spi/spi-oc-tiny.c | 10 +- trunk/drivers/spi/spi-octeon.c | 6 +- trunk/drivers/spi/spi-omap-100k.c | 2 +- trunk/drivers/spi/spi-omap2-mcspi.c | 76 +- trunk/drivers/spi/spi-orion.c | 27 +- trunk/drivers/spi/spi-pl022.c | 61 +- trunk/drivers/spi/spi-pxa2xx-pci.c | 6 +- trunk/drivers/spi/spi-pxa2xx.c | 4 +- trunk/drivers/spi/spi-rspi.c | 10 +- trunk/drivers/spi/spi-s3c24xx.c | 6 +- trunk/drivers/spi/spi-s3c64xx.c | 38 +- trunk/drivers/spi/spi-sh-hspi.c | 49 +- trunk/drivers/spi/spi-sh-msiof.c | 6 +- trunk/drivers/spi/spi-sh.c | 6 +- trunk/drivers/spi/spi-sirf.c | 6 +- trunk/drivers/spi/spi-stmp.c | 664 ++ trunk/drivers/spi/spi-tegra20-sflash.c | 665 -- trunk/drivers/spi/spi-tegra20-slink.c | 1358 --- trunk/drivers/spi/spi-ti-ssp.c | 6 +- trunk/drivers/spi/spi-tle62x0.c | 6 +- trunk/drivers/spi/spi-topcliff-pch.c | 12 +- trunk/drivers/spi/spi-xcomm.c | 6 +- trunk/drivers/spi/spi-xilinx.c | 6 +- trunk/drivers/spi/spi.c | 101 +- trunk/drivers/spi/spidev.c | 16 +- trunk/drivers/staging/comedi/drivers/usbdux.c | 2 +- .../staging/media/dt3155v4l/dt3155v4l.c | 4 +- .../drivers/staging/media/go7007/go7007-fw.c | 42 +- .../staging/media/go7007/go7007-v4l2.c | 2 +- .../staging/media/go7007/s2250-board.c | 13 +- .../drivers/staging/media/go7007/wis-ov7640.c | 20 +- .../staging/media/go7007/wis-saa7113.c | 20 +- .../staging/media/go7007/wis-saa7115.c | 20 +- .../staging/media/go7007/wis-sony-tuner.c | 13 +- .../drivers/staging/media/go7007/wis-tw2804.c | 13 +- .../drivers/staging/media/go7007/wis-tw9903.c | 13 +- .../staging/media/go7007/wis-uda1342.c | 13 +- .../drivers/staging/media/lirc/lirc_serial.c | 6 +- trunk/drivers/staging/tidspbridge/rmgr/node.c | 2 +- .../target/iscsi/iscsi_target_configfs.c | 2 +- .../drivers/target/iscsi/iscsi_target_erl0.c | 6 +- .../target/iscsi/iscsi_target_parameters.c | 1 - .../drivers/target/iscsi/iscsi_target_util.c | 2 +- trunk/drivers/thermal/Kconfig | 2 +- trunk/drivers/tty/Kconfig | 1 - trunk/drivers/tty/hvc/hvc_opal.c | 2 +- trunk/drivers/tty/hvc/hvc_vio.c | 2 +- trunk/drivers/tty/ipwireless/setup_protocol.h | 2 +- trunk/drivers/tty/serial/8250/Kconfig | 2 +- trunk/drivers/tty/serial/bfin_uart.c | 2 +- trunk/drivers/tty/serial/icom.c | 2 +- trunk/drivers/usb/core/driver.c | 2 +- trunk/drivers/usb/gadget/at91_udc.c | 2 +- trunk/drivers/usb/gadget/omap_udc.c | 2 +- trunk/drivers/usb/host/ehci-orion.c | 38 +- trunk/drivers/usb/musb/tusb6010_omap.c | 2 +- trunk/drivers/usb/storage/realtek_cr.c | 2 +- trunk/drivers/vhost/tcm_vhost.c | 2 +- trunk/drivers/video/omap/lcdc.c | 2 +- trunk/drivers/video/omap/omapfb_main.c | 2 +- trunk/drivers/video/omap/sossi.c | 2 +- trunk/drivers/virt/Kconfig | 1 - trunk/drivers/watchdog/at91sam9_wdt.c | 11 - trunk/drivers/watchdog/booke_wdt.c | 2 +- trunk/drivers/watchdog/omap_wdt.c | 2 + trunk/drivers/xen/Kconfig | 3 - trunk/drivers/xen/Makefile | 7 +- trunk/drivers/xen/balloon.c | 5 +- trunk/drivers/xen/privcmd.c | 72 +- trunk/drivers/xen/xen-acpi-pad.c | 182 - trunk/drivers/xen/xen-pciback/pci_stub.c | 120 +- trunk/drivers/xen/xenbus/xenbus_xs.c | 1 + trunk/fs/autofs4/expire.c | 9 + trunk/fs/autofs4/root.c | 83 +- trunk/fs/btrfs/ctree.h | 2 +- trunk/fs/btrfs/extent-tree.c | 2 +- trunk/fs/btrfs/extent_map.c | 3 +- trunk/fs/btrfs/ordered-data.h | 2 +- trunk/fs/btrfs/volumes.c | 2 +- trunk/fs/buffer.c | 6 +- trunk/fs/cifs/README | 2 +- trunk/fs/ext4/ext4.h | 2 +- trunk/fs/fhandle.c | 4 +- trunk/fs/fs-writeback.c | 2 +- trunk/fs/hugetlbfs/inode.c | 2 +- trunk/fs/jbd/transaction.c | 2 +- trunk/fs/jbd2/transaction.c | 2 +- trunk/fs/logfs/inode.c | 2 +- trunk/fs/ncpfs/mmap.c | 2 +- trunk/fs/notify/fanotify/Kconfig | 2 +- trunk/fs/notify/notification.c | 2 +- trunk/fs/proc/kcore.c | 2 +- trunk/fs/proc/task_mmu.c | 6 +- trunk/include/acpi/acpi_drivers.h | 4 +- trunk/include/asm-generic/io.h | 21 +- trunk/include/asm-generic/pgtable.h | 26 - trunk/include/linux/atmel-ssc.h | 6 - trunk/include/linux/bootmem.h | 3 + trunk/include/linux/cpuset.h | 2 +- trunk/include/linux/dlm.h | 2 +- trunk/include/linux/dvb/Kbuild | 0 trunk/include/linux/dvb/dmx.h | 29 + trunk/include/linux/dvb/video.h | 29 + trunk/include/linux/efi.h | 71 - trunk/include/linux/gfp.h | 1 - trunk/include/linux/hash.h | 2 +- trunk/include/linux/hid-sensor-ids.h | 1 + trunk/include/linux/hid.h | 6 - trunk/include/linux/huge_mm.h | 18 +- trunk/include/linux/i2c/i2c-hid.h | 35 - trunk/include/linux/input/mt.h | 6 - trunk/include/linux/ipmi_smi.h | 2 +- trunk/include/linux/irq.h | 10 +- trunk/include/linux/kvm_host.h | 53 +- trunk/include/linux/lru_cache.h | 4 +- trunk/include/linux/memcontrol.h | 9 +- trunk/include/linux/memory.h | 1 - trunk/include/linux/mfd/abx500.h | 34 +- trunk/include/linux/mfd/arizona/core.h | 4 - trunk/include/linux/mfd/arizona/pdata.h | 6 - trunk/include/linux/mfd/arizona/registers.h | 16 - trunk/include/linux/mfd/da9055/pdata.h | 27 +- trunk/include/linux/mfd/lp8788.h | 8 +- trunk/include/linux/mfd/max8997-private.h | 1 - trunk/include/linux/mfd/max8997.h | 1 - trunk/include/linux/mfd/tps65090.h | 35 - trunk/include/linux/mfd/tps6586x.h | 3 - trunk/include/linux/mfd/wm8994/core.h | 4 - trunk/include/linux/mfd/wm8994/pdata.h | 5 - trunk/include/linux/miscdevice.h | 1 - trunk/include/linux/mlx4/device.h | 21 - trunk/include/linux/mmzone.h | 41 +- trunk/include/linux/netdevice.h | 2 +- trunk/include/linux/nodemask.h | 5 - trunk/include/linux/omap-dma.h | 366 - trunk/include/linux/pci.h | 22 +- trunk/include/linux/platform_data/asoc-s3c.h | 6 + .../linux/platform_data/crypto-ux500.h | 2 +- .../include/linux/platform_data/davinci_asp.h | 4 +- .../linux/platform_data/omap-twl4030.h | 26 - .../linux/platform_data/spi-clps711x.h | 21 - .../linux/platform_data/spi-omap2-mcspi.h | 4 - trunk/include/linux/power/bq2415x_charger.h | 95 - trunk/include/linux/power/smartreflex.h | 14 +- trunk/include/linux/power_supply.h | 3 - trunk/include/linux/pvclock_gtod.h | 9 - trunk/include/linux/regulator/consumer.h | 13 - trunk/include/linux/regulator/driver.h | 5 - .../linux/regulator/max8973-regulator.h | 72 - .../linux/regulator/tps51632-regulator.h | 47 - .../linux/regulator/tps65090-regulator.h | 50 + trunk/include/linux/res_counter.h | 5 + trunk/include/linux/sched.h | 8 - trunk/include/linux/spi/spi-tegra.h | 40 - trunk/include/linux/spi/spi.h | 3 - trunk/include/linux/stmmac.h | 2 +- trunk/include/linux/vgaarb.h | 4 +- trunk/include/linux/vm_event_item.h | 2 - trunk/include/linux/watchdog.h | 2 +- trunk/include/media/adp1653.h | 4 +- trunk/include/media/davinci/vpbe_display.h | 15 +- trunk/include/media/davinci/vpbe_osd.h | 2 +- trunk/include/media/ir-kbd-i2c.h | 2 +- trunk/include/media/mt9v022.h | 16 - trunk/include/media/rc-core.h | 4 +- trunk/include/media/rc-map.h | 64 +- trunk/include/media/s3c_camif.h | 45 - trunk/include/media/smiapp.h | 2 +- trunk/include/media/v4l2-event.h | 2 +- trunk/include/media/v4l2-fh.h | 2 +- trunk/include/media/v4l2-ioctl.h | 2 - trunk/include/media/v4l2-mem2mem.h | 3 - trunk/include/media/videobuf2-core.h | 38 - trunk/include/media/videobuf2-memops.h | 5 + trunk/include/net/inet_connection_sock.h | 1 - trunk/include/net/irda/irlmp.h | 2 +- trunk/include/net/ndisc.h | 7 - trunk/include/net/sock.h | 2 +- trunk/include/rdma/Kbuild | 6 + trunk/include/{uapi => }/rdma/ib_user_cm.h | 0 trunk/include/{uapi => }/rdma/ib_user_mad.h | 0 trunk/include/{uapi => }/rdma/ib_user_sa.h | 0 trunk/include/{uapi => }/rdma/ib_user_verbs.h | 0 trunk/include/rdma/rdma_netlink.h | 36 +- trunk/include/{uapi => }/rdma/rdma_user_cm.h | 0 trunk/include/scsi/scsi_device.h | 1 - trunk/include/scsi/scsi_transport_sas.h | 1 - trunk/include/scsi/scsi_transport_srp.h | 8 - trunk/include/sound/Kbuild | 10 + trunk/include/sound/asequencer.h | 594 +- trunk/include/sound/asound.h | 935 +- trunk/include/{uapi => }/sound/asound_fm.h | 0 .../{uapi => }/sound/compress_offload.h | 0 .../{uapi => }/sound/compress_params.h | 0 trunk/include/sound/cs4271.h | 1 - trunk/include/sound/emu10k1.h | 359 +- trunk/include/{uapi => }/sound/hdsp.h | 0 trunk/include/{uapi => }/sound/hdspm.h | 0 trunk/include/sound/pcm.h | 3 - trunk/include/sound/sb16_csp.h | 104 +- trunk/include/{uapi => }/sound/sfnt_info.h | 0 trunk/include/sound/sh_fsi.h | 6 - trunk/include/sound/tlv320aic32x4.h | 1 - trunk/include/sound/vx_core.h | 6 + trunk/include/uapi/linux/if_bridge.h | 3 - trunk/include/uapi/linux/input.h | 1 - trunk/include/uapi/linux/kvm.h | 21 +- trunk/include/uapi/linux/pci_regs.h | 23 +- trunk/include/uapi/linux/videodev2.h | 37 +- trunk/include/uapi/rdma/Kbuild | 6 - trunk/include/uapi/rdma/rdma_netlink.h | 37 - trunk/include/uapi/sound/Kbuild | 10 - trunk/include/uapi/sound/asequencer.h | 614 -- trunk/include/uapi/sound/asound.h | 971 -- trunk/include/uapi/sound/emu10k1.h | 373 - trunk/include/uapi/sound/sb16_csp.h | 122 - trunk/include/xen/interface/memory.h | 44 +- trunk/include/xen/interface/platform.h | 17 - trunk/include/xen/xen-ops.h | 9 +- trunk/init/main.c | 2 +- trunk/kernel/cpuset.c | 32 +- trunk/kernel/kthread.c | 2 +- trunk/kernel/pid.c | 4 +- trunk/kernel/profile.c | 7 +- trunk/kernel/res_counter.c | 22 + trunk/kernel/sched/core.c | 15 - trunk/kernel/sched/fair.c | 18 +- trunk/kernel/time/timekeeping.c | 50 - trunk/kernel/trace/ftrace.c | 2 +- trunk/kernel/trace/trace.c | 2 +- trunk/kernel/trace/trace_functions.c | 2 +- trunk/kernel/trace/trace_irqsoff.c | 2 +- trunk/kernel/trace/trace_sched_wakeup.c | 2 +- trunk/kernel/wait.c | 2 +- trunk/lib/Kconfig.debug | 10 +- trunk/lib/bitmap.c | 2 +- trunk/mm/Kconfig | 8 - trunk/mm/bootmem.c | 59 +- trunk/mm/compaction.c | 108 +- trunk/mm/huge_memory.c | 359 +- trunk/mm/hugetlb.c | 38 +- trunk/mm/memcontrol.c | 27 +- trunk/mm/memory.c | 25 +- trunk/mm/memory_hotplug.c | 119 +- trunk/mm/mempolicy.c | 14 +- trunk/mm/migrate.c | 2 +- trunk/mm/mmap.c | 32 - trunk/mm/mprotect.c | 2 +- trunk/mm/mremap.c | 2 +- trunk/mm/nobootmem.c | 22 - trunk/mm/oom_kill.c | 52 +- trunk/mm/page_alloc.c | 119 +- trunk/mm/page_cgroup.c | 2 +- trunk/mm/pagewalk.c | 2 +- trunk/mm/rmap.c | 12 +- trunk/mm/shmem.c | 92 +- trunk/mm/util.c | 2 +- trunk/mm/vmscan.c | 4 +- trunk/mm/vmstat.c | 12 +- trunk/net/atm/atm_sysfs.c | 40 +- trunk/net/bluetooth/hidp/core.c | 9 +- trunk/net/bridge/br_mdb.c | 9 +- trunk/net/bridge/br_multicast.c | 12 +- trunk/net/bridge/br_private.h | 4 +- trunk/net/can/proc.c | 2 +- trunk/net/dccp/ipv4.c | 4 +- trunk/net/dccp/ipv6.c | 3 +- trunk/net/ipv4/inet_connection_sock.c | 16 - trunk/net/ipv4/tcp_cong.c | 2 +- trunk/net/ipv4/tcp_ipv4.c | 6 +- trunk/net/ipv6/Makefile | 2 +- trunk/net/ipv6/ndisc.c | 17 - trunk/net/ipv6/tcp_ipv6.c | 3 +- trunk/net/mac80211/driver-ops.h | 2 +- trunk/net/mac802154/ieee802154_dev.c | 4 +- trunk/net/netfilter/nf_log.c | 2 +- trunk/net/netlink/af_netlink.c | 5 +- trunk/net/rfkill/core.c | 4 +- trunk/net/sctp/Kconfig | 27 +- trunk/net/sctp/endpointola.c | 2 +- trunk/net/sctp/probe.c | 3 +- trunk/net/sctp/protocol.c | 4 +- trunk/net/sctp/sm_statefuns.c | 2 +- trunk/scripts/kernel-doc | 34 - trunk/security/keys/process_keys.c | 2 + trunk/security/selinux/nlmsgtab.c | 2 - trunk/sound/arm/aaci.c | 18 +- trunk/sound/arm/pxa2xx-ac97-lib.c | 2 +- trunk/sound/arm/pxa2xx-ac97.c | 6 +- trunk/sound/atmel/abdac.c | 8 +- trunk/sound/atmel/ac97c.c | 10 +- trunk/sound/core/oss/pcm_plugin.c | 6 +- trunk/sound/core/pcm.c | 3 +- trunk/sound/core/pcm_compat.c | 20 +- trunk/sound/core/pcm_lib.c | 57 +- trunk/sound/core/pcm_native.c | 4 +- trunk/sound/core/seq/seq_device.c | 2 +- trunk/sound/drivers/Kconfig | 2 +- trunk/sound/drivers/aloop.c | 52 +- trunk/sound/drivers/dummy.c | 87 +- trunk/sound/drivers/ml403-ac97cr.c | 10 +- trunk/sound/drivers/mpu401/mpu401.c | 18 +- trunk/sound/drivers/mtpav.c | 14 +- trunk/sound/drivers/mts64.c | 40 +- trunk/sound/drivers/pcsp/pcsp.c | 14 +- trunk/sound/drivers/pcsp/pcsp_input.c | 2 +- trunk/sound/drivers/pcsp/pcsp_input.h | 2 +- trunk/sound/drivers/pcsp/pcsp_lib.c | 2 +- trunk/sound/drivers/pcsp/pcsp_mixer.c | 10 +- trunk/sound/drivers/portman2x4.c | 18 +- trunk/sound/drivers/serial-u16550.c | 32 +- trunk/sound/drivers/virmidi.c | 6 +- trunk/sound/drivers/vx/vx_hwdep.c | 139 + trunk/sound/firewire/Kconfig | 13 - trunk/sound/firewire/Makefile | 2 - trunk/sound/firewire/scs1x.c | 527 -- trunk/sound/firewire/speakers.c | 8 +- trunk/sound/isa/Kconfig | 4 +- trunk/sound/isa/ad1816a/ad1816a.c | 18 +- trunk/sound/isa/ad1816a/ad1816a_lib.c | 19 +- trunk/sound/isa/ad1848/ad1848.c | 8 +- trunk/sound/isa/adlib.c | 8 +- trunk/sound/isa/als100.c | 22 +- trunk/sound/isa/azt2320.c | 26 +- trunk/sound/isa/cmi8328.c | 8 +- trunk/sound/isa/cmi8330.c | 42 +- trunk/sound/isa/cs423x/cs4231.c | 8 +- trunk/sound/isa/cs423x/cs4236.c | 50 +- trunk/sound/isa/es1688/es1688.c | 28 +- trunk/sound/isa/es18xx.c | 80 +- trunk/sound/isa/galaxy/galaxy.c | 26 +- trunk/sound/isa/gus/gusclassic.c | 15 +- trunk/sound/isa/gus/gusextreme.c | 24 +- trunk/sound/isa/gus/gusmax.c | 16 +- trunk/sound/isa/gus/interwave.c | 54 +- trunk/sound/isa/msnd/msnd.h | 2 +- trunk/sound/isa/msnd/msnd_pinnacle.c | 44 +- trunk/sound/isa/msnd/msnd_pinnacle_mixer.c | 2 +- trunk/sound/isa/opl3sa2.c | 40 +- trunk/sound/isa/opti9xx/miro.c | 68 +- trunk/sound/isa/opti9xx/opti92x-ad1848.c | 42 +- trunk/sound/isa/sb/emu8000.c | 30 +- trunk/sound/isa/sb/jazz16.c | 18 +- trunk/sound/isa/sb/sb16.c | 26 +- trunk/sound/isa/sb/sb8.c | 8 +- trunk/sound/isa/sc6000.c | 38 +- trunk/sound/isa/sscape.c | 32 +- trunk/sound/isa/wavefront/wavefront.c | 53 +- trunk/sound/isa/wavefront/wavefront_fx.c | 2 +- trunk/sound/isa/wavefront/wavefront_midi.c | 2 +- trunk/sound/isa/wavefront/wavefront_synth.c | 14 +- trunk/sound/mips/au1x00.c | 4 +- trunk/sound/mips/hal2.c | 14 +- trunk/sound/mips/sgio2audio.c | 28 +- trunk/sound/oss/ad1848.c | 2 +- trunk/sound/oss/kahlua.c | 10 +- trunk/sound/oss/sb_audio.c | 3 +- trunk/sound/parisc/harmony.c | 12 +- trunk/sound/pci/Kconfig | 5 +- trunk/sound/pci/ad1889.c | 18 +- trunk/sound/pci/ak4531_codec.c | 10 +- trunk/sound/pci/ali5451/ali5451.c | 32 +- trunk/sound/pci/als300.c | 14 +- trunk/sound/pci/als4000.c | 12 +- trunk/sound/pci/asihpi/asihpi.c | 55 +- trunk/sound/pci/asihpi/hpidspcd.c | 22 +- trunk/sound/pci/asihpi/hpioctl.c | 23 +- trunk/sound/pci/asihpi/hpioctl.h | 6 +- trunk/sound/pci/atiixp.c | 32 +- trunk/sound/pci/atiixp_modem.c | 20 +- trunk/sound/pci/au88x0/au88x0.c | 10 +- trunk/sound/pci/au88x0/au88x0_a3d.c | 6 +- trunk/sound/pci/au88x0/au88x0_core.c | 9 +- trunk/sound/pci/au88x0/au88x0_eq.c | 10 +- trunk/sound/pci/au88x0/au88x0_game.c | 2 +- trunk/sound/pci/au88x0/au88x0_mixer.c | 2 +- trunk/sound/pci/au88x0/au88x0_mpu401.c | 2 +- trunk/sound/pci/au88x0/au88x0_pcm.c | 6 +- trunk/sound/pci/aw2/aw2-alsa.c | 28 +- trunk/sound/pci/azt3328.c | 22 +- trunk/sound/pci/bt87x.c | 22 +- trunk/sound/pci/ca0106/ca0106_main.c | 12 +- trunk/sound/pci/ca0106/ca0106_mixer.c | 26 +- trunk/sound/pci/ca0106/ca0106_proc.c | 2 +- trunk/sound/pci/ca0106/ca_midi.c | 2 +- trunk/sound/pci/cmipci.c | 48 +- trunk/sound/pci/cs4281.c | 30 +- trunk/sound/pci/cs46xx/cs46xx.c | 8 +- trunk/sound/pci/cs46xx/cs46xx_lib.c | 35 +- trunk/sound/pci/cs5530.c | 16 +- trunk/sound/pci/cs5535audio/cs5535audio.c | 18 +- trunk/sound/pci/cs5535audio/cs5535audio.h | 10 +- .../sound/pci/cs5535audio/cs5535audio_olpc.c | 10 +- trunk/sound/pci/cs5535audio/cs5535audio_pcm.c | 2 +- trunk/sound/pci/ctxfi/ctatc.c | 20 +- trunk/sound/pci/ctxfi/ctatc.h | 8 +- trunk/sound/pci/ctxfi/cthardware.c | 4 +- trunk/sound/pci/ctxfi/cthw20k1.c | 4 +- trunk/sound/pci/ctxfi/cthw20k2.c | 4 +- trunk/sound/pci/ctxfi/xfi.c | 6 +- trunk/sound/pci/echoaudio/echoaudio.c | 46 +- trunk/sound/pci/echoaudio/echoaudio.h | 4 +- trunk/sound/pci/echoaudio/midi.c | 4 +- trunk/sound/pci/emu10k1/emu10k1.c | 12 +- trunk/sound/pci/emu10k1/emu10k1_main.c | 96 +- trunk/sound/pci/emu10k1/emu10k1_patch.c | 2 +- trunk/sound/pci/emu10k1/emu10k1x.c | 29 +- trunk/sound/pci/emu10k1/emufx.c | 25 +- trunk/sound/pci/emu10k1/emumixer.c | 22 +- trunk/sound/pci/emu10k1/emumpu401.c | 6 +- trunk/sound/pci/emu10k1/emupcm.c | 11 +- trunk/sound/pci/emu10k1/emuproc.c | 2 +- trunk/sound/pci/emu10k1/p16v.c | 8 +- trunk/sound/pci/emu10k1/timer.c | 2 +- trunk/sound/pci/ens1370.c | 52 +- trunk/sound/pci/es1938.c | 20 +- trunk/sound/pci/es1968.c | 44 +- trunk/sound/pci/fm801.c | 26 +- trunk/sound/pci/hda/Kconfig | 5 +- trunk/sound/pci/hda/Makefile | 1 - trunk/sound/pci/hda/hda_auto_parser.c | 106 +- trunk/sound/pci/hda/hda_codec.c | 214 +- trunk/sound/pci/hda/hda_codec.h | 6 - trunk/sound/pci/hda/hda_hwdep.c | 2 +- trunk/sound/pci/hda/hda_intel.c | 435 +- trunk/sound/pci/hda/hda_intel_trace.h | 62 - trunk/sound/pci/hda/hda_jack.c | 93 +- trunk/sound/pci/hda/hda_jack.h | 6 - trunk/sound/pci/hda/hda_local.h | 17 +- trunk/sound/pci/hda/patch_analog.c | 73 +- trunk/sound/pci/hda/patch_cirrus.c | 47 +- trunk/sound/pci/hda/patch_conexant.c | 99 +- trunk/sound/pci/hda/patch_hdmi.c | 22 +- trunk/sound/pci/hda/patch_realtek.c | 192 +- trunk/sound/pci/hda/patch_sigmatel.c | 150 +- trunk/sound/pci/hda/patch_via.c | 186 +- trunk/sound/pci/ice1712/Makefile | 2 +- trunk/sound/pci/ice1712/amp.c | 7 +- trunk/sound/pci/ice1712/aureon.c | 28 +- trunk/sound/pci/ice1712/delta.c | 45 +- trunk/sound/pci/ice1712/ews.c | 33 +- trunk/sound/pci/ice1712/hoontech.c | 27 +- trunk/sound/pci/ice1712/ice1712.c | 103 +- trunk/sound/pci/ice1712/ice1712.h | 12 +- trunk/sound/pci/ice1712/ice1724.c | 85 +- trunk/sound/pci/ice1712/juli.c | 26 +- trunk/sound/pci/ice1712/maya44.c | 21 +- trunk/sound/pci/ice1712/phase.c | 25 +- trunk/sound/pci/ice1712/pontis.c | 11 +- trunk/sound/pci/ice1712/prodigy192.c | 17 +- trunk/sound/pci/ice1712/prodigy_hifi.c | 21 +- trunk/sound/pci/ice1712/psc724.c | 464 - trunk/sound/pci/ice1712/psc724.h | 13 - trunk/sound/pci/ice1712/quartet.c | 32 +- trunk/sound/pci/ice1712/revo.c | 29 +- trunk/sound/pci/ice1712/se.c | 31 +- trunk/sound/pci/ice1712/vt1720_mobo.c | 11 +- trunk/sound/pci/ice1712/wm8766.c | 361 - trunk/sound/pci/ice1712/wm8766.h | 163 - trunk/sound/pci/ice1712/wm8776.c | 633 -- trunk/sound/pci/ice1712/wm8776.h | 226 - trunk/sound/pci/ice1712/wtm.c | 11 +- trunk/sound/pci/intel8x0.c | 56 +- trunk/sound/pci/intel8x0m.c | 30 +- trunk/sound/pci/korg1212/korg1212.c | 12 +- trunk/sound/pci/lola/lola.c | 14 +- trunk/sound/pci/lola/lola_clock.c | 2 +- trunk/sound/pci/lola/lola_mixer.c | 32 +- trunk/sound/pci/lola/lola_pcm.c | 4 +- trunk/sound/pci/lola/lola_proc.c | 2 +- trunk/sound/pci/lx6464es/lx6464es.c | 30 +- trunk/sound/pci/lx6464es/lx_core.c | 2 +- trunk/sound/pci/lx6464es/lx_core.h | 2 +- trunk/sound/pci/maestro3.c | 24 +- trunk/sound/pci/mixart/mixart.c | 12 +- trunk/sound/pci/mixart/mixart_hwdep.c | 76 + trunk/sound/pci/nm256/nm256.c | 18 +- trunk/sound/pci/oxygen/oxygen.c | 10 +- trunk/sound/pci/oxygen/virtuoso.c | 11 +- trunk/sound/pci/oxygen/xonar_cs43xx.c | 4 +- trunk/sound/pci/oxygen/xonar_pcm179x.c | 4 +- trunk/sound/pci/oxygen/xonar_wm87x6.c | 10 +- trunk/sound/pci/pcxhr/pcxhr.c | 14 +- trunk/sound/pci/pcxhr/pcxhr_hwdep.c | 86 + trunk/sound/pci/riptide/riptide.c | 20 +- trunk/sound/pci/rme32.c | 10 +- trunk/sound/pci/rme96.c | 14 +- trunk/sound/pci/rme9652/hdsp.c | 77 +- trunk/sound/pci/rme9652/hdspm.c | 439 +- trunk/sound/pci/rme9652/rme9652.c | 22 +- trunk/sound/pci/sis7019.c | 18 +- trunk/sound/pci/sonicvibes.c | 37 +- trunk/sound/pci/trident/trident.c | 8 +- trunk/sound/pci/trident/trident_main.c | 46 +- trunk/sound/pci/via82xx.c | 50 +- trunk/sound/pci/via82xx_modem.c | 26 +- trunk/sound/pci/vx222/vx222.c | 14 +- trunk/sound/pci/ymfpci/ymfpci.c | 12 +- trunk/sound/pci/ymfpci/ymfpci_main.c | 50 +- trunk/sound/ppc/awacs.c | 54 +- trunk/sound/ppc/beep.c | 2 +- trunk/sound/ppc/burgundy.c | 22 +- trunk/sound/ppc/daca.c | 2 +- trunk/sound/ppc/keywest.c | 4 +- trunk/sound/ppc/pmac.c | 12 +- trunk/sound/ppc/powermac.c | 6 +- trunk/sound/ppc/snd_ps3.c | 12 +- trunk/sound/ppc/tumbler.c | 16 +- trunk/sound/sh/aica.c | 13 +- trunk/sound/sh/sh_dac_audio.c | 10 +- trunk/sound/soc/atmel/Kconfig | 13 +- trunk/sound/soc/atmel/Makefile | 4 - trunk/sound/soc/atmel/atmel-pcm-dma.c | 240 - trunk/sound/soc/atmel/atmel-pcm-pdc.c | 401 - trunk/sound/soc/atmel/atmel-pcm.c | 401 +- trunk/sound/soc/atmel/atmel-pcm.h | 34 - trunk/sound/soc/atmel/atmel_ssc_dai.c | 168 +- trunk/sound/soc/atmel/atmel_ssc_dai.h | 3 +- trunk/sound/soc/atmel/sam9g20_wm8731.c | 116 +- trunk/sound/soc/au1x/ac97c.c | 6 +- trunk/sound/soc/au1x/db1000.c | 6 +- trunk/sound/soc/au1x/db1200.c | 8 +- trunk/sound/soc/au1x/dbdma2.c | 6 +- trunk/sound/soc/au1x/dma.c | 6 +- trunk/sound/soc/au1x/i2sc.c | 6 +- trunk/sound/soc/au1x/psc-ac97.c | 6 +- trunk/sound/soc/au1x/psc-i2s.c | 6 +- trunk/sound/soc/blackfin/bf5xx-ac97-pcm.c | 6 +- trunk/sound/soc/blackfin/bf5xx-ac97.c | 6 +- trunk/sound/soc/blackfin/bf5xx-ad1836.c | 6 +- trunk/sound/soc/blackfin/bf5xx-i2s-pcm.c | 6 +- trunk/sound/soc/blackfin/bf5xx-i2s.c | 6 +- trunk/sound/soc/blackfin/bf5xx-tdm-pcm.c | 6 +- trunk/sound/soc/blackfin/bf5xx-tdm.c | 6 +- trunk/sound/soc/blackfin/bf6xx-i2s.c | 6 +- trunk/sound/soc/blackfin/bfin-eval-adau1373.c | 4 +- trunk/sound/soc/blackfin/bfin-eval-adau1701.c | 4 +- trunk/sound/soc/blackfin/bfin-eval-adav80x.c | 4 +- trunk/sound/soc/cirrus/edb93xx.c | 6 +- trunk/sound/soc/cirrus/ep93xx-ac97.c | 6 +- trunk/sound/soc/cirrus/ep93xx-i2s.c | 4 +- trunk/sound/soc/cirrus/ep93xx-pcm.c | 6 +- trunk/sound/soc/cirrus/simone.c | 6 +- trunk/sound/soc/cirrus/snappercl15.c | 6 +- trunk/sound/soc/codecs/88pm860x-codec.c | 6 +- trunk/sound/soc/codecs/Kconfig | 16 - trunk/sound/soc/codecs/Makefile | 6 - trunk/sound/soc/codecs/ab8500-codec.c | 8 +- trunk/sound/soc/codecs/ac97.c | 6 +- trunk/sound/soc/codecs/ad1836.c | 6 +- trunk/sound/soc/codecs/ad193x.c | 14 +- trunk/sound/soc/codecs/ad1980.c | 6 +- trunk/sound/soc/codecs/ad73311.c | 4 +- trunk/sound/soc/codecs/adau1373.c | 8 +- trunk/sound/soc/codecs/adau1701.c | 8 +- trunk/sound/soc/codecs/adav80x.c | 20 +- trunk/sound/soc/codecs/ads117x.c | 6 +- trunk/sound/soc/codecs/ak4104.c | 69 +- trunk/sound/soc/codecs/ak4535.c | 15 +- trunk/sound/soc/codecs/ak4641.c | 8 +- trunk/sound/soc/codecs/ak4642.c | 31 +- trunk/sound/soc/codecs/ak4671.c | 8 +- trunk/sound/soc/codecs/alc5623.c | 8 +- trunk/sound/soc/codecs/alc5632.c | 8 +- trunk/sound/soc/codecs/arizona.c | 53 +- trunk/sound/soc/codecs/arizona.h | 71 +- trunk/sound/soc/codecs/cq93vc.c | 2 +- trunk/sound/soc/codecs/cs4271.c | 35 +- trunk/sound/soc/codecs/cs42l52.c | 2 +- trunk/sound/soc/codecs/cs42l73.c | 8 +- trunk/sound/soc/codecs/da7210.c | 38 +- trunk/sound/soc/codecs/da732x.c | 8 +- trunk/sound/soc/codecs/da9055.c | 51 +- trunk/sound/soc/codecs/dfbmcs320.c | 6 +- trunk/sound/soc/codecs/dmic.c | 6 +- trunk/sound/soc/codecs/isabelle.c | 8 +- trunk/sound/soc/codecs/jz4740.c | 148 +- trunk/sound/soc/codecs/lm4857.c | 8 +- trunk/sound/soc/codecs/lm49453.c | 18 +- trunk/sound/soc/codecs/max9768.c | 15 +- trunk/sound/soc/codecs/max98088.c | 16 +- trunk/sound/soc/codecs/max98090.c | 577 -- trunk/sound/soc/codecs/max98095.c | 4 +- trunk/sound/soc/codecs/max9850.c | 8 +- trunk/sound/soc/codecs/max9877.c | 8 +- trunk/sound/soc/codecs/mc13783.c | 2 +- trunk/sound/soc/codecs/ml26124.c | 8 +- trunk/sound/soc/codecs/omap-hdmi.c | 6 +- trunk/sound/soc/codecs/pcm3008.c | 6 +- trunk/sound/soc/codecs/rt5631.c | 6 +- trunk/sound/soc/codecs/sgtl5000.c | 8 +- trunk/sound/soc/codecs/si476x.c | 255 - trunk/sound/soc/codecs/sn95031.c | 6 +- trunk/sound/soc/codecs/ssm2602.c | 12 +- trunk/sound/soc/codecs/sta32x.c | 8 +- trunk/sound/soc/codecs/sta529.c | 8 +- trunk/sound/soc/codecs/stac9766.c | 6 +- trunk/sound/soc/codecs/tlv320aic32x4.c | 32 +- trunk/sound/soc/codecs/tlv320aic32x4.h | 3 - trunk/sound/soc/codecs/tlv320dac33.c | 8 +- trunk/sound/soc/codecs/tpa6130a2.c | 8 +- trunk/sound/soc/codecs/twl4030.c | 6 +- trunk/sound/soc/codecs/twl6040.c | 6 +- trunk/sound/soc/codecs/uda134x.c | 6 +- trunk/sound/soc/codecs/uda1380.c | 8 +- trunk/sound/soc/codecs/wl1273.c | 6 +- trunk/sound/soc/codecs/wm0010.c | 425 +- trunk/sound/soc/codecs/wm1250-ev1.c | 10 +- trunk/sound/soc/codecs/wm2000.c | 10 +- trunk/sound/soc/codecs/wm2200.c | 277 +- trunk/sound/soc/codecs/wm5100.c | 10 +- trunk/sound/soc/codecs/wm5102.c | 144 +- trunk/sound/soc/codecs/wm5110.c | 75 +- trunk/sound/soc/codecs/wm8350.c | 10 +- trunk/sound/soc/codecs/wm8400.c | 20 +- trunk/sound/soc/codecs/wm8510.c | 17 +- trunk/sound/soc/codecs/wm8523.c | 8 +- trunk/sound/soc/codecs/wm8711.c | 14 +- trunk/sound/soc/codecs/wm8727.c | 6 +- trunk/sound/soc/codecs/wm8728.c | 14 +- trunk/sound/soc/codecs/wm8731.c | 14 +- trunk/sound/soc/codecs/wm8737.c | 14 +- trunk/sound/soc/codecs/wm8741.c | 10 +- trunk/sound/soc/codecs/wm8750.c | 100 +- trunk/sound/soc/codecs/wm8753.c | 47 +- trunk/sound/soc/codecs/wm8770.c | 223 +- trunk/sound/soc/codecs/wm8776.c | 14 +- trunk/sound/soc/codecs/wm8782.c | 6 +- trunk/sound/soc/codecs/wm8804.c | 31 +- trunk/sound/soc/codecs/wm8900.c | 14 +- trunk/sound/soc/codecs/wm8903.c | 8 +- trunk/sound/soc/codecs/wm8904.c | 8 +- trunk/sound/soc/codecs/wm8940.c | 8 +- trunk/sound/soc/codecs/wm8955.c | 19 +- trunk/sound/soc/codecs/wm8958-dsp2.c | 79 +- trunk/sound/soc/codecs/wm8960.c | 10 +- trunk/sound/soc/codecs/wm8961.c | 8 +- trunk/sound/soc/codecs/wm8962.c | 32 +- trunk/sound/soc/codecs/wm8971.c | 88 +- trunk/sound/soc/codecs/wm8974.c | 8 +- trunk/sound/soc/codecs/wm8978.c | 24 +- trunk/sound/soc/codecs/wm8983.c | 14 +- trunk/sound/soc/codecs/wm8985.c | 44 +- trunk/sound/soc/codecs/wm8988.c | 28 +- trunk/sound/soc/codecs/wm8990.c | 8 +- trunk/sound/soc/codecs/wm8991.c | 8 +- trunk/sound/soc/codecs/wm8993.c | 22 +- trunk/sound/soc/codecs/wm8994.c | 349 +- trunk/sound/soc/codecs/wm8994.h | 13 +- trunk/sound/soc/codecs/wm8995.c | 54 +- trunk/sound/soc/codecs/wm8996.c | 8 +- trunk/sound/soc/codecs/wm9081.c | 30 +- trunk/sound/soc/codecs/wm9090.c | 24 +- trunk/sound/soc/codecs/wm9705.c | 6 +- trunk/sound/soc/codecs/wm9712.c | 6 +- trunk/sound/soc/codecs/wm9713.c | 6 +- trunk/sound/soc/codecs/wm_adsp.c | 699 -- trunk/sound/soc/codecs/wm_adsp.h | 59 - trunk/sound/soc/codecs/wmfw.h | 128 - trunk/sound/soc/davinci/davinci-evm.c | 5 - trunk/sound/soc/davinci/davinci-mcasp.c | 152 +- trunk/sound/soc/davinci/davinci-mcasp.h | 15 +- trunk/sound/soc/davinci/davinci-pcm.c | 53 +- trunk/sound/soc/davinci/davinci-pcm.h | 2 - trunk/sound/soc/fsl/Kconfig | 20 +- trunk/sound/soc/fsl/Makefile | 14 +- trunk/sound/soc/fsl/eukrea-tlv320.c | 6 +- trunk/sound/soc/fsl/fsl_dma.c | 6 +- trunk/sound/soc/fsl/fsl_ssi.c | 2 +- trunk/sound/soc/fsl/imx-audmux.c | 8 +- trunk/sound/soc/fsl/imx-mc13783.c | 6 +- trunk/sound/soc/fsl/imx-pcm-dma.c | 6 +- trunk/sound/soc/fsl/imx-pcm-fiq.c | 6 +- trunk/sound/soc/fsl/imx-pcm.c | 4 - trunk/sound/soc/fsl/imx-sgtl5000.c | 7 +- trunk/sound/soc/fsl/imx-ssi.c | 4 +- trunk/sound/soc/fsl/mpc5200_psc_ac97.c | 8 +- trunk/sound/soc/fsl/mpc5200_psc_i2s.c | 8 +- trunk/sound/soc/fsl/mpc8610_hpcd.c | 4 +- trunk/sound/soc/fsl/mx27vis-aic32x4.c | 6 +- trunk/sound/soc/fsl/p1022_ds.c | 4 +- trunk/sound/soc/fsl/p1022_rdk.c | 392 - trunk/sound/soc/fsl/pcm030-audio-fabric.c | 8 +- trunk/sound/soc/jz4740/jz4740-i2s.c | 6 +- trunk/sound/soc/jz4740/jz4740-pcm.c | 6 +- trunk/sound/soc/jz4740/qi_lb60.c | 6 +- trunk/sound/soc/kirkwood/kirkwood-dma.c | 22 +- trunk/sound/soc/kirkwood/kirkwood-i2s.c | 241 +- trunk/sound/soc/kirkwood/kirkwood-openrd.c | 6 +- trunk/sound/soc/kirkwood/kirkwood-t5325.c | 6 +- trunk/sound/soc/kirkwood/kirkwood.h | 11 +- trunk/sound/soc/mid-x86/mfld_machine.c | 6 +- trunk/sound/soc/mxs/mxs-pcm.c | 4 +- trunk/sound/soc/mxs/mxs-saif.c | 8 +- trunk/sound/soc/mxs/mxs-sgtl5000.c | 8 +- trunk/sound/soc/nuc900/nuc900-ac97.c | 6 +- trunk/sound/soc/nuc900/nuc900-pcm.c | 6 +- trunk/sound/soc/omap/ams-delta.c | 6 +- trunk/sound/soc/omap/mcbsp.c | 11 +- trunk/sound/soc/omap/mcbsp.h | 10 +- trunk/sound/soc/omap/omap-abe-twl6040.c | 10 +- trunk/sound/soc/omap/omap-dmic.c | 6 +- trunk/sound/soc/omap/omap-hdmi-card.c | 6 +- trunk/sound/soc/omap/omap-hdmi.c | 6 +- trunk/sound/soc/omap/omap-mcbsp.c | 11 +- trunk/sound/soc/omap/omap-mcpdm.c | 6 +- trunk/sound/soc/omap/omap-pcm.c | 6 +- trunk/sound/soc/omap/omap-twl4030.c | 6 +- trunk/sound/soc/omap/zoom2.c | 7 + trunk/sound/soc/pxa/brownstone.c | 6 +- trunk/sound/soc/pxa/corgi.c | 6 +- trunk/sound/soc/pxa/e740_wm9705.c | 6 +- trunk/sound/soc/pxa/e750_wm9705.c | 6 +- trunk/sound/soc/pxa/e800_wm9712.c | 6 +- trunk/sound/soc/pxa/hx4700.c | 6 +- trunk/sound/soc/pxa/imote2.c | 6 +- trunk/sound/soc/pxa/mioa701_wm9713.c | 6 +- trunk/sound/soc/pxa/mmp-pcm.c | 6 +- trunk/sound/soc/pxa/mmp-sspa.c | 6 +- trunk/sound/soc/pxa/palm27x.c | 4 +- trunk/sound/soc/pxa/poodle.c | 6 +- trunk/sound/soc/pxa/pxa-ssp.c | 6 +- trunk/sound/soc/pxa/pxa2xx-ac97.c | 8 +- trunk/sound/soc/pxa/pxa2xx-i2s.c | 4 +- trunk/sound/soc/pxa/pxa2xx-pcm.c | 6 +- trunk/sound/soc/pxa/tosa.c | 6 +- trunk/sound/soc/pxa/ttc-dkb.c | 6 +- trunk/sound/soc/s6000/s6000-i2s.c | 6 +- trunk/sound/soc/s6000/s6000-pcm.c | 6 +- trunk/sound/soc/samsung/ac97.c | 22 +- trunk/sound/soc/samsung/bells.c | 228 +- trunk/sound/soc/samsung/dma.c | 24 +- trunk/sound/soc/samsung/dma.h | 3 - trunk/sound/soc/samsung/goni_wm8994.c | 2 +- trunk/sound/soc/samsung/h1940_uda1380.c | 2 +- trunk/sound/soc/samsung/i2s.c | 33 +- trunk/sound/soc/samsung/idma.c | 6 +- trunk/sound/soc/samsung/jive_wm8750.c | 2 +- trunk/sound/soc/samsung/littlemill.c | 10 +- trunk/sound/soc/samsung/ln2440sbc_alc650.c | 2 +- trunk/sound/soc/samsung/lowland.c | 8 +- trunk/sound/soc/samsung/neo1973_wm8753.c | 2 +- trunk/sound/soc/samsung/pcm.c | 27 +- trunk/sound/soc/samsung/rx1950_uda1380.c | 2 +- trunk/sound/soc/samsung/s3c2412-i2s.c | 26 +- trunk/sound/soc/samsung/s3c24xx-i2s.c | 26 +- trunk/sound/soc/samsung/s3c24xx_simtec.c | 6 +- .../sound/soc/samsung/s3c24xx_simtec_hermes.c | 6 +- .../soc/samsung/s3c24xx_simtec_tlv320aic23.c | 6 +- trunk/sound/soc/samsung/s3c24xx_uda134x.c | 2 +- trunk/sound/soc/samsung/smartq_wm8987.c | 2 +- trunk/sound/soc/samsung/smdk2443_wm9710.c | 2 +- trunk/sound/soc/samsung/smdk_spdif.c | 2 +- trunk/sound/soc/samsung/smdk_wm8580.c | 6 +- trunk/sound/soc/samsung/smdk_wm8580pcm.c | 8 +- trunk/sound/soc/samsung/smdk_wm8994.c | 10 +- trunk/sound/soc/samsung/smdk_wm8994pcm.c | 8 +- trunk/sound/soc/samsung/smdk_wm9713.c | 2 +- trunk/sound/soc/samsung/spdif.c | 28 +- trunk/sound/soc/samsung/speyside.c | 8 +- trunk/sound/soc/samsung/tobermory.c | 8 +- trunk/sound/soc/sh/dma-sh7760.c | 6 +- trunk/sound/soc/sh/fsi.c | 550 +- trunk/sound/soc/sh/hac.c | 6 +- trunk/sound/soc/sh/siu_dai.c | 6 +- trunk/sound/soc/sh/ssi.c | 6 +- trunk/sound/soc/soc-cache.c | 10 +- trunk/sound/soc/soc-core.c | 243 +- trunk/sound/soc/soc-dapm.c | 134 +- trunk/sound/soc/soc-dmaengine-pcm.c | 2 - trunk/sound/soc/soc-jack.c | 16 +- trunk/sound/soc/soc-pcm.c | 195 +- trunk/sound/soc/soc-utils.c | 6 +- trunk/sound/soc/spear/spear_pcm.c | 6 +- trunk/sound/soc/tegra/tegra20_das.c | 8 +- trunk/sound/soc/tegra/tegra20_i2s.c | 10 +- trunk/sound/soc/tegra/tegra20_spdif.c | 8 +- trunk/sound/soc/tegra/tegra30_ahub.c | 14 +- trunk/sound/soc/tegra/tegra30_i2s.c | 10 +- trunk/sound/soc/tegra/tegra_alc5632.c | 8 +- trunk/sound/soc/tegra/tegra_pcm.c | 4 +- trunk/sound/soc/tegra/tegra_wm8753.c | 8 +- trunk/sound/soc/tegra/tegra_wm8903.c | 8 +- trunk/sound/soc/tegra/trimslice.c | 8 +- trunk/sound/soc/txx9/txx9aclc-ac97.c | 6 +- trunk/sound/soc/txx9/txx9aclc.c | 6 +- trunk/sound/soc/ux500/mop500.c | 14 +- trunk/sound/soc/ux500/ux500_msp_dai.c | 59 +- trunk/sound/soc/ux500/ux500_msp_dai.h | 1 - trunk/sound/soc/ux500/ux500_pcm.c | 22 +- trunk/sound/soc/ux500/ux500_pcm.h | 3 - trunk/sound/sparc/amd7930.c | 16 +- trunk/sound/sparc/cs4231.c | 38 +- trunk/sound/sparc/dbri.c | 28 +- trunk/sound/spi/at73c213.c | 20 +- trunk/sound/usb/6fire/chip.c | 4 +- trunk/sound/usb/6fire/comm.c | 5 +- trunk/sound/usb/6fire/comm.h | 2 +- trunk/sound/usb/6fire/control.c | 8 +- trunk/sound/usb/6fire/control.h | 2 +- trunk/sound/usb/6fire/firmware.h | 2 +- trunk/sound/usb/6fire/midi.c | 2 +- trunk/sound/usb/6fire/midi.h | 2 +- trunk/sound/usb/6fire/pcm.c | 11 +- trunk/sound/usb/6fire/pcm.h | 2 +- trunk/sound/usb/Kconfig | 2 +- trunk/sound/usb/caiaq/control.c | 8 +- trunk/sound/usb/caiaq/device.c | 6 +- trunk/sound/usb/card.c | 7 + trunk/sound/usb/card.h | 2 - trunk/sound/usb/endpoint.c | 53 +- trunk/sound/usb/endpoint.h | 5 +- trunk/sound/usb/format.c | 10 +- trunk/sound/usb/midi.c | 91 +- trunk/sound/usb/mixer.c | 74 +- trunk/sound/usb/mixer.h | 1 - trunk/sound/usb/mixer_quirks.c | 223 +- trunk/sound/usb/pcm.c | 175 +- trunk/sound/usb/quirks-table.h | 198 - trunk/sound/usb/quirks.c | 2 +- trunk/sound/usb/stream.c | 230 +- trunk/sound/usb/usbaudio.h | 1 + trunk/tools/firewire/nosy-dump.c | 4 - .../tools/perf/Documentation/perf-record.txt | 2 +- trunk/tools/testing/ktest/ktest.pl | 120 +- trunk/tools/testing/ktest/sample.conf | 46 +- trunk/usr/gen_init_cpio.c | 1 + trunk/virt/kvm/assigned-dev.c | 36 +- trunk/virt/kvm/eventfd.c | 8 +- trunk/virt/kvm/iommu.c | 10 +- trunk/virt/kvm/irq_comm.c | 83 +- trunk/virt/kvm/kvm_main.c | 57 +- 2188 files changed, 36013 insertions(+), 127757 deletions(-) delete mode 100644 trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus delete mode 100644 trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra delete mode 100644 trunk/Documentation/ABI/stable/sysfs-driver-ib_srp delete mode 100644 trunk/Documentation/ABI/stable/sysfs-transport-srp delete mode 100644 trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-lua delete mode 100644 trunk/Documentation/DocBook/media/v4l/vidioc-expbuf.xml delete mode 100644 trunk/Documentation/bus-devices/ti-gpmc.txt delete mode 100644 trunk/Documentation/devicetree/bindings/ata/exynos-sata-phy.txt delete mode 100644 trunk/Documentation/devicetree/bindings/ata/exynos-sata.txt delete mode 100644 trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt delete mode 100644 trunk/Documentation/devicetree/bindings/clock/zynq-7000.txt delete mode 100644 trunk/Documentation/devicetree/bindings/drm/exynos/hdmi.txt delete mode 100644 trunk/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt delete mode 100644 trunk/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt delete mode 100644 trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt delete mode 100644 trunk/Documentation/devicetree/bindings/gpio/gpio-poweroff.txt delete mode 100644 trunk/Documentation/devicetree/bindings/hwmon/vexpress.txt delete mode 100644 trunk/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt delete mode 100644 trunk/Documentation/devicetree/bindings/media/s5p-mfc.txt delete mode 100644 trunk/Documentation/devicetree/bindings/misc/atmel-ssc.txt delete mode 100644 trunk/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt delete mode 100644 trunk/Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt delete mode 100644 trunk/Documentation/devicetree/bindings/power_supply/ab8500/charger.txt delete mode 100644 trunk/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt delete mode 100644 trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt delete mode 100644 trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt delete mode 100644 trunk/Documentation/devicetree/bindings/regulator/max8997-regulator.txt delete mode 100644 trunk/Documentation/devicetree/bindings/regulator/vexpress.txt delete mode 100644 trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/ak4104.txt delete mode 100644 trunk/Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt delete mode 100644 trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt delete mode 100644 trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt delete mode 100644 trunk/Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt delete mode 100644 trunk/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt delete mode 100644 trunk/Documentation/devicetree/bindings/usb/ehci-orion.txt delete mode 100644 trunk/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt delete mode 100644 trunk/Documentation/hwmon/vexpress delete mode 100644 trunk/arch/arm/boot/dts/ccu9540.dts delete mode 100644 trunk/arch/arm/boot/dts/cros5250-common.dtsi delete mode 100644 trunk/arch/arm/boot/dts/exynos4212.dtsi delete mode 100644 trunk/arch/arm/boot/dts/exynos4412-smdk4412.dts delete mode 100644 trunk/arch/arm/boot/dts/exynos4412.dtsi delete mode 100644 trunk/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi delete mode 100644 trunk/arch/arm/boot/dts/exynos4x12.dtsi delete mode 100644 trunk/arch/arm/boot/dts/exynos5250-snow.dts delete mode 100644 trunk/arch/arm/boot/dts/href.dtsi delete mode 100644 trunk/arch/arm/boot/dts/hrefprev60.dts delete mode 100644 trunk/arch/arm/boot/dts/imx25-karo-tx25.dts delete mode 100644 trunk/arch/arm/boot/dts/imx25.dtsi delete mode 100644 trunk/arch/arm/boot/dts/imx27-apf27.dts delete mode 100644 trunk/arch/arm/boot/dts/imx28-apf28.dts delete mode 100644 trunk/arch/arm/boot/dts/imx28-apf28dev.dts delete mode 100644 trunk/arch/arm/boot/dts/imx28-sps1.dts delete mode 100644 trunk/arch/arm/boot/dts/imx6q-sabreauto.dts delete mode 100644 trunk/arch/arm/boot/dts/kirkwood-6281.dtsi delete mode 100644 trunk/arch/arm/boot/dts/kirkwood-6282.dtsi delete mode 100644 trunk/arch/arm/boot/dts/kirkwood-98dx4122.dtsi delete mode 100644 trunk/arch/arm/boot/dts/stuib.dtsi delete mode 100644 trunk/arch/arm/boot/dts/u9540.dts delete mode 100644 trunk/arch/arm/boot/dts/zynq-7000.dtsi create mode 100644 trunk/arch/arm/boot/dts/zynq-ep107.dts delete mode 100644 trunk/arch/arm/boot/dts/zynq-zc702.dts delete mode 100644 trunk/arch/arm/include/debug/tegra.S create mode 100644 trunk/arch/arm/mach-exynos/dev-drm.c delete mode 100644 trunk/arch/arm/mach-imx/imx25-dt.c delete mode 100644 trunk/arch/arm/mach-omap2/cclock2420_data.c delete mode 100644 trunk/arch/arm/mach-omap2/cclock2430_data.c delete mode 100644 trunk/arch/arm/mach-omap2/cclock33xx_data.c delete mode 100644 trunk/arch/arm/mach-omap2/cclock3xxx_data.c delete mode 100644 trunk/arch/arm/mach-omap2/cclock44xx_data.c create mode 100644 trunk/arch/arm/mach-omap2/clock2420_data.c create mode 100644 trunk/arch/arm/mach-omap2/clock2430_data.c create mode 100644 trunk/arch/arm/mach-omap2/clock33xx_data.c create mode 100644 trunk/arch/arm/mach-omap2/clock3xxx_data.c create mode 100644 trunk/arch/arm/mach-omap2/clock44xx_data.c create mode 100644 trunk/arch/arm/mach-tegra/include/mach/debug-macro.S create mode 100644 trunk/arch/arm/mach-tegra/include/mach/irqs.h delete mode 100644 trunk/arch/arm/mach-vexpress/reset.c delete mode 100644 trunk/arch/arm/mach-vt8500/Kconfig create mode 100644 trunk/arch/arm/mach-vt8500/include/mach/entry-macro.S rename trunk/{include/linux/clk/zynq.h => arch/arm/mach-vt8500/include/mach/irqs.h} (78%) delete mode 100644 trunk/arch/arm/mach-zynq/Kconfig rename trunk/arch/arm/{include/debug/zynq.S => mach-zynq/include/mach/debug-macro.S} (61%) create mode 100644 trunk/arch/arm/mach-zynq/include/mach/hardware.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/irqs.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/timex.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/uart.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/uncompress.h create mode 100644 trunk/arch/arm/mach-zynq/include/mach/zynq_soc.h create mode 100644 trunk/arch/arm/plat-nomadik/Kconfig create mode 100644 trunk/arch/arm/plat-nomadik/Makefile rename trunk/{include/linux/platform_data/clocksource-nomadik-mtu.h => arch/arm/plat-nomadik/include/plat/mtu.h} (71%) rename trunk/{include/linux/platform_data/dma-ste-dma40.h => arch/arm/plat-nomadik/include/plat/ste_dma40.h} (100%) rename trunk/{drivers/clocksource/nomadik-mtu.c => arch/arm/plat-nomadik/timer.c} (93%) create mode 100644 trunk/arch/arm/plat-omap/include/plat-omap/dma-omap.h create mode 100644 trunk/arch/m68k/include/asm/hw_irq.h create mode 100644 trunk/arch/m68k/include/asm/shmparam.h create mode 100644 trunk/arch/m68k/include/asm/spinlock.h create mode 100644 trunk/arch/m68k/include/asm/termios.h create mode 100644 trunk/arch/m68k/include/uapi/asm/auxvec.h create mode 100644 trunk/arch/m68k/include/uapi/asm/msgbuf.h create mode 100644 trunk/arch/m68k/include/uapi/asm/sembuf.h create mode 100644 trunk/arch/m68k/include/uapi/asm/shmbuf.h create mode 100644 trunk/arch/m68k/include/uapi/asm/socket.h create mode 100644 trunk/arch/m68k/include/uapi/asm/sockios.h create mode 100644 trunk/arch/m68k/include/uapi/asm/termbits.h create mode 100644 trunk/arch/m68k/include/uapi/asm/termios.h create mode 100644 trunk/arch/m68k/mm/init_mm.c create mode 100644 trunk/arch/m68k/mm/init_no.c delete mode 100644 trunk/arch/powerpc/include/uapi/asm/epapr_hcalls.h delete mode 100644 trunk/arch/powerpc/kvm/book3s_hv_ras.c delete mode 100644 trunk/arch/s390/include/asm/clp.h delete mode 100644 trunk/arch/s390/include/asm/dma-mapping.h delete mode 100644 trunk/arch/s390/include/asm/hw_irq.h delete mode 100644 trunk/arch/s390/include/asm/pci_clp.h delete mode 100644 trunk/arch/s390/include/asm/pci_dma.h delete mode 100644 trunk/arch/s390/include/asm/pci_insn.h delete mode 100644 trunk/arch/s390/include/asm/pci_io.h delete mode 100644 trunk/arch/s390/include/asm/vga.h delete mode 100644 trunk/arch/s390/kernel/pgm_check.S delete mode 100644 trunk/arch/s390/pci/Makefile delete mode 100644 trunk/arch/s390/pci/pci.c delete mode 100644 trunk/arch/s390/pci/pci_clp.c delete mode 100644 trunk/arch/s390/pci/pci_dma.c delete mode 100644 trunk/arch/s390/pci/pci_event.c delete mode 100644 trunk/arch/s390/pci/pci_msi.c delete mode 100644 trunk/arch/s390/pci/pci_sysfs.c delete mode 100644 trunk/arch/x86/include/asm/kvm_guest.h delete mode 100644 trunk/arch/x86/include/asm/numachip/numachip.h delete mode 100644 trunk/arch/x86/pci/numachip.c delete mode 100644 trunk/drivers/clk/clk-zynq.c delete mode 100644 trunk/drivers/hid/hid-icade.c delete mode 100644 trunk/drivers/hid/hid-roccat-lua.c delete mode 100644 trunk/drivers/hid/hid-roccat-lua.h delete mode 100644 trunk/drivers/hid/i2c-hid/Kconfig delete mode 100644 trunk/drivers/hid/i2c-hid/Makefile delete mode 100644 trunk/drivers/hid/i2c-hid/i2c-hid.c delete mode 100644 trunk/drivers/hwmon/vexpress.c delete mode 100644 trunk/drivers/input/misc/arizona-haptics.c delete mode 100644 trunk/drivers/media/platform/s3c-camif/Makefile delete mode 100644 trunk/drivers/media/platform/s3c-camif/camif-capture.c delete mode 100644 trunk/drivers/media/platform/s3c-camif/camif-core.c delete mode 100644 trunk/drivers/media/platform/s3c-camif/camif-core.h delete mode 100644 trunk/drivers/media/platform/s3c-camif/camif-regs.c delete mode 100644 trunk/drivers/media/platform/s3c-camif/camif-regs.h delete mode 100644 trunk/drivers/pci/hotplug/s390_pci_hpc.c delete mode 100644 trunk/drivers/power/ab8500_bmdata.c delete mode 100644 trunk/drivers/power/bq2415x_charger.c delete mode 100644 trunk/drivers/power/reset/Kconfig delete mode 100644 trunk/drivers/power/reset/Makefile delete mode 100644 trunk/drivers/power/reset/gpio-poweroff.c delete mode 100644 trunk/drivers/power/rx51_battery.c delete mode 100644 trunk/drivers/regulator/as3711-regulator.c delete mode 100644 trunk/drivers/regulator/da9055-regulator.c delete mode 100644 trunk/drivers/regulator/max8973-regulator.c delete mode 100644 trunk/drivers/regulator/tps51632-regulator.c delete mode 100644 trunk/drivers/regulator/tps80031-regulator.c delete mode 100644 trunk/drivers/regulator/vexpress.c delete mode 100644 trunk/drivers/scsi/csiostor/Kconfig delete mode 100644 trunk/drivers/scsi/csiostor/Makefile delete mode 100644 trunk/drivers/scsi/csiostor/csio_attr.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_defs.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_hw.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_hw.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_init.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_init.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_isr.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_lnode.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_lnode.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_mb.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_mb.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_rnode.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_rnode.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_scsi.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_scsi.h delete mode 100644 trunk/drivers/scsi/csiostor/csio_wr.c delete mode 100644 trunk/drivers/scsi/csiostor/csio_wr.h delete mode 100644 trunk/drivers/scsi/csiostor/t4fw_api_stor.h delete mode 100644 trunk/drivers/scsi/mpt3sas/Kconfig delete mode 100644 trunk/drivers/scsi/mpt3sas/Makefile delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_init.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_ioc.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_raid.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_sas.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_tool.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpi/mpi2_type.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_base.c delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_base.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_config.c delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_ctl.c delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_ctl.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_debug.h delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_scsih.c delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_transport.c delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c delete mode 100644 trunk/drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h delete mode 100644 trunk/drivers/spi/spi-clps711x.c create mode 100644 trunk/drivers/spi/spi-stmp.c delete mode 100644 trunk/drivers/spi/spi-tegra20-sflash.c delete mode 100644 trunk/drivers/spi/spi-tegra20-slink.c delete mode 100644 trunk/drivers/xen/xen-acpi-pad.c create mode 100644 trunk/include/linux/dvb/Kbuild create mode 100644 trunk/include/linux/dvb/dmx.h create mode 100644 trunk/include/linux/dvb/video.h delete mode 100644 trunk/include/linux/i2c/i2c-hid.h delete mode 100644 trunk/include/linux/platform_data/spi-clps711x.h delete mode 100644 trunk/include/linux/power/bq2415x_charger.h delete mode 100644 trunk/include/linux/pvclock_gtod.h delete mode 100644 trunk/include/linux/regulator/max8973-regulator.h delete mode 100644 trunk/include/linux/regulator/tps51632-regulator.h create mode 100644 trunk/include/linux/regulator/tps65090-regulator.h delete mode 100644 trunk/include/linux/spi/spi-tegra.h delete mode 100644 trunk/include/media/mt9v022.h delete mode 100644 trunk/include/media/s3c_camif.h rename trunk/include/{uapi => }/rdma/ib_user_cm.h (100%) rename trunk/include/{uapi => }/rdma/ib_user_mad.h (100%) rename trunk/include/{uapi => }/rdma/ib_user_sa.h (100%) rename trunk/include/{uapi => }/rdma/ib_user_verbs.h (100%) rename trunk/include/{uapi => }/rdma/rdma_user_cm.h (100%) rename trunk/include/{uapi => }/sound/asound_fm.h (100%) rename trunk/include/{uapi => }/sound/compress_offload.h (100%) rename trunk/include/{uapi => }/sound/compress_params.h (100%) rename trunk/include/{uapi => }/sound/hdsp.h (100%) rename trunk/include/{uapi => }/sound/hdspm.h (100%) rename trunk/include/{uapi => }/sound/sfnt_info.h (100%) delete mode 100644 trunk/include/uapi/rdma/rdma_netlink.h delete mode 100644 trunk/include/uapi/sound/asequencer.h delete mode 100644 trunk/include/uapi/sound/asound.h delete mode 100644 trunk/include/uapi/sound/emu10k1.h delete mode 100644 trunk/include/uapi/sound/sb16_csp.h delete mode 100644 trunk/sound/firewire/scs1x.c delete mode 100644 trunk/sound/pci/hda/hda_intel_trace.h delete mode 100644 trunk/sound/pci/ice1712/psc724.c delete mode 100644 trunk/sound/pci/ice1712/psc724.h delete mode 100644 trunk/sound/pci/ice1712/wm8766.c delete mode 100644 trunk/sound/pci/ice1712/wm8766.h delete mode 100644 trunk/sound/pci/ice1712/wm8776.c delete mode 100644 trunk/sound/pci/ice1712/wm8776.h delete mode 100644 trunk/sound/soc/atmel/atmel-pcm-dma.c delete mode 100644 trunk/sound/soc/atmel/atmel-pcm-pdc.c delete mode 100644 trunk/sound/soc/codecs/max98090.c delete mode 100644 trunk/sound/soc/codecs/si476x.c delete mode 100644 trunk/sound/soc/codecs/wm_adsp.c delete mode 100644 trunk/sound/soc/codecs/wm_adsp.h delete mode 100644 trunk/sound/soc/codecs/wmfw.h delete mode 100644 trunk/sound/soc/fsl/p1022_rdk.c diff --git a/[refs] b/[refs] index 38cd82211a2b..c26d82491fc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1e37ea287979052e3eab441e58da3899a8e2389 +refs/heads/master: 028014c81e3f8a5e8b5f161dceac5e6e5d6314ec diff --git a/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus b/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus index 833fd59926a7..c2a270b45b03 100644 --- a/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus +++ b/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-koneplus @@ -8,41 +8,3 @@ Description: The integer value of this attribute ranges from 0-4. When written, this file sets the number of the startup profile and the mouse activates this profile immediately. Please use actual_profile, it does the same thing. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/firmware_version -Date: October 2010 -Contact: Stefan Achatz -Description: When read, this file returns the raw integer version number of the - firmware reported by the mouse. Using the integer value eases - further usage in other programs. To receive the real version - number the decimal point has to be shifted 2 positions to the - left. E.g. a returned value of 121 means 1.21 - This file is readonly. - Please read binary attribute info which contains firmware version. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/profile[1-5]_buttons -Date: August 2010 -Contact: Stefan Achatz -Description: The mouse can store 5 profiles which can be switched by the - press of a button. A profile is split in settings and buttons. - profile_buttons holds information about button layout. - When read, these files return the respective profile buttons. - The returned data is 77 bytes in size. - This file is readonly. - Write control to select profile and read profile_buttons instead. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/profile[1-5]_settings -Date: August 2010 -Contact: Stefan Achatz -Description: The mouse can store 5 profiles which can be switched by the - press of a button. A profile is split in settings and buttons. - profile_settings holds information like resolution, sensitivity - and light effects. - When read, these files return the respective profile settings. - The returned data is 43 bytes in size. - This file is readonly. - Write control to select profile and read profile_settings instead. -Users: http://roccat.sourceforge.net \ No newline at end of file diff --git a/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus b/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus deleted file mode 100644 index 4a98e02b6c6a..000000000000 --- a/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-kovaplus +++ /dev/null @@ -1,66 +0,0 @@ -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_cpi -Date: January 2011 -Contact: Stefan Achatz -Description: The integer value of this attribute ranges from 1-4. - When read, this attribute returns the number of the active - cpi level. - This file is readonly. - Has never been used. If bookkeeping is done, it's done in userland tools. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_sensitivity_x -Date: January 2011 -Contact: Stefan Achatz -Description: The integer value of this attribute ranges from 1-10. - When read, this attribute returns the number of the actual - sensitivity in x direction. - This file is readonly. - Has never been used. If bookkeeping is done, it's done in userland tools. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_sensitivity_y -Date: January 2011 -Contact: Stefan Achatz -Description: The integer value of this attribute ranges from 1-10. - When read, this attribute returns the number of the actual - sensitivity in y direction. - This file is readonly. - Has never been used. If bookkeeping is done, it's done in userland tools. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/firmware_version -Date: January 2011 -Contact: Stefan Achatz -Description: When read, this file returns the raw integer version number of the - firmware reported by the mouse. Using the integer value eases - further usage in other programs. To receive the real version - number the decimal point has to be shifted 2 positions to the - left. E.g. a returned value of 121 means 1.21 - This file is readonly. - Obsoleted by binary sysfs attribute "info". -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/profile[1-5]_buttons -Date: January 2011 -Contact: Stefan Achatz -Description: The mouse can store 5 profiles which can be switched by the - press of a button. A profile is split in settings and buttons. - profile_buttons holds information about button layout. - When read, these files return the respective profile buttons. - The returned data is 23 bytes in size. - This file is readonly. - Write control to select profile and read profile_buttons instead. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/profile[1-5]_settings -Date: January 2011 -Contact: Stefan Achatz -Description: The mouse can store 5 profiles which can be switched by the - press of a button. A profile is split in settings and buttons. - profile_settings holds information like resolution, sensitivity - and light effects. - When read, these files return the respective profile settings. - The returned data is 16 bytes in size. - This file is readonly. - Write control to select profile and read profile_settings instead. -Users: http://roccat.sourceforge.net diff --git a/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra b/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra deleted file mode 100644 index 87ac87e9556d..000000000000 --- a/trunk/Documentation/ABI/obsolete/sysfs-driver-hid-roccat-pyra +++ /dev/null @@ -1,73 +0,0 @@ -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/actual_cpi -Date: August 2010 -Contact: Stefan Achatz -Description: It is possible to switch the cpi setting of the mouse with the - press of a button. - When read, this file returns the raw number of the actual cpi - setting reported by the mouse. This number has to be further - processed to receive the real dpi value. - - VALUE DPI - 1 400 - 2 800 - 4 1600 - - This file is readonly. - Has never been used. If bookkeeping is done, it's done in userland tools. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/actual_profile -Date: August 2010 -Contact: Stefan Achatz -Description: When read, this file returns the number of the actual profile in - range 0-4. - This file is readonly. - Please use binary attribute "settings" which provides this information. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/firmware_version -Date: August 2010 -Contact: Stefan Achatz -Description: When read, this file returns the raw integer version number of the - firmware reported by the mouse. Using the integer value eases - further usage in other programs. To receive the real version - number the decimal point has to be shifted 2 positions to the - left. E.g. a returned value of 138 means 1.38 - This file is readonly. - Please use binary attribute "info" which provides this information. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/profile[1-5]_buttons -Date: August 2010 -Contact: Stefan Achatz -Description: The mouse can store 5 profiles which can be switched by the - press of a button. A profile is split in settings and buttons. - profile_buttons holds information about button layout. - When read, these files return the respective profile buttons. - The returned data is 19 bytes in size. - This file is readonly. - Write control to select profile and read profile_buttons instead. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/profile[1-5]_settings -Date: August 2010 -Contact: Stefan Achatz -Description: The mouse can store 5 profiles which can be switched by the - press of a button. A profile is split in settings and buttons. - profile_settings holds information like resolution, sensitivity - and light effects. - When read, these files return the respective profile settings. - The returned data is 13 bytes in size. - This file is readonly. - Write control to select profile and read profile_settings instead. -Users: http://roccat.sourceforge.net - -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/startup_profile -Date: August 2010 -Contact: Stefan Achatz -Description: The integer value of this attribute ranges from 0-4. - When read, this attribute returns the number of the profile - that's active when the mouse is powered on. - This file is readonly. - Please use binary attribute "settings" which provides this information. -Users: http://roccat.sourceforge.net diff --git a/trunk/Documentation/ABI/stable/sysfs-driver-ib_srp b/trunk/Documentation/ABI/stable/sysfs-driver-ib_srp deleted file mode 100644 index 481aae95c7d1..000000000000 --- a/trunk/Documentation/ABI/stable/sysfs-driver-ib_srp +++ /dev/null @@ -1,156 +0,0 @@ -What: /sys/class/infiniband_srp/srp--/add_target -Date: January 2, 2006 -KernelVersion: 2.6.15 -Contact: linux-rdma@vger.kernel.org -Description: Interface for making ib_srp connect to a new target. - One can request ib_srp to connect to a new target by writing - a comma-separated list of login parameters to this sysfs - attribute. The supported parameters are: - * id_ext, a 16-digit hexadecimal number specifying the eight - byte identifier extension in the 16-byte SRP target port - identifier. The target port identifier is sent by ib_srp - to the target in the SRP_LOGIN_REQ request. - * ioc_guid, a 16-digit hexadecimal number specifying the eight - byte I/O controller GUID portion of the 16-byte target port - identifier. - * dgid, a 32-digit hexadecimal number specifying the - destination GID. - * pkey, a four-digit hexadecimal number specifying the - InfiniBand partition key. - * service_id, a 16-digit hexadecimal number specifying the - InfiniBand service ID used to establish communication with - the SRP target. How to find out the value of the service ID - is specified in the documentation of the SRP target. - * max_sect, a decimal number specifying the maximum number of - 512-byte sectors to be transferred via a single SCSI command. - * max_cmd_per_lun, a decimal number specifying the maximum - number of outstanding commands for a single LUN. - * io_class, a hexadecimal number specifying the SRP I/O class. - Must be either 0xff00 (rev 10) or 0x0100 (rev 16a). The I/O - class defines the format of the SRP initiator and target - port identifiers. - * initiator_ext, a 16-digit hexadecimal number specifying the - identifier extension portion of the SRP initiator port - identifier. This data is sent by the initiator to the target - in the SRP_LOGIN_REQ request. - * cmd_sg_entries, a number in the range 1..255 that specifies - the maximum number of data buffer descriptors stored in the - SRP_CMD information unit itself. With allow_ext_sg=0 the - parameter cmd_sg_entries defines the maximum S/G list length - for a single SRP_CMD, and commands whose S/G list length - exceeds this limit after S/G list collapsing will fail. - * allow_ext_sg, whether ib_srp is allowed to include a partial - memory descriptor list in an SRP_CMD instead of the entire - list. If a partial memory descriptor list has been included - in an SRP_CMD the remaining memory descriptors are - communicated from initiator to target via an additional RDMA - transfer. Setting allow_ext_sg to 1 increases the maximum - amount of data that can be transferred between initiator and - target via a single SCSI command. Since not all SRP target - implementations support partial memory descriptor lists the - default value for this option is 0. - * sg_tablesize, a number in the range 1..2048 specifying the - maximum S/G list length the SCSI layer is allowed to pass to - ib_srp. Specifying a value that exceeds cmd_sg_entries is - only safe with partial memory descriptor list support enabled - (allow_ext_sg=1). - -What: /sys/class/infiniband_srp/srp--/ibdev -Date: January 2, 2006 -KernelVersion: 2.6.15 -Contact: linux-rdma@vger.kernel.org -Description: HCA name (). - -What: /sys/class/infiniband_srp/srp--/port -Date: January 2, 2006 -KernelVersion: 2.6.15 -Contact: linux-rdma@vger.kernel.org -Description: HCA port number (). - -What: /sys/class/scsi_host/host/allow_ext_sg -Date: May 19, 2011 -KernelVersion: 2.6.39 -Contact: linux-rdma@vger.kernel.org -Description: Whether ib_srp is allowed to include a partial memory - descriptor list in an SRP_CMD when communicating with an SRP - target. - -What: /sys/class/scsi_host/host/cmd_sg_entries -Date: May 19, 2011 -KernelVersion: 2.6.39 -Contact: linux-rdma@vger.kernel.org -Description: Maximum number of data buffer descriptors that may be sent to - the target in a single SRP_CMD request. - -What: /sys/class/scsi_host/host/dgid -Date: June 17, 2006 -KernelVersion: 2.6.17 -Contact: linux-rdma@vger.kernel.org -Description: InfiniBand destination GID used for communication with the SRP - target. Differs from orig_dgid if port redirection has happened. - -What: /sys/class/scsi_host/host/id_ext -Date: June 17, 2006 -KernelVersion: 2.6.17 -Contact: linux-rdma@vger.kernel.org -Description: Eight-byte identifier extension portion of the 16-byte target - port identifier. - -What: /sys/class/scsi_host/host/ioc_guid -Date: June 17, 2006 -KernelVersion: 2.6.17 -Contact: linux-rdma@vger.kernel.org -Description: Eight-byte I/O controller GUID portion of the 16-byte target - port identifier. - -What: /sys/class/scsi_host/host/local_ib_device -Date: November 29, 2006 -KernelVersion: 2.6.19 -Contact: linux-rdma@vger.kernel.org -Description: Name of the InfiniBand HCA used for communicating with the - SRP target. - -What: /sys/class/scsi_host/host/local_ib_port -Date: November 29, 2006 -KernelVersion: 2.6.19 -Contact: linux-rdma@vger.kernel.org -Description: Number of the HCA port used for communicating with the - SRP target. - -What: /sys/class/scsi_host/host/orig_dgid -Date: June 17, 2006 -KernelVersion: 2.6.17 -Contact: linux-rdma@vger.kernel.org -Description: InfiniBand destination GID specified in the parameters - written to the add_target sysfs attribute. - -What: /sys/class/scsi_host/host/pkey -Date: June 17, 2006 -KernelVersion: 2.6.17 -Contact: linux-rdma@vger.kernel.org -Description: A 16-bit number representing the InfiniBand partition key used - for communication with the SRP target. - -What: /sys/class/scsi_host/host/req_lim -Date: October 20, 2010 -KernelVersion: 2.6.36 -Contact: linux-rdma@vger.kernel.org -Description: Number of requests ib_srp can send to the target before it has - to wait for more credits. For more information see also the - SRP credit algorithm in the SRP specification. - -What: /sys/class/scsi_host/host/service_id -Date: June 17, 2006 -KernelVersion: 2.6.17 -Contact: linux-rdma@vger.kernel.org -Description: InfiniBand service ID used for establishing communication with - the SRP target. - -What: /sys/class/scsi_host/host/zero_req_lim -Date: September 20, 2006 -KernelVersion: 2.6.18 -Contact: linux-rdma@vger.kernel.org -Description: Number of times the initiator had to wait before sending a - request to the target because it ran out of credits. For more - information see also the SRP credit algorithm in the SRP - specification. diff --git a/trunk/Documentation/ABI/stable/sysfs-transport-srp b/trunk/Documentation/ABI/stable/sysfs-transport-srp deleted file mode 100644 index b36fb0dc13c8..000000000000 --- a/trunk/Documentation/ABI/stable/sysfs-transport-srp +++ /dev/null @@ -1,19 +0,0 @@ -What: /sys/class/srp_remote_ports/port-:/delete -Date: June 1, 2012 -KernelVersion: 3.7 -Contact: linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org -Description: Instructs an SRP initiator to disconnect from a target and to - remove all LUNs imported from that target. - -What: /sys/class/srp_remote_ports/port-:/port_id -Date: June 27, 2007 -KernelVersion: 2.6.24 -Contact: linux-scsi@vger.kernel.org -Description: 16-byte local SRP port identifier in hexadecimal format. An - example: 4c:49:4e:55:58:20:56:49:4f:00:00:00:00:00:00:00. - -What: /sys/class/srp_remote_ports/port-:/roles -Date: June 27, 2007 -KernelVersion: 2.6.24 -Contact: linux-scsi@vger.kernel.org -Description: Role of the remote port. Either "SRP Initiator" or "SRP Target". diff --git a/trunk/Documentation/ABI/testing/dev-kmsg b/trunk/Documentation/ABI/testing/dev-kmsg index bb820be48179..7e7e07a82e0e 100644 --- a/trunk/Documentation/ABI/testing/dev-kmsg +++ b/trunk/Documentation/ABI/testing/dev-kmsg @@ -92,7 +92,7 @@ Description: The /dev/kmsg character device node provides userspace access The flags field carries '-' by default. A 'c' indicates a fragment of a line. All following fragments are flagged with '+'. Note, that these hints about continuation lines are not - necessarily correct, and the stream could be interleaved with + neccessarily correct, and the stream could be interleaved with unrelated messages, but merging the lines in the output usually produces better human readable results. A similar logic is used internally when messages are printed to the diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-pci b/trunk/Documentation/ABI/testing/sysfs-bus-pci index 1ce5ae329c04..dff1f48d252d 100644 --- a/trunk/Documentation/ABI/testing/sysfs-bus-pci +++ b/trunk/Documentation/ABI/testing/sysfs-bus-pci @@ -222,37 +222,3 @@ Description: satisfied too. Reading this attribute will show the current value of d3cold_allowed bit. Writing this attribute will set the value of d3cold_allowed bit. - -What: /sys/bus/pci/devices/.../sriov_totalvfs -Date: November 2012 -Contact: Donald Dutile -Description: - This file appears when a physical PCIe device supports SR-IOV. - Userspace applications can read this file to determine the - maximum number of Virtual Functions (VFs) a PCIe physical - function (PF) can support. Typically, this is the value reported - in the PF's SR-IOV extended capability structure's TotalVFs - element. Drivers have the ability at probe time to reduce the - value read from this file via the pci_sriov_set_totalvfs() - function. - -What: /sys/bus/pci/devices/.../sriov_numvfs -Date: November 2012 -Contact: Donald Dutile -Description: - This file appears when a physical PCIe device supports SR-IOV. - Userspace applications can read and write to this file to - determine and control the enablement or disablement of Virtual - Functions (VFs) on the physical function (PF). A read of this - file will return the number of VFs that are enabled on this PF. - A number written to this file will enable the specified - number of VFs. A userspace application would typically read the - file and check that the value is zero, and then write the number - of VFs that should be enabled on the PF; the value written - should be less than or equal to the value in the sriov_totalvfs - file. A userspace application wanting to disable the VFs would - write a zero to this file. The core ensures that valid values - are written to this file, and returns errors when values are not - valid. For example, writing a 2 to this file when sriov_numvfs - is not 0 and not 2 already will return an error. Writing a 10 - when the value of sriov_totalvfs is 8 will return an error. diff --git a/trunk/Documentation/ABI/testing/sysfs-devices-power b/trunk/Documentation/ABI/testing/sysfs-devices-power index 9d43e7670841..7fc2997b23a6 100644 --- a/trunk/Documentation/ABI/testing/sysfs-devices-power +++ b/trunk/Documentation/ABI/testing/sysfs-devices-power @@ -164,7 +164,7 @@ Contact: Rafael J. Wysocki Description: The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute contains the total time the device has been preventing - opportunistic transitions to sleep states from occurring. + opportunistic transitions to sleep states from occuring. This attribute is read-only. If the device is not enabled to wake up the system from sleep states, this attribute is not present. diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku index 9eca5a182e64..189dc43891bf 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku +++ b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-isku @@ -117,14 +117,6 @@ Description: When written, this file lets one store macros with max 500 which profile and key to read. Users: http://roccat.sourceforge.net -What: /sys/bus/usb/devices/-:./::./isku/roccatisku/reset -Date: November 2012 -Contact: Stefan Achatz -Description: When written, this file lets one reset the device. - The data has to be 3 bytes long. - This file is writeonly. -Users: http://roccat.sourceforge.net - What: /sys/bus/usb/devices/-:./::./isku/roccatisku/control Date: June 2011 Contact: Stefan Achatz diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus index 7bd776f9c3c7..65e6e5dd67e8 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus +++ b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus @@ -9,12 +9,15 @@ Description: The integer value of this attribute ranges from 0-4. and the mouse activates this profile immediately. Users: http://roccat.sourceforge.net -What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/info -Date: November 2012 +What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/firmware_version +Date: October 2010 Contact: Stefan Achatz -Description: When read, this file returns general data like firmware version. - When written, the device can be reset. - The data is 8 bytes long. +Description: When read, this file returns the raw integer version number of the + firmware reported by the mouse. Using the integer value eases + further usage in other programs. To receive the real version + number the decimal point has to be shifted 2 positions to the + left. E.g. a returned value of 121 means 1.21 + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/macro @@ -39,8 +42,18 @@ Description: The mouse can store 5 profiles which can be switched by the The mouse will reject invalid data. Which profile to write is determined by the profile number contained in the data. - Before reading this file, control has to be written to select - which profile to read. + This file is writeonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/profile[1-5]_buttons +Date: August 2010 +Contact: Stefan Achatz +Description: The mouse can store 5 profiles which can be switched by the + press of a button. A profile is split in settings and buttons. + profile_buttons holds information about button layout. + When read, these files return the respective profile buttons. + The returned data is 77 bytes in size. + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/profile_settings @@ -55,8 +68,19 @@ Description: The mouse can store 5 profiles which can be switched by the The mouse will reject invalid data. Which profile to write is determined by the profile number contained in the data. - Before reading this file, control has to be written to select - which profile to read. + This file is writeonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/profile[1-5]_settings +Date: August 2010 +Contact: Stefan Achatz +Description: The mouse can store 5 profiles which can be switched by the + press of a button. A profile is split in settings and buttons. + profile_settings holds information like resolution, sensitivity + and light effects. + When read, these files return the respective profile settings. + The returned data is 43 bytes in size. + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/sensor @@ -80,9 +104,9 @@ What: /sys/bus/usb/devices/-:./ Description: When written a calibration process for the tracking control unit - can be initiated/cancelled. Also lets one read/write sensor - registers. - The data has to be 4 bytes long. + can be initiated/cancelled. + The data has to be 3 bytes long. + This file is writeonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./koneplus/roccatkoneplus/tcu_image diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus index a10404f15a54..20f937c9d84f 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus +++ b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus @@ -1,3 +1,12 @@ +What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_cpi +Date: January 2011 +Contact: Stefan Achatz +Description: The integer value of this attribute ranges from 1-4. + When read, this attribute returns the number of the active + cpi level. + This file is readonly. +Users: http://roccat.sourceforge.net + What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_profile Date: January 2011 Contact: Stefan Achatz @@ -9,12 +18,33 @@ Description: The integer value of this attribute ranges from 0-4. active when the mouse is powered on. Users: http://roccat.sourceforge.net -What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/info -Date: November 2012 +What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_sensitivity_x +Date: January 2011 Contact: Stefan Achatz -Description: When read, this file returns general data like firmware version. - When written, the device can be reset. - The data is 6 bytes long. +Description: The integer value of this attribute ranges from 1-10. + When read, this attribute returns the number of the actual + sensitivity in x direction. + This file is readonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/actual_sensitivity_y +Date: January 2011 +Contact: Stefan Achatz +Description: The integer value of this attribute ranges from 1-10. + When read, this attribute returns the number of the actual + sensitivity in y direction. + This file is readonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/firmware_version +Date: January 2011 +Contact: Stefan Achatz +Description: When read, this file returns the raw integer version number of the + firmware reported by the mouse. Using the integer value eases + further usage in other programs. To receive the real version + number the decimal point has to be shifted 2 positions to the + left. E.g. a returned value of 121 means 1.21 + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/profile_buttons @@ -28,8 +58,18 @@ Description: The mouse can store 5 profiles which can be switched by the The mouse will reject invalid data. Which profile to write is determined by the profile number contained in the data. - Before reading this file, control has to be written to select - which profile to read. + This file is writeonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/profile[1-5]_buttons +Date: January 2011 +Contact: Stefan Achatz +Description: The mouse can store 5 profiles which can be switched by the + press of a button. A profile is split in settings and buttons. + profile_buttons holds information about button layout. + When read, these files return the respective profile buttons. + The returned data is 23 bytes in size. + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/profile_settings @@ -44,6 +84,17 @@ Description: The mouse can store 5 profiles which can be switched by the The mouse will reject invalid data. Which profile to write is determined by the profile number contained in the data. - Before reading this file, control has to be written to select - which profile to read. + This file is writeonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./kovaplus/roccatkovaplus/profile[1-5]_settings +Date: January 2011 +Contact: Stefan Achatz +Description: The mouse can store 5 profiles which can be switched by the + press of a button. A profile is split in settings and buttons. + profile_settings holds information like resolution, sensitivity + and light effects. + When read, these files return the respective profile settings. + The returned data is 16 bytes in size. + This file is readonly. Users: http://roccat.sourceforge.net diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-lua b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-lua deleted file mode 100644 index 31c6c4c8ba2b..000000000000 --- a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-lua +++ /dev/null @@ -1,7 +0,0 @@ -What: /sys/bus/usb/devices/-:./control -Date: October 2012 -Contact: Stefan Achatz -Description: When written, cpi, button and light settings can be configured. - When read, actual cpi setting and sensor data are returned. - The data has to be 8 bytes long. -Users: http://roccat.sourceforge.net diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra index 9fa9de30d14b..3f8de50e4ff1 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra +++ b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra @@ -1,9 +1,37 @@ -What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/info -Date: November 2012 +What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/actual_cpi +Date: August 2010 +Contact: Stefan Achatz +Description: It is possible to switch the cpi setting of the mouse with the + press of a button. + When read, this file returns the raw number of the actual cpi + setting reported by the mouse. This number has to be further + processed to receive the real dpi value. + + VALUE DPI + 1 400 + 2 800 + 4 1600 + + This file is readonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/actual_profile +Date: August 2010 Contact: Stefan Achatz -Description: When read, this file returns general data like firmware version. - When written, the device can be reset. - The data is 6 bytes long. +Description: When read, this file returns the number of the actual profile in + range 0-4. + This file is readonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/firmware_version +Date: August 2010 +Contact: Stefan Achatz +Description: When read, this file returns the raw integer version number of the + firmware reported by the mouse. Using the integer value eases + further usage in other programs. To receive the real version + number the decimal point has to be shifted 2 positions to the + left. E.g. a returned value of 138 means 1.38 + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/profile_settings @@ -18,8 +46,19 @@ Description: The mouse can store 5 profiles which can be switched by the The mouse will reject invalid data. Which profile to write is determined by the profile number contained in the data. - Before reading this file, control has to be written to select - which profile to read. + This file is writeonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/profile[1-5]_settings +Date: August 2010 +Contact: Stefan Achatz +Description: The mouse can store 5 profiles which can be switched by the + press of a button. A profile is split in settings and buttons. + profile_settings holds information like resolution, sensitivity + and light effects. + When read, these files return the respective profile settings. + The returned data is 13 bytes in size. + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/profile_buttons @@ -33,8 +72,27 @@ Description: The mouse can store 5 profiles which can be switched by the The mouse will reject invalid data. Which profile to write is determined by the profile number contained in the data. - Before reading this file, control has to be written to select - which profile to read. + This file is writeonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/profile[1-5]_buttons +Date: August 2010 +Contact: Stefan Achatz +Description: The mouse can store 5 profiles which can be switched by the + press of a button. A profile is split in settings and buttons. + profile_buttons holds information about button layout. + When read, these files return the respective profile buttons. + The returned data is 19 bytes in size. + This file is readonly. +Users: http://roccat.sourceforge.net + +What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/startup_profile +Date: August 2010 +Contact: Stefan Achatz +Description: The integer value of this attribute ranges from 0-4. + When read, this attribute returns the number of the profile + that's active when the mouse is powered on. + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./pyra/roccatpyra/settings diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu index f1e02a98bd9d..b42922cf6b1f 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu +++ b/trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-savu @@ -40,8 +40,8 @@ What: /sys/bus/usb/devices/-:./ Description: When read, this file returns general data like firmware version. - When written, the device can be reset. The data is 8 bytes long. + This file is readonly. Users: http://roccat.sourceforge.net What: /sys/bus/usb/devices/-:./::./savu/roccatsavu/macro @@ -74,3 +74,4 @@ Description: The mouse has a Avago ADNS-3090 sensor. This file allows reading and writing of the mouse sensors registers. The data has to be 4 bytes long. Users: http://roccat.sourceforge.net + diff --git a/trunk/Documentation/ABI/testing/sysfs-driver-ppi b/trunk/Documentation/ABI/testing/sysfs-driver-ppi index 7d1435bc976c..97a003ee058b 100644 --- a/trunk/Documentation/ABI/testing/sysfs-driver-ppi +++ b/trunk/Documentation/ABI/testing/sysfs-driver-ppi @@ -5,7 +5,7 @@ Contact: xiaoyan.zhang@intel.com Description: This folder includes the attributes related with PPI (Physical Presence Interface). Only if TPM is supported by BIOS, this - folder makes sense. The folder path can be got by command + folder makes sence. The folder path can be got by command 'find /sys/ -name 'pcrs''. For the detail information of PPI, please refer to the PPI specification from http://www.trustedcomputinggroup.org/ diff --git a/trunk/Documentation/ABI/testing/sysfs-profiling b/trunk/Documentation/ABI/testing/sysfs-profiling index 8a8e466eb2c0..b02d8b8c173a 100644 --- a/trunk/Documentation/ABI/testing/sysfs-profiling +++ b/trunk/Documentation/ABI/testing/sysfs-profiling @@ -1,13 +1,13 @@ -What: /sys/kernel/profiling +What: /sys/kernel/profile Date: September 2008 Contact: Dave Hansen Description: - /sys/kernel/profiling is the runtime equivalent + /sys/kernel/profile is the runtime equivalent of the boot-time profile= option. You can get the same effect running: - echo 2 > /sys/kernel/profiling + echo 2 > /sys/kernel/profile as you would by issuing profile=2 on the boot command line. diff --git a/trunk/Documentation/DocBook/media/v4l/compat.xml b/trunk/Documentation/DocBook/media/v4l/compat.xml index 3dd9e78815d1..4fdf6b562d1c 100644 --- a/trunk/Documentation/DocBook/media/v4l/compat.xml +++ b/trunk/Documentation/DocBook/media/v4l/compat.xml @@ -2586,13 +2586,6 @@ ioctls. Vendor and device specific media bus pixel formats. . - - Importing DMABUF file descriptors as a new IO method described - in . - - - Exporting DMABUF files using &VIDIOC-EXPBUF; ioctl. - diff --git a/trunk/Documentation/DocBook/media/v4l/io.xml b/trunk/Documentation/DocBook/media/v4l/io.xml index 388a34032653..b5d1cbdc558b 100644 --- a/trunk/Documentation/DocBook/media/v4l/io.xml +++ b/trunk/Documentation/DocBook/media/v4l/io.xml @@ -331,7 +331,7 @@ application until one or more buffers can be dequeued. By default outgoing queue. When the O_NONBLOCK flag was given to the &func-open; function, VIDIOC_DQBUF returns immediately with an &EAGAIN; when no buffer is available. The -&func-select; or &func-poll; functions are always available. +&func-select; or &func-poll; function are always available. To start and stop capturing or output applications call the &VIDIOC-STREAMON; and &VIDIOC-STREAMOFF; ioctl. Note @@ -472,165 +472,6 @@ rest should be evident. -
- Streaming I/O (DMA buffer importing) - - - Experimental - This is an experimental - interface and may change in the future. - - -The DMABUF framework provides a generic method for sharing buffers -between multiple devices. Device drivers that support DMABUF can export a DMA -buffer to userspace as a file descriptor (known as the exporter role), import a -DMA buffer from userspace using a file descriptor previously exported for a -different or the same device (known as the importer role), or both. This -section describes the DMABUF importer role API in V4L2. - - Refer to DMABUF exporting for -details about exporting V4L2 buffers as DMABUF file descriptors. - -Input and output devices support the streaming I/O method when the -V4L2_CAP_STREAMING flag in the -capabilities field of &v4l2-capability; returned by -the &VIDIOC-QUERYCAP; ioctl is set. Whether importing DMA buffers through -DMABUF file descriptors is supported is determined by calling the -&VIDIOC-REQBUFS; ioctl with the memory type set to -V4L2_MEMORY_DMABUF. - - This I/O method is dedicated to sharing DMA buffers between different -devices, which may be V4L devices or other video-related devices (e.g. DRM). -Buffers (planes) are allocated by a driver on behalf of an application. Next, -these buffers are exported to the application as file descriptors using an API -which is specific for an allocator driver. Only such file descriptor are -exchanged. The descriptors and meta-information are passed in &v4l2-buffer; (or -in &v4l2-plane; in the multi-planar API case). The driver must be switched -into DMABUF I/O mode by calling the &VIDIOC-REQBUFS; with the desired buffer -type. - - - Initiating streaming I/O with DMABUF file descriptors - - -&v4l2-requestbuffers; reqbuf; - -memset(&reqbuf, 0, sizeof (reqbuf)); -reqbuf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; -reqbuf.memory = V4L2_MEMORY_DMABUF; -reqbuf.count = 1; - -if (ioctl(fd, &VIDIOC-REQBUFS;, &reqbuf) == -1) { - if (errno == EINVAL) - printf("Video capturing or DMABUF streaming is not supported\n"); - else - perror("VIDIOC_REQBUFS"); - - exit(EXIT_FAILURE); -} - - - - The buffer (plane) file descriptor is passed on the fly with the -&VIDIOC-QBUF; ioctl. In case of multiplanar buffers, every plane can be -associated with a different DMABUF descriptor. Although buffers are commonly -cycled, applications can pass a different DMABUF descriptor at each -VIDIOC_QBUF call. - - - Queueing DMABUF using single plane API - - -int buffer_queue(int v4lfd, int index, int dmafd) -{ - &v4l2-buffer; buf; - - memset(&buf, 0, sizeof buf); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.memory = V4L2_MEMORY_DMABUF; - buf.index = index; - buf.m.fd = dmafd; - - if (ioctl(v4lfd, &VIDIOC-QBUF;, &buf) == -1) { - perror("VIDIOC_QBUF"); - return -1; - } - - return 0; -} - - - - - Queueing DMABUF using multi plane API - - -int buffer_queue_mp(int v4lfd, int index, int dmafd[], int n_planes) -{ - &v4l2-buffer; buf; - &v4l2-plane; planes[VIDEO_MAX_PLANES]; - int i; - - memset(&buf, 0, sizeof buf); - buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - buf.memory = V4L2_MEMORY_DMABUF; - buf.index = index; - buf.m.planes = planes; - buf.length = n_planes; - - memset(&planes, 0, sizeof planes); - - for (i = 0; i < n_planes; ++i) - buf.m.planes[i].m.fd = dmafd[i]; - - if (ioctl(v4lfd, &VIDIOC-QBUF;, &buf) == -1) { - perror("VIDIOC_QBUF"); - return -1; - } - - return 0; -} - - - - Captured or displayed buffers are dequeued with the -&VIDIOC-DQBUF; ioctl. The driver can unlock the buffer at any -time between the completion of the DMA and this ioctl. The memory is -also unlocked when &VIDIOC-STREAMOFF; is called, &VIDIOC-REQBUFS;, or -when the device is closed. - - For capturing applications it is customary to enqueue a -number of empty buffers, to start capturing and enter the read loop. -Here the application waits until a filled buffer can be dequeued, and -re-enqueues the buffer when the data is no longer needed. Output -applications fill and enqueue buffers, when enough buffers are stacked -up output is started. In the write loop, when the application -runs out of free buffers it must wait until an empty buffer can be -dequeued and reused. Two methods exist to suspend execution of the -application until one or more buffers can be dequeued. By default -VIDIOC_DQBUF blocks when no buffer is in the -outgoing queue. When the O_NONBLOCK flag was -given to the &func-open; function, VIDIOC_DQBUF -returns immediately with an &EAGAIN; when no buffer is available. The -&func-select; and &func-poll; functions are always available. - - To start and stop capturing or displaying applications call the -&VIDIOC-STREAMON; and &VIDIOC-STREAMOFF; ioctls. Note that -VIDIOC_STREAMOFF removes all buffers from both queues and -unlocks all buffers as a side effect. Since there is no notion of doing -anything "now" on a multitasking system, if an application needs to synchronize -with another event it should examine the &v4l2-buffer; -timestamp of captured buffers, or set the field -before enqueuing buffers for output. - - Drivers implementing DMABUF importing I/O must support the -VIDIOC_REQBUFS, VIDIOC_QBUF, -VIDIOC_DQBUF, VIDIOC_STREAMON and -VIDIOC_STREAMOFF ioctls, and the -select() and poll() functions. - -
-
Asynchronous I/O @@ -831,14 +672,6 @@ memory, set by the application. See for details. in the length field of this v4l2_buffer structure. - - - int - fd - For the single-plane API and when -memory is V4L2_MEMORY_DMABUF this -is the file descriptor associated with a DMABUF buffer. - __u32 length @@ -910,15 +743,6 @@ should set this to 0. pointer to the memory allocated for this plane by an application. - - - int - fd - When the memory type in the containing &v4l2-buffer; is - V4L2_MEMORY_DMABUF, this is a file - descriptor associated with a DMABUF buffer, similar to the - fd field in &v4l2-buffer;. - __u32 data_offset @@ -1099,7 +923,7 @@ application. Drivers set or clear this flag when the V4L2_BUF_FLAG_NO_CACHE_INVALIDATE - 0x0800 + 0x0400 Caches do not have to be invalidated for this buffer. Typically applications shall use this flag if the data captured in the buffer is not going to be touched by the CPU, instead the buffer will, probably, be @@ -1108,7 +932,7 @@ passed on to a DMA-capable hardware unit for further processing or output. V4L2_BUF_FLAG_NO_CACHE_CLEAN - 0x1000 + 0x0800 Caches do not have to be cleaned for this buffer. Typically applications shall use this flag for output buffers if the data in this buffer has not been created by the CPU but by some DMA-capable unit, @@ -1140,12 +964,6 @@ pointer I/O. 3 [to do] - - V4L2_MEMORY_DMABUF - 4 - The buffer is used for DMA shared -buffer I/O. - diff --git a/trunk/Documentation/DocBook/media/v4l/v4l2.xml b/trunk/Documentation/DocBook/media/v4l/v4l2.xml index 4d110b1ad3e9..10ccde9d16d0 100644 --- a/trunk/Documentation/DocBook/media/v4l/v4l2.xml +++ b/trunk/Documentation/DocBook/media/v4l/v4l2.xml @@ -543,7 +543,6 @@ and discussions on the V4L mailing list. &sub-enuminput; &sub-enumoutput; &sub-enumstd; - &sub-expbuf; &sub-g-audio; &sub-g-audioout; &sub-g-crop; diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml index cd9943672434..a8cda1acacd9 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml @@ -6,8 +6,7 @@ VIDIOC_CREATE_BUFS - Create buffers for Memory Mapped or User Pointer or DMA Buffer - I/O + Create buffers for Memory Mapped or User Pointer I/O @@ -56,11 +55,11 @@ This ioctl is used to create buffers for memory -mapped or user pointer or DMA buffer I/O. It can be used as an alternative or in -addition to the VIDIOC_REQBUFS ioctl, when a tighter -control over buffers is required. This ioctl can be called multiple times to -create buffers of different sizes. +mapped or user pointer +I/O. It can be used as an alternative or in addition to the +VIDIOC_REQBUFS ioctl, when a tighter control over buffers +is required. This ioctl can be called multiple times to create buffers of +different sizes. To allocate device buffers applications initialize relevant fields of the v4l2_create_buffers structure. They set the @@ -110,8 +109,7 @@ information. __u32 memory Applications set this field to -V4L2_MEMORY_MMAP, -V4L2_MEMORY_DMABUF or +V4L2_MEMORY_MMAP or V4L2_MEMORY_USERPTR. See diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-expbuf.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-expbuf.xml deleted file mode 100644 index 72dfbd20a802..000000000000 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-expbuf.xml +++ /dev/null @@ -1,212 +0,0 @@ - - - - ioctl VIDIOC_EXPBUF - &manvol; - - - - VIDIOC_EXPBUF - Export a buffer as a DMABUF file descriptor. - - - - - - int ioctl - int fd - int request - struct v4l2_exportbuffer *argp - - - - - - Arguments - - - - fd - - &fd; - - - - request - - VIDIOC_EXPBUF - - - - argp - - - - - - - - - Description - - - Experimental - This is an experimental - interface and may change in the future. - - -This ioctl is an extension to the memory -mapping I/O method, therefore it is available only for -V4L2_MEMORY_MMAP buffers. It can be used to export a -buffer as a DMABUF file at any time after buffers have been allocated with the -&VIDIOC-REQBUFS; ioctl. - - To export a buffer, applications fill &v4l2-exportbuffer;. The - type field is set to the same buffer type as was -previously used with &v4l2-requestbuffers; type . -Applications must also set the index field. Valid -index numbers range from zero to the number of buffers allocated with -&VIDIOC-REQBUFS; (&v4l2-requestbuffers; count ) -minus one. For the multi-planar API, applications set the plane - field to the index of the plane to be exported. Valid planes -range from zero to the maximal number of valid planes for the currently active -format. For the single-planar API, applications must set plane - to zero. Additional flags may be posted in the -flags field. Refer to a manual for open() for details. -Currently only O_CLOEXEC is supported. All other fields must be set to zero. -In the case of multi-planar API, every plane is exported separately using -multiple VIDIOC_EXPBUF calls. - - After calling VIDIOC_EXPBUF the fd - field will be set by a driver. This is a DMABUF file -descriptor. The application may pass it to other DMABUF-aware devices. Refer to -DMABUF importing for details about importing -DMABUF files into V4L2 nodes. It is recommended to close a DMABUF file when it -is no longer used to allow the associated memory to be reclaimed. - - - -
- Examples - - - Exporting a buffer. - -int buffer_export(int v4lfd, &v4l2-buf-type; bt, int index, int *dmafd) -{ - &v4l2-exportbuffer; expbuf; - - memset(&expbuf, 0, sizeof(expbuf)); - expbuf.type = bt; - expbuf.index = index; - if (ioctl(v4lfd, &VIDIOC-EXPBUF;, &expbuf) == -1) { - perror("VIDIOC_EXPBUF"); - return -1; - } - - *dmafd = expbuf.fd; - - return 0; -} - - - - - Exporting a buffer using the multi-planar API. - -int buffer_export_mp(int v4lfd, &v4l2-buf-type; bt, int index, - int dmafd[], int n_planes) -{ - int i; - - for (i = 0; i < n_planes; ++i) { - &v4l2-exportbuffer; expbuf; - - memset(&expbuf, 0, sizeof(expbuf)); - expbuf.type = bt; - expbuf.index = index; - expbuf.plane = i; - if (ioctl(v4lfd, &VIDIOC-EXPBUF;, &expbuf) == -1) { - perror("VIDIOC_EXPBUF"); - while (i) - close(dmafd[--i]); - return -1; - } - dmafd[i] = expbuf.fd; - } - - return 0; -} - - -
- - - - - struct <structname>v4l2_exportbuffer</structname> - - &cs-str; - - - __u32 - type - Type of the buffer, same as &v4l2-format; -type or &v4l2-requestbuffers; -type, set by the application. See - - - __u32 - index - Number of the buffer, set by the application. This field is -only used for memory mapping I/O and can range from -zero to the number of buffers allocated with the &VIDIOC-REQBUFS; and/or -&VIDIOC-CREATE-BUFS; ioctls. - - - __u32 - plane - Index of the plane to be exported when using the -multi-planar API. Otherwise this value must be set to zero. - - - __u32 - flags - Flags for the newly created file, currently only -O_CLOEXEC is supported, refer to the manual of open() for more -details. - - - __s32 - fd - The DMABUF file descriptor associated with a buffer. Set by - the driver. - - - __u32 - reserved[11] - Reserved field for future use. Must be set to zero. - - - -
- - - - - &return-value; - - - EINVAL - - A queue is not in MMAP mode or DMABUF exporting is not -supported or flags or type - or index or plane - fields are invalid. - - - - - - diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml index 3504a7f2f382..2d37abefce13 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-qbuf.xml @@ -109,23 +109,6 @@ they cannot be swapped out to disk. Buffers remain locked until dequeued, until the &VIDIOC-STREAMOFF; or &VIDIOC-REQBUFS; ioctl is called, or until the device is closed. - To enqueue a DMABUF buffer applications -set the memory field to -V4L2_MEMORY_DMABUF and the m.fd -field to a file descriptor associated with a DMABUF buffer. When the -multi-planar API is used the m.fd fields of the -passed array of &v4l2-plane; have to be used instead. When -VIDIOC_QBUF is called with a pointer to this structure the -driver sets the V4L2_BUF_FLAG_QUEUED flag and clears the -V4L2_BUF_FLAG_MAPPED and -V4L2_BUF_FLAG_DONE flags in the -flags field, or it returns an error code. This -ioctl locks the buffer. Locking a buffer means passing it to a driver for a -hardware access (usually DMA). If an application accesses (reads/writes) a -locked buffer then the result is undefined. Buffers remain locked until -dequeued, until the &VIDIOC-STREAMOFF; or &VIDIOC-REQBUFS; ioctl is called, or -until the device is closed. - Applications call the VIDIOC_DQBUF ioctl to dequeue a filled (capturing) or displayed (output) buffer from the driver's outgoing queue. They just set the diff --git a/trunk/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml b/trunk/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml index 78a06a9a5ece..2b50ef2007f3 100644 --- a/trunk/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml +++ b/trunk/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml @@ -48,30 +48,28 @@ Description -This ioctl is used to initiate memory mapped, -user pointer or DMABUF based I/O. Memory mapped buffers are located in -device memory and must be allocated with this ioctl before they can be mapped -into the application's address space. User buffers are allocated by -applications themselves, and this ioctl is merely used to switch the driver -into user pointer I/O mode and to setup some internal structures. -Similarly, DMABUF buffers are allocated by applications through a device -driver, and this ioctl only configures the driver into DMABUF I/O mode without -performing any direct allocation. + This ioctl is used to initiate memory +mapped or user pointer +I/O. Memory mapped buffers are located in device memory and must be +allocated with this ioctl before they can be mapped into the +application's address space. User buffers are allocated by +applications themselves, and this ioctl is merely used to switch the +driver into user pointer I/O mode and to setup some internal structures. - To allocate device buffers applications initialize all fields of the -v4l2_requestbuffers structure. They set the -type field to the respective stream or buffer type, -the count field to the desired number of buffers, -memory must be set to the requested I/O method and -the reserved array must be zeroed. When the ioctl is -called with a pointer to this structure the driver will attempt to allocate the -requested number of buffers and it stores the actual number allocated in the -count field. It can be smaller than the number -requested, even zero, when the driver runs out of free memory. A larger number -is also possible when the driver requires more buffers to function correctly. -For example video output requires at least two buffers, one displayed and one -filled by the application. + To allocate device buffers applications initialize all +fields of the v4l2_requestbuffers structure. +They set the type field to the respective +stream or buffer type, the count field to +the desired number of buffers, memory +must be set to the requested I/O method and the reserved array +must be zeroed. When the ioctl +is called with a pointer to this structure the driver will attempt to allocate +the requested number of buffers and it stores the actual number +allocated in the count field. It can be +smaller than the number requested, even zero, when the driver runs out +of free memory. A larger number is also possible when the driver requires +more buffers to function correctly. For example video output requires at least two buffers, +one displayed and one filled by the application. When the I/O method is not supported the ioctl returns an &EINVAL;. @@ -104,8 +102,7 @@ as the &v4l2-format; type field. See __u32 memory Applications set this field to -V4L2_MEMORY_MMAP, -V4L2_MEMORY_DMABUF or +V4L2_MEMORY_MMAP or V4L2_MEMORY_USERPTR. See . diff --git a/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl index fb32aead5a0b..cab4ec58e46e 100644 --- a/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl +++ b/trunk/Documentation/DocBook/writing-an-alsa-driver.tmpl @@ -433,9 +433,9 @@ /* chip-specific constructor * (see "Management of Cards and Components") */ - static int snd_mychip_create(struct snd_card *card, - struct pci_dev *pci, - struct mychip **rchip) + static int __devinit snd_mychip_create(struct snd_card *card, + struct pci_dev *pci, + struct mychip **rchip) { struct mychip *chip; int err; @@ -475,8 +475,8 @@ } /* constructor -- see "Constructor" sub-section */ - static int snd_mychip_probe(struct pci_dev *pci, - const struct pci_device_id *pci_id) + static int __devinit snd_mychip_probe(struct pci_dev *pci, + const struct pci_device_id *pci_id) { static int dev; struct snd_card *card; @@ -526,7 +526,7 @@ } /* destructor -- see the "Destructor" sub-section */ - static void snd_mychip_remove(struct pci_dev *pci) + static void __devexit snd_mychip_remove(struct pci_dev *pci) { snd_card_free(pci_get_drvdata(pci)); pci_set_drvdata(pci, NULL); @@ -542,8 +542,9 @@ The real constructor of PCI drivers is the probe callback. The probe callback and other component-constructors which are called - from the probe callback cannot be used with - the __init prefix + from the probe callback should be defined with + the __devinit prefix. You + cannot use the __init prefix for them, because any PCI device could be a hotplug device. @@ -727,7 +728,7 @@ + + As further notes, the destructors (both + snd_mychip_dev_free and + snd_mychip_free) cannot be defined with + the __devexit prefix, because they may be + called from the constructor, too, at the false path. + + For a device which allows hotplugging, you can use snd_card_free_when_closed. This one will @@ -1111,9 +1120,9 @@ } /* chip-specific constructor */ - static int snd_mychip_create(struct snd_card *card, - struct pci_dev *pci, - struct mychip **rchip) + static int __devinit snd_mychip_create(struct snd_card *card, + struct pci_dev *pci, + struct mychip **rchip) { struct mychip *chip; int err; @@ -1191,7 +1200,7 @@ .name = KBUILD_MODNAME, .id_table = snd_mychip_ids, .probe = snd_mychip_probe, - .remove = snd_mychip_remove, + .remove = __devexit_p(snd_mychip_remove), }; /* module initialization */ @@ -1455,6 +1464,11 @@ + + Again, remember that you cannot + use the __devexit prefix for this destructor. + + We didn't implement the hardware disabling part in the above. If you need to do this, please note that the destructor may be @@ -1605,7 +1619,7 @@ .name = KBUILD_MODNAME, .id_table = snd_mychip_ids, .probe = snd_mychip_probe, - .remove = snd_mychip_remove, + .remove = __devexit_p(snd_mychip_remove), }; ]]> @@ -1616,7 +1630,11 @@ The probe and remove functions have already been defined in the previous sections. - The name + The remove function should + be defined with the + __devexit_p() macro, so that it's not + defined for built-in (and non-hot-pluggable) case. The + name field is the name string of this device. Note that you must not use a slash / in this string. @@ -1647,7 +1665,9 @@ Note that these module entries are tagged with __init and - __exit prefixes. + __exit prefixes, not + __devinit nor + __devexit. @@ -1898,7 +1918,7 @@ */ /* create a pcm device */ - static int snd_mychip_new_pcm(struct mychip *chip) + static int __devinit snd_mychip_new_pcm(struct mychip *chip) { struct snd_pcm *pcm; int err; @@ -1937,7 +1957,7 @@ Definition of a Control + + Most likely the control is created via + snd_ctl_new1(), and in such a case, you can + add the __devinitdata prefix to the + definition as above. + + The iface field specifies the control type, SNDRV_CTL_ELEM_IFACE_XXX, which @@ -3820,8 +3847,10 @@ struct _snd_pcm_runtime { snd_ctl_new1() allocates a new - snd_kcontrol instance, - and snd_ctl_add assigns the given + snd_kcontrol instance (that's why the definition + of my_control can be with + the __devinitdata + prefix), and snd_ctl_add assigns the given control component to the card.
@@ -3867,7 +3896,7 @@ struct _snd_pcm_runtime { - Update: November 2012 - -- sysfs-based SRIOV enable-/disable-ment - Donald Dutile 1. Overview @@ -27,21 +24,10 @@ real existing PCI device. 2.1 How can I enable SR-IOV capability -Multiple methods are available for SR-IOV enablement. -In the first method, the device driver (PF driver) will control the -enabling and disabling of the capability via API provided by SR-IOV core. -If the hardware has SR-IOV capability, loading its PF driver would -enable it and all VFs associated with the PF. Some PF drivers require -a module parameter to be set to determine the number of VFs to enable. -In the second method, a write to the sysfs file sriov_numvfs will -enable and disable the VFs associated with a PCIe PF. This method -enables per-PF, VF enable/disable values versus the first method, -which applies to all PFs of the same device. Additionally, the -PCI SRIOV core support ensures that enable/disable operations are -valid to reduce duplication in multiple drivers for the same -checks, e.g., check numvfs == 0 if enabling VFs, ensure -numvfs <= totalvfs. -The second method is the recommended method for new/future VF devices. +The device driver (PF driver) will control the enabling and disabling +of the capability via API provided by SR-IOV core. If the hardware +has SR-IOV capability, loading its PF driver would enable it and all +VFs associated with the PF. 2.2 How can I use the Virtual Functions @@ -54,22 +40,13 @@ requires device driver that is same as a normal PCI device's. 3.1 SR-IOV API To enable SR-IOV capability: -(a) For the first method, in the driver: int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn); 'nr_virtfn' is number of VFs to be enabled. -(b) For the second method, from sysfs: - echo 'nr_virtfn' > \ - /sys/bus/pci/devices//sriov_numvfs To disable SR-IOV capability: -(a) For the first method, in the driver: void pci_disable_sriov(struct pci_dev *dev); -(b) For the second method, from sysfs: - echo 0 > \ - /sys/bus/pci/devices//sriov_numvfs To notify SR-IOV core of Virtual Function Migration: -(a) In the driver: irqreturn_t pci_sriov_migration(struct pci_dev *dev); 3.2 Usage example @@ -111,22 +88,6 @@ static void dev_shutdown(struct pci_dev *dev) ... } -static int dev_sriov_configure(struct pci_dev *dev, int numvfs) -{ - if (numvfs > 0) { - ... - pci_enable_sriov(dev, numvfs); - ... - return numvfs; - } - if (numvfs == 0) { - .... - pci_disable_sriov(dev); - ... - return 0; - } -} - static struct pci_driver dev_driver = { .name = "SR-IOV Physical Function driver", .id_table = dev_id_table, @@ -135,5 +96,4 @@ static struct pci_driver dev_driver = { .suspend = dev_suspend, .resume = dev_resume, .shutdown = dev_shutdown, - .sriov_configure = dev_sriov_configure, }; diff --git a/trunk/Documentation/accounting/getdelays.c b/trunk/Documentation/accounting/getdelays.c index f8ebcde43b17..6f706aca2049 100644 --- a/trunk/Documentation/accounting/getdelays.c +++ b/trunk/Documentation/accounting/getdelays.c @@ -51,6 +51,7 @@ int dbg; int print_delays; int print_io_accounting; int print_task_context_switch_counts; +__u64 stime, utime; #define PRINTF(fmt, arg...) { \ if (dbg) { \ diff --git a/trunk/Documentation/bus-devices/ti-gpmc.txt b/trunk/Documentation/bus-devices/ti-gpmc.txt deleted file mode 100644 index cc9ce57e0a26..000000000000 --- a/trunk/Documentation/bus-devices/ti-gpmc.txt +++ /dev/null @@ -1,122 +0,0 @@ -GPMC (General Purpose Memory Controller): -========================================= - -GPMC is an unified memory controller dedicated to interfacing external -memory devices like - * Asynchronous SRAM like memories and application specific integrated - circuit devices. - * Asynchronous, synchronous, and page mode burst NOR flash devices - NAND flash - * Pseudo-SRAM devices - -GPMC is found on Texas Instruments SoC's (OMAP based) -IP details: http://www.ti.com/lit/pdf/spruh73 section 7.1 - - -GPMC generic timing calculation: -================================ - -GPMC has certain timings that has to be programmed for proper -functioning of the peripheral, while peripheral has another set of -timings. To have peripheral work with gpmc, peripheral timings has to -be translated to the form gpmc can understand. The way it has to be -translated depends on the connected peripheral. Also there is a -dependency for certain gpmc timings on gpmc clock frequency. Hence a -generic timing routine was developed to achieve above requirements. - -Generic routine provides a generic method to calculate gpmc timings -from gpmc peripheral timings. struct gpmc_device_timings fields has to -be updated with timings from the datasheet of the peripheral that is -connected to gpmc. A few of the peripheral timings can be fed either -in time or in cycles, provision to handle this scenario has been -provided (refer struct gpmc_device_timings definition). It may so -happen that timing as specified by peripheral datasheet is not present -in timing structure, in this scenario, try to correlate peripheral -timing to the one available. If that doesn't work, try to add a new -field as required by peripheral, educate generic timing routine to -handle it, make sure that it does not break any of the existing. -Then there may be cases where peripheral datasheet doesn't mention -certain fields of struct gpmc_device_timings, zero those entries. - -Generic timing routine has been verified to work properly on -multiple onenand's and tusb6010 peripherals. - -A word of caution: generic timing routine has been developed based -on understanding of gpmc timings, peripheral timings, available -custom timing routines, a kind of reverse engineering without -most of the datasheets & hardware (to be exact none of those supported -in mainline having custom timing routine) and by simulation. - -gpmc timing dependency on peripheral timings: -[: , ...] - -1. common -cs_on: t_ceasu -adv_on: t_avdasu, t_ceavd - -2. sync common -sync_clk: clk -page_burst_access: t_bacc -clk_activation: t_ces, t_avds - -3. read async muxed -adv_rd_off: t_avdp_r -oe_on: t_oeasu, t_aavdh -access: t_iaa, t_oe, t_ce, t_aa -rd_cycle: t_rd_cycle, t_cez_r, t_oez - -4. read async non-muxed -adv_rd_off: t_avdp_r -oe_on: t_oeasu -access: t_iaa, t_oe, t_ce, t_aa -rd_cycle: t_rd_cycle, t_cez_r, t_oez - -5. read sync muxed -adv_rd_off: t_avdp_r, t_avdh -oe_on: t_oeasu, t_ach, cyc_aavdh_oe -access: t_iaa, cyc_iaa, cyc_oe -rd_cycle: t_cez_r, t_oez, t_ce_rdyz - -6. read sync non-muxed -adv_rd_off: t_avdp_r -oe_on: t_oeasu -access: t_iaa, cyc_iaa, cyc_oe -rd_cycle: t_cez_r, t_oez, t_ce_rdyz - -7. write async muxed -adv_wr_off: t_avdp_w -we_on, wr_data_mux_bus: t_weasu, t_aavdh, cyc_aavhd_we -we_off: t_wpl -cs_wr_off: t_wph -wr_cycle: t_cez_w, t_wr_cycle - -8. write async non-muxed -adv_wr_off: t_avdp_w -we_on, wr_data_mux_bus: t_weasu -we_off: t_wpl -cs_wr_off: t_wph -wr_cycle: t_cez_w, t_wr_cycle - -9. write sync muxed -adv_wr_off: t_avdp_w, t_avdh -we_on, wr_data_mux_bus: t_weasu, t_rdyo, t_aavdh, cyc_aavhd_we -we_off: t_wpl, cyc_wpl -cs_wr_off: t_wph -wr_cycle: t_cez_w, t_ce_rdyz - -10. write sync non-muxed -adv_wr_off: t_avdp_w -we_on, wr_data_mux_bus: t_weasu, t_rdyo -we_off: t_wpl, cyc_wpl -cs_wr_off: t_wph -wr_cycle: t_cez_w, t_ce_rdyz - - -Note: Many of gpmc timings are dependent on other gpmc timings (a few -gpmc timings purely dependent on other gpmc timings, a reason that -some of the gpmc timings are missing above), and it will result in -indirect dependency of peripheral timings to gpmc timings other than -mentioned above, refer timing routine for more details. To know what -these peripheral timings correspond to, please see explanations in -struct gpmc_device_timings definition. And for gpmc timings refer -IP details (link above). diff --git a/trunk/Documentation/cgroups/cpusets.txt b/trunk/Documentation/cgroups/cpusets.txt index 12e01d432bfe..cefd3d8bbd11 100644 --- a/trunk/Documentation/cgroups/cpusets.txt +++ b/trunk/Documentation/cgroups/cpusets.txt @@ -218,7 +218,7 @@ and name space for cpusets, with a minimum of additional kernel code. The cpus and mems files in the root (top_cpuset) cpuset are read-only. The cpus file automatically tracks the value of cpu_online_mask using a CPU hotplug notifier, and the mems file -automatically tracks the value of node_states[N_MEMORY]--i.e., +automatically tracks the value of node_states[N_HIGH_MEMORY]--i.e., nodes with memory--using the cpuset_track_online_nodes() hook. diff --git a/trunk/Documentation/devicetree/bindings/arm/exynos/power_domain.txt b/trunk/Documentation/devicetree/bindings/arm/exynos/power_domain.txt index 5216b419016a..6528e215c5fe 100644 --- a/trunk/Documentation/devicetree/bindings/arm/exynos/power_domain.txt +++ b/trunk/Documentation/devicetree/bindings/arm/exynos/power_domain.txt @@ -4,13 +4,14 @@ Exynos processors include support for multiple power domains which are used to gate power to one or more peripherals on the processor. Required Properties: -- compatible: should be one of the following. +- compatiable: should be one of the following. * samsung,exynos4210-pd - for exynos4210 type power domain. - reg: physical base address of the controller and length of memory mapped region. -Node of a device using power domains must have a samsung,power-domain property -defined with a phandle to respective power domain. +Optional Properties: +- samsung,exynos4210-pd-off: Specifies that the power domain is in turned-off + state during boot and remains to be turned-off until explicitly turned-on. Example: @@ -18,11 +19,3 @@ Example: compatible = "samsung,exynos4210-pd"; reg = <0x10023C00 0x10>; }; - -Example of the node using power domain: - - node { - /* ... */ - samsung,power-domain = <&lcd0>; - /* ... */ - }; diff --git a/trunk/Documentation/devicetree/bindings/arm/fsl.txt b/trunk/Documentation/devicetree/bindings/arm/fsl.txt index f79818711e83..ac9e7516756e 100644 --- a/trunk/Documentation/devicetree/bindings/arm/fsl.txt +++ b/trunk/Documentation/devicetree/bindings/arm/fsl.txt @@ -41,10 +41,6 @@ i.MX6 Quad SABRE Smart Device Board Required root node properties: - compatible = "fsl,imx6q-sabresd", "fsl,imx6q"; -i.MX6 Quad SABRE Automotive Board -Required root node properties: - - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; - Generic i.MX boards ------------------- diff --git a/trunk/Documentation/devicetree/bindings/ata/exynos-sata-phy.txt b/trunk/Documentation/devicetree/bindings/ata/exynos-sata-phy.txt deleted file mode 100644 index 37824fac688e..000000000000 --- a/trunk/Documentation/devicetree/bindings/ata/exynos-sata-phy.txt +++ /dev/null @@ -1,14 +0,0 @@ -* Samsung SATA PHY Controller - -SATA PHY nodes are defined to describe on-chip SATA Physical layer controllers. -Each SATA PHY controller should have its own node. - -Required properties: -- compatible : compatible list, contains "samsung,exynos5-sata-phy" -- reg : - -Example: - sata@ffe07000 { - compatible = "samsung,exynos5-sata-phy"; - reg = <0xffe07000 0x1000>; - }; diff --git a/trunk/Documentation/devicetree/bindings/ata/exynos-sata.txt b/trunk/Documentation/devicetree/bindings/ata/exynos-sata.txt deleted file mode 100644 index 0849f1025e34..000000000000 --- a/trunk/Documentation/devicetree/bindings/ata/exynos-sata.txt +++ /dev/null @@ -1,17 +0,0 @@ -* Samsung AHCI SATA Controller - -SATA nodes are defined to describe on-chip Serial ATA controllers. -Each SATA controller should have its own node. - -Required properties: -- compatible : compatible list, contains "samsung,exynos5-sata" -- interrupts : -- reg : -- samsung,sata-freq : - -Example: - sata@ffe08000 { - compatible = "samsung,exynos5-sata"; - reg = <0xffe08000 0x1000>; - interrupts = <115>; - }; diff --git a/trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt b/trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt deleted file mode 100644 index c2a3525ecb4e..000000000000 --- a/trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt +++ /dev/null @@ -1,162 +0,0 @@ -* Clock bindings for Freescale i.MX25 - -Required properties: -- compatible: Should be "fsl,imx25-ccm" -- reg: Address and length of the register set -- interrupts: Should contain CCM interrupt -- #clock-cells: Should be <1> - -The clock consumer should specify the desired clock by having the clock -ID in its "clocks" phandle cell. The following is a full list of i.MX25 -clocks and IDs. - - Clock ID - --------------------------- - dummy 0 - osc 1 - mpll 2 - upll 3 - mpll_cpu_3_4 4 - cpu_sel 5 - cpu 6 - ahb 7 - usb_div 8 - ipg 9 - per0_sel 10 - per1_sel 11 - per2_sel 12 - per3_sel 13 - per4_sel 14 - per5_sel 15 - per6_sel 16 - per7_sel 17 - per8_sel 18 - per9_sel 19 - per10_sel 20 - per11_sel 21 - per12_sel 22 - per13_sel 23 - per14_sel 24 - per15_sel 25 - per0 26 - per1 27 - per2 28 - per3 29 - per4 30 - per5 31 - per6 32 - per7 33 - per8 34 - per9 35 - per10 36 - per11 37 - per12 38 - per13 39 - per14 40 - per15 41 - csi_ipg_per 42 - epit_ipg_per 43 - esai_ipg_per 44 - esdhc1_ipg_per 45 - esdhc2_ipg_per 46 - gpt_ipg_per 47 - i2c_ipg_per 48 - lcdc_ipg_per 49 - nfc_ipg_per 50 - owire_ipg_per 51 - pwm_ipg_per 52 - sim1_ipg_per 53 - sim2_ipg_per 54 - ssi1_ipg_per 55 - ssi2_ipg_per 56 - uart_ipg_per 57 - ata_ahb 58 - reserved 59 - csi_ahb 60 - emi_ahb 61 - esai_ahb 62 - esdhc1_ahb 63 - esdhc2_ahb 64 - fec_ahb 65 - lcdc_ahb 66 - rtic_ahb 67 - sdma_ahb 68 - slcdc_ahb 69 - usbotg_ahb 70 - reserved 71 - reserved 72 - reserved 73 - reserved 74 - can1_ipg 75 - can2_ipg 76 - csi_ipg 77 - cspi1_ipg 78 - cspi2_ipg 79 - cspi3_ipg 80 - dryice_ipg 81 - ect_ipg 82 - epit1_ipg 83 - epit2_ipg 84 - reserved 85 - esdhc1_ipg 86 - esdhc2_ipg 87 - fec_ipg 88 - reserved 89 - reserved 90 - reserved 91 - gpt1_ipg 92 - gpt2_ipg 93 - gpt3_ipg 94 - gpt4_ipg 95 - reserved 96 - reserved 97 - reserved 98 - iim_ipg 99 - reserved 100 - reserved 101 - kpp_ipg 102 - lcdc_ipg 103 - reserved 104 - pwm1_ipg 105 - pwm2_ipg 106 - pwm3_ipg 107 - pwm4_ipg 108 - rngb_ipg 109 - reserved 110 - scc_ipg 111 - sdma_ipg 112 - sim1_ipg 113 - sim2_ipg 114 - slcdc_ipg 115 - spba_ipg 116 - ssi1_ipg 117 - ssi2_ipg 118 - tsc_ipg 119 - uart1_ipg 120 - uart2_ipg 121 - uart3_ipg 122 - uart4_ipg 123 - uart5_ipg 124 - reserved 125 - wdt_ipg 126 - -Examples: - -clks: ccm@53f80000 { - compatible = "fsl,imx25-ccm"; - reg = <0x53f80000 0x4000>; - interrupts = <31>; - clock-output-names = ... - "uart_ipg", - "uart_serial", - ...; -}; - -uart1: serial@43f90000 { - compatible = "fsl,imx25-uart", "fsl,imx21-uart"; - reg = <0x43f90000 0x4000>; - interrupts = <45>; - clocks = <&clks 79>, <&clks 50>; - clock-names = "ipg", "per"; - status = "disabled"; -}; diff --git a/trunk/Documentation/devicetree/bindings/clock/zynq-7000.txt b/trunk/Documentation/devicetree/bindings/clock/zynq-7000.txt deleted file mode 100644 index 23ae1db1bc13..000000000000 --- a/trunk/Documentation/devicetree/bindings/clock/zynq-7000.txt +++ /dev/null @@ -1,55 +0,0 @@ -Device Tree Clock bindings for the Zynq 7000 EPP - -The Zynq EPP has several different clk providers, each with there own bindings. -The purpose of this document is to document their usage. - -See clock_bindings.txt for more information on the generic clock bindings. -See Chapter 25 of Zynq TRM for more information about Zynq clocks. - -== PLLs == - -Used to describe the ARM_PLL, DDR_PLL, and IO_PLL. - -Required properties: -- #clock-cells : shall be 0 (only one clock is output from this node) -- compatible : "xlnx,zynq-pll" -- reg : pair of u32 values, which are the address offsets within the SLCR - of the relevant PLL_CTRL register and PLL_CFG register respectively -- clocks : phandle for parent clock. should be the phandle for ps_clk - -Optional properties: -- clock-output-names : name of the output clock - -Example: - armpll: armpll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x100 0x110>; - clock-output-names = "armpll"; - }; - -== Peripheral clocks == - -Describes clock node for the SDIO, SMC, SPI, QSPI, and UART clocks. - -Required properties: -- #clock-cells : shall be 1 -- compatible : "xlnx,zynq-periph-clock" -- reg : a single u32 value, describing the offset within the SLCR where - the CLK_CTRL register is found for this peripheral -- clocks : phandle for parent clocks. should hold phandles for - the IO_PLL, ARM_PLL, and DDR_PLL in order -- clock-output-names : names of the output clock(s). For peripherals that have - two output clocks (for example, the UART), two clocks - should be listed. - -Example: - uart_clk: uart_clk { - #clock-cells = <1>; - compatible = "xlnx,zynq-periph-clock"; - clocks = <&iopll &armpll &ddrpll>; - reg = <0x154>; - clock-output-names = "uart0_ref_clk", - "uart1_ref_clk"; - }; diff --git a/trunk/Documentation/devicetree/bindings/drm/exynos/hdmi.txt b/trunk/Documentation/devicetree/bindings/drm/exynos/hdmi.txt deleted file mode 100644 index 589edee37394..000000000000 --- a/trunk/Documentation/devicetree/bindings/drm/exynos/hdmi.txt +++ /dev/null @@ -1,22 +0,0 @@ -Device-Tree bindings for drm hdmi driver - -Required properties: -- compatible: value should be "samsung,exynos5-hdmi". -- reg: physical base address of the hdmi and length of memory mapped - region. -- interrupts: interrupt number to the cpu. -- hpd-gpio: following information about the hotplug gpio pin. - a) phandle of the gpio controller node. - b) pin number within the gpio controller. - c) pin function mode. - d) optional flags and pull up/down. - e) drive strength. - -Example: - - hdmi { - compatible = "samsung,exynos5-hdmi"; - reg = <0x14530000 0x100000>; - interrupts = <0 95 0>; - hpd-gpio = <&gpx3 7 0xf 1 3>; - }; diff --git a/trunk/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt b/trunk/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt deleted file mode 100644 index fa166d945809..000000000000 --- a/trunk/Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt +++ /dev/null @@ -1,12 +0,0 @@ -Device-Tree bindings for hdmiddc driver - -Required properties: -- compatible: value should be "samsung,exynos5-hdmiddc". -- reg: I2C address of the hdmiddc device. - -Example: - - hdmiddc { - compatible = "samsung,exynos5-hdmiddc"; - reg = <0x50>; - }; diff --git a/trunk/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt b/trunk/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt deleted file mode 100644 index 858f4f9b902f..000000000000 --- a/trunk/Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt +++ /dev/null @@ -1,12 +0,0 @@ -Device-Tree bindings for hdmiphy driver - -Required properties: -- compatible: value should be "samsung,exynos5-hdmiphy". -- reg: I2C address of the hdmiphy device. - -Example: - - hdmiphy { - compatible = "samsung,exynos5-hdmiphy"; - reg = <0x38>; - }; diff --git a/trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt b/trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt deleted file mode 100644 index 9b2ea0343566..000000000000 --- a/trunk/Documentation/devicetree/bindings/drm/exynos/mixer.txt +++ /dev/null @@ -1,15 +0,0 @@ -Device-Tree bindings for mixer driver - -Required properties: -- compatible: value should be "samsung,exynos5-mixer". -- reg: physical base address of the mixer and length of memory mapped - region. -- interrupts: interrupt number to the cpu. - -Example: - - mixer { - compatible = "samsung,exynos5-mixer"; - reg = <0x14450000 0x10000>; - interrupts = <0 94 0>; - }; diff --git a/trunk/Documentation/devicetree/bindings/gpio/gpio-poweroff.txt b/trunk/Documentation/devicetree/bindings/gpio/gpio-poweroff.txt deleted file mode 100644 index 558cdf3c9abc..000000000000 --- a/trunk/Documentation/devicetree/bindings/gpio/gpio-poweroff.txt +++ /dev/null @@ -1,22 +0,0 @@ -GPIO line that should be set high/low to power off a device - -Required properties: -- compatible : should be "gpio-poweroff". -- gpios : The GPIO to set high/low, see "gpios property" in - Documentation/devicetree/bindings/gpio/gpio.txt. If the pin should be - low to power down the board set it to "Active Low", otherwise set - gpio to "Active High". - -Optional properties: -- input : Initially configure the GPIO line as an input. Only reconfigure - it to an output when the pm_power_off function is called. If this optional - property is not specified, the GPIO is initialized as an output in its - inactive state. - - -Examples: - -gpio-poweroff { - compatible = "gpio-poweroff"; - gpios = <&gpio 4 0>; /* GPIO 4 Active Low */ -}; diff --git a/trunk/Documentation/devicetree/bindings/hwmon/vexpress.txt b/trunk/Documentation/devicetree/bindings/hwmon/vexpress.txt deleted file mode 100644 index 9c27ed694bbb..000000000000 --- a/trunk/Documentation/devicetree/bindings/hwmon/vexpress.txt +++ /dev/null @@ -1,23 +0,0 @@ -Versatile Express hwmon sensors -------------------------------- - -Requires node properties: -- "compatible" value : one of - "arm,vexpress-volt" - "arm,vexpress-amp" - "arm,vexpress-temp" - "arm,vexpress-power" - "arm,vexpress-energy" -- "arm,vexpress-sysreg,func" when controlled via vexpress-sysreg - (see Documentation/devicetree/bindings/arm/vexpress-sysreg.txt - for more details) - -Optional node properties: -- label : string describing the monitored value - -Example: - energy@0 { - compatible = "arm,vexpress-energy"; - arm,vexpress-sysreg,func = <13 0>; - label = "A15 Jcore"; - }; diff --git a/trunk/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt b/trunk/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt deleted file mode 100644 index ca5a2c86480c..000000000000 --- a/trunk/Documentation/devicetree/bindings/input/touchscreen/bu21013.txt +++ /dev/null @@ -1,28 +0,0 @@ -* Rohm BU21013 Touch Screen - -Required properties: - - compatible : "rohm,bu21013_tp" - - reg : I2C device address - -Optional properties: - - touch-gpio : GPIO pin registering a touch event - - -supply : Phandle to a regulator supply - - rohm,touch-max-x : Maximum outward permitted limit in the X axis - - rohm,touch-max-y : Maximum outward permitted limit in the Y axis - - rohm,flip-x : Flip touch coordinates on the X axis - - rohm,flip-y : Flip touch coordinates on the Y axis - -Example: - - i2c@80110000 { - bu21013_tp@0x5c { - compatible = "rohm,bu21013_tp"; - reg = <0x5c>; - touch-gpio = <&gpio2 20 0x4>; - avdd-supply = <&ab8500_ldo_aux1_reg>; - - rohm,touch-max-x = <384>; - rohm,touch-max-y = <704>; - rohm,flip-y; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/media/s5p-mfc.txt b/trunk/Documentation/devicetree/bindings/media/s5p-mfc.txt deleted file mode 100644 index 67ec3d4ccc7f..000000000000 --- a/trunk/Documentation/devicetree/bindings/media/s5p-mfc.txt +++ /dev/null @@ -1,23 +0,0 @@ -* Samsung Multi Format Codec (MFC) - -Multi Format Codec (MFC) is the IP present in Samsung SoCs which -supports high resolution decoding and encoding functionalities. -The MFC device driver is a v4l2 driver which can encode/decode -video raw/elementary streams and has support for all popular -video codecs. - -Required properties: - - compatible : value should be either one among the following - (a) "samsung,mfc-v5" for MFC v5 present in Exynos4 SoCs - (b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs - - - reg : Physical base address of the IP registers and length of memory - mapped region. - - - interrupts : MFC interrupt number to the CPU. - - - samsung,mfc-r : Base address of the first memory bank used by MFC - for DMA contiguous memory allocation and its size. - - - samsung,mfc-l : Base address of the second memory bank used by MFC - for DMA contiguous memory allocation and its size. diff --git a/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt b/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt index 13b707b7355c..ce83c8d3c00e 100644 --- a/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt +++ b/trunk/Documentation/devicetree/bindings/mfd/ab8500.txt @@ -24,32 +24,7 @@ ab8500-bm : : : Battery Manager ab8500-btemp : : : Battery Temperature ab8500-charger : : : Battery Charger ab8500-codec : : : Audio Codec -ab8500-fg : : vddadc : Fuel Gauge - : NCONV_ACCU : : Accumulate N Sample Conversion - : BATT_OVV : : Battery Over Voltage - : LOW_BAT_F : : LOW threshold battery voltage - : CC_INT_CALIB : : Coulomb Counter Internal Calibration - : CCEOC : : Coulomb Counter End of Conversion -ab8500-btemp : : vtvout : Battery Temperature - : BAT_CTRL_INDB : : Battery Removal Indicator - : BTEMP_LOW : : Btemp < BtempLow, if battery temperature is lower than -10°C - : BTEMP_LOW_MEDIUM : : BtempLow < Btemp < BtempMedium,if battery temperature is between -10 and 0°C - : BTEMP_MEDIUM_HIGH : : BtempMedium < Btemp < BtempHigh,if battery temperature is between 0°C and“MaxTemp - : BTEMP_HIGH : : Btemp > BtempHigh, if battery temperature is higher than “MaxTemp -ab8500-charger : : vddadc : Charger interface - : MAIN_CH_UNPLUG_DET : : main charger unplug detection management (not in 8505) - : MAIN_CHARGE_PLUG_DET : : main charger plug detection management (not in 8505) - : MAIN_EXT_CH_NOT_OK : : main charger not OK - : MAIN_CH_TH_PROT_R : : Die temp is above main charger - : MAIN_CH_TH_PROT_F : : Die temp is below main charger - : VBUS_DET_F : : VBUS falling detected - : VBUS_DET_R : : VBUS rising detected - : USB_LINK_STATUS : : USB link status has changed - : USB_CH_TH_PROT_R : : Die temp is above usb charger - : USB_CH_TH_PROT_F : : Die temp is below usb charger - : USB_CHARGER_NOT_OKR : : allowed USB charger not ok detection - : VBUS_OVV : : Overvoltage on Vbus ball detected (USB charge is stopped) - : CH_WD_EXP : : Charger watchdog detected +ab8500-fg : : : Fuel Gauge ab8500-gpadc : HW_CONV_END : vddadc : Analogue to Digital Converter SW_CONV_END : : ab8500-gpio : : : GPIO Controller diff --git a/trunk/Documentation/devicetree/bindings/misc/atmel-ssc.txt b/trunk/Documentation/devicetree/bindings/misc/atmel-ssc.txt deleted file mode 100644 index 38e51ad2e07e..000000000000 --- a/trunk/Documentation/devicetree/bindings/misc/atmel-ssc.txt +++ /dev/null @@ -1,15 +0,0 @@ -* Atmel SSC driver. - -Required properties: -- compatible: "atmel,at91rm9200-ssc" or "atmel,at91sam9g45-ssc" - - atmel,at91rm9200-ssc: support pdc transfer - - atmel,at91sam9g45-ssc: support dma transfer -- reg: Should contain SSC registers location and length -- interrupts: Should contain SSC interrupt - -Example: -ssc0: ssc@fffbc000 { - compatible = "atmel,at91rm9200-ssc"; - reg = <0xfffbc000 0x4000>; - interrupts = <14 4 5>; -}; diff --git a/trunk/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt b/trunk/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt index 95daf6335c37..361bccb7ec89 100644 --- a/trunk/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt +++ b/trunk/Documentation/devicetree/bindings/pinctrl/marvell,kirkwood-pinctrl.txt @@ -7,10 +7,8 @@ Required properties: - compatible: "marvell,88f6180-pinctrl", "marvell,88f6190-pinctrl", "marvell,88f6192-pinctrl", "marvell,88f6281-pinctrl", "marvell,88f6282-pinctrl" - "marvell,98dx4122-pinctrl" This driver supports all kirkwood variants, i.e. 88f6180, 88f619x, and 88f628x. -It also support the 88f6281-based variant in the 98dx412x Bobcat SoCs. Available mpp pins/groups and functions: Note: brackets (x) are not part of the mpp name for marvell,function and given @@ -279,40 +277,3 @@ mpp46 46 gpio, ts(mp10), tdm(fs), lcd(hsync) mpp47 47 gpio, ts(mp11), tdm(drx), lcd(vsync) mpp48 48 gpio, ts(mp12), tdm(dtx), lcd(d16) mpp49 49 gpo, tdm(rx0ql), pex(clkreq), lcd(d17) - -* Marvell Bobcat 98dx4122 - -name pins functions -================================================================================ -mpp0 0 gpio, nand(io2), spi(cs) -mpp1 1 gpo, nand(io3), spi(mosi) -mpp2 2 gpo, nand(io4), spi(sck) -mpp3 3 gpo, nand(io5), spi(miso) -mpp4 4 gpio, nand(io6), uart0(rxd) -mpp5 5 gpo, nand(io7), uart0(txd) -mpp6 6 sysrst(out), spi(mosi) -mpp7 7 gpo, pex(rsto), spi(cs) -mpp8 8 gpio, twsi0(sda), uart0(rts), uart1(rts) -mpp9 9 gpio, twsi(sck), uart0(cts), uart1(cts) -mpp10 10 gpo, spi(sck), uart0(txd) -mpp11 11 gpio, spi(miso), uart0(rxd) -mpp13 13 gpio, uart1(txd) -mpp14 14 gpio, uart1(rxd) -mpp15 15 gpio, uart0(rts) -mpp16 16 gpio, uart0(cts) -mpp18 18 gpo, nand(io0) -mpp19 19 gpo, nand(io1) -mpp34 34 gpio -mpp35 35 gpio -mpp36 36 gpio -mpp37 37 gpio -mpp38 38 gpio -mpp39 39 gpio -mpp40 40 gpio -mpp41 41 gpio -mpp42 42 gpio -mpp43 43 gpio -mpp44 44 gpio -mpp45 45 gpio -mpp49 49 gpio - diff --git a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt b/trunk/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt deleted file mode 100644 index 0ba1bcc7f33a..000000000000 --- a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/btemp.txt +++ /dev/null @@ -1,16 +0,0 @@ -=== AB8500 Battery Temperature Monitor Driver === - -The properties below describes the node for btemp driver. - -Required Properties: -- compatible = Shall be: "stericsson,ab8500-btemp" -- battery = Shall be battery specific information - - Example: - ab8500_btemp { - compatible = "stericsson,ab8500-btemp"; - battery = <&ab8500_battery>; - }; - -For information on battery specific node, Ref: -Documentation/devicetree/bindings/power_supply/ab8500/fg.txt diff --git a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt b/trunk/Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt deleted file mode 100644 index ef5328371122..000000000000 --- a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/chargalg.txt +++ /dev/null @@ -1,16 +0,0 @@ -=== AB8500 Charging Algorithm Driver === - -The properties below describes the node for chargalg driver. - -Required Properties: -- compatible = Shall be: "stericsson,ab8500-chargalg" -- battery = Shall be battery specific information - -Example: -ab8500_chargalg { - compatible = "stericsson,ab8500-chargalg"; - battery = <&ab8500_battery>; -}; - -For information on battery specific node, Ref: -Documentation/devicetree/bindings/power_supply/ab8500/fg.txt diff --git a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/charger.txt b/trunk/Documentation/devicetree/bindings/power_supply/ab8500/charger.txt deleted file mode 100644 index 6bdbb08ea9e0..000000000000 --- a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/charger.txt +++ /dev/null @@ -1,25 +0,0 @@ -=== AB8500 Charger Driver === - -Required Properties: -- compatible = Shall be "stericsson,ab8500-charger" -- battery = Shall be battery specific information - Example: - ab8500_charger { - compatible = "stericsson,ab8500-charger"; - battery = <&ab8500_battery>; - }; - -- vddadc-supply: Supply for USB and Main charger - Example: - ab8500-charger { - vddadc-supply = <&ab8500_ldo_tvout_reg>; - } -- autopower_cfg: - Boolean value depicting the presence of 'automatic poweron after powerloss' - Example: - ab8500-charger { - autopower_cfg; - }; - -For information on battery specific node, Ref: -Documentation/devicetree/bindings/power_supply/ab8500/fg.txt diff --git a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt b/trunk/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt deleted file mode 100644 index ccafcb9112fb..000000000000 --- a/trunk/Documentation/devicetree/bindings/power_supply/ab8500/fg.txt +++ /dev/null @@ -1,58 +0,0 @@ -=== AB8500 Fuel Gauge Driver === - -AB8500 is a mixed signal multimedia and power management -device comprising: power and energy-management-module, -wall-charger, usb-charger, audio codec, general purpose adc, -tvout, clock management and sim card interface. - -Fuelgauge support is part of energy-management-modules, other -components of this module are: -main-charger, usb-combo-charger and battery-temperature-monitoring. - -The properties below describes the node for fuelgauge driver. - -Required Properties: -- compatible = This shall be: "stericsson,ab8500-fg" -- battery = Shall be battery specific information - Example: - ab8500_fg { - compatible = "stericsson,ab8500-fg"; - battery = <&ab8500_battery>; - }; - -dependent node: - ab8500_battery: ab8500_battery { - }; - This node will provide information on 'thermistor interface' and - 'battery technology type' used. - -Properties of this node are: -thermistor-on-batctrl: - A boolean value indicating thermistor interface to battery - - Note: - 'btemp' and 'batctrl' are the pins interfaced for battery temperature - measurement, 'btemp' signal is used when NTC(negative temperature - coefficient) resister is interfaced external to battery whereas - 'batctrl' pin is used when NTC resister is internal to battery. - - Example: - ab8500_battery: ab8500_battery { - thermistor-on-batctrl; - }; - indicates: NTC resister is internal to battery, 'batctrl' is used - for thermal measurement. - - The absence of property 'thermal-on-batctrl' indicates - NTC resister is external to battery and 'btemp' signal is used - for thermal measurement. - -battery-type: - This shall be the battery manufacturing technology type, - allowed types are: - "UNKNOWN" "NiMH" "LION" "LIPO" "LiFe" "NiCd" "LiMn" - Example: - ab8500_battery: ab8500_battery { - stericsson,battery-type = "LIPO"; - } - diff --git a/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt deleted file mode 100644 index 63c659800c03..000000000000 --- a/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt +++ /dev/null @@ -1,37 +0,0 @@ -GPIO controlled regulators - -Required properties: -- compatible : Must be "regulator-gpio". -- states : Selection of available voltages and GPIO configs. - if there are no states, then use a fixed regulator - -Optional properties: -- enable-gpio : GPIO to use to enable/disable the regulator. -- gpios : GPIO group used to control voltage. -- startup-delay-us : Startup time in microseconds. -- enable-active-high : Polarity of GPIO is active high (default is low). - -Any property defined as part of the core regulator binding defined in -regulator.txt can also be used. - -Example: - - mmciv: gpio-regulator { - compatible = "regulator-gpio"; - - regulator-name = "mmci-gpio-supply"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2600000>; - regulator-boot-on; - - enable-gpio = <&gpio0 23 0x4>; - gpios = <&gpio0 24 0x4 - &gpio0 25 0x4>; - states = <1800000 0x3 - 2200000 0x2 - 2600000 0x1 - 2900000 0x0>; - - startup-delay-us = <100000>; - enable-active-high; - }; diff --git a/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt deleted file mode 100644 index 0057695aae8f..000000000000 --- a/trunk/Documentation/devicetree/bindings/regulator/max8925-regulator.txt +++ /dev/null @@ -1,40 +0,0 @@ -Max8925 Voltage regulators - -Required nodes: --nodes: - - SDV1 for SDV SDV1 - - SDV2 for SDV SDV2 - - SDV3 for SDV SDV3 - - LDO1 for LDO LDO1 - - LDO2 for LDO LDO2 - - LDO3 for LDO LDO3 - - LDO4 for LDO LDO4 - - LDO5 for LDO LDO5 - - LDO6 for LDO LDO6 - - LDO7 for LDO LDO7 - - LDO8 for LDO LDO8 - - LDO9 for LDO LDO9 - - LDO10 for LDO LDO10 - - LDO11 for LDO LDO11 - - LDO12 for LDO LDO12 - - LDO13 for LDO LDO13 - - LDO14 for LDO LDO14 - - LDO15 for LDO LDO15 - - LDO16 for LDO LDO16 - - LDO17 for LDO LDO17 - - LDO18 for LDO LDO18 - - LDO19 for LDO LDO19 - - LDO20 for LDO LDO20 - -Optional properties: -- Any optional property defined in bindings/regulator/regulator.txt - -Example: - - SDV1 { - regulator-min-microvolt = <637500>; - regulator-max-microvolt = <1425000>; - regulator-boot-on; - regulator-always-on; - }; - diff --git a/trunk/Documentation/devicetree/bindings/regulator/max8997-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/max8997-regulator.txt deleted file mode 100644 index 9fd69a18b0ba..000000000000 --- a/trunk/Documentation/devicetree/bindings/regulator/max8997-regulator.txt +++ /dev/null @@ -1,146 +0,0 @@ -* Maxim MAX8997 Voltage and Current Regulator - -The Maxim MAX8997 is a multi-function device which includes volatage and -current regulators, rtc, charger controller and other sub-blocks. It is -interfaced to the host controller using a i2c interface. Each sub-block is -addressed by the host system using different i2c slave address. This document -describes the bindings for 'pmic' sub-block of max8997. - -Required properties: -- compatible: Should be "maxim,max8997-pmic". -- reg: Specifies the i2c slave address of the pmic block. It should be 0x66. - -- max8997,pmic-buck1-dvs-voltage: A set of 8 voltage values in micro-volt (uV) - units for buck1 when changing voltage using gpio dvs. Refer to [1] below - for additional information. - -- max8997,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV) - units for buck2 when changing voltage using gpio dvs. Refer to [1] below - for additional information. - -- max8997,pmic-buck5-dvs-voltage: A set of 8 voltage values in micro-volt (uV) - units for buck5 when changing voltage using gpio dvs. Refer to [1] below - for additional information. - -[1] If none of the 'max8997,pmic-buck[1/2/5]-uses-gpio-dvs' optional - property is specified, the 'max8997,pmic-buck[1/2/5]-dvs-voltage' - property should specify atleast one voltage level (which would be a - safe operating voltage). - - If either of the 'max8997,pmic-buck[1/2/5]-uses-gpio-dvs' optional - property is specified, then all the eigth voltage values for the - 'max8997,pmic-buck[1/2/5]-dvs-voltage' should be specified. - -Optional properties: -- interrupt-parent: Specifies the phandle of the interrupt controller to which - the interrupts from max8997 are delivered to. -- interrupts: Interrupt specifiers for two interrupt sources. - - First interrupt specifier is for 'irq1' interrupt. - - Second interrupt specifier is for 'alert' interrupt. -- max8997,pmic-buck1-uses-gpio-dvs: 'buck1' can be controlled by gpio dvs. -- max8997,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs. -- max8997,pmic-buck5-uses-gpio-dvs: 'buck5' can be controlled by gpio dvs. - -Additional properties required if either of the optional properties are used: -- max8997,pmic-ignore-gpiodvs-side-effect: When GPIO-DVS mode is used for - multiple bucks, changing the voltage value of one of the bucks may affect - that of another buck, which is the side effect of the change (set_voltage). - Use this property to ignore such side effects and change the voltage. - -- max8997,pmic-buck125-default-dvs-idx: Default voltage setting selected from - the possible 8 options selectable by the dvs gpios. The value of this - property should be between 0 and 7. If not specified or if out of range, the - default value of this property is set to 0. - -- max8997,pmic-buck125-dvs-gpios: GPIO specifiers for three host gpio's used - for dvs. The format of the gpio specifier depends in the gpio controller. - -Regulators: The regulators of max8997 that have to be instantiated should be -included in a sub-node named 'regulators'. Regulator nodes included in this -sub-node should be of the format as listed below. - - regulator_name { - standard regulator bindings here - }; - -The following are the names of the regulators that the max8997 pmic block -supports. Note: The 'n' in LDOn and BUCKn represents the LDO or BUCK number -as per the datasheet of max8997. - - - LDOn - - valid values for n are 1 to 18 and 21 - - Example: LDO0, LD01, LDO2, LDO21 - - BUCKn - - valid values for n are 1 to 7. - - Example: BUCK1, BUCK2, BUCK3, BUCK7 - - - ENVICHG: Battery Charging Current Monitor Output. This is a fixed - voltage type regulator - - - ESAFEOUT1: (ldo19) - - ESAFEOUT2: (ld020) - - - CHARGER_CV: main battery charger voltage control - - CHARGER: main battery charger current control - - CHARGER_TOPOFF: end of charge current threshold level - -The bindings inside the regulator nodes use the standard regulator bindings -which are documented elsewhere. - -Example: - - max8997_pmic@66 { - compatible = "maxim,max8997-pmic"; - interrupt-parent = <&wakeup_eint>; - reg = <0x66>; - interrupts = <4 0>, <3 0>; - - max8997,pmic-buck1-uses-gpio-dvs; - max8997,pmic-buck2-uses-gpio-dvs; - max8997,pmic-buck5-uses-gpio-dvs; - - max8997,pmic-ignore-gpiodvs-side-effect; - max8997,pmic-buck125-default-dvs-idx = <0>; - - max8997,pmic-buck125-dvs-gpios = <&gpx0 0 1 0 0>, /* SET1 */ - <&gpx0 1 1 0 0>, /* SET2 */ - <&gpx0 2 1 0 0>; /* SET3 */ - - max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>, - <1250000>, <1200000>, - <1150000>, <1100000>, - <1000000>, <950000>; - - max8997,pmic-buck2-dvs-voltage = <1100000>, <1100000>, - <1100000>, <1100000>, - <1000000>, <1000000>, - <1000000>, <1000000>; - - max8997,pmic-buck5-dvs-voltage = <1200000>, <1200000>, - <1200000>, <1200000>, - <1200000>, <1200000>, - <1200000>, <1200000>; - - regulators { - ldo1_reg: LDO1 { - regulator-name = "VDD_ABB_3.3V"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - ldo2_reg: LDO2 { - regulator-name = "VDD_ALIVE_1.1V"; - regulator-min-microvolt = <1100000>; - regulator-max-microvolt = <1100000>; - regulator-always-on; - }; - - buck1_reg: BUCK1 { - regulator-name = "VDD_ARM_1.2V"; - regulator-min-microvolt = <950000>; - regulator-max-microvolt = <1350000>; - regulator-always-on; - regulator-boot-on; - }; - }; - }; diff --git a/trunk/Documentation/devicetree/bindings/regulator/vexpress.txt b/trunk/Documentation/devicetree/bindings/regulator/vexpress.txt deleted file mode 100644 index d775f72487aa..000000000000 --- a/trunk/Documentation/devicetree/bindings/regulator/vexpress.txt +++ /dev/null @@ -1,32 +0,0 @@ -Versatile Express voltage regulators ------------------------------------- - -Requires node properties: -- "compatible" value: "arm,vexpress-volt" -- "arm,vexpress-sysreg,func" when controlled via vexpress-sysreg - (see Documentation/devicetree/bindings/arm/vexpress-sysreg.txt - for more details) - -Required regulator properties: -- "regulator-name" -- "regulator-always-on" - -Optional regulator properties: -- "regulator-min-microvolt" -- "regulator-max-microvolt" - -See Documentation/devicetree/bindings/regulator/regulator.txt -for more details about the regulator properties. - -When no "regulator-[min|max]-microvolt" properties are defined, -the device is treated as fixed (or rather "read-only") regulator. - -Example: - volt@0 { - compatible = "arm,vexpress-volt"; - arm,vexpress-sysreg,func = <2 0>; - regulator-name = "Cores"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1050000>; - regulator-always-on; - }; diff --git a/trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt b/trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt deleted file mode 100644 index 93f45e9dce7c..000000000000 --- a/trunk/Documentation/devicetree/bindings/rtc/nvidia,tegra20-rtc.txt +++ /dev/null @@ -1,19 +0,0 @@ -NVIDIA Tegra20 real-time clock - -The Tegra RTC maintains seconds and milliseconds counters, and five alarm -registers. The alarms and other interrupts may wake the system from low-power -state. - -Required properties: - -- compatible : should be "nvidia,tegra20-rtc". -- reg : Specifies base physical address and size of the registers. -- interrupts : A single interrupt specifier. - -Example: - -timer { - compatible = "nvidia,tegra20-rtc"; - reg = <0x7000e000 0x100>; - interrupts = <0 2 0x04>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/ak4104.txt b/trunk/Documentation/devicetree/bindings/sound/ak4104.txt deleted file mode 100644 index b902ee39cf89..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/ak4104.txt +++ /dev/null @@ -1,22 +0,0 @@ -AK4104 S/PDIF transmitter - -This device supports SPI mode only. - -Required properties: - - - compatible : "asahi-kasei,ak4104" - - - reg : The chip select number on the SPI bus - -Optional properties: - - - reset-gpio : a GPIO spec for the reset pin. If specified, it will be - deasserted before communication to the device starts. - -Example: - -spdif: ak4104@0 { - compatible = "asahi-kasei,ak4104"; - reg = <0>; - spi-max-frequency = <5000000>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt b/trunk/Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt deleted file mode 100644 index 9c5a9947b64d..000000000000 --- a/trunk/Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt +++ /dev/null @@ -1,26 +0,0 @@ -* Atmel at91sam9g20ek wm8731 audio complex - -Required properties: - - compatible: "atmel,at91sam9g20ek-wm8731-audio" - - atmel,model: The user-visible name of this sound complex. - - atmel,audio-routing: A list of the connections between audio components. - - atmel,ssc-controller: The phandle of the SSC controller - - atmel,audio-codec: The phandle of the WM8731 audio codec -Optional properties: - - pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt - -Example: -sound { - compatible = "atmel,at91sam9g20ek-wm8731-audio"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pck0_as_mck>; - - atmel,model = "wm8731 @ AT91SAMG20EK"; - - atmel,audio-routing = - "Ext Spk", "LHPOUT", - "Int MIC", "MICIN"; - - atmel,ssc-controller = <&ssc0>; - atmel,audio-codec = <&wm8731>; -}; diff --git a/trunk/Documentation/devicetree/bindings/sound/cs4271.txt b/trunk/Documentation/devicetree/bindings/sound/cs4271.txt index a850fb9c88ea..c81b5fd5a5bc 100644 --- a/trunk/Documentation/devicetree/bindings/sound/cs4271.txt +++ b/trunk/Documentation/devicetree/bindings/sound/cs4271.txt @@ -18,8 +18,6 @@ Optional properties: - reset-gpio: a GPIO spec to define which pin is connected to the chip's !RESET pin - - cirrus,amuteb-eq-bmutec: When given, the Codec's AMUTEB=BMUTEC flag - is enabled. Examples: diff --git a/trunk/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt b/trunk/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt index fd40c852d7c7..65dec876cb2d 100644 --- a/trunk/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt +++ b/trunk/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt @@ -12,7 +12,7 @@ Required properties: Optional properties: - ti,dmic: phandle for the OMAP dmic node if the machine have it connected -- ti,jack_detection: Need to be present if the board capable to detect jack +- ti,jack_detection: Need to be set to <1> if the board capable to detect jack insertion, removal. Available audio endpoints for the audio-routing table: @@ -59,7 +59,7 @@ sound { compatible = "ti,abe-twl6040"; ti,model = "SDP4430"; - ti,jack-detection; + ti,jack-detection = <1>; ti,mclk-freq = <38400000>; ti,mcpdm = <&mcpdm>; diff --git a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt deleted file mode 100644 index 8cf24f6f0a99..000000000000 --- a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt +++ /dev/null @@ -1,26 +0,0 @@ -NVIDIA Tegra20 SFLASH controller. - -Required properties: -- compatible : should be "nvidia,tegra20-sflash". -- reg: Should contain SFLASH registers location and length. -- interrupts: Should contain SFLASH interrupts. -- nvidia,dma-request-selector : The Tegra DMA controller's phandle and - request selector for this SFLASH controller. - -Recommended properties: -- spi-max-frequency: Definition as per - Documentation/devicetree/bindings/spi/spi-bus.txt - -Example: - -spi@7000d600 { - compatible = "nvidia,tegra20-sflash"; - reg = <0x7000c380 0x80>; - interrupts = <0 39 0x04>; - nvidia,dma-request-selector = <&apbdma 16>; - spi-max-frequency = <25000000>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; -}; - diff --git a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt b/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt deleted file mode 100644 index f5b1ad1a1ec3..000000000000 --- a/trunk/Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt +++ /dev/null @@ -1,26 +0,0 @@ -NVIDIA Tegra20/Tegra30 SLINK controller. - -Required properties: -- compatible : should be "nvidia,tegra20-slink", "nvidia,tegra30-slink". -- reg: Should contain SLINK registers location and length. -- interrupts: Should contain SLINK interrupts. -- nvidia,dma-request-selector : The Tegra DMA controller's phandle and - request selector for this SLINK controller. - -Recommended properties: -- spi-max-frequency: Definition as per - Documentation/devicetree/bindings/spi/spi-bus.txt - -Example: - -slink@7000d600 { - compatible = "nvidia,tegra20-slink"; - reg = <0x7000d600 0x200>; - interrupts = <0 82 0x04>; - nvidia,dma-request-selector = <&apbdma 16>; - spi-max-frequency = <25000000>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; -}; - diff --git a/trunk/Documentation/devicetree/bindings/spi/omap-spi.txt b/trunk/Documentation/devicetree/bindings/spi/omap-spi.txt index 938809c6829b..81df374adbb9 100644 --- a/trunk/Documentation/devicetree/bindings/spi/omap-spi.txt +++ b/trunk/Documentation/devicetree/bindings/spi/omap-spi.txt @@ -6,9 +6,7 @@ Required properties: - "ti,omap4-spi" for OMAP4+. - ti,spi-num-cs : Number of chipselect supported by the instance. - ti,hwmods: Name of the hwmod associated to the McSPI -- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as - input. The default is D0 as input and - D1 as output. + Example: diff --git a/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt b/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt index 296015e3c632..d2c33d0f533e 100644 --- a/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt +++ b/trunk/Documentation/devicetree/bindings/spi/spi-bus.txt @@ -12,7 +12,6 @@ The SPI master node requires the following properties: - #size-cells - should be zero. - compatible - name of SPI bus controller following generic names recommended practice. -- cs-gpios - (optional) gpios chip select. No other properties are required in the SPI bus node. It is assumed that a driver for an SPI bus device will understand that it is an SPI bus. However, the binding does not attempt to define the specific method for @@ -25,22 +24,6 @@ support describing the chip select layout. Optional property: - num-cs : total number of chipselects -If cs-gpios is used the number of chip select will automatically increased -with max(cs-gpios > hw cs) - -So if for example the controller has 2 CS lines, and the cs-gpios -property looks like this: - -cs-gpios = <&gpio1 0 0> <0> <&gpio1 1 0> <&gpio1 2 0>; - -Then it should be configured so that num_chipselect = 4 with the -following mapping: - -cs0 : &gpio1 0 0 -cs1 : native -cs2 : &gpio1 1 0 -cs3 : &gpio1 2 0 - SPI slave nodes must be children of the SPI master node and can contain the following properties. - reg - (required) chip select address of device. @@ -53,11 +36,6 @@ contain the following properties. shifted clock phase (CPHA) mode - spi-cs-high - (optional) Empty property indicating device requires chip select active high -- spi-3wire - (optional) Empty property indicating device requires - 3-wire mode. - -If a gpio chipselect is used for the SPI slave the gpio number will be passed -via the cs_gpio SPI example for an MPC5200 SPI bus: spi@f00 { diff --git a/trunk/Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt b/trunk/Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt deleted file mode 100644 index e019fdc38773..000000000000 --- a/trunk/Documentation/devicetree/bindings/timer/nvidia,tegra20-timer.txt +++ /dev/null @@ -1,21 +0,0 @@ -NVIDIA Tegra20 timer - -The Tegra20 timer provides four 29-bit timer channels and a single 32-bit free -running counter. The first two channels may also trigger a watchdog reset. - -Required properties: - -- compatible : should be "nvidia,tegra20-timer". -- reg : Specifies base physical address and size of the registers. -- interrupts : A list of 4 interrupts; one per timer channel. - -Example: - -timer { - compatible = "nvidia,tegra20-timer"; - reg = <0x60005000 0x60>; - interrupts = <0 0 0x04 - 0 1 0x04 - 0 41 0x04 - 0 42 0x04>; -}; diff --git a/trunk/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt b/trunk/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt deleted file mode 100644 index 906109d4c593..000000000000 --- a/trunk/Documentation/devicetree/bindings/timer/nvidia,tegra30-timer.txt +++ /dev/null @@ -1,23 +0,0 @@ -NVIDIA Tegra30 timer - -The Tegra30 timer provides ten 29-bit timer channels, a single 32-bit free -running counter, and 5 watchdog modules. The first two channels may also -trigger a legacy watchdog reset. - -Required properties: - -- compatible : should be "nvidia,tegra30-timer", "nvidia,tegra20-timer". -- reg : Specifies base physical address and size of the registers. -- interrupts : A list of 6 interrupts; one per each of timer channels 1 - through 5, and one for the shared interrupt for the remaining channels. - -timer { - compatible = "nvidia,tegra30-timer", "nvidia,tegra20-timer"; - reg = <0x60005000 0x400>; - interrupts = <0 0 0x04 - 0 1 0x04 - 0 41 0x04 - 0 42 0x04 - 0 121 0x04 - 0 122 0x04>; -}; diff --git a/trunk/Documentation/devicetree/bindings/usb/ehci-orion.txt b/trunk/Documentation/devicetree/bindings/usb/ehci-orion.txt deleted file mode 100644 index 6bc09ec14c4d..000000000000 --- a/trunk/Documentation/devicetree/bindings/usb/ehci-orion.txt +++ /dev/null @@ -1,15 +0,0 @@ -* EHCI controller, Orion Marvell variants - -Required properties: -- compatible: must be "marvell,orion-ehci" -- reg: physical base address of the controller and length of memory mapped - region. -- interrupts: The EHCI interrupt - -Example: - - ehci@50000 { - compatible = "marvell,orion-ehci"; - reg = <0x50000 0x1000>; - interrupts = <19>; - }; diff --git a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt index 902b1b1f568e..770a0193ca1b 100644 --- a/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/trunk/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -55,5 +55,4 @@ ti Texas Instruments via VIA Technologies, Inc. wlf Wolfson Microelectronics wm Wondermedia Technologies, Inc. -winbond Winbond Electronics corp. xlnx Xilinx diff --git a/trunk/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt b/trunk/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt deleted file mode 100644 index 2957ebb5aa71..000000000000 --- a/trunk/Documentation/devicetree/bindings/watchdog/atmel-wdt.txt +++ /dev/null @@ -1,15 +0,0 @@ -* Atmel Watchdog Timers - -** at91sam9-wdt - -Required properties: -- compatible: must be "atmel,at91sam9260-wdt". -- reg: physical base address of the controller and length of memory mapped - region. - -Example: - - watchdog@fffffd40 { - compatible = "atmel,at91sam9260-wdt"; - reg = <0xfffffd40 0x10>; - }; diff --git a/trunk/Documentation/dma-buf-sharing.txt b/trunk/Documentation/dma-buf-sharing.txt index 0188903bc9e1..ad86fb86c9a0 100644 --- a/trunk/Documentation/dma-buf-sharing.txt +++ b/trunk/Documentation/dma-buf-sharing.txt @@ -376,7 +376,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases: leaving the cpu domain and flushing caches at fault time. Note that all the dma_buf files share the same anon inode, hence the exporter needs to replace the dma_buf file stored in vma->vm_file with it's own if pte shootdown is - required. This is because the kernel uses the underlying inode's address_space + requred. This is because the kernel uses the underlying inode's address_space for vma tracking (and hence pte tracking at shootdown time with unmap_mapping_range). @@ -388,7 +388,7 @@ Being able to mmap an export dma-buf buffer object has 2 main use-cases: Exporters that shoot down mappings (for any reasons) shall not do any synchronization at fault time with outstanding device operations. Synchronization is an orthogonal issue to sharing the backing storage of a - buffer and hence should not be handled by dma-buf itself. This is explicitly + buffer and hence should not be handled by dma-buf itself. This is explictly mentioned here because many people seem to want something like this, but if different exporters handle this differently, buffer sharing can fail in interesting ways depending upong the exporter (if userspace starts depending diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff index b89a739a3276..74c25c8d8884 100644 --- a/trunk/Documentation/dontdiff +++ b/trunk/Documentation/dontdiff @@ -181,6 +181,7 @@ modversions.h* nconf ncscope.* offset.h +offsets.h oui.c* page-types parse.c diff --git a/trunk/Documentation/fault-injection/notifier-error-inject.txt b/trunk/Documentation/fault-injection/notifier-error-inject.txt index 09adabef513f..c83526c364e5 100644 --- a/trunk/Documentation/fault-injection/notifier-error-inject.txt +++ b/trunk/Documentation/fault-injection/notifier-error-inject.txt @@ -1,7 +1,7 @@ Notifier error injection ======================== -Notifier error injection provides the ability to inject artificial errors to +Notifier error injection provides the ability to inject artifical errors to specified notifier chain callbacks. It is useful to test the error handling of notifier call chain failures which is rarely executed. There are kernel modules that can be used to test the following notifiers. @@ -14,7 +14,7 @@ modules that can be used to test the following notifiers. CPU notifier error injection module ----------------------------------- This feature can be used to test the error handling of the CPU notifiers by -injecting artificial errors to CPU notifier chain callbacks. +injecting artifical errors to CPU notifier chain callbacks. If the notifier call chain should be failed with some events notified, write the error code to debugfs interface diff --git a/trunk/Documentation/hid/uhid.txt b/trunk/Documentation/hid/uhid.txt index 3c741214dfbb..4627c4241ece 100644 --- a/trunk/Documentation/hid/uhid.txt +++ b/trunk/Documentation/hid/uhid.txt @@ -108,7 +108,7 @@ the request was handled successfully. UHID_FEATURE_ANSWER: If you receive a UHID_FEATURE request you must answer with this request. You must copy the "id" field from the request into the answer. Set the "err" field - to 0 if no error occurred or to EIO if an I/O error occurred. + to 0 if no error occured or to EIO if an I/O error occurred. If "err" is 0 then you should fill the buffer of the answer with the results of the feature request and set "size" correspondingly. diff --git a/trunk/Documentation/hwmon/pmbus b/trunk/Documentation/hwmon/pmbus index 3d3a0f97f966..f90f99920cc5 100644 --- a/trunk/Documentation/hwmon/pmbus +++ b/trunk/Documentation/hwmon/pmbus @@ -138,7 +138,7 @@ Sysfs entries When probing the chip, the driver identifies which PMBus registers are supported, and determines available sensors from this information. -Attribute files only exist if respective sensors are supported by the chip. +Attribute files only exist if respective sensors are suported by the chip. Labels are provided to inform the user about the sensor associated with a given sysfs entry. diff --git a/trunk/Documentation/hwmon/vexpress b/trunk/Documentation/hwmon/vexpress deleted file mode 100644 index 557d6d5ad90d..000000000000 --- a/trunk/Documentation/hwmon/vexpress +++ /dev/null @@ -1,34 +0,0 @@ -Kernel driver vexpress -====================== - -Supported systems: - * ARM Ltd. Versatile Express platform - Prefix: 'vexpress' - Datasheets: - * "Hardware Description" sections of the Technical Reference Manuals - for the Versatile Express boards: - http://infocenter.arm.com/help/topic/com.arm.doc.subset.boards.express/index.html - * Section "4.4.14. System Configuration registers" of the V2M-P1 TRM: - http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0447-/index.html - -Author: Pawel Moll - -Description ------------ - -Versatile Express platform (http://www.arm.com/versatileexpress/) is a -reference & prototyping system for ARM Ltd. processors. It can be set up -from a wide range of boards, each of them containing (apart of the main -chip/FPGA) a number of microcontrollers responsible for platform -configuration and control. Theses microcontrollers can also monitor the -board and its environment by a number of internal and external sensors, -providing information about power lines voltages and currents, board -temperature and power usage. Some of them also calculate consumed energy -and provide a cumulative use counter. - -The configuration devices are _not_ memory mapped and must be accessed -via a custom interface, abstracted by the "vexpress_config" API. - -As these devices are non-discoverable, they must be described in a Device -Tree passed to the kernel. Details of the DT binding for them can be found -in Documentation/devicetree/bindings/hwmon/vexpress.txt. diff --git a/trunk/Documentation/input/alps.txt b/trunk/Documentation/input/alps.txt index 3262b6e4d686..ae8ba9a74ce1 100644 --- a/trunk/Documentation/input/alps.txt +++ b/trunk/Documentation/input/alps.txt @@ -133,7 +133,7 @@ number of contacts (f1 and f0 in the table below). This packet only appears after a position packet with the mt bit set, and usually only appears when there are two or more contacts (although -occasionally it's seen with only a single contact). +occassionally it's seen with only a single contact). The final v3 packet type is the trackstick packet. diff --git a/trunk/Documentation/input/event-codes.txt b/trunk/Documentation/input/event-codes.txt index f1ea2c69648d..53305bd08182 100644 --- a/trunk/Documentation/input/event-codes.txt +++ b/trunk/Documentation/input/event-codes.txt @@ -196,17 +196,6 @@ EV_MSC: EV_MSC events are used for input and output events that do not fall under other categories. -A few EV_MSC codes have special meaning: - -* MSC_TIMESTAMP: - - Used to report the number of microseconds since the last reset. This event - should be coded as an uint32 value, which is allowed to wrap around with - no special consequence. It is assumed that the time difference between two - consecutive events is reliable on a reasonable time scale (hours). - A reset to zero can happen, in which case the time since the last event is - unknown. If the device does not provide this information, the driver must - not provide it to user space. - EV_LED: ---------- EV_LED events are used for input and output to set and query the state of diff --git a/trunk/Documentation/kbuild/modules.txt b/trunk/Documentation/kbuild/modules.txt index 69372fb98cf8..3fb39e0116b4 100644 --- a/trunk/Documentation/kbuild/modules.txt +++ b/trunk/Documentation/kbuild/modules.txt @@ -470,7 +470,7 @@ build. Sometimes, an external module uses exported symbols from another external module. kbuild needs to have full knowledge of - all symbols to avoid spliitting out warnings about undefined + all symbols to avoid spitting out warnings about undefined symbols. Three solutions exist for this situation. NOTE: The method with a top-level kbuild file is recommended diff --git a/trunk/Documentation/kernel-doc-nano-HOWTO.txt b/trunk/Documentation/kernel-doc-nano-HOWTO.txt index 99b57abddf8a..3d8a97747f77 100644 --- a/trunk/Documentation/kernel-doc-nano-HOWTO.txt +++ b/trunk/Documentation/kernel-doc-nano-HOWTO.txt @@ -64,8 +64,6 @@ Example kernel-doc function comment: * comment lines. * * The longer description can have multiple paragraphs. - * - * Return: Describe the return value of foobar. */ The short description following the subject can span multiple lines @@ -80,8 +78,6 @@ If a function parameter is "..." (varargs), it should be listed in kernel-doc notation as: * @...: description -The return value, if any, should be described in a dedicated section -named "Return". Example kernel-doc data structure comment. @@ -226,9 +222,6 @@ only a "*"). "section header:" names must be unique per function (or struct, union, typedef, enum). -Use the section header "Return" for sections describing the return value -of a function. - Avoid putting a spurious blank line after the function name, or else the description will be repeated! @@ -244,21 +237,21 @@ patterns, which are highlighted appropriately. NOTE 1: The multi-line descriptive text you provide does *not* recognize line breaks, so if you try to format some text nicely, as in: - Return: + Return codes 0 - cool 1 - invalid arg 2 - out of memory this will all run together and produce: - Return: 0 - cool 1 - invalid arg 2 - out of memory + Return codes 0 - cool 1 - invalid arg 2 - out of memory NOTE 2: If the descriptive text you provide has lines that begin with some phrase followed by a colon, each of those phrases will be taken as a new section heading, which means you should similarly try to avoid text like: - Return: + Return codes: 0: cool 1: invalid arg 2: out of memory diff --git a/trunk/Documentation/memory-hotplug.txt b/trunk/Documentation/memory-hotplug.txt index 8e5eacbdcfa3..c6f993d491b5 100644 --- a/trunk/Documentation/memory-hotplug.txt +++ b/trunk/Documentation/memory-hotplug.txt @@ -390,7 +390,6 @@ struct memory_notify { unsigned long start_pfn; unsigned long nr_pages; int status_change_nid_normal; - int status_change_nid_high; int status_change_nid; } @@ -398,9 +397,7 @@ start_pfn is start_pfn of online/offline memory. nr_pages is # of pages of online/offline memory. status_change_nid_normal is set node id when N_NORMAL_MEMORY of nodemask is (will be) set/clear, if this is -1, then nodemask status is not changed. -status_change_nid_high is set node id when N_HIGH_MEMORY of nodemask -is (will be) set/clear, if this is -1, then nodemask status is not changed. -status_change_nid is set node id when N_MEMORY of nodemask is (will be) +status_change_nid is set node id when N_HIGH_MEMORY of nodemask is (will be) set/clear. It means a new(memoryless) node gets new memory by online and a node loses all memory. If this is -1, then nodemask status is not changed. If status_changed_nid* >= 0, callback should create/discard structures for the diff --git a/trunk/Documentation/misc-devices/mei/mei-amt-version.c b/trunk/Documentation/misc-devices/mei/mei-amt-version.c index 49e4f770864a..01804f216312 100644 --- a/trunk/Documentation/misc-devices/mei/mei-amt-version.c +++ b/trunk/Documentation/misc-devices/mei/mei-amt-version.c @@ -214,7 +214,7 @@ static ssize_t mei_send_msg(struct mei *me, const unsigned char *buffer, } /*************************************************************************** - * Intel Advanced Management Technology ME Client + * Intel Advanced Management Technolgy ME Client ***************************************************************************/ #define AMT_MAJOR_VERSION 1 @@ -256,7 +256,7 @@ struct amt_code_versions { } __attribute__((packed)); /*************************************************************************** - * Intel Advanced Management Technology Host Interface + * Intel Advanced Management Technolgy Host Interface ***************************************************************************/ struct amt_host_if_msg_header { diff --git a/trunk/Documentation/power/power_supply_class.txt b/trunk/Documentation/power/power_supply_class.txt index 3f10b39b0346..9c647bd7c5a9 100644 --- a/trunk/Documentation/power/power_supply_class.txt +++ b/trunk/Documentation/power/power_supply_class.txt @@ -123,9 +123,6 @@ CONSTANT_CHARGE_VOLTAGE - constant charge voltage programmed by charger. CONSTANT_CHARGE_VOLTAGE_MAX - maximum charge voltage supported by the power supply object. -CHARGE_CONTROL_LIMIT - current charge control limit setting -CHARGE_CONTROL_LIMIT_MAX - maximum charge control limit setting - ENERGY_FULL, ENERGY_EMPTY - same as above but for energy. CAPACITY - capacity in percents. diff --git a/trunk/Documentation/scsi/hptiop.txt b/trunk/Documentation/scsi/hptiop.txt index 4a4f47e759cd..9605179711f4 100644 --- a/trunk/Documentation/scsi/hptiop.txt +++ b/trunk/Documentation/scsi/hptiop.txt @@ -37,7 +37,7 @@ For Intel IOP based adapters, the controller IOP is accessed via PCI BAR0: 0x40 Inbound Queue Port 0x44 Outbound Queue Port -For Marvell not Frey IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1: +For Marvell IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1: BAR0 offset Register 0x20400 Inbound Doorbell Register @@ -55,31 +55,9 @@ For Marvell not Frey IOP based adapters, the IOP is accessed via PCI BAR0 and BA 0x40-0x1040 Inbound Queue 0x1040-0x2040 Outbound Queue -For Marvell Frey IOP based adapters, the IOP is accessed via PCI BAR0 and BAR1: - BAR0 offset Register - 0x0 IOP configuration information. - - BAR1 offset Register - 0x4000 Inbound List Base Address Low - 0x4004 Inbound List Base Address High - 0x4018 Inbound List Write Pointer - 0x402C Inbound List Configuration and Control - 0x4050 Outbound List Base Address Low - 0x4054 Outbound List Base Address High - 0x4058 Outbound List Copy Pointer Shadow Base Address Low - 0x405C Outbound List Copy Pointer Shadow Base Address High - 0x4088 Outbound List Interrupt Cause - 0x408C Outbound List Interrupt Enable - 0x1020C PCIe Function 0 Interrupt Enable - 0x10400 PCIe Function 0 to CPU Message A - 0x10420 CPU to PCIe Function 0 Message A - 0x10480 CPU to PCIe Function 0 Doorbell - 0x10484 CPU to PCIe Function 0 Doorbell Enable - - -I/O Request Workflow of Not Marvell Frey ------------------------------------------- +I/O Request Workflow +---------------------- All queued requests are handled via inbound/outbound queue port. A request packet can be allocated in either IOP or host memory. @@ -123,45 +101,6 @@ register 0. An outbound message with the same value indicates the completion of an inbound message. -I/O Request Workflow of Marvell Frey --------------------------------------- - -All queued requests are handled via inbound/outbound list. - -To send a request to the controller: - - - Allocate a free request in host DMA coherent memory. - - Requests allocated in host memory must be aligned on 32-bytes boundary. - - - Fill the request with index of the request in the flag. - - Fill a free inbound list unit with the physical address and the size of - the request. - - Set up the inbound list write pointer with the index of previous unit, - round to 0 if the index reaches the supported count of requests. - - - Post the inbound list writer pointer to IOP. - - - The IOP process the request. When the request is completed, the flag of - the request with or-ed IOPMU_QUEUE_MASK_HOST_BITS will be put into a - free outbound list unit and the index of the outbound list unit will be - put into the copy pointer shadow register. An outbound interrupt will be - generated. - - - The host read the outbound list copy pointer shadow register and compare - with previous saved read ponter N. If they are different, the host will - read the (N+1)th outbound list unit. - - The host get the index of the request from the (N+1)th outbound list - unit and complete the request. - -Non-queued requests (reset communication/reset/flush etc) can be sent via PCIe -Function 0 to CPU Message A register. The CPU to PCIe Function 0 Message register -with the same value indicates the completion of message. - - User-level Interface --------------------- @@ -173,7 +112,7 @@ The driver exposes following sysfs attributes: ----------------------------------------------------------------------------- -Copyright (C) 2006-2012 HighPoint Technologies, Inc. All Rights Reserved. +Copyright (C) 2006-2009 HighPoint Technologies, Inc. All Rights Reserved. This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt index b9cfd339a6fa..d90d8ec2853d 100644 --- a/trunk/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/trunk/Documentation/sound/alsa/ALSA-Configuration.txt @@ -1905,6 +1905,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. vid - Vendor ID for the device (optional) pid - Product ID for the device (optional) nrpacks - Max. number of packets per URB (default: 8) + async_unlink - Use async unlink mode (default: yes) device_setup - Device specific magic number (optional) - Influence depends on the device - Default: 0x0000 @@ -1916,6 +1917,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. NB: nrpacks parameter can be modified dynamically via sysfs. Don't put the value over 20. Changing via sysfs has no sanity check. + NB: async_unlink=0 would cause Oops. It remains just for + debugging purpose (if any). NB: ignore_ctl_error=1 may help when you get an error at accessing the mixer element such as URB error -22. This happens on some buggy USB device or the controller. diff --git a/trunk/Documentation/video4linux/bttv/Cards b/trunk/Documentation/video4linux/bttv/Cards index a8fb6e2d3c8b..db833ced2cb8 100644 --- a/trunk/Documentation/video4linux/bttv/Cards +++ b/trunk/Documentation/video4linux/bttv/Cards @@ -43,7 +43,7 @@ Very nice card if you only have satellite TV but several tuners connected to the card via composite. Many thanks to Matrix-Vision for giving us 2 cards for free which made -Bt848a/Bt849 single crystal operation support possible!!! +Bt848a/Bt849 single crytal operation support possible!!! diff --git a/trunk/Documentation/video4linux/bttv/Sound-FAQ b/trunk/Documentation/video4linux/bttv/Sound-FAQ index d3f1d7783d1c..395f6c6fdd98 100644 --- a/trunk/Documentation/video4linux/bttv/Sound-FAQ +++ b/trunk/Documentation/video4linux/bttv/Sound-FAQ @@ -82,7 +82,7 @@ card installed, you might to check out if you can read these registers values used by the windows driver. A tool to do this is available from ftp://telepresence.dmem.strath.ac.uk/pub/bt848/winutil, but it does'nt work with bt878 boards according to some reports I received. -Another one with bt878 support is available from +Another one with bt878 suport is available from http://btwincap.sourceforge.net/Files/btspy2.00.zip You might also dig around in the *.ini files of the Windows applications. diff --git a/trunk/Documentation/virtual/kvm/api.txt b/trunk/Documentation/virtual/kvm/api.txt index a4df5535996b..f6ec3a92e621 100644 --- a/trunk/Documentation/virtual/kvm/api.txt +++ b/trunk/Documentation/virtual/kvm/api.txt @@ -1194,15 +1194,12 @@ struct kvm_ppc_pvinfo { This ioctl fetches PV specific information that need to be passed to the guest using the device tree or other means from vm context. -The hcall array defines 4 instructions that make up a hypercall. +For now the only implemented piece of information distributed here is an array +of 4 instructions that make up a hypercall. If any additional field gets added to this structure later on, a bit for that additional piece of information will be set in the flags bitmap. -The flags bitmap is defined as: - - /* the host supports the ePAPR idle hcall - #define KVM_PPC_PVINFO_FLAGS_EV_IDLE (1<<0) 4.48 KVM_ASSIGN_PCI_DEVICE @@ -1734,46 +1731,7 @@ registers, find a list below: Arch | Register | Width (bits) | | PPC | KVM_REG_PPC_HIOR | 64 - PPC | KVM_REG_PPC_IAC1 | 64 - PPC | KVM_REG_PPC_IAC2 | 64 - PPC | KVM_REG_PPC_IAC3 | 64 - PPC | KVM_REG_PPC_IAC4 | 64 - PPC | KVM_REG_PPC_DAC1 | 64 - PPC | KVM_REG_PPC_DAC2 | 64 - PPC | KVM_REG_PPC_DABR | 64 - PPC | KVM_REG_PPC_DSCR | 64 - PPC | KVM_REG_PPC_PURR | 64 - PPC | KVM_REG_PPC_SPURR | 64 - PPC | KVM_REG_PPC_DAR | 64 - PPC | KVM_REG_PPC_DSISR | 32 - PPC | KVM_REG_PPC_AMR | 64 - PPC | KVM_REG_PPC_UAMOR | 64 - PPC | KVM_REG_PPC_MMCR0 | 64 - PPC | KVM_REG_PPC_MMCR1 | 64 - PPC | KVM_REG_PPC_MMCRA | 64 - PPC | KVM_REG_PPC_PMC1 | 32 - PPC | KVM_REG_PPC_PMC2 | 32 - PPC | KVM_REG_PPC_PMC3 | 32 - PPC | KVM_REG_PPC_PMC4 | 32 - PPC | KVM_REG_PPC_PMC5 | 32 - PPC | KVM_REG_PPC_PMC6 | 32 - PPC | KVM_REG_PPC_PMC7 | 32 - PPC | KVM_REG_PPC_PMC8 | 32 - PPC | KVM_REG_PPC_FPR0 | 64 - ... - PPC | KVM_REG_PPC_FPR31 | 64 - PPC | KVM_REG_PPC_VR0 | 128 - ... - PPC | KVM_REG_PPC_VR31 | 128 - PPC | KVM_REG_PPC_VSR0 | 128 - ... - PPC | KVM_REG_PPC_VSR31 | 128 - PPC | KVM_REG_PPC_FPSCR | 64 - PPC | KVM_REG_PPC_VSCR | 32 - PPC | KVM_REG_PPC_VPA_ADDR | 64 - PPC | KVM_REG_PPC_VPA_SLB | 128 - PPC | KVM_REG_PPC_VPA_DTL | 128 - PPC | KVM_REG_PPC_EPCR | 32 + 4.69 KVM_GET_ONE_REG @@ -1789,7 +1747,7 @@ kvm_one_reg struct passed in. On success, the register value can be found at the memory location pointed to by "addr". The list of registers accessible using this interface is identical to the -list in 4.68. +list in 4.64. 4.70 KVM_KVMCLOCK_CTRL @@ -2039,93 +1997,6 @@ return the hash table order in the parameter. (If the guest is using the virtualized real-mode area (VRMA) facility, the kernel will re-create the VMRA HPTEs on the next KVM_RUN of any vcpu.) -4.77 KVM_S390_INTERRUPT - -Capability: basic -Architectures: s390 -Type: vm ioctl, vcpu ioctl -Parameters: struct kvm_s390_interrupt (in) -Returns: 0 on success, -1 on error - -Allows to inject an interrupt to the guest. Interrupts can be floating -(vm ioctl) or per cpu (vcpu ioctl), depending on the interrupt type. - -Interrupt parameters are passed via kvm_s390_interrupt: - -struct kvm_s390_interrupt { - __u32 type; - __u32 parm; - __u64 parm64; -}; - -type can be one of the following: - -KVM_S390_SIGP_STOP (vcpu) - sigp restart -KVM_S390_PROGRAM_INT (vcpu) - program check; code in parm -KVM_S390_SIGP_SET_PREFIX (vcpu) - sigp set prefix; prefix address in parm -KVM_S390_RESTART (vcpu) - restart -KVM_S390_INT_VIRTIO (vm) - virtio external interrupt; external interrupt - parameters in parm and parm64 -KVM_S390_INT_SERVICE (vm) - sclp external interrupt; sclp parameter in parm -KVM_S390_INT_EMERGENCY (vcpu) - sigp emergency; source cpu in parm -KVM_S390_INT_EXTERNAL_CALL (vcpu) - sigp external call; source cpu in parm - -Note that the vcpu ioctl is asynchronous to vcpu execution. - -4.78 KVM_PPC_GET_HTAB_FD - -Capability: KVM_CAP_PPC_HTAB_FD -Architectures: powerpc -Type: vm ioctl -Parameters: Pointer to struct kvm_get_htab_fd (in) -Returns: file descriptor number (>= 0) on success, -1 on error - -This returns a file descriptor that can be used either to read out the -entries in the guest's hashed page table (HPT), or to write entries to -initialize the HPT. The returned fd can only be written to if the -KVM_GET_HTAB_WRITE bit is set in the flags field of the argument, and -can only be read if that bit is clear. The argument struct looks like -this: - -/* For KVM_PPC_GET_HTAB_FD */ -struct kvm_get_htab_fd { - __u64 flags; - __u64 start_index; - __u64 reserved[2]; -}; - -/* Values for kvm_get_htab_fd.flags */ -#define KVM_GET_HTAB_BOLTED_ONLY ((__u64)0x1) -#define KVM_GET_HTAB_WRITE ((__u64)0x2) - -The `start_index' field gives the index in the HPT of the entry at -which to start reading. It is ignored when writing. - -Reads on the fd will initially supply information about all -"interesting" HPT entries. Interesting entries are those with the -bolted bit set, if the KVM_GET_HTAB_BOLTED_ONLY bit is set, otherwise -all entries. When the end of the HPT is reached, the read() will -return. If read() is called again on the fd, it will start again from -the beginning of the HPT, but will only return HPT entries that have -changed since they were last read. - -Data read or written is structured as a header (8 bytes) followed by a -series of valid HPT entries (16 bytes) each. The header indicates how -many valid HPT entries there are and how many invalid entries follow -the valid entries. The invalid entries are not represented explicitly -in the stream. The header format is: - -struct kvm_get_htab_header { - __u32 index; - __u16 n_valid; - __u16 n_invalid; -}; - -Writes to the fd create HPT entries starting at the index given in the -header; first `n_valid' valid entries with contents from the data -written, then `n_invalid' invalid entries, invalidating any previously -valid entries found. - 5. The kvm_run structure ------------------------ @@ -2238,8 +2109,7 @@ executed a memory-mapped I/O instruction which could not be satisfied by kvm. The 'data' member contains the written data if 'is_write' is true, and should be filled by application code otherwise. -NOTE: For KVM_EXIT_IO, KVM_EXIT_MMIO, KVM_EXIT_OSI, KVM_EXIT_DCR - and KVM_EXIT_PAPR the corresponding +NOTE: For KVM_EXIT_IO, KVM_EXIT_MMIO and KVM_EXIT_OSI, the corresponding operations are complete (and guest state is consistent) only after userspace has re-entered the kernel with KVM_RUN. The kernel side will first finish incomplete operations and then check for pending signals. Userspace diff --git a/trunk/Documentation/vm/frontswap.txt b/trunk/Documentation/vm/frontswap.txt index c71a019be600..5ef2d1366425 100644 --- a/trunk/Documentation/vm/frontswap.txt +++ b/trunk/Documentation/vm/frontswap.txt @@ -193,7 +193,7 @@ faster. or maybe swap-over-nbd/NFS)? No. First, the existing swap subsystem doesn't allow for any kind of -swap hierarchy. Perhaps it could be rewritten to accommodate a hierarchy, +swap hierarchy. Perhaps it could be rewritten to accomodate a hierarchy, but this would require fairly drastic changes. Even if it were rewritten, the existing swap subsystem uses the block I/O layer which assumes a swap device is fixed size and any page in it is linearly diff --git a/trunk/Documentation/vm/transhuge.txt b/trunk/Documentation/vm/transhuge.txt index 8785fb87d9c7..f734bb2a78dc 100644 --- a/trunk/Documentation/vm/transhuge.txt +++ b/trunk/Documentation/vm/transhuge.txt @@ -116,13 +116,6 @@ echo always >/sys/kernel/mm/transparent_hugepage/defrag echo madvise >/sys/kernel/mm/transparent_hugepage/defrag echo never >/sys/kernel/mm/transparent_hugepage/defrag -By default kernel tries to use huge zero page on read page fault. -It's possible to disable huge zero page by writing 0 or enable it -back by writing 1: - -echo 0 >/sys/kernel/mm/transparent_hugepage/khugepaged/use_zero_page -echo 1 >/sys/kernel/mm/transparent_hugepage/khugepaged/use_zero_page - khugepaged will be automatically started when transparent_hugepage/enabled is set to "always" or "madvise, and it'll be automatically shutdown if it's set to "never". @@ -204,14 +197,6 @@ thp_split is incremented every time a huge page is split into base pages. This can happen for a variety of reasons but a common reason is that a huge page is old and is being reclaimed. -thp_zero_page_alloc is incremented every time a huge zero page is - successfully allocated. It includes allocations which where - dropped due race with other allocation. Note, it doesn't count - every map of the huge zero page, only its allocation. - -thp_zero_page_alloc_failed is incremented if kernel fails to allocate - huge zero page and falls back to using small pages. - As the system ages, allocating huge pages may be expensive as the system uses memory compaction to copy data around memory to free a huge page for use. There are some counters in /proc/vmstat to help @@ -291,7 +276,7 @@ unaffected. libhugetlbfs will also work fine as usual. == Graceful fallback == Code walking pagetables but unware about huge pmds can simply call -split_huge_page_pmd(vma, addr, pmd) where the pmd is the one returned by +split_huge_page_pmd(mm, pmd) where the pmd is the one returned by pmd_offset. It's trivial to make the code transparent hugepage aware by just grepping for "pmd_offset" and adding split_huge_page_pmd where missing after pmd_offset returns the pmd. Thanks to the graceful @@ -314,7 +299,7 @@ diff --git a/mm/mremap.c b/mm/mremap.c return NULL; pmd = pmd_offset(pud, addr); -+ split_huge_page_pmd(vma, addr, pmd); ++ split_huge_page_pmd(mm, pmd); if (pmd_none_or_clear_bad(pmd)) return NULL; diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a6be3e864b53..0bc485c4a88e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -337,13 +337,6 @@ W: http://wireless.kernel.org/ S: Orphan F: drivers/net/wireless/adm8211.* -ADP1653 FLASH CONTROLLER DRIVER -M: Sakari Ailus -L: linux-media@vger.kernel.org -S: Maintained -F: drivers/media/i2c/adp1653.c -F: include/media/adp1653.h - ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501) M: Michael Hennerich L: device-drivers-devel@blackfin.uclinux.org @@ -1501,14 +1494,6 @@ F: include/linux/ax25.h F: include/net/ax25.h F: net/ax25/ -AZ6007 DVB DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/usb/dvb-usb-v2/az6007.c - B43 WIRELESS DRIVER M: Stefano Brivio L: linux-wireless@vger.kernel.org @@ -1760,11 +1745,11 @@ F: Documentation/filesystems/btrfs.txt F: fs/btrfs/ BTTV VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab +M: Mauro Carvalho Chehab L: linux-media@vger.kernel.org W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Odd fixes +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git +S: Maintained F: Documentation/video4linux/bttv/ F: drivers/media/pci/bt8xx/bttv* @@ -1793,7 +1778,7 @@ F: fs/cachefiles/ CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER M: Jonathan Corbet L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: Documentation/video4linux/cafe_ccic F: drivers/media/platform/marvell-ccic/ @@ -2179,22 +2164,12 @@ CX18 VIDEO4LINUX DRIVER M: Andy Walls L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://linuxtv.org W: http://www.ivtvdriver.org/index.php/Cx18 S: Maintained F: Documentation/video4linux/cx18.txt F: drivers/media/pci/cx18/ -F: include/uapi/linux/ivtv* - -CX88 VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Odd fixes -F: Documentation/video4linux/cx88/ -F: drivers/media/pci/cx88/ CXD2820R MEDIA DRIVER M: Antti Palosaari @@ -2881,14 +2856,6 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/ethernet/ibm/ehea/ -EM28XX VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/usb/em28xx/ - EMBEDDED LINUX M: Paul Gortmaker M: Matt Mackall @@ -3087,14 +3054,6 @@ T: git git://git.alsa-project.org/alsa-kernel.git S: Maintained F: sound/firewire/ -FIREWIRE MEDIA DRIVERS (firedtv) -M: Stefan Richter -L: linux-media@vger.kernel.org -L: linux1394-devel@lists.sourceforge.net -T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git -S: Maintained -F: drivers/media/firewire/ - FIREWIRE SBP-2 TARGET M: Chris Boot L: linux-scsi@vger.kernel.org @@ -3381,56 +3340,56 @@ F: drivers/net/ethernet/aeroflex/ GSPCA FINEPIX SUBDRIVER M: Frank Zago L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/finepix.c GSPCA GL860 SUBDRIVER M: Olivier Lorin L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/gl860/ GSPCA M5602 SUBDRIVER M: Erik Andren L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/m5602/ GSPCA PAC207 SONIXB SUBDRIVER M: Hans de Goede L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/pac207.c GSPCA SN9C20X SUBDRIVER M: Brian Johnson L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/sn9c20x.c GSPCA T613 SUBDRIVER M: Leandro Costantino L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/t613.c GSPCA USB WEBCAM DRIVER M: Hans de Goede L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/gspca/ STK1160 USB VIDEO CAPTURE DRIVER M: Ezequiel Garcia L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/usb/stk1160/ @@ -3637,7 +3596,7 @@ S: Maintained F: drivers/input/touchscreen/htcpen.c HUGETLB FILESYSTEM -M: Nadia Yvette Chambers +M: William Irwin S: Maintained F: fs/hugetlbfs/ @@ -3828,12 +3787,6 @@ F: net/ieee802154/ F: net/mac802154/ F: drivers/ieee802154/ -IGUANAWORKS USB IR TRANSCEIVER -M: Sean Young -L: linux-media@vger.kernel.org -S: Maintained -F: drivers/media/rc/iguanair.c - IIO SUBSYSTEM AND DRIVERS M: Jonathan Cameron L: linux-iio@vger.kernel.org @@ -4219,41 +4172,17 @@ S: Maintained F: Documentation/hwmon/it87 F: drivers/hwmon/it87.c -IT913X MEDIA DRIVER -M: Malcolm Priestley -L: linux-media@vger.kernel.org -W: http://linuxtv.org/ -Q: http://patchwork.linuxtv.org/project/linux-media/list/ -S: Maintained -F: drivers/media/usb/dvb-usb-v2/it913x* - -IT913X FE MEDIA DRIVER -M: Malcolm Priestley -L: linux-media@vger.kernel.org -W: http://linuxtv.org/ -Q: http://patchwork.linuxtv.org/project/linux-media/list/ -S: Maintained -F: drivers/media/dvb-frontends/it913x-fe* - IVTV VIDEO4LINUX DRIVER M: Andy Walls L: ivtv-devel@ivtvdriver.org (moderated for non-subscribers) L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://www.ivtvdriver.org S: Maintained F: Documentation/video4linux/*.ivtv F: drivers/media/pci/ivtv/ F: include/linux/ivtv* -IX2505V MEDIA DRIVER -M: Malcolm Priestley -L: linux-media@vger.kernel.org -W: http://linuxtv.org/ -Q: http://patchwork.linuxtv.org/project/linux-media/list/ -S: Maintained -F: drivers/media/dvb-frontends/ix2505v* - JC42.4 TEMPERATURE SENSOR DRIVER M: Guenter Roeck L: lm-sensors@lm-sensors.org @@ -4385,10 +4314,10 @@ F: include/linux/kvm* F: virt/kvm/ KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V -M: Joerg Roedel +M: Joerg Roedel L: kvm@vger.kernel.org W: http://kvm.qumranet.com -S: Maintained +S: Supported F: arch/x86/include/asm/svm.h F: arch/x86/kvm/svm.c @@ -4396,7 +4325,6 @@ KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC M: Alexander Graf L: kvm-ppc@vger.kernel.org W: http://kvm.qumranet.com -T: git git://github.com/agraf/linux-2.6.git S: Supported F: arch/powerpc/include/asm/kvm* F: arch/powerpc/kvm/ @@ -4699,14 +4627,6 @@ S: Maintained F: Documentation/hwmon/lm90 F: drivers/hwmon/lm90.c -LME2510 MEDIA DRIVER -M: Malcolm Priestley -L: linux-media@vger.kernel.org -W: http://linuxtv.org/ -Q: http://patchwork.linuxtv.org/project/linux-media/list/ -S: Maintained -F: drivers/media/usb/dvb-usb-v2/lmedm04* - LOCKDEP AND LOCKSTAT M: Peter Zijlstra M: Ingo Molnar @@ -4734,16 +4654,13 @@ S: Maintained F: fs/logfs/ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) -M: Nagalakshmi Nandigama -M: Sreekanth Reddy +M: Eric Moore M: support@lsi.com L: DL-MPTFusionLinux@lsi.com L: linux-scsi@vger.kernel.org W: http://www.lsilogic.com/support S: Supported F: drivers/message/fusion/ -F: drivers/scsi/mpt2sas/ -F: drivers/scsi/mpt3sas/ LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers M: Matthew Wilcox @@ -4800,14 +4717,6 @@ W: http://www.tazenda.demon.co.uk/phil/linux-hp S: Maintained F: arch/m68k/hp300/ -M88RS2000 MEDIA DRIVER -M: Malcolm Priestley -L: linux-media@vger.kernel.org -W: http://linuxtv.org/ -Q: http://patchwork.linuxtv.org/project/linux-media/list/ -S: Maintained -F: drivers/media/dvb-frontends/m88rs2000* - MAC80211 M: Johannes Berg L: linux-wireless@vger.kernel.org @@ -4900,12 +4809,12 @@ F: Documentation/hwmon/max6650 F: drivers/hwmon/max6650.c MEDIA INPUT INFRASTRUCTURE (V4L/DVB) -M: Mauro Carvalho Chehab +M: Mauro Carvalho Chehab P: LinuxTV.org Project L: linux-media@vger.kernel.org W: http://linuxtv.org Q: http://patchwork.kernel.org/project/linux-media/list/ -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: Documentation/dvb/ F: Documentation/video4linux/ @@ -4913,13 +4822,8 @@ F: Documentation/DocBook/media/ F: drivers/media/ F: drivers/staging/media/ F: include/media/ -F: include/uapi/linux/dvb/ -F: include/uapi/linux/videodev2.h -F: include/uapi/linux/media.h -F: include/uapi/linux/v4l2-* -F: include/uapi/linux/meye.h -F: include/uapi/linux/ivtv* -F: include/uapi/linux/uvcvideo.h +F: include/linux/dvb/ +F: include/linux/videodev*.h MEGARAID SCSI DRIVERS M: Neela Syam Kolli @@ -5001,7 +4905,7 @@ W: http://popies.net/meye/ S: Orphan F: Documentation/video4linux/meye.txt F: drivers/media/pci/meye/ -F: include/uapi/linux/meye.h +F: include/linux/meye.h MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER M: Pavel Pisa @@ -5015,13 +4919,6 @@ S: Maintained F: Documentation/serial/moxa-smartio F: drivers/tty/mxser.* -MR800 AVERMEDIA USB FM RADIO DRIVER -M: Alexey Klimov -L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/radio/radio-mr800.c - MSI LAPTOP SUPPORT M: "Lee, Chun-Yi" L: platform-driver-x86@vger.kernel.org @@ -5484,7 +5381,7 @@ F: drivers/char/pcmcia/cm4040_cs.* OMNIVISION OV7670 SENSOR DRIVER M: Jonathan Corbet L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: drivers/media/i2c/ov7670.c @@ -6033,18 +5930,11 @@ M: Mike Isely L: pvrusb2@isely.net (subscribers-only) L: linux-media@vger.kernel.org W: http://www.isely.net/pvrusb2/ -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: Documentation/video4linux/README.pvrusb2 F: drivers/media/usb/pvrusb2/ -PWC WEBCAM DRIVER -M: Hans de Goede -L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/usb/pwc/* - PWM SUBSYSTEM M: Thierry Reding L: linux-kernel@vger.kernel.org @@ -6187,21 +6077,6 @@ S: Maintained F: drivers/video/aty/radeon* F: include/linux/radeonfb.h -RADIOSHARK RADIO DRIVER -M: Hans de Goede -L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/radio/radio-shark.c - -RADIOSHARK2 RADIO DRIVER -M: Hans de Goede -L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/radio/radio-shark2.c -F: drivers/media/radio/radio-tea5777.c - RAGE128 FRAMEBUFFER DISPLAY DRIVER M: Paul Mackerras L: linux-fbdev@vger.kernel.org @@ -6442,19 +6317,10 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported F: drivers/mmc/host/s3cmci.* -SAA7134 VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Odd fixes -F: Documentation/video4linux/saa7134/ -F: drivers/media/pci/saa7134/ - SAA7146 VIDEO4LINUX-2 DRIVER M: Michael Hunold L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://www.mihu.de/linux/saa7146 S: Maintained F: drivers/media/common/saa7146/ @@ -6489,14 +6355,6 @@ F: drivers/regulator/s5m*.c F: drivers/rtc/rtc-sec.c F: include/linux/mfd/samsung/ -SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER -M: Sylwester Nawrocki -L: linux-media@vger.kernel.org -L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) -S: Maintained -F: drivers/media/platform/s3c-camif/ -F: include/media/s3c_camif.h - SERIAL DRIVERS M: Alan Cox L: linux-serial@vger.kernel.org @@ -6791,18 +6649,6 @@ S: Supported F: arch/arm/mach-davinci F: drivers/i2c/busses/i2c-davinci.c -TI DAVINCI SERIES MEDIA DRIVER -M: Manjunath Hadli -M: Prabhakar Lad -L: linux-media@vger.kernel.org -L: davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers) -W: http://linuxtv.org/ -Q: http://patchwork.linuxtv.org/project/linux-media/list/ -T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git -S: Supported -F: drivers/media/platform/davinci/ -F: include/media/davinci/ - SIS 190 ETHERNET DRIVER M: Francois Romieu L: netdev@vger.kernel.org @@ -6869,15 +6715,6 @@ M: Nicolas Pitre S: Odd Fixes F: drivers/net/ethernet/smsc/smc91x.* -SMIA AND SMIA++ IMAGE SENSOR DRIVER -M: Sakari Ailus -L: linux-media@vger.kernel.org -S: Maintained -F: drivers/media/i2c/smiapp -F: include/media/smiapp.h -F: drivers/media/i2c/smiapp-pll.c -F: drivers/media/i2c/smiapp-pll.h - SMM665 HARDWARE MONITOR DRIVER M: Guenter Roeck L: lm-sensors@lm-sensors.org @@ -6936,7 +6773,7 @@ F: arch/ia64/sn/ SOC-CAMERA V4L2 SUBSYSTEM M: Guennadi Liakhovetski L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git S: Maintained F: include/media/soc* F: drivers/media/i2c/soc_camera/ @@ -7426,22 +7263,6 @@ T: git git://linuxtv.org/mkrufky/tuners.git S: Maintained F: drivers/media/tuners/tda8290.* -TEA5761 TUNER DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Odd fixes -F: drivers/media/tuners/tea5761.* - -TEA5767 TUNER DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/tuners/tea5767.* - TEAM DRIVER M: Jiri Pirko L: netdev@vger.kernel.org @@ -7449,12 +7270,6 @@ S: Supported F: drivers/net/team/ F: include/linux/if_team.h -TECHNOTREND USB IR RECEIVER -M: Sean Young -L: linux-media@vger.kernel.org -S: Maintained -F: drivers/media/rc/ttusbir.c - TEGRA SUPPORT M: Stephen Warren L: linux-tegra@vger.kernel.org @@ -7607,14 +7422,6 @@ S: Maintained F: include/linux/shmem_fs.h F: mm/shmem.c -TM6000 VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Odd fixes -F: drivers/media/usb/tm6000/ - TPM DEVICE DRIVER M: Kent Yoder M: Rajiv Andrade @@ -8009,7 +7816,7 @@ USB SN9C1xx DRIVER M: Luca Risolia L: linux-usb@vger.kernel.org L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://www.linux-projects.org S: Maintained F: Documentation/video4linux/sn9c102.txt @@ -8045,11 +7852,10 @@ USB VIDEO CLASS M: Laurent Pinchart L: linux-uvc-devel@lists.sourceforge.net (subscribers-only) L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://www.ideasonboard.org/uvc/ S: Maintained F: drivers/media/usb/uvc/ -F: include/uapi/linux/uvcvideo.h USB WEBCAM GADGET M: Laurent Pinchart @@ -8081,7 +7887,7 @@ USB ZR364XX DRIVER M: Antoine Jacquet L: linux-usb@vger.kernel.org L: linux-media@vger.kernel.org -T: git git://linuxtv.org/media_tree.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git W: http://royale.zerezo.com/zr364xx/ S: Maintained F: Documentation/video4linux/zr364xx.txt @@ -8436,14 +8242,6 @@ L: linux-edac@vger.kernel.org S: Maintained F: arch/x86/kernel/cpu/mcheck/* -XC2028/3028 TUNER DRIVER -M: Mauro Carvalho Chehab -L: linux-media@vger.kernel.org -W: http://linuxtv.org -T: git git://linuxtv.org/media_tree.git -S: Maintained -F: drivers/media/tuners/tuner-xc2028.* - XEN HYPERVISOR INTERFACE M: Konrad Rzeszutek Wilk M: Jeremy Fitzhardinge diff --git a/trunk/README b/trunk/README index a24ec89ba442..f32710a817fc 100644 --- a/trunk/README +++ b/trunk/README @@ -180,10 +180,6 @@ CONFIGURING the kernel: with questions already answered. Additionally updates the dependencies. - "make olddefconfig" - Like above, but sets new symbols to their default - values without prompting. - "make defconfig" Create a ./.config file by using the default symbol values from either arch/$ARCH/defconfig or arch/$ARCH/configs/${PLATFORM}_defconfig, diff --git a/trunk/arch/alpha/include/asm/mmzone.h b/trunk/arch/alpha/include/asm/mmzone.h index c5b5d6bac9ed..445dc42e0334 100644 --- a/trunk/arch/alpha/include/asm/mmzone.h +++ b/trunk/arch/alpha/include/asm/mmzone.h @@ -66,7 +66,7 @@ PLAT_NODE_DATA_LOCALNR(unsigned long p, int n) ((unsigned long)__va(NODE_DATA(kvaddr_to_nid(kaddr))->node_start_pfn \ << PAGE_SHIFT)) -/* XXX: FIXME -- nyc */ +/* XXX: FIXME -- wli */ #define kern_addr_valid(kaddr) (0) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) diff --git a/trunk/arch/alpha/kernel/pci_iommu.c b/trunk/arch/alpha/kernel/pci_iommu.c index a21d0ab3b19e..3f844d26d2c7 100644 --- a/trunk/arch/alpha/kernel/pci_iommu.c +++ b/trunk/arch/alpha/kernel/pci_iommu.c @@ -354,7 +354,8 @@ static dma_addr_t alpha_pci_map_page(struct device *dev, struct page *page, struct pci_dev *pdev = alpha_gendev_to_pci(dev); int dac_allowed; - BUG_ON(dir == PCI_DMA_NONE); + if (dir == PCI_DMA_NONE) + BUG(); dac_allowed = pdev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; return pci_map_single_1(pdev, (char *)page_address(page) + offset, @@ -377,7 +378,8 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr, struct pci_iommu_arena *arena; long dma_ofs, npages; - BUG_ON(dir == PCI_DMA_NONE); + if (dir == PCI_DMA_NONE) + BUG(); if (dma_addr >= __direct_map_base && dma_addr < __direct_map_base + __direct_map_size) { @@ -660,7 +662,8 @@ static int alpha_pci_map_sg(struct device *dev, struct scatterlist *sg, dma_addr_t max_dma; int dac_allowed; - BUG_ON(dir == PCI_DMA_NONE); + if (dir == PCI_DMA_NONE) + BUG(); dac_allowed = dev ? pci_dac_dma_supported(pdev, pdev->dma_mask) : 0; @@ -739,7 +742,8 @@ static void alpha_pci_unmap_sg(struct device *dev, struct scatterlist *sg, dma_addr_t max_dma; dma_addr_t fbeg, fend; - BUG_ON(dir == PCI_DMA_NONE); + if (dir == PCI_DMA_NONE) + BUG(); if (! alpha_mv.mv_pci_tbi) return; diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 2277f9530b00..08330d9e6a9c 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -536,8 +536,6 @@ config ARCH_DOVE select CPU_V7 select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI - select PINCTRL - select PINCTRL_DOVE select PLAT_ORION_LEGACY select USB_ARCH_HAS_EHCI help @@ -550,8 +548,6 @@ config ARCH_KIRKWOOD select GENERIC_CLOCKEVENTS select PCI select PCI_QUIRKS - select PINCTRL - select PINCTRL_KIRKWOOD select PLAT_ORION_LEGACY help Support for the following Marvell Kirkwood series SoCs: @@ -650,7 +646,6 @@ config ARCH_TEGRA select HAVE_CLK select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 - select SPARSE_IRQ select USE_OF help This enables support for NVIDIA Tegra based systems (Tegra APX, @@ -892,7 +887,6 @@ config ARCH_U8500 select GENERIC_CLOCKEVENTS select HAVE_SMP select MIGHT_HAVE_CACHE_L2X0 - select SPARSE_IRQ help Support for ST-Ericsson's Ux500 architecture @@ -907,7 +901,6 @@ config ARCH_NOMADIK select MIGHT_HAVE_CACHE_L2X0 select PINCTRL select PINCTRL_STN8815 - select SPARSE_IRQ help Support for the Nomadik platform by ST-Ericsson @@ -951,7 +944,7 @@ config ARCH_OMAP help Support for TI's OMAP platform (OMAP1/2/3/4). -config ARCH_VT8500_SINGLE +config ARCH_VT8500 bool "VIA/WonderMedia 85xx" select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB @@ -961,12 +954,21 @@ config ARCH_VT8500_SINGLE select GENERIC_CLOCKEVENTS select GENERIC_GPIO select HAVE_CLK - select MULTI_IRQ_HANDLER - select SPARSE_IRQ select USE_OF help Support for VIA/WonderMedia VT8500/WM85xx System-on-Chip. +config ARCH_ZYNQ + bool "Xilinx Zynq ARM Cortex A9 Platform" + select ARM_AMBA + select ARM_GIC + select CPU_V7 + select GENERIC_CLOCKEVENTS + select ICST + select MIGHT_HAVE_CACHE_L2X0 + select USE_OF + help + Support for Xilinx Zynq ARM Cortex A9 Platform endchoice menu "Multiple platform selection" @@ -1067,6 +1069,7 @@ source "arch/arm/mach-mxs/Kconfig" source "arch/arm/mach-netx/Kconfig" source "arch/arm/mach-nomadik/Kconfig" +source "arch/arm/plat-nomadik/Kconfig" source "arch/arm/plat-omap/Kconfig" @@ -1129,12 +1132,8 @@ source "arch/arm/mach-versatile/Kconfig" source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" -source "arch/arm/mach-vt8500/Kconfig" - source "arch/arm/mach-w90x900/Kconfig" -source "arch/arm/mach-zynq/Kconfig" - # Definitions to make life easier config ARCH_ACORN bool diff --git a/trunk/arch/arm/Kconfig.debug b/trunk/arch/arm/Kconfig.debug index 661030d6bc6c..04a3f0d1d053 100644 --- a/trunk/arch/arm/Kconfig.debug +++ b/trunk/arch/arm/Kconfig.debug @@ -132,23 +132,6 @@ choice their output to UART1 serial port on DaVinci TNETV107X devices. - config DEBUG_ZYNQ_UART0 - bool "Kernel low-level debugging on Xilinx Zynq using UART0" - depends on ARCH_ZYNQ - help - Say Y here if you want the debug print routines to direct - their output to UART0 on the Zynq platform. - - config DEBUG_ZYNQ_UART1 - bool "Kernel low-level debugging on Xilinx Zynq using UART1" - depends on ARCH_ZYNQ - help - Say Y here if you want the debug print routines to direct - their output to UART1 on the Zynq platform. - - If you have a ZC702 board and want early boot messages to - appear on the USB serial adaptor, select this option. - config DEBUG_DC21285_PORT bool "Kernel low-level debugging messages via footbridge serial port" depends on FOOTBRIDGE @@ -226,12 +209,20 @@ choice Say Y here if you want kernel low-level debugging support on i.MX50 or i.MX53. - config DEBUG_IMX6Q_UART - bool "i.MX6Q Debug UART" + config DEBUG_IMX6Q_UART2 + bool "i.MX6Q Debug UART2" depends on SOC_IMX6Q help Say Y here if you want kernel low-level debugging support - on i.MX6Q. + on i.MX6Q UART2. This is correct for e.g. the SabreLite + board. + + config DEBUG_IMX6Q_UART4 + bool "i.MX6Q Debug UART4" + depends on SOC_IMX6Q + help + Say Y here if you want kernel low-level debugging support + on i.MX6Q UART4. config DEBUG_MMP_UART2 bool "Kernel low-level debugging message via MMP UART2" @@ -379,13 +370,6 @@ choice Say Y here if you want kernel low-level debugging support on Allwinner A1X based platforms on the UART1. - config DEBUG_TEGRA_UART - depends on ARCH_TEGRA - bool "Use Tegra UART for low-level debug" - help - Say Y here if you want kernel low-level debugging support - on Tegra based platforms. - config DEBUG_VEXPRESS_UART0_DETECT bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" depends on ARCH_VEXPRESS && CPU_CP15_MMU @@ -450,45 +434,6 @@ choice endchoice -config DEBUG_IMX6Q_UART_PORT - int "i.MX6Q Debug UART Port (1-5)" if DEBUG_IMX6Q_UART - range 1 5 - default 1 - depends on SOC_IMX6Q - help - Choose UART port on which kernel low-level debug messages - should be output. - -choice - prompt "Low-level debug console UART" - depends on DEBUG_LL && DEBUG_TEGRA_UART - - config TEGRA_DEBUG_UART_AUTO_ODMDATA - bool "Via ODMDATA" - help - Automatically determines which UART to use for low-level debug based - on the ODMDATA value. This value is part of the BCT, and is written - to the boot memory device using nvflash, or other flashing tool. - When bits 19:18 are 3, then bits 17:15 indicate which UART to use; - 0/1/2/3/4 are UART A/B/C/D/E. - - config TEGRA_DEBUG_UARTA - bool "UART A" - - config TEGRA_DEBUG_UARTB - bool "UART B" - - config TEGRA_DEBUG_UARTC - bool "UART C" - - config TEGRA_DEBUG_UARTD - bool "UART D" - - config TEGRA_DEBUG_UARTE - bool "UART E" - -endchoice - config DEBUG_LL_INCLUDE string default "debug/icedcc.S" if DEBUG_ICEDCC @@ -498,7 +443,8 @@ config DEBUG_LL_INCLUDE DEBUG_IMX31_IMX35_UART || \ DEBUG_IMX51_UART || \ DEBUG_IMX50_IMX53_UART ||\ - DEBUG_IMX6Q_UART + DEBUG_IMX6Q_UART2 || \ + DEBUG_IMX6Q_UART4 default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "debug/mvebu.S" if DEBUG_MVEBU_UART default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART @@ -506,8 +452,6 @@ config DEBUG_LL_INCLUDE default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \ DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 - default "debug/tegra.S" if DEBUG_TEGRA_UART - default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S" config EARLY_PRINTK diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile index 30c443c406f3..9c60f474a559 100644 --- a/trunk/arch/arm/Makefile +++ b/trunk/arch/arm/Makefile @@ -202,6 +202,7 @@ machine-$(CONFIG_ARCH_SUNXI) += sunxi plat-$(CONFIG_ARCH_OMAP) += omap plat-$(CONFIG_ARCH_S3C64XX) += samsung plat-$(CONFIG_PLAT_IOP) += iop +plat-$(CONFIG_PLAT_NOMADIK) += nomadik plat-$(CONFIG_PLAT_ORION) += orion plat-$(CONFIG_PLAT_PXA) += pxa plat-$(CONFIG_PLAT_S3C24XX) += s3c24xx samsung diff --git a/trunk/arch/arm/boot/dts/Makefile b/trunk/arch/arm/boot/dts/Makefile index 2af359cfe985..f3f2f80cdf3b 100644 --- a/trunk/arch/arm/boot/dts/Makefile +++ b/trunk/arch/arm/boot/dts/Makefile @@ -34,8 +34,6 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb -dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ - da850-evm.dtb dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ dove-cubox.dtb \ dove-dove-db.dtb @@ -43,10 +41,7 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-smdkv310.dtb \ exynos4210-trats.dtb \ exynos5250-smdk5250.dtb \ - exynos5440-ssdk5440.dtb \ - exynos4412-smdk4412.dtb \ - exynos5250-smdk5250.dtb \ - exynos5250-snow.dtb + exynos5440-ssdk5440.dtb dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \ ecx-2000.dtb dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \ @@ -84,20 +79,16 @@ dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \ imx53-qsb.dtb \ imx53-smd.dtb \ imx6q-arm2.dtb \ - imx6q-sabreauto.dtb \ imx6q-sabrelite.dtb \ imx6q-sabresd.dtb dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \ imx23-olinuxino.dtb \ imx23-stmp378x_devb.dtb \ - imx28-apf28.dtb \ - imx28-apf28dev.dtb \ imx28-apx4devkit.dtb \ imx28-cfa10036.dtb \ imx28-cfa10049.dtb \ imx28-evk.dtb \ imx28-m28evk.dtb \ - imx28-sps1.dtb \ imx28-tx28.dtb dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ omap3-beagle.dtb \ @@ -114,10 +105,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ am335x-bone.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb -dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ - hrefprev60.dtb \ - hrefv60plus.dtb \ - ccu9540.dtb +dtb-$(CONFIG_ARCH_U8500) += snowball.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ r8a7740-armadillo800eva.dtb \ sh73a0-kzm9g.dtb \ @@ -149,7 +137,6 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ wm8505-ref.dtb \ wm8650-mid.dtb -dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb targets += dtbs endif diff --git a/trunk/arch/arm/boot/dts/at91sam9260.dtsi b/trunk/arch/arm/boot/dts/at91sam9260.dtsi index 68bccf41a2c6..b1d3fab60e0a 100644 --- a/trunk/arch/arm/boot/dts/at91sam9260.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9260.dtsi @@ -29,7 +29,6 @@ tcb0 = &tcb0; tcb1 = &tcb1; i2c0 = &i2c0; - ssc0 = &ssc0; }; cpus { cpu@0 { @@ -446,13 +445,6 @@ status = "disabled"; }; - ssc0: ssc@fffbc000 { - compatible = "atmel,at91rm9200-ssc"; - reg = <0xfffbc000 0x4000>; - interrupts = <14 4 5>; - status = "disabled"; - }; - adc0: adc@fffe0000 { compatible = "atmel,at91sam9260-adc"; reg = <0xfffe0000 0x100>; @@ -487,12 +479,6 @@ trigger-external; }; }; - - watchdog@fffffd40 { - compatible = "atmel,at91sam9260-wdt"; - reg = <0xfffffd40 0x10>; - status = "disabled"; - }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9263.dtsi b/trunk/arch/arm/boot/dts/at91sam9263.dtsi index 8e6251f1f7a3..66106eecf1ed 100644 --- a/trunk/arch/arm/boot/dts/at91sam9263.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9263.dtsi @@ -25,8 +25,6 @@ gpio4 = &pioE; tcb0 = &tcb0; i2c0 = &i2c0; - ssc0 = &ssc0; - ssc1 = &ssc1; }; cpus { cpu@0 { @@ -364,20 +362,6 @@ status = "disabled"; }; - ssc0: ssc@fff98000 { - compatible = "atmel,at91rm9200-ssc"; - reg = <0xfff98000 0x4000>; - interrupts = <16 4 5>; - status = "disable"; - }; - - ssc1: ssc@fff9c000 { - compatible = "atmel,at91rm9200-ssc"; - reg = <0xfff9c000 0x4000>; - interrupts = <17 4 5>; - status = "disable"; - }; - macb0: ethernet@fffbc000 { compatible = "cdns,at32ap7000-macb", "cdns,macb"; reg = <0xfffbc000 0x100>; @@ -420,12 +404,6 @@ #size-cells = <0>; status = "disabled"; }; - - watchdog@fffffd40 { - compatible = "atmel,at91sam9260-wdt"; - reg = <0xfffffd40 0x10>; - status = "disabled"; - }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index da15e83e7f17..32a500a0e481 100644 --- a/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -30,16 +30,6 @@ ahb { apb { - pinctrl@fffff400 { - board { - pinctrl_pck0_as_mck: pck0_as_mck { - atmel,pins = - <2 1 0x2 0x0>; /* PC1 periph B */ - }; - - }; - }; - dbgu: serial@fffff200 { status = "okay"; }; @@ -91,11 +81,6 @@ }; }; }; - - ssc0: ssc@fffbc000 { - status = "okay"; - pinctrl-0 = <&pinctrl_ssc0_tx>; - }; }; nand0: nand@40000000 { @@ -159,7 +144,7 @@ reg = <0x50>; }; - wm8731: wm8731@1b { + wm8731@1b { compatible = "wm8731"; reg = <0x1b>; }; @@ -184,19 +169,4 @@ gpio-key,wakeup; }; }; - - sound { - compatible = "atmel,at91sam9g20ek-wm8731-audio"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pck0_as_mck>; - - atmel,model = "wm8731 @ AT91SAMG20EK"; - - atmel,audio-routing = - "Ext Spk", "LHPOUT", - "Int Mic", "MICIN"; - - atmel,ssc-controller = <&ssc0>; - atmel,audio-codec = <&wm8731>; - }; }; diff --git a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi index fa1ae0c5479c..0741caeeced1 100644 --- a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi @@ -31,8 +31,6 @@ tcb1 = &tcb1; i2c0 = &i2c0; i2c1 = &i2c1; - ssc0 = &ssc0; - ssc1 = &ssc1; }; cpus { cpu@0 { @@ -421,20 +419,6 @@ status = "disabled"; }; - ssc0: ssc@fff9c000 { - compatible = "atmel,at91sam9g45-ssc"; - reg = <0xfff9c000 0x4000>; - interrupts = <16 4 5>; - status = "disable"; - }; - - ssc1: ssc@fffa0000 { - compatible = "atmel,at91sam9g45-ssc"; - reg = <0xfffa0000 0x4000>; - interrupts = <17 4 5>; - status = "disable"; - }; - adc0: adc@fffb0000 { compatible = "atmel,at91sam9260-adc"; reg = <0xfffb0000 0x100>; @@ -489,12 +473,6 @@ #size-cells = <0>; status = "disabled"; }; - - watchdog@fffffd40 { - compatible = "atmel,at91sam9260-wdt"; - reg = <0xfffffd40 0x10>; - status = "disabled"; - }; }; nand0: nand@40000000 { diff --git a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi index 617ede541ca2..7ee49e8daf98 100644 --- a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi @@ -30,7 +30,6 @@ i2c0 = &i2c0; i2c1 = &i2c1; i2c2 = &i2c2; - ssc0 = &ssc0; }; cpus { cpu@0 { @@ -88,13 +87,6 @@ interrupts = <1 4 7>; }; - ssc0: ssc@f0010000 { - compatible = "atmel,at91sam9g45-ssc"; - reg = <0xf0010000 0x4000>; - interrupts = <28 4 5>; - status = "disable"; - }; - tcb0: timer@f8008000 { compatible = "atmel,at91sam9x5-tcb"; reg = <0xf8008000 0x100>; diff --git a/trunk/arch/arm/boot/dts/ccu9540.dts b/trunk/arch/arm/boot/dts/ccu9540.dts deleted file mode 100644 index 04305463f00d..000000000000 --- a/trunk/arch/arm/boot/dts/ccu9540.dts +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2012 ST-Ericsson AB - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "dbx5x0.dtsi" - -/ { - model = "ST-Ericsson CCU9540 platform with Device Tree"; - compatible = "st-ericsson,ccu9540", "st-ericsson,u9540"; - - memory { - reg = <0x00000000 0x20000000>; - }; - - soc-u9500 { - uart@80120000 { - status = "okay"; - }; - - uart@80121000 { - status = "okay"; - }; - - uart@80007000 { - status = "okay"; - }; - - // External Micro SD slot - sdi0_per1@80126000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - - cd-gpios = <&gpio7 6 0x4>; // 230 - cd-inverted; - - status = "okay"; - }; - - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - - status = "okay"; - }; - - // On-board eMMC - sdi4_per2@80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - - status = "okay"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/cros5250-common.dtsi b/trunk/arch/arm/boot/dts/cros5250-common.dtsi deleted file mode 100644 index fddd17417433..000000000000 --- a/trunk/arch/arm/boot/dts/cros5250-common.dtsi +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Common device tree include for all Exynos 5250 boards based off of Daisy. - * - * Copyright (c) 2012 Google, Inc - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/ { - aliases { - }; - - memory { - reg = <0x40000000 0x80000000>; - }; - - chosen { - }; - - i2c@12C60000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; - gpios = <&gpb3 0 2 3 0>, - <&gpb3 1 2 3 0>; - }; - - i2c@12C70000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; - gpios = <&gpb3 2 2 3 0>, - <&gpb3 3 2 3 0>; - }; - - i2c@12C80000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - - /* - * Disabled pullups since external part has its own pullups and - * double-pulling gets us out of spec in some cases. - */ - gpios = <&gpa0 6 3 0 0>, - <&gpa0 7 3 0 0>; - - hdmiddc@50 { - compatible = "samsung,exynos5-hdmiddc"; - reg = <0x50>; - }; - }; - - i2c@12C90000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - gpios = <&gpa1 2 3 3 0>, - <&gpa1 3 3 3 0>; - }; - - i2c@12CA0000 { - status = "disabled"; - }; - - i2c@12CB0000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - gpios = <&gpa2 2 3 3 0>, - <&gpa2 3 3 3 0>; - }; - - i2c@12CC0000 { - status = "disabled"; - }; - - i2c@12CD0000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - gpios = <&gpb2 2 3 3 0>, - <&gpb2 3 3 3 0>; - }; - - i2c@12CE0000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <378000>; - - hdmiphy@38 { - compatible = "samsung,exynos5-hdmiphy"; - reg = <0x38>; - }; - }; - - dwmmc0@12200000 { - num-slots = <1>; - supports-highspeed; - broken-cd; - fifo-depth = <0x80>; - card-detect-delay = <200>; - samsung,dw-mshc-ciu-div = <3>; - samsung,dw-mshc-sdr-timing = <2 3 3>; - samsung,dw-mshc-ddr-timing = <1 2 3>; - - slot@0 { - reg = <0>; - bus-width = <8>; - gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>, - <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>, - <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>, - <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>, - <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>; - }; - }; - - dwmmc1@12210000 { - status = "disabled"; - }; - - dwmmc2@12220000 { - num-slots = <1>; - supports-highspeed; - fifo-depth = <0x80>; - card-detect-delay = <200>; - samsung,dw-mshc-ciu-div = <3>; - samsung,dw-mshc-sdr-timing = <2 3 3>; - samsung,dw-mshc-ddr-timing = <1 2 3>; - - slot@0 { - reg = <0>; - bus-width = <4>; - samsung,cd-pinmux-gpio = <&gpc3 2 2 3 3>; - wp-gpios = <&gpc2 1 0 0 3>; - gpios = <&gpc3 0 2 0 3>, <&gpc3 1 2 0 3>, - <&gpc3 3 2 3 3>, <&gpc3 4 2 3 3>, - <&gpc3 5 2 3 3>, <&gpc3 6 2 3 3>; - }; - }; - - dwmmc3@12230000 { - num-slots = <1>; - supports-highspeed; - broken-cd; - fifo-depth = <0x80>; - card-detect-delay = <200>; - samsung,dw-mshc-ciu-div = <3>; - samsung,dw-mshc-sdr-timing = <2 3 3>; - samsung,dw-mshc-ddr-timing = <1 2 3>; - - slot@0 { - reg = <0>; - bus-width = <4>; - /* See board-specific dts files for GPIOs */ - }; - }; - - spi_0: spi@12d20000 { - status = "disabled"; - }; - - spi_1: spi@12d30000 { - gpios = <&gpa2 4 2 3 0>, - <&gpa2 6 2 3 0>, - <&gpa2 7 2 3 0>; - samsung,spi-src-clk = <0>; - num-cs = <1>; - }; - - spi_2: spi@12d40000 { - status = "disabled"; - }; - - hdmi { - hpd-gpio = <&gpx3 7 0xf 1 3>; - }; - - gpio-keys { - compatible = "gpio-keys"; - - power { - label = "Power"; - gpios = <&gpx1 3 0 0x10000 0>; - linux,code = <116>; /* KEY_POWER */ - gpio-key,wakeup; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/dbx5x0.dtsi b/trunk/arch/arm/boot/dts/dbx5x0.dtsi index 2efd9c891bc9..731086b2fca2 100644 --- a/trunk/arch/arm/boot/dts/dbx5x0.dtsi +++ b/trunk/arch/arm/boot/dts/dbx5x0.dtsi @@ -217,103 +217,123 @@ // DB8500_REGULATOR_VAPE db8500_vape_reg: db8500_vape { regulator-compatible = "db8500_vape"; + regulator-name = "db8500-vape"; regulator-always-on; }; // DB8500_REGULATOR_VARM db8500_varm_reg: db8500_varm { regulator-compatible = "db8500_varm"; + regulator-name = "db8500-varm"; }; // DB8500_REGULATOR_VMODEM db8500_vmodem_reg: db8500_vmodem { regulator-compatible = "db8500_vmodem"; + regulator-name = "db8500-vmodem"; }; // DB8500_REGULATOR_VPLL db8500_vpll_reg: db8500_vpll { regulator-compatible = "db8500_vpll"; + regulator-name = "db8500-vpll"; }; // DB8500_REGULATOR_VSMPS1 db8500_vsmps1_reg: db8500_vsmps1 { regulator-compatible = "db8500_vsmps1"; + regulator-name = "db8500-vsmps1"; }; // DB8500_REGULATOR_VSMPS2 db8500_vsmps2_reg: db8500_vsmps2 { regulator-compatible = "db8500_vsmps2"; + regulator-name = "db8500-vsmps2"; }; // DB8500_REGULATOR_VSMPS3 db8500_vsmps3_reg: db8500_vsmps3 { regulator-compatible = "db8500_vsmps3"; + regulator-name = "db8500-vsmps3"; }; // DB8500_REGULATOR_VRF1 db8500_vrf1_reg: db8500_vrf1 { regulator-compatible = "db8500_vrf1"; + regulator-name = "db8500-vrf1"; }; // DB8500_REGULATOR_SWITCH_SVAMMDSP db8500_sva_mmdsp_reg: db8500_sva_mmdsp { regulator-compatible = "db8500_sva_mmdsp"; + regulator-name = "db8500-sva-mmdsp"; }; // DB8500_REGULATOR_SWITCH_SVAMMDSPRET db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret { regulator-compatible = "db8500_sva_mmdsp_ret"; + regulator-name = "db8500-sva-mmdsp-ret"; }; // DB8500_REGULATOR_SWITCH_SVAPIPE db8500_sva_pipe_reg: db8500_sva_pipe { regulator-compatible = "db8500_sva_pipe"; + regulator-name = "db8500_sva_pipe"; }; // DB8500_REGULATOR_SWITCH_SIAMMDSP db8500_sia_mmdsp_reg: db8500_sia_mmdsp { regulator-compatible = "db8500_sia_mmdsp"; + regulator-name = "db8500_sia_mmdsp"; }; // DB8500_REGULATOR_SWITCH_SIAMMDSPRET db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret { + regulator-name = "db8500-sia-mmdsp-ret"; }; // DB8500_REGULATOR_SWITCH_SIAPIPE db8500_sia_pipe_reg: db8500_sia_pipe { regulator-compatible = "db8500_sia_pipe"; + regulator-name = "db8500-sia-pipe"; }; // DB8500_REGULATOR_SWITCH_SGA db8500_sga_reg: db8500_sga { regulator-compatible = "db8500_sga"; + regulator-name = "db8500-sga"; vin-supply = <&db8500_vape_reg>; }; // DB8500_REGULATOR_SWITCH_B2R2_MCDE db8500_b2r2_mcde_reg: db8500_b2r2_mcde { regulator-compatible = "db8500_b2r2_mcde"; + regulator-name = "db8500-b2r2-mcde"; vin-supply = <&db8500_vape_reg>; }; // DB8500_REGULATOR_SWITCH_ESRAM12 db8500_esram12_reg: db8500_esram12 { regulator-compatible = "db8500_esram12"; + regulator-name = "db8500-esram12"; }; // DB8500_REGULATOR_SWITCH_ESRAM12RET db8500_esram12_ret_reg: db8500_esram12_ret { regulator-compatible = "db8500_esram12_ret"; + regulator-name = "db8500-esram12-ret"; }; // DB8500_REGULATOR_SWITCH_ESRAM34 db8500_esram34_reg: db8500_esram34 { regulator-compatible = "db8500_esram34"; + regulator-name = "db8500-esram34"; }; // DB8500_REGULATOR_SWITCH_ESRAM34RET db8500_esram34_ret_reg: db8500_esram34_ret { regulator-compatible = "db8500_esram34_ret"; + regulator-name = "db8500-esram34-ret"; }; }; @@ -340,33 +360,7 @@ vddadc-supply = <&ab8500_ldo_tvout_reg>; }; - ab8500_battery: ab8500_battery { - stericsson,battery-type = "LIPO"; - thermistor-on-batctrl; - }; - - ab8500_fg { - compatible = "stericsson,ab8500-fg"; - battery = <&ab8500_battery>; - }; - - ab8500_btemp { - compatible = "stericsson,ab8500-btemp"; - battery = <&ab8500_battery>; - }; - - ab8500_charger { - compatible = "stericsson,ab8500-charger"; - battery = <&ab8500_battery>; - vddadc-supply = <&ab8500_ldo_tvout_reg>; - }; - - ab8500_chargalg { - compatible = "stericsson,ab8500-chargalg"; - battery = <&ab8500_battery>; - }; - - ab8500_usb { + ab8500-usb { compatible = "stericsson,ab8500-usb"; interrupts = < 90 0x4 96 0x4 @@ -418,6 +412,7 @@ // supplies to the display/camera ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { regulator-compatible = "ab8500_ldo_aux1"; + regulator-name = "V-DISPLAY"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2900000>; regulator-boot-on; @@ -428,6 +423,7 @@ // supplies to the on-board eMMC ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { regulator-compatible = "ab8500_ldo_aux2"; + regulator-name = "V-eMMC1"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <3300000>; }; @@ -435,6 +431,7 @@ // supply for VAUX3; SDcard slots ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { regulator-compatible = "ab8500_ldo_aux3"; + regulator-name = "V-MMC-SD"; regulator-min-microvolt = <1100000>; regulator-max-microvolt = <3300000>; }; @@ -442,41 +439,49 @@ // supply for v-intcore12; VINTCORE12 LDO ab8500_ldo_initcore_reg: ab8500_ldo_initcore { regulator-compatible = "ab8500_ldo_initcore"; + regulator-name = "V-INTCORE"; }; // supply for tvout; gpadc; TVOUT LDO ab8500_ldo_tvout_reg: ab8500_ldo_tvout { regulator-compatible = "ab8500_ldo_tvout"; + regulator-name = "V-TVOUT"; }; // supply for ab8500-usb; USB LDO ab8500_ldo_usb_reg: ab8500_ldo_usb { regulator-compatible = "ab8500_ldo_usb"; + regulator-name = "dummy"; }; // supply for ab8500-vaudio; VAUDIO LDO ab8500_ldo_audio_reg: ab8500_ldo_audio { regulator-compatible = "ab8500_ldo_audio"; + regulator-name = "V-AUD"; }; // supply for v-anamic1 VAMic1-LDO ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { regulator-compatible = "ab8500_ldo_anamic1"; + regulator-name = "V-AMIC1"; }; // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1 ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { regulator-compatible = "ab8500_ldo_amamic2"; + regulator-name = "V-AMIC2"; }; // supply for v-dmic; VDMIC LDO ab8500_ldo_dmic_reg: ab8500_ldo_dmic { regulator-compatible = "ab8500_ldo_dmic"; + regulator-name = "V-DMIC"; }; // supply for U8500 CSI/DSI; VANA LDO ab8500_ldo_ana_reg: ab8500_ldo_ana { regulator-compatible = "ab8500_ldo_ana"; + regulator-name = "V-CSI/DSI"; }; }; }; @@ -580,42 +585,42 @@ status = "disabled"; }; - sdi0_per1@80126000 { + sdi@80126000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80126000 0x1000>; interrupts = <0 60 0x4>; status = "disabled"; }; - sdi1_per2@80118000 { + sdi@80118000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80118000 0x1000>; interrupts = <0 50 0x4>; status = "disabled"; }; - sdi2_per3@80005000 { + sdi@80005000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80005000 0x1000>; interrupts = <0 41 0x4>; status = "disabled"; }; - sdi3_per2@80119000 { + sdi@80119000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80119000 0x1000>; interrupts = <0 59 0x4>; status = "disabled"; }; - sdi4_per2@80114000 { + sdi@80114000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80114000 0x1000>; interrupts = <0 99 0x4>; status = "disabled"; }; - sdi5_per3@80008000 { + sdi@80008000 { compatible = "arm,pl18x", "arm,primecell"; reg = <0x80008000 0x1000>; interrupts = <0 100 0x4>; @@ -669,18 +674,5 @@ status = "disabled"; }; - vmmci: regulator-gpio { - compatible = "regulator-gpio"; - - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2600000>; - regulator-name = "mmci-reg"; - regulator-type = "voltage"; - - states = <1800000 0x1 - 2900000 0x0>; - - status = "disabled"; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/dove-cubox.dts b/trunk/arch/arm/boot/dts/dove-cubox.dts index fed7d3f9f431..0adbd5a38095 100644 --- a/trunk/arch/arm/boot/dts/dove-cubox.dts +++ b/trunk/arch/arm/boot/dts/dove-cubox.dts @@ -40,13 +40,3 @@ reg = <0>; }; }; - -&pinctrl { - pinctrl-0 = <&pmx_gpio_18>; - pinctrl-names = "default"; - - pmx_gpio_18: pmx-gpio-18 { - marvell,pins = "mpp18"; - marvell,function = "gpio"; - }; -}; diff --git a/trunk/arch/arm/boot/dts/dove.dtsi b/trunk/arch/arm/boot/dts/dove.dtsi index 61f391412a5a..5a00022383e7 100644 --- a/trunk/arch/arm/boot/dts/dove.dtsi +++ b/trunk/arch/arm/boot/dts/dove.dtsi @@ -4,12 +4,6 @@ compatible = "marvell,dove"; model = "Marvell Armada 88AP510 SoC"; - aliases { - gpio0 = &gpio0; - gpio1 = &gpio1; - gpio2 = &gpio2; - }; - soc@f1000000 { compatible = "simple-bus"; #address-cells = <1>; @@ -78,8 +72,7 @@ #gpio-cells = <2>; gpio-controller; reg = <0xd0400 0x20>; - ngpios = <32>; - interrupt-controller; + ngpio = <32>; interrupts = <12>, <13>, <14>, <60>; }; @@ -88,8 +81,7 @@ #gpio-cells = <2>; gpio-controller; reg = <0xd0420 0x20>; - ngpios = <32>; - interrupt-controller; + ngpio = <32>; interrupts = <61>; }; @@ -98,12 +90,7 @@ #gpio-cells = <2>; gpio-controller; reg = <0xe8400 0x0c>; - ngpios = <8>; - }; - - pinctrl: pinctrl@d0200 { - compatible = "marvell,dove-pinctrl"; - reg = <0xd0200 0x10>; + ngpio = <8>; }; spi0: spi@10600 { diff --git a/trunk/arch/arm/boot/dts/evk-pro3.dts b/trunk/arch/arm/boot/dts/evk-pro3.dts index 96e50f569433..b7354e6506de 100644 --- a/trunk/arch/arm/boot/dts/evk-pro3.dts +++ b/trunk/arch/arm/boot/dts/evk-pro3.dts @@ -22,22 +22,10 @@ status = "okay"; }; - usart0: serial@fffb0000 { - status = "okay"; - }; - - usart2: serial@fffb8000 { - status = "okay"; - }; - usb1: gadget@fffa4000 { atmel,vbus-gpio = <&pioC 5 0>; status = "okay"; }; - - watchdog@fffffd40 { - status = "okay"; - }; }; usb0: ohci@00500000 { diff --git a/trunk/arch/arm/boot/dts/exynos4.dtsi b/trunk/arch/arm/boot/dts/exynos4.dtsi index e1347fceb5bc..96d4462730fb 100644 --- a/trunk/arch/arm/boot/dts/exynos4.dtsi +++ b/trunk/arch/arm/boot/dts/exynos4.dtsi @@ -28,44 +28,6 @@ spi0 = &spi_0; spi1 = &spi_1; spi2 = &spi_2; - i2c0 = &i2c_0; - i2c1 = &i2c_1; - i2c2 = &i2c_2; - i2c3 = &i2c_3; - i2c4 = &i2c_4; - i2c5 = &i2c_5; - i2c6 = &i2c_6; - i2c7 = &i2c_7; - }; - - pd_mfc: mfc-power-domain@10023C40 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023C40 0x20>; - }; - - pd_g3d: g3d-power-domain@10023C60 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023C60 0x20>; - }; - - pd_lcd0: lcd0-power-domain@10023C80 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023C80 0x20>; - }; - - pd_tv: tv-power-domain@10023C20 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023C20 0x20>; - }; - - pd_cam: cam-power-domain@10023C00 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023C00 0x20>; - }; - - pd_gps: gps-power-domain@10023CE0 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023CE0 0x20>; }; gic:interrupt-controller@10490000 { @@ -159,7 +121,7 @@ status = "disabled"; }; - i2c_0: i2c@13860000 { + i2c@13860000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -168,7 +130,7 @@ status = "disabled"; }; - i2c_1: i2c@13870000 { + i2c@13870000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -177,7 +139,7 @@ status = "disabled"; }; - i2c_2: i2c@13880000 { + i2c@13880000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -186,7 +148,7 @@ status = "disabled"; }; - i2c_3: i2c@13890000 { + i2c@13890000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -195,7 +157,7 @@ status = "disabled"; }; - i2c_4: i2c@138A0000 { + i2c@138A0000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -204,7 +166,7 @@ status = "disabled"; }; - i2c_5: i2c@138B0000 { + i2c@138B0000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -213,7 +175,7 @@ status = "disabled"; }; - i2c_6: i2c@138C0000 { + i2c@138C0000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; @@ -222,7 +184,7 @@ status = "disabled"; }; - i2c_7: i2c@138D0000 { + i2c@138D0000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,s3c2440-i2c"; diff --git a/trunk/arch/arm/boot/dts/exynos4210-origen.dts b/trunk/arch/arm/boot/dts/exynos4210-origen.dts index f2710018e84e..3e68f52e8454 100644 --- a/trunk/arch/arm/boot/dts/exynos4210-origen.dts +++ b/trunk/arch/arm/boot/dts/exynos4210-origen.dts @@ -22,54 +22,38 @@ compatible = "insignal,origen", "samsung,exynos4210"; memory { - reg = <0x40000000 0x10000000 - 0x50000000 0x10000000 - 0x60000000 0x10000000 - 0x70000000 0x10000000>; + reg = <0x40000000 0x40000000>; }; chosen { bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; }; - mmc_reg: voltage-regulator { - compatible = "regulator-fixed"; - regulator-name = "VMEM_VDD_2.8V"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - gpio = <&gpx1 1 0>; - enable-active-high; - }; - sdhci@12530000 { - bus-width = <4>; - pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>; - pinctrl-names = "default"; - vmmc-supply = <&mmc_reg>; + samsung,sdhci-bus-width = <4>; + linux,mmc_cap_4_bit_data; + samsung,sdhci-cd-internal; + gpio-cd = <&gpk2 2 2 3 3>; + gpios = <&gpk2 0 2 0 3>, + <&gpk2 1 2 0 3>, + <&gpk2 3 2 3 3>, + <&gpk2 4 2 3 3>, + <&gpk2 5 2 3 3>, + <&gpk2 6 2 3 3>; status = "okay"; }; sdhci@12510000 { - bus-width = <4>; - pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>; - pinctrl-names = "default"; - vmmc-supply = <&mmc_reg>; - status = "okay"; - }; - - serial@13800000 { - status = "okay"; - }; - - serial@13810000 { - status = "okay"; - }; - - serial@13820000 { - status = "okay"; - }; - - serial@13830000 { + samsung,sdhci-bus-width = <4>; + linux,mmc_cap_4_bit_data; + samsung,sdhci-cd-internal; + gpio-cd = <&gpk0 2 2 3 3>; + gpios = <&gpk0 0 2 0 3>, + <&gpk0 1 2 0 3>, + <&gpk0 3 2 3 3>, + <&gpk0 4 2 3 3>, + <&gpk0 5 2 3 3>, + <&gpk0 6 2 3 3>; status = "okay"; }; @@ -80,35 +64,35 @@ up { label = "Up"; - gpios = <&gpx2 0 1>; + gpios = <&gpx2 0 0 0x10000 2>; linux,code = <103>; gpio-key,wakeup; }; down { label = "Down"; - gpios = <&gpx2 1 1>; + gpios = <&gpx2 1 0 0x10000 2>; linux,code = <108>; gpio-key,wakeup; }; back { label = "Back"; - gpios = <&gpx1 7 1>; + gpios = <&gpx1 7 0 0x10000 2>; linux,code = <158>; gpio-key,wakeup; }; home { label = "Home"; - gpios = <&gpx1 6 1>; + gpios = <&gpx1 6 0 0x10000 2>; linux,code = <102>; gpio-key,wakeup; }; menu { label = "Menu"; - gpios = <&gpx1 5 1>; + gpios = <&gpx1 5 0 0x10000 2>; linux,code = <139>; gpio-key,wakeup; }; @@ -117,7 +101,7 @@ leds { compatible = "gpio-leds"; status { - gpios = <&gpx1 3 1>; + gpios = <&gpx1 3 0 0x10000 2>; linux,default-trigger = "heartbeat"; }; }; diff --git a/trunk/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/trunk/arch/arm/boot/dts/exynos4210-pinctrl.dtsi index 55a2efb763d1..6a4a1a04221c 100644 --- a/trunk/arch/arm/boot/dts/exynos4210-pinctrl.dtsi +++ b/trunk/arch/arm/boot/dts/exynos4210-pinctrl.dtsi @@ -482,196 +482,196 @@ samsung,pins = "gpk0-0"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd0_cmd: sd0-cmd { samsung,pins = "gpk0-1"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd0_cd: sd0-cd { samsung,pins = "gpk0-2"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd0_bus1: sd0-bus-width1 { samsung,pins = "gpk0-3"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd0_bus4: sd0-bus-width4 { samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd0_bus8: sd0-bus-width8 { samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; samsung,pin-function = <3>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd4_clk: sd4-clk { samsung,pins = "gpk0-0"; samsung,pin-function = <3>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd4_cmd: sd4-cmd { samsung,pins = "gpk0-1"; samsung,pin-function = <3>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd4_cd: sd4-cd { samsung,pins = "gpk0-2"; samsung,pin-function = <3>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd4_bus1: sd4-bus-width1 { samsung,pins = "gpk0-3"; samsung,pin-function = <3>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd4_bus4: sd4-bus-width4 { samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6"; samsung,pin-function = <3>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd4_bus8: sd4-bus-width8 { samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; samsung,pin-function = <3>; samsung,pin-pud = <4>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd1_clk: sd1-clk { samsung,pins = "gpk1-0"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd1_cmd: sd1-cmd { samsung,pins = "gpk1-1"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd1_cd: sd1-cd { samsung,pins = "gpk1-2"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd1_bus1: sd1-bus-width1 { samsung,pins = "gpk1-3"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd1_bus4: sd1-bus-width4 { samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd2_clk: sd2-clk { samsung,pins = "gpk2-0"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd2_cmd: sd2-cmd { samsung,pins = "gpk2-1"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd2_cd: sd2-cd { samsung,pins = "gpk2-2"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd2_bus1: sd2-bus-width1 { samsung,pins = "gpk2-3"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd2_bus4: sd2-bus-width4 { samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd2_bus8: sd2-bus-width8 { samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6"; samsung,pin-function = <3>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd3_clk: sd3-clk { samsung,pins = "gpk3-0"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd3_cmd: sd3-cmd { samsung,pins = "gpk3-1"; samsung,pin-function = <2>; samsung,pin-pud = <0>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd3_cd: sd3-cd { samsung,pins = "gpk3-2"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd3_bus1: sd3-bus-width1 { samsung,pins = "gpk3-3"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; sd3_bus4: sd3-bus-width4 { samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6"; samsung,pin-function = <2>; samsung,pin-pud = <3>; - samsung,pin-drv = <3>; + samsung,pin-drv = <0>; }; eint0: ext-int0 { diff --git a/trunk/arch/arm/boot/dts/exynos4210-smdkv310.dts b/trunk/arch/arm/boot/dts/exynos4210-smdkv310.dts index 9b23a8255e39..63610c3ba3af 100644 --- a/trunk/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/trunk/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -43,22 +43,6 @@ status = "okay"; }; - serial@13800000 { - status = "okay"; - }; - - serial@13810000 { - status = "okay"; - }; - - serial@13820000 { - status = "okay"; - }; - - serial@13830000 { - status = "okay"; - }; - keypad@100A0000 { samsung,keypad-num-rows = <2>; samsung,keypad-num-columns = <8>; diff --git a/trunk/arch/arm/boot/dts/exynos4210-trats.dts b/trunk/arch/arm/boot/dts/exynos4210-trats.dts index c346b64dff55..a21511c14071 100644 --- a/trunk/arch/arm/boot/dts/exynos4210-trats.dts +++ b/trunk/arch/arm/boot/dts/exynos4210-trats.dts @@ -35,15 +35,24 @@ regulator-name = "VMEM_VDD_2.8V"; regulator-min-microvolt = <2800000>; regulator-max-microvolt = <2800000>; - gpio = <&gpk0 2 0>; + gpio = <&gpk0 2 1 0 0>; enable-active-high; }; sdhci_emmc: sdhci@12510000 { bus-width = <8>; non-removable; - pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>; - pinctrl-names = "default"; + broken-voltage; + gpios = <&gpk0 0 2 0 3>, + <&gpk0 1 2 0 3>, + <&gpk0 3 2 2 3>, + <&gpk0 4 2 2 3>, + <&gpk0 5 2 2 3>, + <&gpk0 6 2 2 3>, + <&gpk1 3 3 3 3>, + <&gpk1 4 3 3 3>, + <&gpk1 5 3 3 3>, + <&gpk1 6 3 3 3>; vmmc-supply = <&vemmc_reg>; status = "okay"; }; @@ -64,74 +73,12 @@ status = "okay"; }; - gpio-keys { - compatible = "gpio-keys"; - - vol-down-key { - gpios = <&gpx2 1 1>; - linux,code = <114>; - label = "volume down"; - debounce-interval = <10>; - }; - - vol-up-key { - gpios = <&gpx2 0 1>; - linux,code = <115>; - label = "volume up"; - debounce-interval = <10>; - }; - - power-key { - gpios = <&gpx2 7 1>; - linux,code = <116>; - label = "power"; - debounce-interval = <10>; - gpio-key,wakeup; - }; - - ok-key { - gpios = <&gpx3 5 1>; - linux,code = <352>; - label = "ok"; - debounce-interval = <10>; - }; - }; - - tsp_reg: voltage-regulator { - compatible = "regulator-fixed"; - regulator-name = "TSP_FIXED_VOLTAGES"; - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - gpio = <&gpl0 3 0>; - enable-active-high; - }; - - i2c@13890000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-slave-addr = <0x10>; - samsung,i2c-max-bus-freq = <400000>; - pinctrl-0 = <&i2c3_bus>; - pinctrl-names = "default"; - status = "okay"; - - mms114-touchscreen@48 { - compatible = "melfas,mms114"; - reg = <0x48>; - interrupt-parent = <&gpx0>; - interrupts = <4 2>; - x-size = <720>; - y-size = <1280>; - avdd-supply = <&tsp_reg>; - vdd-supply = <&tsp_reg>; - }; - }; - i2c@138B0000 { samsung,i2c-sda-delay = <100>; samsung,i2c-slave-addr = <0x10>; samsung,i2c-max-bus-freq = <100000>; - pinctrl-0 = <&i2c5_bus>; - pinctrl-names = "default"; + gpios = <&gpb 6 3 3 0>, + <&gpb 7 3 3 0>; status = "okay"; max8997_pmic@66 { @@ -146,9 +93,9 @@ max8997,pmic-ignore-gpiodvs-side-effect; max8997,pmic-buck125-default-dvs-idx = <0>; - max8997,pmic-buck125-dvs-gpios = <&gpx0 5 0>, - <&gpx0 6 0>, - <&gpl0 0 0>; + max8997,pmic-buck125-dvs-gpios = <&gpx0 5 1 0 0>, + <&gpx0 6 1 0 0>, + <&gpl0 0 1 0 0>; max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>, <1250000>, <1200000>, diff --git a/trunk/arch/arm/boot/dts/exynos4210.dtsi b/trunk/arch/arm/boot/dts/exynos4210.dtsi index e31bfc4a6f09..d877dbe7ac0e 100644 --- a/trunk/arch/arm/boot/dts/exynos4210.dtsi +++ b/trunk/arch/arm/boot/dts/exynos4210.dtsi @@ -31,11 +31,6 @@ pinctrl2 = &pinctrl_2; }; - pd_lcd1: lcd1-power-domain@10023CA0 { - compatible = "samsung,exynos4210-pd"; - reg = <0x10023CA0 0x20>; - }; - gic:interrupt-controller@10490000 { cpu-offset = <0x8000>; }; @@ -69,11 +64,4 @@ compatible = "samsung,pinctrl-exynos4210"; reg = <0x03860000 0x1000>; }; - - tmu@100C0000 { - compatible = "samsung,exynos4210-tmu"; - interrupt-parent = <&combiner>; - reg = <0x100C0000 0x100>; - interrupts = <2 4>; - }; }; diff --git a/trunk/arch/arm/boot/dts/exynos4212.dtsi b/trunk/arch/arm/boot/dts/exynos4212.dtsi deleted file mode 100644 index c6ae2005961f..000000000000 --- a/trunk/arch/arm/boot/dts/exynos4212.dtsi +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Samsung's Exynos4212 SoC device tree source - * - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Samsung's Exynos4212 SoC device nodes are listed in this file. Exynos4212 - * based board files can include this file and provide values for board specfic - * bindings. - * - * Note: This file does not include device nodes for all the controllers in - * Exynos4212 SoC. As device tree coverage for Exynos4212 increases, additional - * nodes can be added to this file. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/include/ "exynos4x12.dtsi" - -/ { - compatible = "samsung,exynos4212"; - - gic:interrupt-controller@10490000 { - cpu-offset = <0x8000>; - }; -}; diff --git a/trunk/arch/arm/boot/dts/exynos4412-smdk4412.dts b/trunk/arch/arm/boot/dts/exynos4412-smdk4412.dts deleted file mode 100644 index f05bf575cc45..000000000000 --- a/trunk/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Samsung's Exynos4412 based SMDK board device tree source - * - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Device tree source file for Samsung's SMDK4412 board which is based on - * Samsung's Exynos4412 SoC. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/dts-v1/; -/include/ "exynos4412.dtsi" - -/ { - model = "Samsung SMDK evaluation board based on Exynos4412"; - compatible = "samsung,smdk4412", "samsung,exynos4412"; - - memory { - reg = <0x40000000 0x40000000>; - }; - - chosen { - bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; - }; - - serial@13800000 { - status = "okay"; - }; - - serial@13810000 { - status = "okay"; - }; - - serial@13820000 { - status = "okay"; - }; - - serial@13830000 { - status = "okay"; - }; -}; diff --git a/trunk/arch/arm/boot/dts/exynos4412.dtsi b/trunk/arch/arm/boot/dts/exynos4412.dtsi deleted file mode 100644 index d7dfe312772a..000000000000 --- a/trunk/arch/arm/boot/dts/exynos4412.dtsi +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Samsung's Exynos4412 SoC device tree source - * - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Samsung's Exynos4412 SoC device nodes are listed in this file. Exynos4412 - * based board files can include this file and provide values for board specfic - * bindings. - * - * Note: This file does not include device nodes for all the controllers in - * Exynos4412 SoC. As device tree coverage for Exynos4412 increases, additional - * nodes can be added to this file. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/include/ "exynos4x12.dtsi" - -/ { - compatible = "samsung,exynos4412"; - - gic:interrupt-controller@10490000 { - cpu-offset = <0x4000>; - }; -}; diff --git a/trunk/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/trunk/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi deleted file mode 100644 index 8e6115adcd97..000000000000 --- a/trunk/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi +++ /dev/null @@ -1,965 +0,0 @@ -/* - * Samsung's Exynos4x12 SoCs pin-mux and pin-config device tree source - * - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Samsung's Exynos4x12 SoCs pin-mux and pin-config optiosn are listed as device - * tree nodes are listed in this file. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/ { - pinctrl@11400000 { - gpa0: gpa0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpa1: gpa1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpb: gpb { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpc0: gpc0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpc1: gpc1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpd0: gpd0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpd1: gpd1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpf0: gpf0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpf1: gpf1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpf2: gpf2 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpf3: gpf3 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpj0: gpj0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpj1: gpj1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - uart0_data: uart0-data { - samsung,pins = "gpa0-0", "gpa0-1"; - samsung,pin-function = <0x2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - uart0_fctl: uart0-fctl { - samsung,pins = "gpa0-2", "gpa0-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - uart1_data: uart1-data { - samsung,pins = "gpa0-4", "gpa0-5"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - uart1_fctl: uart1-fctl { - samsung,pins = "gpa0-6", "gpa0-7"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2c2_bus: i2c2-bus { - samsung,pins = "gpa0-6", "gpa0-7"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - uart2_data: uart2-data { - samsung,pins = "gpa1-0", "gpa1-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - uart2_fctl: uart2-fctl { - samsung,pins = "gpa1-2", "gpa1-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - uart_audio_a: uart-audio-a { - samsung,pins = "gpa1-0", "gpa1-1"; - samsung,pin-function = <4>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2c3_bus: i2c3-bus { - samsung,pins = "gpa1-2", "gpa1-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - uart3_data: uart3-data { - samsung,pins = "gpa1-4", "gpa1-5"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - uart_audio_b: uart-audio-b { - samsung,pins = "gpa1-4", "gpa1-5"; - samsung,pin-function = <4>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - spi0_bus: spi0-bus { - samsung,pins = "gpb-0", "gpb-2", "gpb-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - i2c4_bus: i2c4-bus { - samsung,pins = "gpb-0", "gpb-1"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - spi1_bus: spi1-bus { - samsung,pins = "gpb-4", "gpb-6", "gpb-7"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - i2c5_bus: i2c5-bus { - samsung,pins = "gpb-2", "gpb-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - i2s1_bus: i2s1-bus { - samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3", - "gpc0-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - pcm1_bus: pcm1-bus { - samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3", - "gpc0-4"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - ac97_bus: ac97-bus { - samsung,pins = "gpc0-0", "gpc0-1", "gpc0-2", "gpc0-3", - "gpc0-4"; - samsung,pin-function = <4>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2s2_bus: i2s2-bus { - samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3", - "gpc1-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - pcm2_bus: pcm2-bus { - samsung,pins = "gpc1-0", "gpc1-1", "gpc1-2", "gpc1-3", - "gpc1-4"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - spdif_bus: spdif-bus { - samsung,pins = "gpc1-0", "gpc1-1"; - samsung,pin-function = <4>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2c6_bus: i2c6-bus { - samsung,pins = "gpc1-3", "gpc1-4"; - samsung,pin-function = <4>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - spi2_bus: spi2-bus { - samsung,pins = "gpc1-1", "gpc1-3", "gpc1-4"; - samsung,pin-function = <5>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - pwm0_out: pwm0-out { - samsung,pins = "gpd0-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - pwm1_out: pwm1-out { - samsung,pins = "gpd0-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - lcd_ctrl: lcd-ctrl { - samsung,pins = "gpd0-0", "gpd0-1"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2c7_bus: i2c7-bus { - samsung,pins = "gpd0-2", "gpd0-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - pwm2_out: pwm2-out { - samsung,pins = "gpd0-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - pwm3_out: pwm3-out { - samsung,pins = "gpd0-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2c0_bus: i2c0-bus { - samsung,pins = "gpd1-0", "gpd1-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - mipi0_clk: mipi0-clk { - samsung,pins = "gpd1-0", "gpd1-1"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - i2c1_bus: i2c1-bus { - samsung,pins = "gpd1-2", "gpd1-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - mipi1_clk: mipi1-clk { - samsung,pins = "gpd1-2", "gpd1-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - lcd_clk: lcd-clk { - samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - lcd_data16: lcd-data-width16 { - samsung,pins = "gpf0-7", "gpf1-0", "gpf1-1", "gpf1-2", - "gpf1-3", "gpf1-6", "gpf1-7", "gpf2-0", - "gpf2-1", "gpf2-2", "gpf2-3", "gpf2-7", - "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - lcd_data18: lcd-data-width18 { - samsung,pins = "gpf0-6", "gpf0-7", "gpf1-0", "gpf1-1", - "gpf1-2", "gpf1-3", "gpf1-6", "gpf1-7", - "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3", - "gpf2-6", "gpf2-7", "gpf3-0", "gpf3-1", - "gpf3-2", "gpf3-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - lcd_data24: lcd-data-width24 { - samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7", - "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3", - "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7", - "gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3", - "gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7", - "gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - lcd_ldi: lcd-ldi { - samsung,pins = "gpf3-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - cam_port_a: cam-port-a { - samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3", - "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7", - "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-3", - "gpj1-4"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - }; - - pinctrl@11000000 { - gpk0: gpk0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpk1: gpk1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpk2: gpk2 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpk3: gpk3 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpl0: gpl0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpl1: gpl1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpl2: gpl2 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpm0: gpm0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpm1: gpm1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpm2: gpm2 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpm3: gpm3 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpm4: gpm4 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpy0: gpy0 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpy1: gpy1 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpy2: gpy2 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpy3: gpy3 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpy4: gpy4 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpy5: gpy5 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpy6: gpy6 { - gpio-controller; - #gpio-cells = <2>; - }; - - gpx0: gpx0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - interrupt-parent = <&gic>; - interrupts = <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>, - <0 20 0>, <0 21 0>, <0 22 0>, <0 23 0>; - #interrupt-cells = <2>; - }; - - gpx1: gpx1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - interrupt-parent = <&gic>; - interrupts = <0 24 0>, <0 25 0>, <0 26 0>, <0 27 0>, - <0 28 0>, <0 29 0>, <0 30 0>, <0 31 0>; - #interrupt-cells = <2>; - }; - - gpx2: gpx2 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpx3: gpx3 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - sd0_clk: sd0-clk { - samsung,pins = "gpk0-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd0_cmd: sd0-cmd { - samsung,pins = "gpk0-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd0_cd: sd0-cd { - samsung,pins = "gpk0-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd0_bus1: sd0-bus-width1 { - samsung,pins = "gpk0-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd0_bus4: sd0-bus-width4 { - samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd0_bus8: sd0-bus-width8 { - samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd4_clk: sd4-clk { - samsung,pins = "gpk0-0"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd4_cmd: sd4-cmd { - samsung,pins = "gpk0-1"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd4_cd: sd4-cd { - samsung,pins = "gpk0-2"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd4_bus1: sd4-bus-width1 { - samsung,pins = "gpk0-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd4_bus4: sd4-bus-width4 { - samsung,pins = "gpk0-3", "gpk0-4", "gpk0-5", "gpk0-6"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd4_bus8: sd4-bus-width8 { - samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; - samsung,pin-function = <3>; - samsung,pin-pud = <4>; - samsung,pin-drv = <3>; - }; - - sd1_clk: sd1-clk { - samsung,pins = "gpk1-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd1_cmd: sd1-cmd { - samsung,pins = "gpk1-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd1_cd: sd1-cd { - samsung,pins = "gpk1-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd1_bus1: sd1-bus-width1 { - samsung,pins = "gpk1-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd1_bus4: sd1-bus-width4 { - samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd2_clk: sd2-clk { - samsung,pins = "gpk2-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd2_cmd: sd2-cmd { - samsung,pins = "gpk2-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd2_cd: sd2-cd { - samsung,pins = "gpk2-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd2_bus1: sd2-bus-width1 { - samsung,pins = "gpk2-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd2_bus4: sd2-bus-width4 { - samsung,pins = "gpk2-3", "gpk2-4", "gpk2-5", "gpk2-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd2_bus8: sd2-bus-width8 { - samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd3_clk: sd3-clk { - samsung,pins = "gpk3-0"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd3_cmd: sd3-cmd { - samsung,pins = "gpk3-1"; - samsung,pin-function = <2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <3>; - }; - - sd3_cd: sd3-cd { - samsung,pins = "gpk3-2"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd3_bus1: sd3-bus-width1 { - samsung,pins = "gpk3-3"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - sd3_bus4: sd3-bus-width4 { - samsung,pins = "gpk3-3", "gpk3-4", "gpk3-5", "gpk3-6"; - samsung,pin-function = <2>; - samsung,pin-pud = <3>; - samsung,pin-drv = <3>; - }; - - keypad_col0: keypad-col0 { - samsung,pins = "gpl2-0"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col1: keypad-col1 { - samsung,pins = "gpl2-1"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col2: keypad-col2 { - samsung,pins = "gpl2-2"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col3: keypad-col3 { - samsung,pins = "gpl2-3"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col4: keypad-col4 { - samsung,pins = "gpl2-4"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col5: keypad-col5 { - samsung,pins = "gpl2-5"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col6: keypad-col6 { - samsung,pins = "gpl2-6"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - keypad_col7: keypad-col7 { - samsung,pins = "gpl2-7"; - samsung,pin-function = <3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - cam_port_b: cam-port-b { - samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3", - "gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7", - "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1", - "gpm2-2"; - samsung,pin-function = <3>; - samsung,pin-pud = <3>; - samsung,pin-drv = <0>; - }; - - eint0: ext-int0 { - samsung,pins = "gpx0-0"; - samsung,pin-function = <0xf>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - eint8: ext-int8 { - samsung,pins = "gpx1-0"; - samsung,pin-function = <0xf>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - eint15: ext-int15 { - samsung,pins = "gpx1-7"; - samsung,pin-function = <0xf>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - eint16: ext-int16 { - samsung,pins = "gpx2-0"; - samsung,pin-function = <0xf>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - eint31: ext-int31 { - samsung,pins = "gpx3-7"; - samsung,pin-function = <0xf>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - }; - - pinctrl@03860000 { - gpz: gpz { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - i2s0_bus: i2s0-bus { - samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3", - "gpz-4", "gpz-5", "gpz-6"; - samsung,pin-function = <0x2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - - pcm0_bus: pcm0-bus { - samsung,pins = "gpz-0", "gpz-1", "gpz-2", "gpz-3", - "gpz-4"; - samsung,pin-function = <0x3>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - }; - - pinctrl@106E0000 { - gpv0: gpv0 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpv1: gpv1 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpv2: gpv2 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpv3: gpv3 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpv4: gpv4 { - gpio-controller; - #gpio-cells = <2>; - - interrupt-controller; - #interrupt-cells = <2>; - }; - - c2c_bus: c2c-bus { - samsung,pins = "gpv0-0", "gpv0-1", "gpv0-2", "gpv0-3", - "gpv0-4", "gpv0-5", "gpv0-6", "gpv0-7", - "gpv1-0", "gpv1-1", "gpv1-2", "gpv1-3", - "gpv1-4", "gpv1-5", "gpv1-6", "gpv1-7", - "gpv2-0", "gpv2-1", "gpv2-2", "gpv2-3", - "gpv2-4", "gpv2-5", "gpv2-6", "gpv2-7", - "gpv3-0", "gpv3-1", "gpv3-2", "gpv3-3", - "gpv3-4", "gpv3-5", "gpv3-6", "gpv3-7", - "gpv4-0", "gpv4-1"; - samsung,pin-function = <0x2>; - samsung,pin-pud = <0>; - samsung,pin-drv = <0>; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/exynos4x12.dtsi b/trunk/arch/arm/boot/dts/exynos4x12.dtsi deleted file mode 100644 index 179a62e46c9d..000000000000 --- a/trunk/arch/arm/boot/dts/exynos4x12.dtsi +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Samsung's Exynos4x12 SoCs device tree source - * - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * Samsung's Exynos4x12 SoCs device nodes are listed in this file. Exynos4x12 - * based board files can include this file and provide values for board specfic - * bindings. - * - * Note: This file does not include device nodes for all the controllers in - * Exynos4x12 SoC. As device tree coverage for Exynos4x12 increases, additional - * nodes can be added to this file. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/include/ "exynos4.dtsi" -/include/ "exynos4x12-pinctrl.dtsi" - -/ { - aliases { - pinctrl0 = &pinctrl_0; - pinctrl1 = &pinctrl_1; - pinctrl2 = &pinctrl_2; - pinctrl3 = &pinctrl_3; - }; - - combiner:interrupt-controller@10440000 { - interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, - <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, - <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, - <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, - <0 16 0>, <0 17 0>, <0 18 0>, <0 19 0>; - }; - - pinctrl_0: pinctrl@11400000 { - compatible = "samsung,pinctrl-exynos4x12"; - reg = <0x11400000 0x1000>; - interrupts = <0 47 0>; - }; - - pinctrl_1: pinctrl@11000000 { - compatible = "samsung,pinctrl-exynos4x12"; - reg = <0x11000000 0x1000>; - interrupts = <0 46 0>; - - wakup_eint: wakeup-interrupt-controller { - compatible = "samsung,exynos4210-wakeup-eint"; - interrupt-parent = <&gic>; - interrupts = <0 32 0>; - }; - }; - - pinctrl_2: pinctrl@03860000 { - compatible = "samsung,pinctrl-exynos4x12"; - reg = <0x03860000 0x1000>; - interrupt-parent = <&combiner>; - interrupts = <10 0>; - }; - - pinctrl_3: pinctrl@106E0000 { - compatible = "samsung,pinctrl-exynos4x12"; - reg = <0x106E0000 0x1000>; - interrupts = <0 72 0>; - }; -}; diff --git a/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts b/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts index 942d5761ca97..a352df403b7a 100644 --- a/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/trunk/arch/arm/boot/dts/exynos5250-smdk5250.dts @@ -17,6 +17,10 @@ compatible = "samsung,smdk5250", "samsung,exynos5250"; aliases { + mshc0 = &dwmmc_0; + mshc1 = &dwmmc_1; + mshc2 = &dwmmc_2; + mshc3 = &dwmmc_3; }; memory { @@ -51,31 +55,8 @@ }; }; - i2c@121D0000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <40000>; - samsung,i2c-slave-addr = <0x38>; - - sata-phy { - compatible = "samsung,sata-phy"; - reg = <0x38>; - }; - }; - - sata@122F0000 { - samsung,sata-freq = <66>; - }; - i2c@12C80000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - gpios = <&gpa0 6 3 3 0>, - <&gpa0 7 3 3 0>; - - hdmiddc@50 { - compatible = "samsung,exynos5-hdmiddc"; - reg = <0x50>; - }; + status = "disabled"; }; i2c@12C90000 { @@ -98,17 +79,7 @@ status = "disabled"; }; - i2c@12CE0000 { - samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <66000>; - - hdmiphy@38 { - compatible = "samsung,exynos5-hdmiphy"; - reg = <0x38>; - }; - }; - - dwmmc0@12200000 { + dwmmc_0: dwmmc0@12200000 { num-slots = <1>; supports-highspeed; broken-cd; @@ -129,11 +100,11 @@ }; }; - dwmmc1@12210000 { + dwmmc_1: dwmmc1@12210000 { status = "disabled"; }; - dwmmc2@12220000 { + dwmmc_2: dwmmc2@12220000 { num-slots = <1>; supports-highspeed; fifo-depth = <0x80>; @@ -154,7 +125,7 @@ }; }; - dwmmc3@12230000 { + dwmmc_3: dwmmc3@12230000 { status = "disabled"; }; @@ -195,13 +166,4 @@ spi_2: spi@12d40000 { status = "disabled"; }; - - hdmi { - hpd-gpio = <&gpx3 7 0xf 1 3>; - }; - - codec@11000000 { - samsung,mfc-r = <0x43000000 0x800000>; - samsung,mfc-l = <0x51000000 0x800000>; - }; }; diff --git a/trunk/arch/arm/boot/dts/exynos5250-snow.dts b/trunk/arch/arm/boot/dts/exynos5250-snow.dts deleted file mode 100644 index 17dd951c1cd2..000000000000 --- a/trunk/arch/arm/boot/dts/exynos5250-snow.dts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Google Snow board device tree source - * - * Copyright (c) 2012 Google, Inc - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -/dts-v1/; -/include/ "exynos5250.dtsi" -/include/ "cros5250-common.dtsi" - -/ { - model = "Google Snow"; - compatible = "google,snow", "samsung,exynos5250"; - - gpio-keys { - compatible = "gpio-keys"; - - lid-switch { - label = "Lid"; - gpios = <&gpx3 5 0 0x10000 0>; - linux,input-type = <5>; /* EV_SW */ - linux,code = <0>; /* SW_LID */ - debounce-interval = <1>; - gpio-key,wakeup; - }; - }; - - /* - * On Snow we've got SIP WiFi and so can keep drive strengths low to - * reduce EMI. - */ - dwmmc3@12230000 { - slot@0 { - gpios = <&gpc4 0 2 0 0>, <&gpc4 1 2 3 0>, - <&gpc4 3 2 3 0>, <&gpc4 4 2 3 0>, - <&gpc4 5 2 3 0>, <&gpc4 6 2 3 0>; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/exynos5250.dtsi b/trunk/arch/arm/boot/dts/exynos5250.dtsi index 36d8246ea50e..dddfd6e444dc 100644 --- a/trunk/arch/arm/boot/dts/exynos5250.dtsi +++ b/trunk/arch/arm/boot/dts/exynos5250.dtsi @@ -31,10 +31,6 @@ gsc1 = &gsc_1; gsc2 = &gsc_2; gsc3 = &gsc_3; - mshc0 = &dwmmc_0; - mshc1 = &dwmmc_1; - mshc2 = &dwmmc_2; - mshc3 = &dwmmc_3; }; gic:interrupt-controller@10481000 { @@ -66,24 +62,12 @@ interrupts = <0 42 0>; }; - codec@11000000 { - compatible = "samsung,mfc-v6"; - reg = <0x11000000 0x10000>; - interrupts = <0 96 0>; - }; - rtc { compatible = "samsung,s3c6410-rtc"; reg = <0x101E0000 0x100>; interrupts = <0 43 0>, <0 44 0>; }; - tmu@10060000 { - compatible = "samsung,exynos5250-tmu"; - reg = <0x10060000 0x100>; - interrupts = <0 65 0>; - }; - serial@12C00000 { compatible = "samsung,exynos4210-uart"; reg = <0x12C00000 0x100>; @@ -108,17 +92,6 @@ interrupts = <0 54 0>; }; - sata@122F0000 { - compatible = "samsung,exynos5-sata-ahci"; - reg = <0x122F0000 0x1ff>; - interrupts = <0 115 0>; - }; - - sata-phy@12170000 { - compatible = "samsung,exynos5-sata-phy"; - reg = <0x12170000 0x1ff>; - }; - i2c@12C60000 { compatible = "samsung,s3c2440-i2c"; reg = <0x12C60000 0x100>; @@ -183,21 +156,6 @@ #size-cells = <0>; }; - i2c@12CE0000 { - compatible = "samsung,s3c2440-hdmiphy-i2c"; - reg = <0x12CE0000 0x1000>; - interrupts = <0 64 0>; - #address-cells = <1>; - #size-cells = <0>; - }; - - i2c@121D0000 { - compatible = "samsung,exynos5-sata-phy-i2c"; - reg = <0x121D0000 0x100>; - #address-cells = <1>; - #size-cells = <0>; - }; - spi_0: spi@12d20000 { compatible = "samsung,exynos4210-spi"; reg = <0x12d20000 0x100>; @@ -228,7 +186,7 @@ #size-cells = <0>; }; - dwmmc_0: dwmmc0@12200000 { + dwmmc0@12200000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12200000 0x1000>; interrupts = <0 75 0>; @@ -236,7 +194,7 @@ #size-cells = <0>; }; - dwmmc_1: dwmmc1@12210000 { + dwmmc1@12210000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12210000 0x1000>; interrupts = <0 76 0>; @@ -244,7 +202,7 @@ #size-cells = <0>; }; - dwmmc_2: dwmmc2@12220000 { + dwmmc2@12220000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12220000 0x1000>; interrupts = <0 77 0>; @@ -252,7 +210,7 @@ #size-cells = <0>; }; - dwmmc_3: dwmmc3@12230000 { + dwmmc3@12230000 { compatible = "samsung,exynos5250-dw-mshc"; reg = <0x12230000 0x1000>; interrupts = <0 78 0>; @@ -562,16 +520,4 @@ reg = <0x13e30000 0x1000>; interrupts = <0 88 0>; }; - - hdmi { - compatible = "samsung,exynos5-hdmi"; - reg = <0x14530000 0x100000>; - interrupts = <0 95 0>; - }; - - mixer { - compatible = "samsung,exynos5-mixer"; - reg = <0x14450000 0x10000>; - interrupts = <0 94 0>; - }; }; diff --git a/trunk/arch/arm/boot/dts/href.dtsi b/trunk/arch/arm/boot/dts/href.dtsi deleted file mode 100644 index 592fb9dc35bd..000000000000 --- a/trunk/arch/arm/boot/dts/href.dtsi +++ /dev/null @@ -1,273 +0,0 @@ -/* - * Copyright 2012 ST-Ericsson AB - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/include/ "dbx5x0.dtsi" - -/ { - memory { - reg = <0x00000000 0x20000000>; - }; - - gpio_keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - - button@1 { - linux,code = <11>; - label = "SFH7741 Proximity Sensor"; - }; - }; - - soc-u9500 { - uart@80120000 { - status = "okay"; - }; - - uart@80121000 { - status = "okay"; - }; - - uart@80007000 { - status = "okay"; - }; - - i2c@80004000 { - tc3589x@42 { - compatible = "tc3589x"; - reg = <0x42>; - interrupt-parent = <&gpio6>; - interrupts = <25 0x1>; - - interrupt-controller; - #interrupt-cells = <2>; - - tc3589x_gpio: tc3589x_gpio { - compatible = "tc3589x-gpio"; - interrupts = <0 0x1>; - - interrupt-controller; - #interrupt-cells = <2>; - gpio-controller; - #gpio-cells = <2>; - }; - }; - }; - - i2c@80128000 { - lp5521@0x33 { - compatible = "lp5521"; - reg = <0x33>; - }; - - lp5521@0x34 { - compatible = "lp5521"; - reg = <0x34>; - }; - - bh1780@0x29 { - compatible = "rohm,bh1780gli"; - reg = <0x33>; - }; - }; - - // External Micro SD slot - sdi0_per1@80126000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - - cd-gpios = <&tc3589x_gpio 3 0x4>; - - status = "okay"; - }; - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - - status = "okay"; - }; - - // PoP:ed eMMC - sdi2_per3@80005000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - - status = "okay"; - }; - - // On-board eMMC - sdi4_per2@80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - - status = "okay"; - }; - - sound { - compatible = "stericsson,snd-soc-mop500"; - - stericsson,cpu-dai = <&msp1 &msp3>; - stericsson,audio-codec = <&codec>; - }; - - msp1: msp@80124000 { - status = "okay"; - }; - - msp3: msp@80125000 { - status = "okay"; - }; - - prcmu@80157000 { - db8500-prcmu-regulators { - db8500_vape_reg: db8500_vape { - regulator-name = "db8500-vape"; - }; - - db8500_varm_reg: db8500_varm { - regulator-name = "db8500-varm"; - }; - - db8500_vmodem_reg: db8500_vmodem { - regulator-name = "db8500-vmodem"; - }; - - db8500_vpll_reg: db8500_vpll { - regulator-name = "db8500-vpll"; - }; - - db8500_vsmps1_reg: db8500_vsmps1 { - regulator-name = "db8500-vsmps1"; - }; - - db8500_vsmps2_reg: db8500_vsmps2 { - regulator-name = "db8500-vsmps2"; - }; - - db8500_vsmps3_reg: db8500_vsmps3 { - regulator-name = "db8500-vsmps3"; - }; - - db8500_vrf1_reg: db8500_vrf1 { - regulator-name = "db8500-vrf1"; - }; - - db8500_sva_mmdsp_reg: db8500_sva_mmdsp { - regulator-name = "db8500-sva-mmdsp"; - }; - - db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret { - regulator-name = "db8500-sva-mmdsp-ret"; - }; - - db8500_sva_pipe_reg: db8500_sva_pipe { - regulator-name = "db8500_sva_pipe"; - }; - - db8500_sia_mmdsp_reg: db8500_sia_mmdsp { - regulator-name = "db8500_sia_mmdsp"; - }; - - db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret { - regulator-name = "db8500-sia-mmdsp-ret"; - }; - - db8500_sia_pipe_reg: db8500_sia_pipe { - regulator-name = "db8500-sia-pipe"; - }; - - db8500_sga_reg: db8500_sga { - regulator-name = "db8500-sga"; - }; - - db8500_b2r2_mcde_reg: db8500_b2r2_mcde { - regulator-name = "db8500-b2r2-mcde"; - }; - - db8500_esram12_reg: db8500_esram12 { - regulator-name = "db8500-esram12"; - }; - - db8500_esram12_ret_reg: db8500_esram12_ret { - regulator-name = "db8500-esram12-ret"; - }; - - db8500_esram34_reg: db8500_esram34 { - regulator-name = "db8500-esram34"; - }; - - db8500_esram34_ret_reg: db8500_esram34_ret { - regulator-name = "db8500-esram34-ret"; - }; - }; - - ab8500@5 { - ab8500-regulators { - ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { - regulator-name = "V-DISPLAY"; - }; - - ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { - regulator-name = "V-eMMC1"; - }; - - ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { - regulator-name = "V-MMC-SD"; - }; - - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { - regulator-name = "V-INTCORE"; - }; - - ab8500_ldo_tvout_reg: ab8500_ldo_tvout { - regulator-name = "V-TVOUT"; - }; - - ab8500_ldo_usb_reg: ab8500_ldo_usb { - regulator-name = "dummy"; - }; - - ab8500_ldo_audio_reg: ab8500_ldo_audio { - regulator-name = "V-AUD"; - }; - - ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { - regulator-name = "V-AMIC1"; - }; - - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { - regulator-name = "V-AMIC2"; - }; - - ab8500_ldo_dmic_reg: ab8500_ldo_dmic { - regulator-name = "V-DMIC"; - }; - - ab8500_ldo_ana_reg: ab8500_ldo_ana { - regulator-name = "V-CSI/DSI"; - }; - }; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/hrefprev60.dts b/trunk/arch/arm/boot/dts/hrefprev60.dts deleted file mode 100644 index eec29c4a86dc..000000000000 --- a/trunk/arch/arm/boot/dts/hrefprev60.dts +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2012 ST-Ericsson AB - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "dbx5x0.dtsi" -/include/ "href.dtsi" -/include/ "stuib.dtsi" - -/ { - model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; - compatible = "st-ericsson,mop500", "st-ericsson,u8500"; - - gpio_keys { - button@1 { - gpios = <&tc3589x_gpio 7 0x4>; - }; - }; - - soc-u9500 { - i2c@80004000 { - tps61052@33 { - compatible = "tps61052"; - reg = <0x33>; - }; - }; - - i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&tc3589x_gpio 13 0x4>; - }; - }; - - vmmci: regulator-gpio { - gpios = <&tc3589x_gpio 18 0x4>; - gpio-enable = <&tc3589x_gpio 17 0x4>; - - status = "okay"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/hrefv60plus.dts b/trunk/arch/arm/boot/dts/hrefv60plus.dts index 55f4191a626e..2131d77dc9c9 100644 --- a/trunk/arch/arm/boot/dts/hrefv60plus.dts +++ b/trunk/arch/arm/boot/dts/hrefv60plus.dts @@ -11,200 +11,85 @@ /dts-v1/; /include/ "dbx5x0.dtsi" -/include/ "href.dtsi" -/include/ "stuib.dtsi" / { - model = "ST-Ericsson HREF (v60+) platform with Device Tree"; - compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500"; + model = "ST-Ericsson HREF platform with Device Tree"; + compatible = "st-ericsson,hrefv60+"; - gpio_keys { - button@1 { - gpios = <&gpio6 25 0x4>; - }; + memory { + reg = <0x00000000 0x20000000>; }; soc-u9500 { - i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&gpio4 15 0x4>; - }; - }; - - // External Micro SD slot - sdi0_per1@80126000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - - cd-gpios = <&tc3589x_gpio 3 0x4>; - - status = "okay"; - }; - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - + uart@80120000 { status = "okay"; }; - // PoP:ed eMMC - sdi2_per3@80005000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - + uart@80121000 { status = "okay"; }; - // On-board eMMC - sdi4_per2@80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - + uart@80007000 { status = "okay"; }; - prcmu@80157000 { - db8500-prcmu-regulators { - db8500_vape_reg: db8500_vape { - regulator-name = "db8500-vape"; - }; - - db8500_varm_reg: db8500_varm { - regulator-name = "db8500-varm"; - }; - - db8500_vmodem_reg: db8500_vmodem { - regulator-name = "db8500-vmodem"; - }; - - db8500_vpll_reg: db8500_vpll { - regulator-name = "db8500-vpll"; - }; - - db8500_vsmps1_reg: db8500_vsmps1 { - regulator-name = "db8500-vsmps1"; - }; - - db8500_vsmps2_reg: db8500_vsmps2 { - regulator-name = "db8500-vsmps2"; - }; - - db8500_vsmps3_reg: db8500_vsmps3 { - regulator-name = "db8500-vsmps3"; - }; - - db8500_vrf1_reg: db8500_vrf1 { - regulator-name = "db8500-vrf1"; - }; - - db8500_sva_mmdsp_reg: db8500_sva_mmdsp { - regulator-name = "db8500-sva-mmdsp"; - }; - - db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret { - regulator-name = "db8500-sva-mmdsp-ret"; - }; - - db8500_sva_pipe_reg: db8500_sva_pipe { - regulator-name = "db8500_sva_pipe"; - }; - - db8500_sia_mmdsp_reg: db8500_sia_mmdsp { - regulator-name = "db8500_sia_mmdsp"; - }; - - db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret { - regulator-name = "db8500-sia-mmdsp-ret"; - }; - - db8500_sia_pipe_reg: db8500_sia_pipe { - regulator-name = "db8500-sia-pipe"; - }; - - db8500_sga_reg: db8500_sga { - regulator-name = "db8500-sga"; - }; - - db8500_b2r2_mcde_reg: db8500_b2r2_mcde { - regulator-name = "db8500-b2r2-mcde"; - }; - - db8500_esram12_reg: db8500_esram12 { - regulator-name = "db8500-esram12"; - }; + i2c@80004000 { + tc3589x@42 { + compatible = "tc3589x"; + reg = <0x42>; + interrupt-parent = <&gpio6>; + interrupts = <25 0x1>; - db8500_esram12_ret_reg: db8500_esram12_ret { - regulator-name = "db8500-esram12-ret"; - }; + interrupt-controller; + #interrupt-cells = <2>; - db8500_esram34_reg: db8500_esram34 { - regulator-name = "db8500-esram34"; - }; + tc3589x_gpio: tc3589x_gpio { + compatible = "tc3589x-gpio"; + interrupts = <0 0x1>; - db8500_esram34_ret_reg: db8500_esram34_ret { - regulator-name = "db8500-esram34-ret"; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; }; }; - ab8500@5 { - ab8500-regulators { - ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { - regulator-name = "V-DISPLAY"; - }; - - ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { - regulator-name = "V-eMMC1"; - }; - - ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { - regulator-name = "V-MMC-SD"; - }; - - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { - regulator-name = "V-INTCORE"; - }; + tps61052@33 { + compatible = "tps61052"; + reg = <0x33>; + }; + }; - ab8500_ldo_tvout_reg: ab8500_ldo_tvout { - regulator-name = "V-TVOUT"; - }; + i2c@80128000 { + lp5521@0x33 { + compatible = "lp5521"; + reg = <0x33>; + }; - ab8500_ldo_usb_reg: ab8500_ldo_usb { - regulator-name = "dummy"; - }; + lp5521@0x34 { + compatible = "lp5521"; + reg = <0x34>; + }; - ab8500_ldo_audio_reg: ab8500_ldo_audio { - regulator-name = "V-AUD"; - }; + bh1780@0x29 { + compatible = "rohm,bh1780gli"; + reg = <0x33>; + }; + }; - ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { - regulator-name = "V-AMIC1"; - }; + sound { + compatible = "stericsson,snd-soc-mop500"; - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { - regulator-name = "V-AMIC2"; - }; + stericsson,cpu-dai = <&msp1 &msp3>; + stericsson,audio-codec = <&codec>; + }; - ab8500_ldo_dmic_reg: ab8500_ldo_dmic { - regulator-name = "V-DMIC"; - }; + msp1: msp@80124000 { + status = "okay"; + }; - ab8500_ldo_ana_reg: ab8500_ldo_ana { - regulator-name = "V-CSI/DSI"; - }; - }; - }; + msp3: msp@80125000 { + status = "okay"; }; }; }; diff --git a/trunk/arch/arm/boot/dts/imx23-olinuxino.dts b/trunk/arch/arm/boot/dts/imx23-olinuxino.dts index 7c43b8e70b9f..384d8b66f337 100644 --- a/trunk/arch/arm/boot/dts/imx23-olinuxino.dts +++ b/trunk/arch/arm/boot/dts/imx23-olinuxino.dts @@ -40,15 +40,6 @@ reg = <0>; fsl,pinmux-ids = < 0x2013 /* MX23_PAD_SSP1_DETECT__GPIO_2_1 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - - led_pin_gpio0_17: led_gpio0_17@0 { - reg = <0>; - fsl,pinmux-ids = < 0x0113 /* MX23_PAD_GPMI_ALE__GPIO_0_17 */ >; fsl,drive-strength = <0>; @@ -56,15 +47,6 @@ fsl,pull-up = <0>; }; }; - - ssp1: ssp@80034000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx23-spi"; - pinctrl-names = "default"; - pinctrl-0 = <&spi2_pins_a>; - status = "okay"; - }; }; apbx@80040000 { @@ -109,12 +91,11 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pin_gpio0_17>; user { label = "green"; - gpios = <&gpio2 1 1>; + gpios = <&gpio2 1 0>; + linux,default-trigger = "default-on"; }; }; }; diff --git a/trunk/arch/arm/boot/dts/imx23.dtsi b/trunk/arch/arm/boot/dts/imx23.dtsi index 65415c598a5e..6d31aa383460 100644 --- a/trunk/arch/arm/boot/dts/imx23.dtsi +++ b/trunk/arch/arm/boot/dts/imx23.dtsi @@ -279,19 +279,6 @@ fsl,voltage = <1>; fsl,pull-up = <0>; }; - - spi2_pins_a: spi2@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x0182 /* MX23_PAD_GPMI_WRN__SSP2_SCK */ - 0x0142 /* MX23_PAD_GPMI_RDY1__SSP2_CMD */ - 0x0002 /* MX23_PAD_GPMI_D00__SSP2_DATA0 */ - 0x0032 /* MX23_PAD_GPMI_D03__SSP2_DATA3 */ - >; - fsl,drive-strength = <1>; - fsl,voltage = <1>; - fsl,pull-up = <1>; - }; }; digctl@8001c000 { diff --git a/trunk/arch/arm/boot/dts/imx25-karo-tx25.dts b/trunk/arch/arm/boot/dts/imx25-karo-tx25.dts deleted file mode 100644 index d81f8a0b9794..000000000000 --- a/trunk/arch/arm/boot/dts/imx25-karo-tx25.dts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2012 Sascha Hauer, Pengutronix - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "imx25.dtsi" - -/ { - model = "Ka-Ro TX25"; - compatible = "karo,imx25-tx25", "fsl,imx25"; - - memory { - reg = <0x80000000 0x02000000 0x90000000 0x02000000>; - }; - - soc { - aips@43f00000 { - uart1: serial@43f90000 { - status = "okay"; - }; - }; - - spba@50000000 { - fec: ethernet@50038000 { - status = "okay"; - phy-mode = "rmii"; - }; - }; - - emi@80000000 { - nand@bb000000 { - nand-on-flash-bbt; - status = "okay"; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx25.dtsi b/trunk/arch/arm/boot/dts/imx25.dtsi deleted file mode 100644 index e1b13ebc96d6..000000000000 --- a/trunk/arch/arm/boot/dts/imx25.dtsi +++ /dev/null @@ -1,515 +0,0 @@ -/* - * Copyright 2012 Sascha Hauer, Pengutronix - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/include/ "skeleton.dtsi" - -/ { - aliases { - serial0 = &uart1; - serial1 = &uart2; - serial2 = &uart3; - serial3 = &uart4; - serial4 = &uart5; - gpio0 = &gpio1; - gpio1 = &gpio2; - gpio2 = &gpio3; - gpio3 = &gpio4; - usb0 = &usbotg; - usb1 = &usbhost1; - }; - - asic: asic-interrupt-controller@68000000 { - compatible = "fsl,imx25-asic", "fsl,avic"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0x68000000 0x8000000>; - }; - - clocks { - #address-cells = <1>; - #size-cells = <0>; - - osc { - compatible = "fsl,imx-osc", "fixed-clock"; - clock-frequency = <24000000>; - }; - }; - - soc { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - interrupt-parent = <&asic>; - ranges; - - aips@43f00000 { /* AIPS1 */ - compatible = "fsl,aips-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x43f00000 0x100000>; - ranges; - - i2c1: i2c@43f80000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx25-i2c", "fsl,imx21-i2c"; - reg = <0x43f80000 0x4000>; - clocks = <&clks 48>; - clock-names = ""; - interrupts = <3>; - status = "disabled"; - }; - - i2c3: i2c@43f84000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx25-i2c", "fsl,imx21-i2c"; - reg = <0x43f84000 0x4000>; - clocks = <&clks 48>; - clock-names = ""; - interrupts = <10>; - status = "disabled"; - }; - - can1: can@43f88000 { - compatible = "fsl,imx25-flexcan", "fsl,p1010-flexcan"; - reg = <0x43f88000 0x4000>; - interrupts = <43>; - clocks = <&clks 75>, <&clks 75>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - can2: can@43f8c000 { - compatible = "fsl,imx25-flexcan", "fsl,p1010-flexcan"; - reg = <0x43f8c000 0x4000>; - interrupts = <44>; - clocks = <&clks 76>, <&clks 76>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - uart1: serial@43f90000 { - compatible = "fsl,imx25-uart", "fsl,imx21-uart"; - reg = <0x43f90000 0x4000>; - interrupts = <45>; - clocks = <&clks 120>, <&clks 57>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - uart2: serial@43f94000 { - compatible = "fsl,imx25-uart", "fsl,imx21-uart"; - reg = <0x43f94000 0x4000>; - interrupts = <32>; - clocks = <&clks 121>, <&clks 57>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - i2c2: i2c@43f98000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx25-i2c", "fsl,imx21-i2c"; - reg = <0x43f98000 0x4000>; - clocks = <&clks 48>; - clock-names = ""; - interrupts = <4>; - status = "disabled"; - }; - - owire@43f9c000 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0x43f9c000 0x4000>; - clocks = <&clks 51>; - clock-names = ""; - interrupts = <2>; - status = "disabled"; - }; - - spi1: cspi@43fa4000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; - reg = <0x43fa4000 0x4000>; - clocks = <&clks 62>; - clock-names = "ipg"; - interrupts = <14>; - status = "disabled"; - }; - - kpp@43fa8000 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0x43fa8000 0x4000>; - clocks = <&clks 102>; - clock-names = ""; - interrupts = <24>; - status = "disabled"; - }; - - iomuxc@43fac000{ - compatible = "fsl,imx25-iomuxc"; - reg = <0x43fac000 0x4000>; - }; - - audmux@43fb0000 { - compatible = "fsl,imx25-audmux", "fsl,imx31-audmux"; - reg = <0x43fb0000 0x4000>; - status = "disabled"; - }; - }; - - spba@50000000 { - compatible = "fsl,spba-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x50000000 0x40000>; - ranges; - - spi3: cspi@50004000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; - reg = <0x50004000 0x4000>; - interrupts = <0>; - clocks = <&clks 80>; - clock-names = "ipg"; - status = "disabled"; - }; - - uart4: serial@50008000 { - compatible = "fsl,imx25-uart", "fsl,imx21-uart"; - reg = <0x50008000 0x4000>; - interrupts = <5>; - clocks = <&clks 123>, <&clks 57>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - uart3: serial@5000c000 { - compatible = "fsl,imx25-uart", "fsl,imx21-uart"; - reg = <0x5000c000 0x4000>; - interrupts = <18>; - clocks = <&clks 122>, <&clks 57>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - spi2: cspi@50010000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; - reg = <0x50010000 0x4000>; - clocks = <&clks 79>; - clock-names = "ipg"; - interrupts = <13>; - status = "disabled"; - }; - - ssi2: ssi@50014000 { - compatible = "fsl,imx25-ssi", "fsl,imx21-ssi"; - reg = <0x50014000 0x4000>; - interrupts = <11>; - status = "disabled"; - }; - - esai@50018000 { - reg = <0x50018000 0x4000>; - interrupts = <7>; - }; - - uart5: serial@5002c000 { - compatible = "fsl,imx25-uart", "fsl,imx21-uart"; - reg = <0x5002c000 0x4000>; - interrupts = <40>; - clocks = <&clks 124>, <&clks 57>; - clock-names = "ipg", "per"; - status = "disabled"; - }; - - tsc: tsc@50030000 { - compatible = "fsl,imx25-adc", "fsl,imx21-tsc"; - reg = <0x50030000 0x4000>; - interrupts = <46>; - clocks = <&clks 119>; - clock-names = "ipg"; - status = "disabled"; - }; - - ssi1: ssi@50034000 { - compatible = "fsl,imx25-ssi", "fsl,imx21-ssi"; - reg = <0x50034000 0x4000>; - interrupts = <12>; - status = "disabled"; - }; - - fec: ethernet@50038000 { - compatible = "fsl,imx25-fec"; - reg = <0x50038000 0x4000>; - interrupts = <57>; - clocks = <&clks 88>, <&clks 65>; - clock-names = "ipg", "ahb"; - status = "disabled"; - }; - }; - - aips@53f00000 { /* AIPS2 */ - compatible = "fsl,aips-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x53f00000 0x100000>; - ranges; - - clks: ccm@53f80000 { - compatible = "fsl,imx25-ccm"; - reg = <0x53f80000 0x4000>; - interrupts = <31>; - #clock-cells = <1>; - }; - - gpt4: timer@53f84000 { - compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; - reg = <0x53f84000 0x4000>; - clocks = <&clks 9>, <&clks 45>; - clock-names = "ipg", "per"; - interrupts = <1>; - }; - - gpt3: timer@53f88000 { - compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; - reg = <0x53f88000 0x4000>; - clocks = <&clks 9>, <&clks 47>; - clock-names = "ipg", "per"; - interrupts = <29>; - }; - - gpt2: timer@53f8c000 { - compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; - reg = <0x53f8c000 0x4000>; - clocks = <&clks 9>, <&clks 47>; - clock-names = "ipg", "per"; - interrupts = <53>; - }; - - gpt1: timer@53f90000 { - compatible = "fsl,imx25-gpt", "fsl,imx31-gpt"; - reg = <0x53f90000 0x4000>; - clocks = <&clks 9>, <&clks 47>; - clock-names = "ipg", "per"; - interrupts = <54>; - }; - - epit1: timer@53f94000 { - compatible = "fsl,imx25-epit"; - reg = <0x53f94000 0x4000>; - interrupts = <28>; - }; - - epit2: timer@53f98000 { - compatible = "fsl,imx25-epit"; - reg = <0x53f98000 0x4000>; - interrupts = <27>; - }; - - gpio4: gpio@53f9c000 { - compatible = "fsl,imx25-gpio", "fsl,imx35-gpio"; - reg = <0x53f9c000 0x4000>; - interrupts = <23>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - pwm2: pwm@53fa0000 { - compatible = "fsl,imx25-pwm", "fsl,imx27-pwm"; - #pwm-cells = <2>; - reg = <0x53fa0000 0x4000>; - clocks = <&clks 106>, <&clks 36>; - clock-names = "ipg", "per"; - interrupts = <36>; - }; - - gpio3: gpio@53fa4000 { - compatible = "fsl,imx25-gpio", "fsl,imx35-gpio"; - reg = <0x53fa4000 0x4000>; - interrupts = <16>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - pwm3: pwm@53fa8000 { - compatible = "fsl,imx25-pwm", "fsl,imx27-pwm"; - #pwm-cells = <2>; - reg = <0x53fa8000 0x4000>; - clocks = <&clks 107>, <&clks 36>; - clock-names = "ipg", "per"; - interrupts = <41>; - }; - - esdhc1: esdhc@53fb4000 { - compatible = "fsl,imx25-esdhc"; - reg = <0x53fb4000 0x4000>; - interrupts = <9>; - clocks = <&clks 86>, <&clks 63>, <&clks 45>; - clock-names = "ipg", "ahb", "per"; - status = "disabled"; - }; - - esdhc2: esdhc@53fb8000 { - compatible = "fsl,imx25-esdhc"; - reg = <0x53fb8000 0x4000>; - interrupts = <8>; - clocks = <&clks 87>, <&clks 64>, <&clks 46>; - clock-names = "ipg", "ahb", "per"; - status = "disabled"; - }; - - lcdc@53fbc000 { - reg = <0x53fbc000 0x4000>; - interrupts = <39>; - clocks = <&clks 103>, <&clks 66>, <&clks 49>; - clock-names = "ipg", "ahb", "per"; - status = "disabled"; - }; - - slcdc@53fc0000 { - reg = <0x53fc0000 0x4000>; - interrupts = <38>; - status = "disabled"; - }; - - pwm4: pwm@53fc8000 { - compatible = "fsl,imx25-pwm", "fsl,imx27-pwm"; - reg = <0x53fc8000 0x4000>; - clocks = <&clks 108>, <&clks 36>; - clock-names = "ipg", "per"; - interrupts = <42>; - }; - - gpio1: gpio@53fcc000 { - compatible = "fsl,imx25-gpio", "fsl,imx35-gpio"; - reg = <0x53fcc000 0x4000>; - interrupts = <52>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - gpio2: gpio@53fd0000 { - compatible = "fsl,imx25-gpio", "fsl,imx35-gpio"; - reg = <0x53fd0000 0x4000>; - interrupts = <51>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - sdma@53fd4000 { - compatible = "fsl,imx25-sdma", "fsl,imx35-sdma"; - reg = <0x53fd4000 0x4000>; - clocks = <&clks 112>, <&clks 68>; - clock-names = "ipg", "ahb"; - interrupts = <34>; - }; - - wdog@53fdc000 { - compatible = "fsl,imx25-wdt", "fsl,imx21-wdt"; - reg = <0x53fdc000 0x4000>; - clocks = <&clks 126>; - clock-names = ""; - interrupts = <55>; - }; - - pwm1: pwm@53fe0000 { - compatible = "fsl,imx25-pwm", "fsl,imx27-pwm"; - #pwm-cells = <2>; - reg = <0x53fe0000 0x4000>; - clocks = <&clks 105>, <&clks 36>; - clock-names = "ipg", "per"; - interrupts = <26>; - }; - - usbphy1: usbphy@1 { - compatible = "nop-usbphy"; - status = "disabled"; - }; - - usbphy2: usbphy@2 { - compatible = "nop-usbphy"; - status = "disabled"; - }; - - usbotg: usb@53ff4000 { - compatible = "fsl,imx25-usb", "fsl,imx27-usb"; - reg = <0x53ff4000 0x0200>; - interrupts = <37>; - clocks = <&clks 9>, <&clks 70>, <&clks 8>; - clock-names = "ipg", "ahb", "per"; - fsl,usbmisc = <&usbmisc 0>; - status = "disabled"; - }; - - usbhost1: usb@53ff4400 { - compatible = "fsl,imx25-usb", "fsl,imx27-usb"; - reg = <0x53ff4400 0x0200>; - interrupts = <35>; - clocks = <&clks 9>, <&clks 70>, <&clks 8>; - clock-names = "ipg", "ahb", "per"; - fsl,usbmisc = <&usbmisc 1>; - status = "disabled"; - }; - - usbmisc: usbmisc@53ff4600 { - #index-cells = <1>; - compatible = "fsl,imx25-usbmisc"; - clocks = <&clks 9>, <&clks 70>, <&clks 8>; - clock-names = "ipg", "ahb", "per"; - reg = <0x53ff4600 0x00f>; - status = "disabled"; - }; - - dryice@53ffc000 { - compatible = "fsl,imx25-dryice", "fsl,imx25-rtc"; - reg = <0x53ffc000 0x4000>; - clocks = <&clks 81>; - clock-names = "ipg"; - interrupts = <25>; - }; - }; - - emi@80000000 { - compatible = "fsl,emi-bus", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - reg = <0x80000000 0x3b002000>; - ranges; - - nand@bb000000 { - #address-cells = <1>; - #size-cells = <1>; - - compatible = "fsl,imx25-nand"; - reg = <0xbb000000 0x2000>; - clocks = <&clks 50>; - clock-names = ""; - interrupts = <33>; - status = "disabled"; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx27-apf27.dts b/trunk/arch/arm/boot/dts/imx27-apf27.dts deleted file mode 100644 index c0327c054de2..000000000000 --- a/trunk/arch/arm/boot/dts/imx27-apf27.dts +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright 2012 Philippe Reynes - * Copyright 2012 Armadeus Systems - * - * Based on code which is: Copyright 2012 Sascha Hauer, Pengutronix - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "imx27.dtsi" - -/ { - model = "Armadeus Systems APF27 module"; - compatible = "armadeus,imx27-apf27", "fsl,imx27"; - - memory { - reg = <0xa0000000 0x04000000>; - }; - - clocks { - #address-cells = <1>; - #size-cells = <0>; - - osc26m { - compatible = "fsl,imx-osc26m", "fixed-clock"; - clock-frequency = <0>; - }; - }; - - soc { - aipi@10000000 { - serial@1000a000 { - status = "okay"; - }; - - ethernet@1002b000 { - status = "okay"; - }; - }; - - nand@d8000000 { - status = "okay"; - nand-bus-width = <16>; - nand-ecc-mode = "hw"; - nand-on-flash-bbt; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x100000>; - }; - - partition@100000 { - label = "env"; - reg = <0x100000 0x80000>; - }; - - partition@180000 { - label = "env2"; - reg = <0x180000 0x80000>; - }; - - partition@200000 { - label = "firmware"; - reg = <0x200000 0x80000>; - }; - - partition@280000 { - label = "dtb"; - reg = <0x280000 0x80000>; - }; - - partition@300000 { - label = "kernel"; - reg = <0x300000 0x500000>; - }; - - partition@800000 { - label = "rootfs"; - reg = <0x800000 0xf800000>; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx27.dtsi b/trunk/arch/arm/boot/dts/imx27.dtsi index b8d3905915ac..67d672792b0d 100644 --- a/trunk/arch/arm/boot/dts/imx27.dtsi +++ b/trunk/arch/arm/boot/dts/imx27.dtsi @@ -58,7 +58,7 @@ reg = <0x10000000 0x10000000>; ranges; - wdog: wdog@10002000 { + wdog@10002000 { compatible = "fsl,imx27-wdt", "fsl,imx21-wdt"; reg = <0x10002000 0x4000>; interrupts = <27>; @@ -218,8 +218,7 @@ status = "disabled"; }; }; - - nfc: nand@d8000000 { + nand@d8000000 { #address-cells = <1>; #size-cells = <1>; diff --git a/trunk/arch/arm/boot/dts/imx28-apf28.dts b/trunk/arch/arm/boot/dts/imx28-apf28.dts deleted file mode 100644 index 7eb075876c4c..000000000000 --- a/trunk/arch/arm/boot/dts/imx28-apf28.dts +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright 2012 Armadeus Systems - - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "imx28.dtsi" - -/ { - model = "Armadeus Systems APF28 module"; - compatible = "armadeus,imx28-apf28", "fsl,imx28"; - - memory { - reg = <0x40000000 0x08000000>; - }; - - apb@80000000 { - apbh@80000000 { - gpmi-nand@8000c000 { - pinctrl-names = "default"; - pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>; - status = "okay"; - - partition@0 { - label = "u-boot"; - reg = <0x0 0x300000>; - }; - - partition@300000 { - label = "env"; - reg = <0x300000 0x80000>; - }; - - partition@380000 { - label = "env2"; - reg = <0x380000 0x80000>; - }; - - partition@400000 { - label = "dtb"; - reg = <0x400000 0x80000>; - }; - - partition@480000 { - label = "splash"; - reg = <0x480000 0x80000>; - }; - - partition@500000 { - label = "kernel"; - reg = <0x500000 0x800000>; - }; - - partition@d00000 { - label = "rootfs"; - reg = <0xd00000 0xf300000>; - }; - }; - }; - - apbx@80040000 { - duart: serial@80074000 { - pinctrl-names = "default"; - pinctrl-0 = <&duart_pins_a>; - status = "okay"; - }; - }; - }; - - ahb@80080000 { - mac0: ethernet@800f0000 { - phy-mode = "rmii"; - pinctrl-names = "default"; - pinctrl-0 = <&mac0_pins_a>; - phy-reset-gpios = <&gpio4 13 0>; - status = "okay"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx28-apf28dev.dts b/trunk/arch/arm/boot/dts/imx28-apf28dev.dts deleted file mode 100644 index 6d8865bfb4b7..000000000000 --- a/trunk/arch/arm/boot/dts/imx28-apf28dev.dts +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright 2012 Armadeus Systems - - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/* APF28Dev is a docking board for the APF28 SOM */ -/include/ "imx28-apf28.dts" - -/ { - model = "Armadeus Systems APF28Dev docking/development board"; - compatible = "armadeus,imx28-apf28dev", "armadeus,imx28-apf28", "fsl,imx28"; - - apb@80000000 { - apbh@80000000 { - ssp0: ssp@80010000 { - compatible = "fsl,imx28-mmc"; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_4bit_pins_a - &mmc0_cd_cfg &mmc0_sck_cfg>; - bus-width = <4>; - status = "okay"; - }; - - ssp2: ssp@80014000 { - compatible = "fsl,imx28-spi"; - pinctrl-names = "default"; - pinctrl-0 = <&spi2_pins_a>; - status = "okay"; - }; - - pinctrl@80018000 { - pinctrl-names = "default"; - pinctrl-0 = <&hog_pins_apf28dev>; - - hog_pins_apf28dev: hog@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x1103 /* MX28_PAD_LCD_D16__GPIO_1_16 */ - 0x1113 /* MX28_PAD_LCD_D17__GPIO_1_17 */ - 0x1123 /* MX28_PAD_LCD_D18__GPIO_1_18 */ - 0x1133 /* MX28_PAD_LCD_D19__GPIO_1_19 */ - 0x1143 /* MX28_PAD_LCD_D20__GPIO_1_20 */ - 0x1153 /* MX28_PAD_LCD_D21__GPIO_1_21 */ - 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - - lcdif_pins_apf28dev: lcdif-apf28dev@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */ - 0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */ - 0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */ - 0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - }; - - lcdif@80030000 { - pinctrl-names = "default"; - pinctrl-0 = <&lcdif_16bit_pins_a - &lcdif_pins_apf28dev>; - status = "okay"; - }; - }; - - apbx@80040000 { - lradc@80050000 { - status = "okay"; - }; - - i2c0: i2c@80058000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; - status = "okay"; - }; - - pwm: pwm@80064000 { - pinctrl-names = "default"; - pinctrl-0 = <&pwm3_pins_a &pwm4_pins_a>; - status = "okay"; - }; - - usbphy0: usbphy@8007c000 { - status = "okay"; - }; - - usbphy1: usbphy@8007e000 { - status = "okay"; - }; - }; - }; - - ahb@80080000 { - usb0: usb@80080000 { - vbus-supply = <®_usb0_vbus>; - status = "okay"; - }; - - usb1: usb@80090000 { - status = "okay"; - }; - - mac1: ethernet@800f4000 { - phy-mode = "rmii"; - pinctrl-names = "default"; - pinctrl-0 = <&mac1_pins_a>; - phy-reset-gpios = <&gpio0 23 0>; - status = "okay"; - }; - }; - - regulators { - compatible = "simple-bus"; - - reg_usb0_vbus: usb0_vbus { - compatible = "regulator-fixed"; - regulator-name = "usb0_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio1 23 1>; - }; - }; - - leds { - compatible = "gpio-leds"; - - user { - label = "Heartbeat"; - gpios = <&gpio0 21 0>; - linux,default-trigger = "heartbeat"; - }; - }; - - backlight { - compatible = "pwm-backlight"; - - pwms = <&pwm 3 191000>; - brightness-levels = <0 4 8 16 32 64 128 255>; - default-brightness-level = <6>; - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx28-cfa10036.dts b/trunk/arch/arm/boot/dts/imx28-cfa10036.dts index 1594694532b9..c03a577beca3 100644 --- a/trunk/arch/arm/boot/dts/imx28-cfa10036.dts +++ b/trunk/arch/arm/boot/dts/imx28-cfa10036.dts @@ -22,31 +22,6 @@ apb@80000000 { apbh@80000000 { - pinctrl@80018000 { - pinctrl-names = "default"; - pinctrl-0 = <&hog_pins_cfa10036>; - - hog_pins_cfa10036: hog-10036@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x2073 /* MX28_PAD_SSP0_D7__GPIO_2_7 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - - led_pins_cfa10036: leds-10036@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x3043 /* MX28_PAD_AUART1_RX__GPIO_3_4 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - }; - ssp0: ssp@80010000 { compatible = "fsl,imx28-mmc"; pinctrl-names = "default"; @@ -58,37 +33,16 @@ }; apbx@80040000 { - pwm: pwm@80064000 { - pinctrl-names = "default"; - pinctrl-0 = <&pwm4_pins_a>; - status = "okay"; - }; - duart: serial@80074000 { pinctrl-names = "default"; pinctrl-0 = <&duart_pins_b>; status = "okay"; }; - - i2c0: i2c@80058000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_b>; - status = "okay"; - - ssd1307: oled@3c { - compatible = "solomon,ssd1307fb-i2c"; - reg = <0x3c>; - pwms = <&pwm 4 3000>; - reset-gpios = <&gpio2 7 0>; - }; - }; }; }; leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_cfa10036>; power { gpios = <&gpio3 4 1>; diff --git a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts b/trunk/arch/arm/boot/dts/imx28-cfa10049.dts index b222614ac9e0..05c892e931e3 100644 --- a/trunk/arch/arm/boot/dts/imx28-cfa10049.dts +++ b/trunk/arch/arm/boot/dts/imx28-cfa10049.dts @@ -22,22 +22,6 @@ apb@80000000 { apbh@80000000 { pinctrl@80018000 { - pinctrl-names = "default", "default"; - pinctrl-1 = <&hog_pins_cfa10049>; - - hog_pins_cfa10049: hog-10049@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */ - 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */ - 0x1173 /* MX28_PAD_LCD_D22__GPIO_1_23 */ - 0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - spi3_pins_cfa10049: spi3-cfa10049@0 { reg = <0>; fsl,pinmux-ids = < @@ -45,7 +29,6 @@ 0x01c1 /* MX28_PAD_GPMI_RESETN__SSP3_CMD */ 0x0111 /* MX28_PAD_GPMI_CE1N__SSP3_D3 */ 0x01a2 /* MX28_PAD_GPMI_ALE__SSP3_D4 */ - 0x01b2 /* MX28_PAD_GPMI_CLE__SSP3_D5 */ >; fsl,drive-strength = <1>; fsl,voltage = <1>; @@ -77,11 +60,6 @@ spi-max-frequency = <100000>; }; - dac0: dh2228@2 { - compatible = "rohm,dh2228fv"; - reg = <2>; - spi-max-frequency = <100000>; - }; }; }; @@ -118,15 +96,4 @@ gpio = <&gpio0 7 1>; }; }; - - ahb@80080000 { - mac0: ethernet@800f0000 { - phy-mode = "rmii"; - pinctrl-names = "default"; - pinctrl-0 = <&mac0_pins_a>; - phy-reset-gpios = <&gpio2 21 0>; - phy-reset-duration = <100>; - status = "okay"; - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/imx28-evk.dts b/trunk/arch/arm/boot/dts/imx28-evk.dts index 2da316e04409..a0ad71ca3a44 100644 --- a/trunk/arch/arm/boot/dts/imx28-evk.dts +++ b/trunk/arch/arm/boot/dts/imx28-evk.dts @@ -76,6 +76,7 @@ 0x20c3 /* MX28_PAD_SSP1_SCK__GPIO_2_12 */ 0x31c3 /* MX28_PAD_PWM3__GPIO_3_28 */ 0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */ + 0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */ 0x3083 /* MX28_PAD_AUART2_RX__GPIO_3_8 */ 0x3093 /* MX28_PAD_AUART2_TX__GPIO_3_9 */ >; @@ -84,16 +85,6 @@ fsl,pull-up = <0>; }; - led_pin_gpio3_5: led_gpio3_5@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - gpmi_pins_evk: gpmi-nand-evk@0 { reg = <0>; fsl,pinmux-ids = < @@ -297,8 +288,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pin_gpio3_5>; user { label = "Heartbeat"; diff --git a/trunk/arch/arm/boot/dts/imx28-sps1.dts b/trunk/arch/arm/boot/dts/imx28-sps1.dts deleted file mode 100644 index e6cde8aa7fff..000000000000 --- a/trunk/arch/arm/boot/dts/imx28-sps1.dts +++ /dev/null @@ -1,169 +0,0 @@ -/* - * Copyright (C) 2012 Marek Vasut - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "imx28.dtsi" - -/ { - model = "SchulerControl GmbH, SC SPS 1"; - compatible = "schulercontrol,imx28-sps1", "fsl,imx28"; - - memory { - reg = <0x40000000 0x08000000>; - }; - - apb@80000000 { - apbh@80000000 { - pinctrl@80018000 { - pinctrl-names = "default"; - pinctrl-0 = <&hog_pins_a>; - - hog_pins_a: hog-gpios@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x0003 /* MX28_PAD_GPMI_D00__GPIO_0_0 */ - 0x0033 /* MX28_PAD_GPMI_D03__GPIO_0_3 */ - 0x0063 /* MX28_PAD_GPMI_D06__GPIO_0_6 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - - }; - - ssp0: ssp@80010000 { - compatible = "fsl,imx28-mmc"; - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_4bit_pins_a>; - bus-width = <4>; - status = "okay"; - }; - - ssp2: ssp@80014000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,imx28-spi"; - pinctrl-names = "default"; - pinctrl-0 = <&spi2_pins_a>; - status = "okay"; - - flash: m25p80@0 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "everspin,mr25h256", "mr25h256"; - spi-max-frequency = <40000000>; - reg = <0>; - }; - }; - }; - - apbx@80040000 { - i2c0: i2c@80058000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; - clock-frequency = <400000>; - status = "okay"; - - rtc: rtc@51 { - compatible = "nxp,pcf8563"; - reg = <0x51>; - }; - - eeprom: eeprom@52 { - compatible = "atmel,24c64"; - reg = <0x52>; - pagesize = <32>; - }; - }; - - duart: serial@80074000 { - pinctrl-names = "default"; - pinctrl-0 = <&duart_pins_a>; - status = "okay"; - }; - - usbphy0: usbphy@8007c000 { - status = "okay"; - }; - - auart0: serial@8006a000 { - pinctrl-names = "default"; - pinctrl-0 = <&auart0_pins_a>; - status = "okay"; - }; - }; - }; - - ahb@80080000 { - usb0: usb@80080000 { - vbus-supply = <®_usb0_vbus>; - pinctrl-names = "default"; - pinctrl-0 = <&usbphy0_pins_b>; - status = "okay"; - }; - - mac0: ethernet@800f0000 { - phy-mode = "rmii"; - pinctrl-names = "default"; - pinctrl-0 = <&mac0_pins_a>; - status = "okay"; - }; - - mac1: ethernet@800f4000 { - phy-mode = "rmii"; - pinctrl-names = "default"; - pinctrl-0 = <&mac1_pins_a>; - status = "okay"; - }; - }; - - regulators { - compatible = "simple-bus"; - - reg_usb0_vbus: usb0_vbus { - compatible = "regulator-fixed"; - regulator-name = "usb0_vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - gpio = <&gpio3 9 0>; - }; - }; - - leds { - #address-cells = <1>; - #size-cells = <0>; - compatible = "gpio-leds"; - status = "okay"; - - led@1 { - label = "sps1-1:yellow:user"; - gpios = <&gpio0 6 0>; - linux,default-trigger = "heartbeat"; - reg = <0>; - }; - - led@2 { - label = "sps1-2:red:user"; - gpios = <&gpio0 3 0>; - linux,default-trigger = "heartbeat"; - reg = <1>; - }; - - led@3 { - label = "sps1-3:red:user"; - gpios = <&gpio0 0 0>; - default-trigger = "heartbeat"; - reg = <2>; - }; - - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx28.dtsi b/trunk/arch/arm/boot/dts/imx28.dtsi index 13b7053d799e..b4587b27ae42 100644 --- a/trunk/arch/arm/boot/dts/imx28.dtsi +++ b/trunk/arch/arm/boot/dts/imx28.dtsi @@ -492,16 +492,6 @@ fsl,pull-up = <0>; }; - pwm3_pins_a: pwm3@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x31c0 /* MX28_PAD_PWM3__PWM_3 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - pwm4_pins_a: pwm4@0 { reg = <0>; fsl,pinmux-ids = < @@ -545,31 +535,6 @@ fsl,pull-up = <0>; }; - lcdif_16bit_pins_a: lcdif-16bit@0 { - reg = <0>; - fsl,pinmux-ids = < - 0x1000 /* MX28_PAD_LCD_D00__LCD_D0 */ - 0x1010 /* MX28_PAD_LCD_D01__LCD_D1 */ - 0x1020 /* MX28_PAD_LCD_D02__LCD_D2 */ - 0x1030 /* MX28_PAD_LCD_D03__LCD_D3 */ - 0x1040 /* MX28_PAD_LCD_D04__LCD_D4 */ - 0x1050 /* MX28_PAD_LCD_D05__LCD_D5 */ - 0x1060 /* MX28_PAD_LCD_D06__LCD_D6 */ - 0x1070 /* MX28_PAD_LCD_D07__LCD_D7 */ - 0x1080 /* MX28_PAD_LCD_D08__LCD_D8 */ - 0x1090 /* MX28_PAD_LCD_D09__LCD_D9 */ - 0x10a0 /* MX28_PAD_LCD_D10__LCD_D10 */ - 0x10b0 /* MX28_PAD_LCD_D11__LCD_D11 */ - 0x10c0 /* MX28_PAD_LCD_D12__LCD_D12 */ - 0x10d0 /* MX28_PAD_LCD_D13__LCD_D13 */ - 0x10e0 /* MX28_PAD_LCD_D14__LCD_D14 */ - 0x10f0 /* MX28_PAD_LCD_D15__LCD_D15 */ - >; - fsl,drive-strength = <0>; - fsl,voltage = <1>; - fsl,pull-up = <0>; - }; - can0_pins_a: can0@0 { reg = <0>; fsl,pinmux-ids = < diff --git a/trunk/arch/arm/boot/dts/imx51.dtsi b/trunk/arch/arm/boot/dts/imx51.dtsi index 1f5d45eff45e..2781e47cff0d 100644 --- a/trunk/arch/arm/boot/dts/imx51.dtsi +++ b/trunk/arch/arm/boot/dts/imx51.dtsi @@ -83,7 +83,7 @@ reg = <0x70000000 0x40000>; ranges; - esdhc1: esdhc@70004000 { + esdhc@70004000 { /* ESDHC1 */ compatible = "fsl,imx51-esdhc"; reg = <0x70004000 0x4000>; interrupts = <1>; @@ -92,13 +92,12 @@ status = "disabled"; }; - esdhc2: esdhc@70008000 { + esdhc@70008000 { /* ESDHC2 */ compatible = "fsl,imx51-esdhc"; reg = <0x70008000 0x4000>; interrupts = <2>; clocks = <&clks 45>, <&clks 0>, <&clks 72>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; @@ -111,7 +110,7 @@ status = "disabled"; }; - ecspi1: ecspi@70010000 { + ecspi@70010000 { /* ECSPI1 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-ecspi"; @@ -132,49 +131,47 @@ status = "disabled"; }; - esdhc3: esdhc@70020000 { + esdhc@70020000 { /* ESDHC3 */ compatible = "fsl,imx51-esdhc"; reg = <0x70020000 0x4000>; interrupts = <3>; clocks = <&clks 46>, <&clks 0>, <&clks 73>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - esdhc4: esdhc@70024000 { + esdhc@70024000 { /* ESDHC4 */ compatible = "fsl,imx51-esdhc"; reg = <0x70024000 0x4000>; interrupts = <4>; clocks = <&clks 47>, <&clks 0>, <&clks 74>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; }; - usbotg: usb@73f80000 { + usb@73f80000 { compatible = "fsl,imx51-usb", "fsl,imx27-usb"; reg = <0x73f80000 0x0200>; interrupts = <18>; status = "disabled"; }; - usbh1: usb@73f80200 { + usb@73f80200 { compatible = "fsl,imx51-usb", "fsl,imx27-usb"; reg = <0x73f80200 0x0200>; interrupts = <14>; status = "disabled"; }; - usbh2: usb@73f80400 { + usb@73f80400 { compatible = "fsl,imx51-usb", "fsl,imx27-usb"; reg = <0x73f80400 0x0200>; interrupts = <16>; status = "disabled"; }; - usbh3: usb@73f80600 { + usb@73f80600 { compatible = "fsl,imx51-usb", "fsl,imx27-usb"; reg = <0x73f80600 0x0200>; interrupts = <17>; @@ -221,14 +218,14 @@ #interrupt-cells = <2>; }; - wdog1: wdog@73f98000 { + wdog@73f98000 { /* WDOG1 */ compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; reg = <0x73f98000 0x4000>; interrupts = <58>; clocks = <&clks 0>; }; - wdog2: wdog@73f9c000 { + wdog@73f9c000 { /* WDOG2 */ compatible = "fsl,imx51-wdt", "fsl,imx21-wdt"; reg = <0x73f9c000 0x4000>; interrupts = <59>; @@ -236,7 +233,7 @@ status = "disabled"; }; - iomuxc: iomuxc@73fa8000 { + iomuxc@73fa8000 { compatible = "fsl,imx51-iomuxc"; reg = <0x73fa8000 0x4000>; @@ -463,7 +460,7 @@ reg = <0x80000000 0x10000000>; ranges; - ecspi2: ecspi@83fac000 { + ecspi@83fac000 { /* ECSPI2 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-ecspi"; @@ -474,7 +471,7 @@ status = "disabled"; }; - sdma: sdma@83fb0000 { + sdma@83fb0000 { compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; reg = <0x83fb0000 0x4000>; interrupts = <6>; @@ -483,7 +480,7 @@ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin"; }; - cspi: cspi@83fc0000 { + cspi@83fc0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-cspi", "fsl,imx35-cspi"; @@ -494,7 +491,7 @@ status = "disabled"; }; - i2c2: i2c@83fc4000 { + i2c@83fc4000 { /* I2C2 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-i2c", "fsl,imx21-i2c"; @@ -504,7 +501,7 @@ status = "disabled"; }; - i2c1: i2c@83fc8000 { + i2c@83fc8000 { /* I2C1 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx51-i2c", "fsl,imx21-i2c"; @@ -524,13 +521,13 @@ status = "disabled"; }; - audmux: audmux@83fd0000 { + audmux@83fd0000 { compatible = "fsl,imx51-audmux", "fsl,imx31-audmux"; reg = <0x83fd0000 0x4000>; status = "disabled"; }; - nfc: nand@83fdb000 { + nand@83fdb000 { compatible = "fsl,imx51-nand"; reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>; interrupts = <8>; @@ -548,7 +545,7 @@ status = "disabled"; }; - fec: ethernet@83fec000 { + ethernet@83fec000 { compatible = "fsl,imx51-fec", "fsl,imx27-fec"; reg = <0x83fec000 0x4000>; interrupts = <87>; diff --git a/trunk/arch/arm/boot/dts/imx53-qsb.dts b/trunk/arch/arm/boot/dts/imx53-qsb.dts index b0075537195b..08948af86d1a 100644 --- a/trunk/arch/arm/boot/dts/imx53-qsb.dts +++ b/trunk/arch/arm/boot/dts/imx53-qsb.dts @@ -60,17 +60,10 @@ 697 0x80000000 /* MX53_PAD_EIM_DA12__GPIO3_12 */ 701 0x80000000 /* MX53_PAD_EIM_DA13__GPIO3_13 */ 868 0x80000000 /* MX53_PAD_PATA_DA_0__GPIO7_6 */ - 1149 0x80000000 /* MX53_PAD_GPIO_16__GPIO7_11 */ - >; - }; - - led_pin_gpio7_7: led_gpio7_7@0 { - fsl,pins = < 873 0x80000000 /* MX53_PAD_PATA_DA_1__GPIO7_7 */ >; }; }; - }; uart1: serial@53fbc000 { @@ -107,93 +100,76 @@ pmic: dialog@48 { compatible = "dlg,da9053-aa", "dlg,da9052"; reg = <0x48>; - interrupt-parent = <&gpio7>; - interrupts = <11 0x8>; /* low-level active IRQ at GPIO7_11 */ regulators { - buck1_reg: buck1 { + buck0 { regulator-min-microvolt = <500000>; regulator-max-microvolt = <2075000>; - regulator-always-on; }; - buck2_reg: buck2 { + buck1 { regulator-min-microvolt = <500000>; regulator-max-microvolt = <2075000>; - regulator-always-on; }; - buck3_reg: buck3 { + buck2 { regulator-min-microvolt = <925000>; regulator-max-microvolt = <2500000>; - regulator-always-on; }; - buck4_reg: buck4 { + buck3 { regulator-min-microvolt = <925000>; regulator-max-microvolt = <2500000>; - regulator-always-on; }; - ldo1_reg: ldo1 { + ldo4 { regulator-min-microvolt = <600000>; regulator-max-microvolt = <1800000>; - regulator-boot-on; - regulator-always-on; }; - ldo2_reg: ldo2 { - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - ldo3_reg: ldo3 { + ldo5 { regulator-min-microvolt = <600000>; regulator-max-microvolt = <1800000>; - regulator-always-on; }; - ldo4_reg: ldo4 { + ldo6 { regulator-min-microvolt = <1725000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; - ldo5_reg: ldo5 { + ldo7 { regulator-min-microvolt = <1725000>; regulator-max-microvolt = <3300000>; - regulator-always-on; }; - ldo6_reg: ldo6 { + ldo8 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <3600000>; - regulator-always-on; }; - ldo7_reg: ldo7 { + ldo9 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <3600000>; - regulator-always-on; }; - ldo8_reg: ldo8 { + ldo10 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <3600000>; - regulator-always-on; }; - ldo9_reg: ldo9 { + ldo11 { regulator-min-microvolt = <1200000>; regulator-max-microvolt = <3600000>; - regulator-always-on; }; - ldo10_reg: ldo10 { + ldo12 { regulator-min-microvolt = <1250000>; regulator-max-microvolt = <3650000>; - regulator-always-on; + }; + + ldo13 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <3600000>; }; }; }; @@ -240,8 +216,6 @@ leds { compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pin_gpio7_7>; user { label = "Heartbeat"; diff --git a/trunk/arch/arm/boot/dts/imx53.dtsi b/trunk/arch/arm/boot/dts/imx53.dtsi index 552aed4ff982..da9a047ce4cf 100644 --- a/trunk/arch/arm/boot/dts/imx53.dtsi +++ b/trunk/arch/arm/boot/dts/imx53.dtsi @@ -88,23 +88,21 @@ reg = <0x50000000 0x40000>; ranges; - esdhc1: esdhc@50004000 { + esdhc@50004000 { /* ESDHC1 */ compatible = "fsl,imx53-esdhc"; reg = <0x50004000 0x4000>; interrupts = <1>; clocks = <&clks 44>, <&clks 0>, <&clks 71>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - esdhc2: esdhc@50008000 { + esdhc@50008000 { /* ESDHC2 */ compatible = "fsl,imx53-esdhc"; reg = <0x50008000 0x4000>; interrupts = <2>; clocks = <&clks 45>, <&clks 0>, <&clks 72>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; @@ -117,7 +115,7 @@ status = "disabled"; }; - ecspi1: ecspi@50010000 { + ecspi@50010000 { /* ECSPI1 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; @@ -138,49 +136,47 @@ status = "disabled"; }; - esdhc3: esdhc@50020000 { + esdhc@50020000 { /* ESDHC3 */ compatible = "fsl,imx53-esdhc"; reg = <0x50020000 0x4000>; interrupts = <3>; clocks = <&clks 46>, <&clks 0>, <&clks 73>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - esdhc4: esdhc@50024000 { + esdhc@50024000 { /* ESDHC4 */ compatible = "fsl,imx53-esdhc"; reg = <0x50024000 0x4000>; interrupts = <4>; clocks = <&clks 47>, <&clks 0>, <&clks 74>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; }; - usbotg: usb@53f80000 { + usb@53f80000 { compatible = "fsl,imx53-usb", "fsl,imx27-usb"; reg = <0x53f80000 0x0200>; interrupts = <18>; status = "disabled"; }; - usbh1: usb@53f80200 { + usb@53f80200 { compatible = "fsl,imx53-usb", "fsl,imx27-usb"; reg = <0x53f80200 0x0200>; interrupts = <14>; status = "disabled"; }; - usbh2: usb@53f80400 { + usb@53f80400 { compatible = "fsl,imx53-usb", "fsl,imx27-usb"; reg = <0x53f80400 0x0200>; interrupts = <16>; status = "disabled"; }; - usbh3: usb@53f80600 { + usb@53f80600 { compatible = "fsl,imx53-usb", "fsl,imx27-usb"; reg = <0x53f80600 0x0200>; interrupts = <17>; @@ -227,14 +223,14 @@ #interrupt-cells = <2>; }; - wdog1: wdog@53f98000 { + wdog@53f98000 { /* WDOG1 */ compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; reg = <0x53f98000 0x4000>; interrupts = <58>; clocks = <&clks 0>; }; - wdog2: wdog@53f9c000 { + wdog@53f9c000 { /* WDOG2 */ compatible = "fsl,imx53-wdt", "fsl,imx21-wdt"; reg = <0x53f9c000 0x4000>; interrupts = <59>; @@ -242,7 +238,7 @@ status = "disabled"; }; - iomuxc: iomuxc@53fa8000 { + iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc"; reg = <0x53fa8000 0x4000>; @@ -342,24 +338,6 @@ }; }; - can1 { - pinctrl_can1_1: can1grp-1 { - fsl,pins = < - 847 0x80000000 /* MX53_PAD_PATA_INTRQ__CAN1_TXCAN */ - 853 0x80000000 /* MX53_PAD_PATA_DIOR__CAN1_RXCAN */ - >; - }; - }; - - can2 { - pinctrl_can2_1: can2grp-1 { - fsl,pins = < - 67 0x80000000 /* MX53_PAD_KEY_COL4__CAN2_TXCAN */ - 74 0x80000000 /* MX53_PAD_KEY_ROW4__CAN2_RXCAN */ - >; - }; - }; - i2c1 { pinctrl_i2c1_1: i2c1grp-1 { fsl,pins = < @@ -378,15 +356,6 @@ }; }; - i2c3 { - pinctrl_i2c3_1: i2c3grp-1 { - fsl,pins = < - 1102 0xc0000000 /* MX53_PAD_GPIO_6__I2C3_SDA */ - 1130 0xc0000000 /* MX53_PAD_GPIO_5__I2C3_SCL */ - >; - }; - }; - uart1 { pinctrl_uart1_1: uart1grp-1 { fsl,pins = < @@ -422,25 +391,6 @@ >; }; }; - - uart4 { - pinctrl_uart4_1: uart4grp-1 { - fsl,pins = < - 11 0x1c5 /* MX53_PAD_KEY_COL0__UART4_TXD_MUX */ - 18 0x1c5 /* MX53_PAD_KEY_ROW0__UART4_RXD_MUX */ - >; - }; - }; - - uart5 { - pinctrl_uart5_1: uart5grp-1 { - fsl,pins = < - 24 0x1c5 /* MX53_PAD_KEY_COL1__UART5_TXD_MUX */ - 31 0x1c5 /* MX53_PAD_KEY_ROW1__UART5_RXD_MUX */ - >; - }; - }; - }; pwm1: pwm@53fb4000 { @@ -534,7 +484,7 @@ #interrupt-cells = <2>; }; - i2c3: i2c@53fec000 { + i2c@53fec000 { /* I2C3 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-i2c", "fsl,imx21-i2c"; @@ -570,7 +520,7 @@ status = "disabled"; }; - ecspi2: ecspi@63fac000 { + ecspi@63fac000 { /* ECSPI2 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-ecspi", "fsl,imx51-ecspi"; @@ -581,7 +531,7 @@ status = "disabled"; }; - sdma: sdma@63fb0000 { + sdma@63fb0000 { compatible = "fsl,imx53-sdma", "fsl,imx35-sdma"; reg = <0x63fb0000 0x4000>; interrupts = <6>; @@ -590,7 +540,7 @@ fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin"; }; - cspi: cspi@63fc0000 { + cspi@63fc0000 { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-cspi", "fsl,imx35-cspi"; @@ -601,7 +551,7 @@ status = "disabled"; }; - i2c2: i2c@63fc4000 { + i2c@63fc4000 { /* I2C2 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-i2c", "fsl,imx21-i2c"; @@ -611,7 +561,7 @@ status = "disabled"; }; - i2c1: i2c@63fc8000 { + i2c@63fc8000 { /* I2C1 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx53-i2c", "fsl,imx21-i2c"; @@ -631,13 +581,13 @@ status = "disabled"; }; - audmux: audmux@63fd0000 { + audmux@63fd0000 { compatible = "fsl,imx53-audmux", "fsl,imx31-audmux"; reg = <0x63fd0000 0x4000>; status = "disabled"; }; - nfc: nand@63fdb000 { + nand@63fdb000 { compatible = "fsl,imx53-nand"; reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>; interrupts = <8>; @@ -655,7 +605,7 @@ status = "disabled"; }; - fec: ethernet@63fec000 { + ethernet@63fec000 { compatible = "fsl,imx53-fec", "fsl,imx25-fec"; reg = <0x63fec000 0x4000>; interrupts = <87>; diff --git a/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts b/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts deleted file mode 100644 index 826e4ad1477e..000000000000 --- a/trunk/arch/arm/boot/dts/imx6q-sabreauto.dts +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2012 Freescale Semiconductor, Inc. - * Copyright 2011 Linaro Ltd. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "imx6q.dtsi" - -/ { - model = "Freescale i.MX6 Quad SABRE Automotive Board"; - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; - - memory { - reg = <0x10000000 0x80000000>; - }; - - soc { - aips-bus@02000000 { /* AIPS1 */ - iomuxc@020e0000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_hog>; - - hog { - pinctrl_hog: hoggrp { - fsl,pins = < - 1376 0x80000000 /* MX6Q_PAD_NANDF_CS2__GPIO_6_15 */ - 13 0x80000000 /* MX6Q_PAD_SD2_DAT2__GPIO_1_13 */ - >; - }; - }; - }; - }; - - aips-bus@02100000 { /* AIPS2 */ - uart4: serial@021f0000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_uart4_1>; - status = "okay"; - }; - - ethernet@02188000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_enet_2>; - phy-mode = "rgmii"; - status = "okay"; - }; - - usdhc@02198000 { /* uSDHC3 */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc3_1>; - cd-gpios = <&gpio6 15 0>; - wp-gpios = <&gpio1 13 0>; - status = "okay"; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/imx6q-sabresd.dts b/trunk/arch/arm/boot/dts/imx6q-sabresd.dts index a42402562b7b..e596c28c214d 100644 --- a/trunk/arch/arm/boot/dts/imx6q-sabresd.dts +++ b/trunk/arch/arm/boot/dts/imx6q-sabresd.dts @@ -38,8 +38,6 @@ hog { pinctrl_hog: hoggrp { fsl,pins = < - 1004 0x80000000 /* MX6Q_PAD_GPIO_4__GPIO_1_4 */ - 1012 0x80000000 /* MX6Q_PAD_GPIO_5__GPIO_1_5 */ 1402 0x80000000 /* MX6Q_PAD_NANDF_D0__GPIO_2_0 */ 1410 0x80000000 /* MX6Q_PAD_NANDF_D1__GPIO_2_1 */ 1418 0x80000000 /* MX6Q_PAD_NANDF_D2__GPIO_2_2 */ @@ -75,20 +73,4 @@ }; }; }; - - gpio-keys { - compatible = "gpio-keys"; - - volume-up { - label = "Volume Up"; - gpios = <&gpio1 4 0>; - linux,code = <115>; /* KEY_VOLUMEUP */ - }; - - volume-down { - label = "Volume Down"; - gpios = <&gpio1 5 0>; - linux,code = <114>; /* KEY_VOLUMEDOWN */ - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi index d6265ca97119..cce1d874c7a5 100644 --- a/trunk/arch/arm/boot/dts/imx6q.dtsi +++ b/trunk/arch/arm/boot/dts/imx6q.dtsi @@ -36,14 +36,6 @@ compatible = "arm,cortex-a9"; reg = <0>; next-level-cache = <&L2>; - operating-points = < - /* kHz uV */ - 792000 1100000 - 396000 950000 - 198000 850000 - >; - clock-latency = <61036>; /* two CLK32 periods */ - cpu0-supply = <®_cpu>; }; cpu@1 { @@ -108,7 +100,7 @@ clocks = <&clks 106>; }; - nfc: gpmi-nand@00112000 { + gpmi-nand@00112000 { compatible = "fsl,imx6q-gpmi-nand"; #address-cells = <1>; #size-cells = <1>; @@ -152,12 +144,12 @@ reg = <0x02000000 0x40000>; ranges; - spdif: spdif@02004000 { + spdif@02004000 { reg = <0x02004000 0x4000>; interrupts = <0 52 0x04>; }; - ecspi1: ecspi@02008000 { + ecspi@02008000 { /* eCSPI1 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -168,7 +160,7 @@ status = "disabled"; }; - ecspi2: ecspi@0200c000 { + ecspi@0200c000 { /* eCSPI2 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -179,7 +171,7 @@ status = "disabled"; }; - ecspi3: ecspi@02010000 { + ecspi@02010000 { /* eCSPI3 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -190,7 +182,7 @@ status = "disabled"; }; - ecspi4: ecspi@02014000 { + ecspi@02014000 { /* eCSPI4 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -201,7 +193,7 @@ status = "disabled"; }; - ecspi5: ecspi@02018000 { + ecspi@02018000 { /* eCSPI5 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ecspi", "fsl,imx51-ecspi"; @@ -221,7 +213,7 @@ status = "disabled"; }; - esai: esai@02024000 { + esai@02024000 { reg = <0x02024000 0x4000>; interrupts = <0 51 0x04>; }; @@ -256,7 +248,7 @@ status = "disabled"; }; - asrc: asrc@02034000 { + asrc@02034000 { reg = <0x02034000 0x4000>; interrupts = <0 50 0x04>; }; @@ -266,7 +258,7 @@ }; }; - vpu: vpu@02040000 { + vpu@02040000 { reg = <0x02040000 0x3c000>; interrupts = <0 3 0x04 0 12 0x04>; }; @@ -275,7 +267,7 @@ reg = <0x0207c000 0x4000>; }; - pwm1: pwm@02080000 { + pwm@02080000 { /* PWM1 */ #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02080000 0x4000>; @@ -284,7 +276,7 @@ clock-names = "ipg", "per"; }; - pwm2: pwm@02084000 { + pwm@02084000 { /* PWM2 */ #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02084000 0x4000>; @@ -293,7 +285,7 @@ clock-names = "ipg", "per"; }; - pwm3: pwm@02088000 { + pwm@02088000 { /* PWM3 */ #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x02088000 0x4000>; @@ -302,7 +294,7 @@ clock-names = "ipg", "per"; }; - pwm4: pwm@0208c000 { + pwm@0208c000 { /* PWM4 */ #pwm-cells = <2>; compatible = "fsl,imx6q-pwm", "fsl,imx27-pwm"; reg = <0x0208c000 0x4000>; @@ -311,17 +303,17 @@ clock-names = "ipg", "per"; }; - can1: flexcan@02090000 { + flexcan@02090000 { /* CAN1 */ reg = <0x02090000 0x4000>; interrupts = <0 110 0x04>; }; - can2: flexcan@02094000 { + flexcan@02094000 { /* CAN2 */ reg = <0x02094000 0x4000>; interrupts = <0 111 0x04>; }; - gpt: gpt@02098000 { + gpt@02098000 { compatible = "fsl,imx6q-gpt"; reg = <0x02098000 0x4000>; interrupts = <0 55 0x04>; @@ -397,19 +389,19 @@ #interrupt-cells = <2>; }; - kpp: kpp@020b8000 { + kpp@020b8000 { reg = <0x020b8000 0x4000>; interrupts = <0 82 0x04>; }; - wdog1: wdog@020bc000 { + wdog@020bc000 { /* WDOG1 */ compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; reg = <0x020bc000 0x4000>; interrupts = <0 80 0x04>; clocks = <&clks 0>; }; - wdog2: wdog@020c0000 { + wdog@020c0000 { /* WDOG2 */ compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt"; reg = <0x020c0000 0x4000>; interrupts = <0 81 0x04>; @@ -471,7 +463,7 @@ anatop-max-voltage = <2750000>; }; - reg_cpu: regulator-vddcore@140 { + regulator-vddcore@140 { compatible = "fsl,anatop-regulator"; regulator-name = "cpu"; regulator-min-microvolt = <725000>; @@ -529,35 +521,27 @@ }; snvs@020cc000 { - compatible = "fsl,sec-v4.0-mon", "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges = <0 0x020cc000 0x4000>; - - snvs-rtc-lp@34 { - compatible = "fsl,sec-v4.0-mon-rtc-lp"; - reg = <0x34 0x58>; - interrupts = <0 19 0x04 0 20 0x04>; - }; + reg = <0x020cc000 0x4000>; + interrupts = <0 19 0x04 0 20 0x04>; }; - epit1: epit@020d0000 { /* EPIT1 */ + epit@020d0000 { /* EPIT1 */ reg = <0x020d0000 0x4000>; interrupts = <0 56 0x04>; }; - epit2: epit@020d4000 { /* EPIT2 */ + epit@020d4000 { /* EPIT2 */ reg = <0x020d4000 0x4000>; interrupts = <0 57 0x04>; }; - src: src@020d8000 { + src@020d8000 { compatible = "fsl,imx6q-src"; reg = <0x020d8000 0x4000>; interrupts = <0 91 0x04 0 96 0x04>; }; - gpc: gpc@020dc000 { + gpc@020dc000 { compatible = "fsl,imx6q-gpc"; reg = <0x020dc000 0x4000>; interrupts = <0 89 0x04 0 90 0x04>; @@ -568,7 +552,7 @@ reg = <0x020e0000 0x38>; }; - iomuxc: iomuxc@020e0000 { + iomuxc@020e0000 { compatible = "fsl,imx6q-iomuxc"; reg = <0x020e0000 0x4000>; @@ -781,17 +765,17 @@ }; }; - dcic1: dcic@020e4000 { + dcic@020e4000 { /* DCIC1 */ reg = <0x020e4000 0x4000>; interrupts = <0 124 0x04>; }; - dcic2: dcic@020e8000 { + dcic@020e8000 { /* DCIC2 */ reg = <0x020e8000 0x4000>; interrupts = <0 125 0x04>; }; - sdma: sdma@020ec000 { + sdma@020ec000 { compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma"; reg = <0x020ec000 0x4000>; interrupts = <0 2 0x04>; @@ -817,7 +801,7 @@ reg = <0x0217c000 0x4000>; }; - usbotg: usb@02184000 { + usb@02184000 { /* USB OTG */ compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184000 0x200>; interrupts = <0 43 0x04>; @@ -827,7 +811,7 @@ status = "disabled"; }; - usbh1: usb@02184200 { + usb@02184200 { /* USB1 */ compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184200 0x200>; interrupts = <0 40 0x04>; @@ -837,7 +821,7 @@ status = "disabled"; }; - usbh2: usb@02184400 { + usb@02184400 { /* USB2 */ compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184400 0x200>; interrupts = <0 41 0x04>; @@ -846,7 +830,7 @@ status = "disabled"; }; - usbh3: usb@02184600 { + usb@02184600 { /* USB3 */ compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; reg = <0x02184600 0x200>; interrupts = <0 42 0x04>; @@ -855,14 +839,14 @@ status = "disabled"; }; - usbmisc: usbmisc: usbmisc@02184800 { + usbmisc: usbmisc@02184800 { #index-cells = <1>; compatible = "fsl,imx6q-usbmisc"; reg = <0x02184800 0x200>; clocks = <&clks 162>; }; - fec: ethernet@02188000 { + ethernet@02188000 { compatible = "fsl,imx6q-fec"; reg = <0x02188000 0x4000>; interrupts = <0 118 0x04 0 119 0x04>; @@ -876,47 +860,43 @@ interrupts = <0 53 0x04 0 117 0x04 0 126 0x04>; }; - usdhc1: usdhc@02190000 { + usdhc@02190000 { /* uSDHC1 */ compatible = "fsl,imx6q-usdhc"; reg = <0x02190000 0x4000>; interrupts = <0 22 0x04>; clocks = <&clks 163>, <&clks 163>, <&clks 163>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - usdhc2: usdhc@02194000 { + usdhc@02194000 { /* uSDHC2 */ compatible = "fsl,imx6q-usdhc"; reg = <0x02194000 0x4000>; interrupts = <0 23 0x04>; clocks = <&clks 164>, <&clks 164>, <&clks 164>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - usdhc3: usdhc@02198000 { + usdhc@02198000 { /* uSDHC3 */ compatible = "fsl,imx6q-usdhc"; reg = <0x02198000 0x4000>; interrupts = <0 24 0x04>; clocks = <&clks 165>, <&clks 165>, <&clks 165>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - usdhc4: usdhc@0219c000 { + usdhc@0219c000 { /* uSDHC4 */ compatible = "fsl,imx6q-usdhc"; reg = <0x0219c000 0x4000>; interrupts = <0 25 0x04>; clocks = <&clks 166>, <&clks 166>, <&clks 166>; clock-names = "ipg", "ahb", "per"; - bus-width = <4>; status = "disabled"; }; - i2c1: i2c@021a0000 { + i2c@021a0000 { /* I2C1 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -926,7 +906,7 @@ status = "disabled"; }; - i2c2: i2c@021a4000 { + i2c@021a4000 { /* I2C2 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -936,7 +916,7 @@ status = "disabled"; }; - i2c3: i2c@021a8000 { + i2c@021a8000 { /* I2C3 */ #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-i2c", "fsl,imx21-i2c"; @@ -950,12 +930,12 @@ reg = <0x021ac000 0x4000>; }; - mmdc0: mmdc@021b0000 { /* MMDC0 */ + mmdc@021b0000 { /* MMDC0 */ compatible = "fsl,imx6q-mmdc"; reg = <0x021b0000 0x4000>; }; - mmdc1: mmdc@021b4000 { /* MMDC1 */ + mmdc@021b4000 { /* MMDC1 */ reg = <0x021b4000 0x4000>; }; @@ -983,7 +963,7 @@ interrupts = <0 109 0x04>; }; - audmux: audmux@021d8000 { + audmux@021d8000 { compatible = "fsl,imx6q-audmux", "fsl,imx31-audmux"; reg = <0x021d8000 0x4000>; status = "disabled"; diff --git a/trunk/arch/arm/boot/dts/kirkwood-6281.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6281.dtsi deleted file mode 100644 index d6c9d65cbaeb..000000000000 --- a/trunk/arch/arm/boot/dts/kirkwood-6281.dtsi +++ /dev/null @@ -1,44 +0,0 @@ -/ { - ocp@f1000000 { - pinctrl: pinctrl@10000 { - compatible = "marvell,88f6281-pinctrl"; - reg = <0x10000 0x20>; - - pmx_nand: pmx-nand { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", - "mpp4", "mpp5", "mpp18", - "mpp19"; - marvell,function = "nand"; - }; - pmx_sata0: pmx-sata0 { - marvell,pins = "mpp5", "mpp21", "mpp23"; - marvell,function = "sata0"; - }; - pmx_sata1: pmx-sata1 { - marvell,pins = "mpp4", "mpp20", "mpp22"; - marvell,function = "sata1"; - }; - pmx_spi: pmx-spi { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; - marvell,function = "spi"; - }; - pmx_twsi0: pmx-twsi0 { - marvell,pins = "mpp8", "mpp9"; - marvell,function = "twsi0"; - }; - pmx_uart0: pmx-uart0 { - marvell,pins = "mpp10", "mpp11"; - marvell,function = "uart0"; - }; - pmx_uart1: pmx-uart1 { - marvell,pins = "mpp13", "mpp14"; - marvell,function = "uart1"; - }; - pmx_sdio: pmx-sdio { - marvell,pins = "mpp12", "mpp13", "mpp14", - "mpp15", "mpp16", "mpp17"; - marvell,function = "sdio"; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi b/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi deleted file mode 100644 index 9ae2004d5675..000000000000 --- a/trunk/arch/arm/boot/dts/kirkwood-6282.dtsi +++ /dev/null @@ -1,45 +0,0 @@ -/ { - ocp@f1000000 { - - pinctrl: pinctrl@10000 { - compatible = "marvell,88f6282-pinctrl"; - reg = <0x10000 0x20>; - - pmx_sata0: pmx-sata0 { - marvell,pins = "mpp5", "mpp21", "mpp23"; - marvell,function = "sata0"; - }; - pmx_sata1: pmx-sata1 { - marvell,pins = "mpp4", "mpp20", "mpp22"; - marvell,function = "sata1"; - }; - pmx_spi: pmx-spi { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; - marvell,function = "spi"; - }; - pmx_twsi0: pmx-twsi0 { - marvell,pins = "mpp8", "mpp9"; - marvell,function = "twsi0"; - }; - pmx_uart0: pmx-uart0 { - marvell,pins = "mpp10", "mpp11"; - marvell,function = "uart0"; - }; - - pmx_uart1: pmx-uart1 { - marvell,pins = "mpp13", "mpp14"; - marvell,function = "uart1"; - }; - }; - - i2c@11100 { - compatible = "marvell,mv64xxx-i2c"; - reg = <0x11100 0x20>; - #address-cells = <1>; - #size-cells = <0>; - interrupts = <32>; - clock-frequency = <100000>; - status = "disabled"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/kirkwood-98dx4122.dtsi b/trunk/arch/arm/boot/dts/kirkwood-98dx4122.dtsi deleted file mode 100644 index 3271e4c8ea07..000000000000 --- a/trunk/arch/arm/boot/dts/kirkwood-98dx4122.dtsi +++ /dev/null @@ -1,31 +0,0 @@ -/ { - ocp@f1000000 { - pinctrl: pinctrl@10000 { - compatible = "marvell,98dx4122-pinctrl"; - reg = <0x10000 0x20>; - - pmx_nand: pmx-nand { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", - "mpp4", "mpp5", "mpp18", - "mpp19"; - marvell,function = "nand"; - }; - pmx_spi: pmx-spi { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; - marvell,function = "spi"; - }; - pmx_twsi0: pmx-twsi0 { - marvell,pins = "mpp8", "mpp9"; - marvell,function = "twsi0"; - }; - pmx_uart0: pmx-uart0 { - marvell,pins = "mpp10", "mpp11"; - marvell,function = "uart0"; - }; - pmx_uart1: pmx-uart1 { - marvell,pins = "mpp13", "mpp14"; - marvell,function = "uart1"; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi index 6875ac00c174..9b32d0272825 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi +++ b/trunk/arch/arm/boot/dts/kirkwood-dnskw.dtsi @@ -1,5 +1,4 @@ /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "D-Link DNS NASes (kirkwood-based)"; @@ -36,116 +35,7 @@ 6000 2>; }; - gpio_poweroff { - compatible = "gpio-poweroff"; - gpios = <&gpio1 4 0>; - }; - ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_nand &pmx_uart1 - &pmx_sata0 &pmx_sata1 - &pmx_led_power - &pmx_led_red_right_hdd - &pmx_led_red_left_hdd - &pmx_led_red_usb_325 - &pmx_button_power - &pmx_led_red_usb_320 - &pmx_power_off &pmx_power_back_on - &pmx_power_sata0 &pmx_power_sata1 - &pmx_present_sata0 &pmx_present_sata1 - &pmx_led_white_usb &pmx_fan_tacho - &pmx_fan_high_speed &pmx_fan_low_speed - &pmx_button_unmount &pmx_button_reset - &pmx_temp_alarm >; - pinctrl-names = "default"; - - pmx_sata0: pmx-sata0 { - marvell,pins = "mpp20"; - marvell,function = "sata1"; - }; - pmx_sata1: pmx-sata1 { - marvell,pins = "mpp21"; - marvell,function = "sata0"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp26"; - marvell,function = "gpio"; - }; - pmx_led_red_right_hdd: pmx-led-red-right-hdd { - marvell,pins = "mpp27"; - marvell,function = "gpio"; - }; - pmx_led_red_left_hdd: pmx-led-red-left-hdd { - marvell,pins = "mpp28"; - marvell,function = "gpio"; - }; - pmx_led_red_usb_325: pmx-led-red-usb-325 { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - pmx_button_power: pmx-button-power { - marvell,pins = "mpp34"; - marvell,function = "gpio"; - }; - pmx_led_red_usb_320: pmx-led-red-usb-320 { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - pmx_power_off: pmx-power-off { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_power_back_on: pmx-power-back-on { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_power_sata0: pmx-power-sata0 { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_power_sata1: pmx-power-sata1 { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_present_sata0: pmx-present-sata0 { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_present_sata1: pmx-present-sata1 { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_led_white_usb: pmx-led-white-usb { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_fan_tacho: pmx-fan-tacho { - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - pmx_fan_high_speed: pmx-fan-high-speed { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_fan_low_speed: pmx-fan-low-speed { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_button_unmount: pmx-button-unmount { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - pmx_button_reset: pmx-button-reset { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - pmx_temp_alarm: pmx-temp-alarm { - marvell,pins = "mpp49"; - marvell,function = "gpio"; - }; - }; sata@80000 { status = "okay"; nr-ports = <2>; @@ -153,7 +43,6 @@ nand@3000000 { status = "okay"; - chip-delay = <35>; partition@0 { label = "u-boot"; @@ -187,33 +76,4 @@ }; }; }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - sata0_power: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "SATA0 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio1 7 0>; - }; - sata1_power: regulator@2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "SATA1 Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio1 8 0>; - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts b/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts index 2e3dd34e21a5..08a582414b88 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-dockstar.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "Seagate FreeAgent Dockstar"; @@ -17,25 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_usb_power_enable - &pmx_led_green &pmx_led_orange >; - pinctrl-names = "default"; - - pmx_usb_power_enable: pmx-usb-power-enable { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - pmx_led_green: pmx-led-green { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_led_orange: pmx-led-orange { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - }; serial@12000 { clock-frequency = <200000000>; status = "ok"; @@ -74,21 +54,4 @@ gpios = <&gpio1 15 1>; }; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - usb_power: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 29 0>; - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts index f2d386c95b07..26e281fbf6bc 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-dreamplug.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "Globalscale Technologies Dreamplug"; @@ -17,26 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_spi - &pmx_led_bluetooth &pmx_led_wifi - &pmx_led_wifi_ap >; - pinctrl-names = "default"; - - pmx_led_bluetooth: pmx-led-bluetooth { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - pmx_led_wifi: pmx-led-wifi { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - pmx_led_wifi_ap: pmx-led-wifi-ap { - marvell,pins = "mpp49"; - marvell,function = "gpio"; - }; - }; serial@12000 { clock-frequency = <200000000>; status = "ok"; diff --git a/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts b/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts index 1b133e0c566e..7c8238fbb6f9 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-goflexnet.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "Seagate GoFlex Net"; @@ -17,61 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_usb_power_enable &pmx_led_orange - &pmx_led_left_cap_0 &pmx_led_left_cap_1 - &pmx_led_left_cap_2 &pmx_led_left_cap_3 - &pmx_led_right_cap_0 &pmx_led_right_cap_1 - &pmx_led_right_cap_2 &pmx_led_right_cap_3 - >; - pinctrl-names = "default"; - - pmx_usb_power_enable: pmx-usb-power-enable { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - pmx_led_right_cap_0: pmx-led_right_cap_0 { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_right_cap_1: pmx-led_right_cap_1 { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_led_right_cap_2: pmx-led_right_cap_2 { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_led_right_cap_3: pmx-led_right_cap_3 { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_led_left_cap_0: pmx-led_left_cap_0 { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_led_left_cap_1: pmx-led_left_cap_1 { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_led_left_cap_2: pmx-led_left_cap_2 { - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - pmx_led_left_cap_3: pmx-led_left_cap_3 { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_led_green: pmx-led_green { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_led_orange: pmx-led_orange { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - }; serial@12000 { clock-frequency = <200000000>; status = "ok"; @@ -152,21 +96,4 @@ gpios = <&gpio1 9 0>; }; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - usb_power: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 29 0>; - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts b/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts index 71902da33d63..66794ed75ff1 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)"; @@ -17,39 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_nand - &pmx_led_os_red &pmx_power_off - &pmx_led_os_green &pmx_led_usb_transfer - &pmx_button_reset &pmx_button_usb_copy >; - pinctrl-names = "default"; - - pmx_led_os_red: pmx-led-os-red { - marvell,pins = "mpp22"; - marvell,function = "gpio"; - }; - pmx_power_off: pmx-power-off { - marvell,pins = "mpp24"; - marvell,function = "gpio"; - }; - pmx_led_os_green: pmx-led-os-green { - marvell,pins = "mpp25"; - marvell,function = "gpio"; - }; - pmx_led_usb_transfer: pmx-led-usb-transfer { - marvell,pins = "mpp27"; - marvell,function = "gpio"; - }; - pmx_button_reset: pmx-button-reset { - marvell,pins = "mpp28"; - marvell,function = "gpio"; - }; - pmx_button_usb_copy: pmx-button-usb-copy { - marvell,pins = "mpp29"; - marvell,function = "gpio"; - }; - }; serial@12000 { clock-frequency = <200000000>; status = "okay"; @@ -113,10 +79,4 @@ gpios = <&gpio0 27 0>; }; }; - gpio_poweroff { - compatible = "gpio-poweroff"; - gpios = <&gpio0 24 0>; - }; - - }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts b/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts index 504f16be8b54..d97cd9d4753e 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-iconnect.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "Iomega Iconnect"; @@ -19,56 +18,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_gpio_12 &pmx_gpio_35 - &pmx_gpio_41 &pmx_gpio_42 - &pmx_gpio_43 &pmx_gpio_44 - &pmx_gpio_45 &pmx_gpio_46 - &pmx_gpio_47 &pmx_gpio_48 >; - pinctrl-names = "default"; - - pmx_gpio_12: pmx-gpio-12 { - marvell,pins = "mpp12"; - marvell,function = "gpio"; - }; - pmx_gpio_35: pmx-gpio-35 { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - pmx_gpio_41: pmx-gpio-41 { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_gpio_42: pmx-gpio-42 { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_gpio_43: pmx-gpio-43 { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_gpio_44: pmx-gpio-44 { - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - pmx_gpio_45: pmx-gpio-45 { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_gpio_46: pmx-gpio-46 { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - pmx_gpio_47: pmx-gpio-47 { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - pmx_gpio_48: pmx-gpio-48 { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - }; i2c@11000 { status = "okay"; diff --git a/trunk/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/trunk/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts index 6cae4599c4b3..865aeec40a26 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "Iomega StorCenter ix2-200"; @@ -17,94 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_button_reset &pmx_button_power - &pmx_led_backup &pmx_led_power - &pmx_button_otb &pmx_led_rebuild - &pmx_led_health - &pmx_led_sata_brt_ctrl_1 - &pmx_led_sata_brt_ctrl_2 - &pmx_led_backup_brt_ctrl_1 - &pmx_led_backup_brt_ctrl_2 - &pmx_led_power_brt_ctrl_1 - &pmx_led_power_brt_ctrl_2 - &pmx_led_health_brt_ctrl_1 - &pmx_led_health_brt_ctrl_2 - &pmx_led_rebuild_brt_ctrl_1 - &pmx_led_rebuild_brt_ctrl_2 >; - pinctrl-names = "default"; - - pmx_button_reset: pmx-button-reset { - marvell,pins = "mpp12"; - marvell,function = "gpio"; - }; - pmx_button_power: pmx-button-power { - marvell,pins = "mpp14"; - marvell,function = "gpio"; - }; - pmx_led_backup: pmx-led-backup { - marvell,pins = "mpp15"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp16"; - marvell,function = "gpio"; - }; - pmx_button_otb: pmx-button-otb { - marvell,pins = "mpp35"; - marvell,function = "gpio"; - }; - pmx_led_rebuild: pmx-led-rebuild { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_health: pmx-led_health { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_led_sata_brt_ctrl_1: pmx-led-sata-brt-ctrl-1 { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_sata_brt_ctrl_2: pmx-led-sata-brt-ctrl-2 { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_led_backup_brt_ctrl_1: pmx-led-backup-brt-ctrl-1 { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_led_backup_brt_ctrl_2: pmx-led-backup-brt-ctrl-2 { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_led_power_brt_ctrl_1: pmx-led-power-brt-ctrl-1 { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_led_power_brt_ctrl_2: pmx-led-power-brt-ctrl-2 { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_led_health_brt_ctrl_1: pmx-led-health-brt-ctrl-1 { - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - pmx_led_health_brt_ctrl_2: pmx-led-health-brt-ctrl-2 { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - pmx_led_rebuild_brt_ctrl_1: pmx-led-rebuild-brt-ctrl-1 { - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - pmx_led_rebuild_brt_ctrl_2: pmx-led-rebuild-brt-ctrl-2 { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - - }; i2c@11000 { status = "okay"; diff --git a/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts index 8db3123ac80f..75bdb93fed26 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-km_kirkwood.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-98dx4122.dtsi" / { model = "Keymile Kirkwood Reference Design"; @@ -17,22 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_nand &pmx_i2c_gpio_sda - &pmx_i2c_gpio_scl >; - pinctrl-names = "default"; - - pmx_i2c_gpio_sda: pmx-gpio-sda { - marvell,pins = "mpp8"; - marvell,function = "gpio"; - }; - pmx_i2c_gpio_scl: pmx-gpio-scl { - marvell,pins = "mpp9"; - marvell,function = "gpio"; - }; - }; - serial@12000 { clock-frequency = <200000000>; status = "ok"; diff --git a/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 37d45c4f88fb..798e60eeedf3 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/trunk/arch/arm/boot/dts/kirkwood-lsxl.dtsi @@ -1,5 +1,4 @@ /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { chosen { @@ -7,71 +6,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_power_hdd &pmx_usb_vbus - &pmx_fan_low &pmx_fan_high - &pmx_led_function_red &pmx_led_alarm - &pmx_led_info &pmx_led_power - &pmx_fan_lock &pmx_button_function - &pmx_power_switch &pmx_power_auto_switch - &pmx_led_function_blue >; - pinctrl-names = "default"; - - pmx_power_hdd: pmx-power-hdd { - marvell,pins = "mpp10"; - marvell,function = "gpo"; - }; - pmx_usb_vbus: pmx-usb-vbus { - marvell,pins = "mpp11"; - marvell,function = "gpio"; - }; - pmx_fan_high: pmx-fan-high { - marvell,pins = "mpp18"; - marvell,function = "gpo"; - }; - pmx_fan_low: pmx-fan-low { - marvell,pins = "mpp19"; - marvell,function = "gpo"; - }; - pmx_led_function_blue: pmx-led-function-blue { - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_led_alarm: pmx-led-alarm { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_led_info: pmx-led-info { - marvell,pins = "mpp38"; - marvell,function = "gpio"; - }; - pmx_led_power: pmx-led-power { - marvell,pins = "mpp39"; - marvell,function = "gpio"; - }; - pmx_fan_lock: pmx-fan-lock { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - pmx_button_function: pmx-button-function { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - pmx_power_switch: pmx-power-switch { - marvell,pins = "mpp42"; - marvell,function = "gpio"; - }; - pmx_power_auto_switch: pmx-power-auto-switch { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_led_function_red: pmx-led-function_red { - marvell,pins = "mpp48"; - marvell,function = "gpio"; - }; - - }; sata@80000 { status = "okay"; nr-ports = <1>; @@ -171,33 +105,4 @@ 5000 0>; alarm-gpios = <&gpio1 8 0>; }; - - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - usb_power: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "USB Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 11 0>; - }; - hdd_power: regulator@2 { - compatible = "regulator-fixed"; - reg = <2>; - regulator-name = "HDD Power"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 10 0>; - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-mplcec4.dts b/trunk/arch/arm/boot/dts/kirkwood-mplcec4.dts index 262c65403760..ac3c080bed21 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-mplcec4.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-mplcec4.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6281.dtsi" / { model = "MPL CEC4"; @@ -17,64 +16,6 @@ }; ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_nand &pmx_uart0 - &pmx_led_health &pmx_sdio - &pmx_sata0 &pmx_sata1 - &pmx_led_user1o - &pmx_led_user1g &pmx_led_user0o - &pmx_led_user0g &pmx_led_misc - &pmx_sdio_cd - >; - pinctrl-names = "default"; - - pmx_led_health: pmx-led-health { - marvell,pins = "mpp7"; - marvell,function = "gpo"; - }; - - pmx_sata1: pmx-sata1 { - marvell,pins = "mpp34"; - marvell,function = "sata1"; - }; - - pmx_sata0: pmx-sata0 { - marvell,pins = "mpp35"; - marvell,function = "sata0"; - }; - - pmx_led_user1o: pmx-led-user1o { - marvell,pins = "mpp40"; - marvell,function = "gpio"; - }; - - pmx_led_user1g: pmx-led-user1g { - marvell,pins = "mpp41"; - marvell,function = "gpio"; - }; - - pmx_led_user0o: pmx-led-user0o { - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - - pmx_led_user0g: pmx-led-user0g { - marvell,pins = "mpp45"; - marvell,function = "gpio"; - }; - - pmx_led_misc: pmx-led-misc { - marvell,pins = "mpp46"; - marvell,function = "gpio"; - }; - - pmx_sdio_cd: pmx-sdio-cd { - marvell,pins = "mpp47"; - marvell,function = "gpio"; - }; - }; - i2c@11000 { status = "okay"; diff --git a/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts index 49d3d74d4d38..9a2606c8b78f 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-openblocks_a6.dts @@ -1,7 +1,6 @@ /dts-v1/; /include/ "kirkwood.dtsi" -/include/ "kirkwood-6282.dtsi" / { model = "Plat'Home OpenBlocksA6"; @@ -30,69 +29,11 @@ nand@3000000 { chip-delay = <25>; status = "okay"; - - partition@0 { - label = "uboot"; - reg = <0x0 0x90000>; - }; - - partition@90000 { - label = "env"; - reg = <0x90000 0x44000>; - }; - - partition@d4000 { - label = "test"; - reg = <0xd4000 0x24000>; - }; - - partition@f4000 { - label = "conf"; - reg = <0xf4000 0x400000>; - }; - - partition@4f4000 { - label = "linux"; - reg = <0x4f4000 0x1d20000>; - }; - - partition@2214000 { - label = "user"; - reg = <0x2214000 0x1dec000>; - }; }; sata@80000 { nr-ports = <1>; status = "okay"; }; - - i2c@11100 { - status = "okay"; - - s35390a: s35390a@30 { - compatible = "s35390a"; - reg = <0x30>; - }; - }; }; - - gpio-leds { - compatible = "gpio-leds"; - - led-red { - label = "obsa6:red:stat"; - gpios = <&gpio1 9 1>; - }; - - led-green { - label = "obsa6:green:stat"; - gpios = <&gpio1 10 1>; - }; - - led-yellow { - label = "obsa6:yellow:stat"; - gpios = <&gpio1 11 1>; - }; - }; }; diff --git a/trunk/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/trunk/arch/arm/boot/dts/kirkwood-ts219-6281.dts index 8295c833887f..ccbf32757800 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-ts219-6281.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-ts219-6281.dts @@ -1,39 +1,8 @@ /dts-v1/; /include/ "kirkwood-ts219.dtsi" -/include/ "kirkwood-6281.dtsi" / { - ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_uart0 &pmx_uart1 &pmx_spi - &pmx_twsi0 &pmx_sata0 &pmx_sata1 - &pmx_ram_size &pmx_reset_button - &pmx_USB_copy_button &pmx_board_id>; - pinctrl-names = "default"; - - pmx_ram_size: pmx-ram-size { - /* RAM: 0: 256 MB, 1: 512 MB */ - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_USB_copy_button: pmx-USB-copy-button { - marvell,pins = "mpp15"; - marvell,function = "gpio"; - }; - pmx_reset_button: pmx-reset-button { - marvell,pins = "mpp16"; - marvell,function = "gpio"; - }; - pmx_board_id: pmx-board-id { - /* 0: TS-11x, 1: TS-21x */ - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - }; - }; - gpio_keys { compatible = "gpio-keys"; #address-cells = <1>; diff --git a/trunk/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/trunk/arch/arm/boot/dts/kirkwood-ts219-6282.dts index df3f95dfba33..fbe9932161a1 100644 --- a/trunk/arch/arm/boot/dts/kirkwood-ts219-6282.dts +++ b/trunk/arch/arm/boot/dts/kirkwood-ts219-6282.dts @@ -1,39 +1,8 @@ /dts-v1/; /include/ "kirkwood-ts219.dtsi" -/include/ "kirkwood-6282.dtsi" / { - ocp@f1000000 { - pinctrl: pinctrl@10000 { - - pinctrl-0 = < &pmx_uart0 &pmx_uart1 &pmx_spi - &pmx_twsi0 &pmx_sata0 &pmx_sata1 - &pmx_ram_size &pmx_reset_button - &pmx_USB_copy_button &pmx_board_id>; - pinctrl-names = "default"; - - pmx_ram_size: pmx-ram-size { - /* RAM: 0: 256 MB, 1: 512 MB */ - marvell,pins = "mpp36"; - marvell,function = "gpio"; - }; - pmx_reset_button: pmx-reset-button { - marvell,pins = "mpp37"; - marvell,function = "gpio"; - }; - pmx_USB_copy_button: pmx-USB-copy-button { - marvell,pins = "mpp43"; - marvell,function = "gpio"; - }; - pmx_board_id: pmx-board-id { - /* 0: TS-11x, 1: TS-21x */ - marvell,pins = "mpp44"; - marvell,function = "gpio"; - }; - }; - }; - gpio_keys { compatible = "gpio-keys"; #address-cells = <1>; diff --git a/trunk/arch/arm/boot/dts/kirkwood.dtsi b/trunk/arch/arm/boot/dts/kirkwood.dtsi index a990c30f0a26..4e5b8154a5be 100644 --- a/trunk/arch/arm/boot/dts/kirkwood.dtsi +++ b/trunk/arch/arm/boot/dts/kirkwood.dtsi @@ -4,10 +4,6 @@ compatible = "marvell,kirkwood"; interrupt-parent = <&intc>; - aliases { - gpio0 = &gpio0; - gpio1 = &gpio1; - }; intc: interrupt-controller { compatible = "marvell,orion-intc", "marvell,intc"; interrupt-controller; @@ -28,8 +24,7 @@ #gpio-cells = <2>; gpio-controller; reg = <0x10100 0x40>; - ngpios = <32>; - interrupt-controller; + ngpio = <32>; interrupts = <35>, <36>, <37>, <38>; }; @@ -38,8 +33,7 @@ #gpio-cells = <2>; gpio-controller; reg = <0x10140 0x40>; - ngpios = <18>; - interrupt-controller; + ngpio = <18>; interrupts = <39>, <40>, <41>; }; @@ -83,13 +77,6 @@ status = "okay"; }; - ehci@50000 { - compatible = "marvell,orion-ehci"; - reg = <0x50000 0x1000>; - interrupts = <19>; - status = "okay"; - }; - sata@80000 { compatible = "marvell,orion-sata"; reg = <0x80000 0x5000>; diff --git a/trunk/arch/arm/boot/dts/lpc32xx.dtsi b/trunk/arch/arm/boot/dts/lpc32xx.dtsi index 1582f484a867..e5ffe960dbf3 100644 --- a/trunk/arch/arm/boot/dts/lpc32xx.dtsi +++ b/trunk/arch/arm/boot/dts/lpc32xx.dtsi @@ -182,13 +182,6 @@ pnx,timeout = <0x64>; }; - mpwm: mpwm@400E8000 { - compatible = "nxp,lpc3220-motor-pwm"; - reg = <0x400E8000 0x78>; - status = "disabled"; - #pwm-cells = <2>; - }; - i2cusb: i2c@31020300 { compatible = "nxp,pnx-i2c"; reg = <0x31020300 0x100>; diff --git a/trunk/arch/arm/boot/dts/snowball.dts b/trunk/arch/arm/boot/dts/snowball.dts index 27f31a5fa494..c6f85f0bc531 100644 --- a/trunk/arch/arm/boot/dts/snowball.dts +++ b/trunk/arch/arm/boot/dts/snowball.dts @@ -14,7 +14,7 @@ / { model = "Calao Systems Snowball platform with device tree"; - compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500"; + compatible = "calaosystems,snowball-a9500"; memory { reg = <0x00000000 0x20000000>; @@ -147,10 +147,10 @@ }; // External Micro SD slot - sdi0_per1@80126000 { + sdi@80126000 { arm,primecell-periphid = <0x10480180>; max-frequency = <50000000>; - bus-width = <4>; + bus-width = <8>; mmc-cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux3_reg>; @@ -161,7 +161,7 @@ }; // On-board eMMC - sdi4_per2@80114000 { + sdi@80114000 { arm,primecell-periphid = <0x10480180>; max-frequency = <50000000>; bus-width = <8>; @@ -214,137 +214,5 @@ cpufreq-cooling { status = "okay"; }; - - prcmu@80157000 { - db8500-prcmu-regulators { - db8500_vape_reg: db8500_vape { - regulator-name = "db8500-vape"; - }; - - db8500_varm_reg: db8500_varm { - regulator-name = "db8500-varm"; - }; - - db8500_vmodem_reg: db8500_vmodem { - regulator-name = "db8500-vmodem"; - }; - - db8500_vpll_reg: db8500_vpll { - regulator-name = "db8500-vpll"; - }; - - db8500_vsmps1_reg: db8500_vsmps1 { - regulator-name = "db8500-vsmps1"; - }; - - db8500_vsmps2_reg: db8500_vsmps2 { - regulator-name = "db8500-vsmps2"; - }; - - db8500_vsmps3_reg: db8500_vsmps3 { - regulator-name = "db8500-vsmps3"; - }; - - db8500_vrf1_reg: db8500_vrf1 { - regulator-name = "db8500-vrf1"; - }; - - db8500_sva_mmdsp_reg: db8500_sva_mmdsp { - regulator-name = "db8500-sva-mmdsp"; - }; - - db8500_sva_mmdsp_ret_reg: db8500_sva_mmdsp_ret { - regulator-name = "db8500-sva-mmdsp-ret"; - }; - - db8500_sva_pipe_reg: db8500_sva_pipe { - regulator-name = "db8500_sva_pipe"; - }; - - db8500_sia_mmdsp_reg: db8500_sia_mmdsp { - regulator-name = "db8500_sia_mmdsp"; - }; - - db8500_sia_mmdsp_ret_reg: db8500_sia_mmdsp_ret { - regulator-name = "db8500-sia-mmdsp-ret"; - }; - - db8500_sia_pipe_reg: db8500_sia_pipe { - regulator-name = "db8500-sia-pipe"; - }; - - db8500_sga_reg: db8500_sga { - regulator-name = "db8500-sga"; - }; - - db8500_b2r2_mcde_reg: db8500_b2r2_mcde { - regulator-name = "db8500-b2r2-mcde"; - }; - - db8500_esram12_reg: db8500_esram12 { - regulator-name = "db8500-esram12"; - }; - - db8500_esram12_ret_reg: db8500_esram12_ret { - regulator-name = "db8500-esram12-ret"; - }; - - db8500_esram34_reg: db8500_esram34 { - regulator-name = "db8500-esram34"; - }; - - db8500_esram34_ret_reg: db8500_esram34_ret { - regulator-name = "db8500-esram34-ret"; - }; - }; - - ab8500@5 { - ab8500-regulators { - ab8500_ldo_aux1_reg: ab8500_ldo_aux1 { - regulator-name = "V-DISPLAY"; - }; - - ab8500_ldo_aux2_reg: ab8500_ldo_aux2 { - regulator-name = "V-eMMC1"; - }; - - ab8500_ldo_aux3_reg: ab8500_ldo_aux3 { - regulator-name = "V-MMC-SD"; - }; - - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { - regulator-name = "V-INTCORE"; - }; - - ab8500_ldo_tvout_reg: ab8500_ldo_tvout { - regulator-name = "V-TVOUT"; - }; - - ab8500_ldo_usb_reg: ab8500_ldo_usb { - regulator-name = "dummy"; - }; - - ab8500_ldo_audio_reg: ab8500_ldo_audio { - regulator-name = "V-AUD"; - }; - - ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { - regulator-name = "V-AMIC1"; - }; - - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { - regulator-name = "V-AMIC2"; - }; - - ab8500_ldo_dmic_reg: ab8500_ldo_dmic { - regulator-name = "V-DMIC"; - }; - - ab8500_ldo_ana_reg: ab8500_ldo_ana { - regulator-name = "V-CSI/DSI"; - }; - }; - }; - }; }; }; diff --git a/trunk/arch/arm/boot/dts/stuib.dtsi b/trunk/arch/arm/boot/dts/stuib.dtsi deleted file mode 100644 index 39446a247e79..000000000000 --- a/trunk/arch/arm/boot/dts/stuib.dtsi +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2012 ST-Ericsson AB - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/ { - soc-u9500 { - i2c@80004000 { - stmpe1601: stmpe1601@40 { - compatible = "st,stmpe1601"; - reg = <0x40>; - interrupts = <26 0x1>; - interrupt-parent = <&gpio6>; - interrupt-controller; - - wakeup-source; - st,autosleep-timeout = <1024>; - - stmpe_keypad { - compatible = "st,stmpe-keypad"; - - debounce-interval = <64>; - st,scan-count = <8>; - st,no-autorepeat; - - linux,keymap = <0x205006b - 0x4010074 - 0x3050072 - 0x1030004 - 0x502006a - 0x500000a - 0x5008b - 0x706001c - 0x405000b - 0x6070003 - 0x3040067 - 0x303006c - 0x60400e7 - 0x602009e - 0x4020073 - 0x5050002 - 0x4030069 - 0x3020008>; - }; - }; - }; - - i2c@80110000 { - bu21013_tp@0x5c { - compatible = "rhom,bu21013_tp"; - reg = <0x5c>; - touch-gpio = <&gpio2 20 0x4>; - avdd-supply = <&ab8500_ldo_aux1_reg>; - - rhom,touch-max-x = <384>; - rhom,touch-max-y = <704>; - rhom,flip-y; - }; - - bu21013_tp@0x5d { - compatible = "rhom,bu21013_tp"; - reg = <0x5d>; - touch-gpio = <&gpio2 20 0x4>; - avdd-supply = <&ab8500_ldo_aux1_reg>; - - rhom,touch-max-x = <384>; - rhom,touch-max-y = <704>; - rhom,flip-y; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/tegra20-harmony.dts b/trunk/arch/arm/boot/dts/tegra20-harmony.dts index 43eb72af8948..74b8a47adf91 100644 --- a/trunk/arch/arm/boot/dts/tegra20-harmony.dts +++ b/trunk/arch/arm/boot/dts/tegra20-harmony.dts @@ -10,18 +10,6 @@ reg = <0x00000000 0x40000000>; }; - host1x { - hdmi { - status = "okay"; - - vdd-supply = <&hdmi_vdd_reg>; - pll-supply = <&hdmi_pll_reg>; - - nvidia,ddc-i2c-bus = <&hdmi_ddc>; - nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ - }; - }; - pinmux { pinctrl-names = "default"; pinctrl-0 = <&state_default>; @@ -274,9 +262,9 @@ }; }; - hdmi_ddc: i2c@7000c400 { + i2c@7000c400 { status = "okay"; - clock-frequency = <100000>; + clock-frequency = <400000>; }; i2c@7000c500 { @@ -381,13 +369,13 @@ regulator-max-microvolt = <1800000>; }; - hdmi_vdd_reg: ldo7 { + ldo7 { regulator-name = "vdd_ldo7,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - hdmi_pll_reg: ldo8 { + ldo8 { regulator-name = "vdd_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -408,11 +396,6 @@ }; }; }; - - temperature-sensor@4c { - compatible = "adi,adt7461"; - reg = <0x4c>; - }; }; pmc { diff --git a/trunk/arch/arm/boot/dts/tegra20-plutux.dts b/trunk/arch/arm/boot/dts/tegra20-plutux.dts index 289480026fbf..331a3ef24d59 100644 --- a/trunk/arch/arm/boot/dts/tegra20-plutux.dts +++ b/trunk/arch/arm/boot/dts/tegra20-plutux.dts @@ -6,12 +6,6 @@ model = "Avionic Design Plutux board"; compatible = "ad,plutux", "ad,tamonten", "nvidia,tegra20"; - host1x { - hdmi { - status = "okay"; - }; - }; - i2c@7000c000 { wm8903: wm8903@1a { compatible = "wlf,wm8903"; diff --git a/trunk/arch/arm/boot/dts/tegra20-seaboard.dts b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts index 420459825b46..e58a0e60f711 100644 --- a/trunk/arch/arm/boot/dts/tegra20-seaboard.dts +++ b/trunk/arch/arm/boot/dts/tegra20-seaboard.dts @@ -561,12 +561,6 @@ status = "okay"; }; - sdhci@c8000000 { - status = "okay"; - power-gpios = <&gpio 86 0>; /* gpio PK6 */ - bus-width = <4>; - }; - sdhci@c8000400 { status = "okay"; cd-gpios = <&gpio 69 0>; /* gpio PI5 */ diff --git a/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi b/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi index a239ccdfaa52..5b3d8b157b33 100644 --- a/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20-tamonten.dtsi @@ -8,16 +8,6 @@ reg = <0x00000000 0x20000000>; }; - host1x { - hdmi { - vdd-supply = <&hdmi_vdd_reg>; - pll-supply = <&hdmi_pll_reg>; - - nvidia,ddc-i2c-bus = <&hdmi_ddc>; - nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ - }; - }; - pinmux { pinctrl-names = "default"; pinctrl-0 = <&state_default>; @@ -72,6 +62,10 @@ nvidia,pins = "dap4"; nvidia,function = "dap4"; }; + ddc { + nvidia,pins = "ddc"; + nvidia,function = "i2c2"; + }; dta { nvidia,pins = "dta", "dtd"; nvidia,function = "sdio2"; @@ -97,7 +91,7 @@ nvidia,function = "pcie"; }; hdint { - nvidia,pins = "hdint"; + nvidia,pins = "hdint", "pta"; nvidia,function = "hdmi"; }; i2cp { @@ -236,39 +230,6 @@ nvidia,pull = <1>; }; }; - - state_i2cmux_ddc: pinmux_i2cmux_ddc { - ddc { - nvidia,pins = "ddc"; - nvidia,function = "i2c2"; - }; - pta { - nvidia,pins = "pta"; - nvidia,function = "rsvd4"; - }; - }; - - state_i2cmux_pta: pinmux_i2cmux_pta { - ddc { - nvidia,pins = "ddc"; - nvidia,function = "rsvd4"; - }; - pta { - nvidia,pins = "pta"; - nvidia,function = "i2c2"; - }; - }; - - state_i2cmux_idle: pinmux_i2cmux_idle { - ddc { - nvidia,pins = "ddc"; - nvidia,function = "rsvd4"; - }; - pta { - nvidia,pins = "pta"; - nvidia,function = "rsvd4"; - }; - }; }; i2s@70002800 { @@ -285,36 +246,6 @@ status = "okay"; }; - i2c@7000c400 { - clock-frequency = <100000>; - status = "okay"; - }; - - i2cmux { - compatible = "i2c-mux-pinctrl"; - #address-cells = <1>; - #size-cells = <0>; - - i2c-parent = <&{/i2c@7000c400}>; - - pinctrl-names = "ddc", "pta", "idle"; - pinctrl-0 = <&state_i2cmux_ddc>; - pinctrl-1 = <&state_i2cmux_pta>; - pinctrl-2 = <&state_i2cmux_idle>; - - hdmi_ddc: i2c@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - }; - - i2c@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - }; - }; - i2c@7000d000 { clock-frequency = <400000>; status = "okay"; @@ -417,13 +348,13 @@ regulator-max-microvolt = <2850000>; }; - hdmi_vdd_reg: ldo7 { + ldo7 { regulator-name = "vdd_ldo7,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; - hdmi_pll_reg: ldo8 { + ldo8 { regulator-name = "vdd_ldo8,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -450,11 +381,6 @@ }; }; }; - - temperature-sensor@4c { - compatible = "onnn,nct1008"; - reg = <0x4c>; - }; }; pmc { diff --git a/trunk/arch/arm/boot/dts/tegra20-tec.dts b/trunk/arch/arm/boot/dts/tegra20-tec.dts index 402b21004bef..9aff31b0fe4a 100644 --- a/trunk/arch/arm/boot/dts/tegra20-tec.dts +++ b/trunk/arch/arm/boot/dts/tegra20-tec.dts @@ -6,13 +6,10 @@ model = "Avionic Design Tamonten Evaluation Carrier"; compatible = "ad,tec", "ad,tamonten", "nvidia,tegra20"; - host1x { - hdmi { - status = "okay"; - }; - }; - i2c@7000c000 { + clock-frequency = <400000>; + status = "okay"; + wm8903: wm8903@1a { compatible = "wlf,wm8903"; reg = <0x1a>; diff --git a/trunk/arch/arm/boot/dts/tegra20-trimslice.dts b/trunk/arch/arm/boot/dts/tegra20-trimslice.dts index b70b4cb754c8..27fb8a67ea42 100644 --- a/trunk/arch/arm/boot/dts/tegra20-trimslice.dts +++ b/trunk/arch/arm/boot/dts/tegra20-trimslice.dts @@ -10,18 +10,6 @@ reg = <0x00000000 0x40000000>; }; - host1x { - hdmi { - status = "okay"; - - vdd-supply = <&hdmi_vdd_reg>; - pll-supply = <&hdmi_pll_reg>; - - nvidia,ddc-i2c-bus = <&hdmi_ddc>; - nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ - }; - }; - pinmux { pinctrl-names = "default"; pinctrl-0 = <&state_default>; @@ -261,24 +249,14 @@ clock-frequency = <216000000>; }; - dvi_ddc: i2c@7000c000 { + i2c@7000c000 { status = "okay"; - clock-frequency = <100000>; - }; - - spi@7000c380 { - status = "okay"; - spi-max-frequency = <48000000>; - spi-flash@0 { - compatible = "winbond,w25q80bl"; - reg = <0>; - spi-max-frequency = <48000000>; - }; + clock-frequency = <400000>; }; - hdmi_ddc: i2c@7000c400 { + i2c@7000c400 { status = "okay"; - clock-frequency = <100000>; + clock-frequency = <400000>; }; i2c@7000c500 { @@ -322,30 +300,6 @@ bus-width = <4>; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - hdmi_vdd_reg: regulator@0 { - compatible = "regulator-fixed"; - reg = <0>; - regulator-name = "avdd_hdmi"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - hdmi_pll_reg: regulator@1 { - compatible = "regulator-fixed"; - reg = <1>; - regulator-name = "avdd_hdmi_pll"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - }; - sound { compatible = "nvidia,tegra-audio-trimslice"; nvidia,i2s-controller = <&tegra_i2s1>; diff --git a/trunk/arch/arm/boot/dts/tegra20-ventana.dts b/trunk/arch/arm/boot/dts/tegra20-ventana.dts index adc47547eaae..86854f1abd58 100644 --- a/trunk/arch/arm/boot/dts/tegra20-ventana.dts +++ b/trunk/arch/arm/boot/dts/tegra20-ventana.dts @@ -64,6 +64,11 @@ nvidia,pins = "dap4"; nvidia,function = "dap4"; }; + ddc { + nvidia,pins = "ddc", "owc", "spdi", "spdo", + "uac"; + nvidia,function = "rsvd2"; + }; dta { nvidia,pins = "dta", "dtb", "dtc", "dtd", "dte"; nvidia,function = "vi"; @@ -93,7 +98,7 @@ nvidia,function = "pcie"; }; hdint { - nvidia,pins = "hdint"; + nvidia,pins = "hdint", "pta"; nvidia,function = "hdmi"; }; i2cp { @@ -124,10 +129,6 @@ "lspi", "lvp1", "lvs"; nvidia,function = "displaya"; }; - owc { - nvidia,pins = "owc", "spdi", "spdo", "uac"; - nvidia,function = "rsvd2"; - }; pmc { nvidia,pins = "pmc"; nvidia,function = "pwr_on"; @@ -236,49 +237,6 @@ "ld23_22"; nvidia,pull = <1>; }; - drive_sdio1 { - nvidia,pins = "drive_sdio1"; - nvidia,high-speed-mode = <0>; - nvidia,schmitt = <1>; - nvidia,low-power-mode = <3>; - nvidia,pull-down-strength = <31>; - nvidia,pull-up-strength = <31>; - nvidia,slew-rate-rising = <3>; - nvidia,slew-rate-falling = <3>; - }; - }; - - state_i2cmux_ddc: pinmux_i2cmux_ddc { - ddc { - nvidia,pins = "ddc"; - nvidia,function = "i2c2"; - }; - pta { - nvidia,pins = "pta"; - nvidia,function = "rsvd4"; - }; - }; - - state_i2cmux_pta: pinmux_i2cmux_pta { - ddc { - nvidia,pins = "ddc"; - nvidia,function = "rsvd4"; - }; - pta { - nvidia,pins = "pta"; - nvidia,function = "i2c2"; - }; - }; - - state_i2cmux_idle: pinmux_i2cmux_idle { - ddc { - nvidia,pins = "ddc"; - nvidia,function = "rsvd4"; - }; - pta { - nvidia,pins = "pta"; - nvidia,function = "rsvd4"; - }; }; }; @@ -323,31 +281,6 @@ clock-frequency = <400000>; }; - i2cmux { - compatible = "i2c-mux-pinctrl"; - #address-cells = <1>; - #size-cells = <0>; - - i2c-parent = <&{/i2c@7000c400}>; - - pinctrl-names = "ddc", "pta", "idle"; - pinctrl-0 = <&state_i2cmux_ddc>; - pinctrl-1 = <&state_i2cmux_pta>; - pinctrl-2 = <&state_i2cmux_idle>; - - i2c@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - }; - - i2c@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - }; - }; - i2c@7000c500 { status = "okay"; clock-frequency = <400000>; @@ -473,11 +406,6 @@ }; }; }; - - temperature-sensor@4c { - compatible = "onnn,nct1008"; - reg = <0x4c>; - }; }; pmc { @@ -497,12 +425,6 @@ status = "okay"; }; - sdhci@c8000000 { - status = "okay"; - power-gpios = <&gpio 86 0>; /* gpio PK6 */ - bus-width = <4>; - }; - sdhci@c8000400 { status = "okay"; cd-gpios = <&gpio 69 0>; /* gpio PI5 */ diff --git a/trunk/arch/arm/boot/dts/tegra20-whistler.dts b/trunk/arch/arm/boot/dts/tegra20-whistler.dts index 20d576ecd555..94a71c91beb5 100644 --- a/trunk/arch/arm/boot/dts/tegra20-whistler.dts +++ b/trunk/arch/arm/boot/dts/tegra20-whistler.dts @@ -10,18 +10,6 @@ reg = <0x00000000 0x20000000>; }; - host1x { - hdmi { - status = "okay"; - - vdd-supply = <&hdmi_vdd_reg>; - pll-supply = <&hdmi_pll_reg>; - - nvidia,ddc-i2c-bus = <&hdmi_ddc>; - nvidia,hpd-gpio = <&gpio 111 0>; /* PN7 */ - }; - }; - pinmux { pinctrl-names = "default"; pinctrl-0 = <&state_default>; @@ -258,11 +246,6 @@ clock-frequency = <216000000>; }; - hdmi_ddc: i2c@7000c400 { - status = "okay"; - clock-frequency = <100000>; - }; - i2c@7000d000 { status = "okay"; clock-frequency = <100000>; @@ -373,7 +356,7 @@ regulator-always-on; }; - hdmi_pll_reg: ldo6 { + ldo6 { regulator-name = "nvvdd_ldo6,avdd_hdmi_pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -405,7 +388,7 @@ regulator-always-on; }; - hdmi_vdd_reg: ldo11 { + ldo11 { regulator-name = "nvvdd_ldo11,vddio_pex_clk,vcom_33,avdd_hdmi"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/trunk/arch/arm/boot/dts/tegra20.dtsi b/trunk/arch/arm/boot/dts/tegra20.dtsi index b8effa1cbda7..f40cfbaa7c7e 100644 --- a/trunk/arch/arm/boot/dts/tegra20.dtsi +++ b/trunk/arch/arm/boot/dts/tegra20.dtsi @@ -4,99 +4,6 @@ compatible = "nvidia,tegra20"; interrupt-parent = <&intc>; - host1x { - compatible = "nvidia,tegra20-host1x", "simple-bus"; - reg = <0x50000000 0x00024000>; - interrupts = <0 65 0x04 /* mpcore syncpt */ - 0 67 0x04>; /* mpcore general */ - - #address-cells = <1>; - #size-cells = <1>; - - ranges = <0x54000000 0x54000000 0x04000000>; - - mpe { - compatible = "nvidia,tegra20-mpe"; - reg = <0x54040000 0x00040000>; - interrupts = <0 68 0x04>; - }; - - vi { - compatible = "nvidia,tegra20-vi"; - reg = <0x54080000 0x00040000>; - interrupts = <0 69 0x04>; - }; - - epp { - compatible = "nvidia,tegra20-epp"; - reg = <0x540c0000 0x00040000>; - interrupts = <0 70 0x04>; - }; - - isp { - compatible = "nvidia,tegra20-isp"; - reg = <0x54100000 0x00040000>; - interrupts = <0 71 0x04>; - }; - - gr2d { - compatible = "nvidia,tegra20-gr2d"; - reg = <0x54140000 0x00040000>; - interrupts = <0 72 0x04>; - }; - - gr3d { - compatible = "nvidia,tegra20-gr3d"; - reg = <0x54180000 0x00040000>; - }; - - dc@54200000 { - compatible = "nvidia,tegra20-dc"; - reg = <0x54200000 0x00040000>; - interrupts = <0 73 0x04>; - - rgb { - status = "disabled"; - }; - }; - - dc@54240000 { - compatible = "nvidia,tegra20-dc"; - reg = <0x54240000 0x00040000>; - interrupts = <0 74 0x04>; - - rgb { - status = "disabled"; - }; - }; - - hdmi { - compatible = "nvidia,tegra20-hdmi"; - reg = <0x54280000 0x00040000>; - interrupts = <0 75 0x04>; - status = "disabled"; - }; - - tvo { - compatible = "nvidia,tegra20-tvo"; - reg = <0x542c0000 0x00040000>; - interrupts = <0 76 0x04>; - status = "disabled"; - }; - - dsi { - compatible = "nvidia,tegra20-dsi"; - reg = <0x54300000 0x00040000>; - status = "disabled"; - }; - }; - - timer@50004600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0x50040600 0x20>; - interrupts = <1 13 0x304>; - }; - cache-controller@50043000 { compatible = "arm,pl310-cache"; reg = <0x50043000 0x1000>; @@ -114,15 +21,6 @@ #interrupt-cells = <3>; }; - timer@60005000 { - compatible = "nvidia,tegra20-timer"; - reg = <0x60005000 0x60>; - interrupts = <0 0 0x04 - 0 1 0x04 - 0 41 0x04 - 0 42 0x04>; - }; - apbdma: dma { compatible = "nvidia,tegra20-apbdma"; reg = <0x6000a000 0x1200>; @@ -240,12 +138,6 @@ #pwm-cells = <2>; }; - rtc { - compatible = "nvidia,tegra20-rtc"; - reg = <0x7000e000 0x100>; - interrupts = <0 2 0x04>; - }; - i2c@7000c000 { compatible = "nvidia,tegra20-i2c"; reg = <0x7000c000 0x100>; @@ -255,16 +147,6 @@ status = "disabled"; }; - spi@7000c380 { - compatible = "nvidia,tegra20-sflash"; - reg = <0x7000c380 0x80>; - interrupts = <0 39 0x04>; - nvidia,dma-request-selector = <&apbdma 11>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - i2c@7000c400 { compatible = "nvidia,tegra20-i2c"; reg = <0x7000c400 0x100>; @@ -292,46 +174,6 @@ status = "disabled"; }; - spi@7000d400 { - compatible = "nvidia,tegra20-slink"; - reg = <0x7000d400 0x200>; - interrupts = <0 59 0x04>; - nvidia,dma-request-selector = <&apbdma 15>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000d600 { - compatible = "nvidia,tegra20-slink"; - reg = <0x7000d600 0x200>; - interrupts = <0 82 0x04>; - nvidia,dma-request-selector = <&apbdma 16>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000d800 { - compatible = "nvidia,tegra20-slink"; - reg = <0x7000d480 0x200>; - interrupts = <0 83 0x04>; - nvidia,dma-request-selector = <&apbdma 17>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000da00 { - compatible = "nvidia,tegra20-slink"; - reg = <0x7000da00 0x200>; - interrupts = <0 93 0x04>; - nvidia,dma-request-selector = <&apbdma 18>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - pmc { compatible = "nvidia,tegra20-pmc"; reg = <0x7000e400 0x400>; diff --git a/trunk/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/trunk/arch/arm/boot/dts/tegra30-cardhu-a02.dts index adc88aa50eb6..dd4222f00eca 100644 --- a/trunk/arch/arm/boot/dts/tegra30-cardhu-a02.dts +++ b/trunk/arch/arm/boot/dts/tegra30-cardhu-a02.dts @@ -83,11 +83,5 @@ gpio = <&gpio 83 0>; /* GPIO PK3 */ }; }; - - sdhci@78000400 { - status = "okay"; - power-gpios = <&gpio 28 0>; /* gpio PD4 */ - bus-width = <4>; - }; }; diff --git a/trunk/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/trunk/arch/arm/boot/dts/tegra30-cardhu-a04.dts index 08163e145d57..0828f097ca86 100644 --- a/trunk/arch/arm/boot/dts/tegra30-cardhu-a04.dts +++ b/trunk/arch/arm/boot/dts/tegra30-cardhu-a04.dts @@ -95,10 +95,4 @@ gpio = <&gpio 232 0>; /* GPIO PDD0 */ }; }; - - sdhci@78000400 { - status = "okay"; - power-gpios = <&gpio 27 0>; /* gpio PD3 */ - bus-width = <4>; - }; }; diff --git a/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi b/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi index bdb2a660f376..b1271a894327 100644 --- a/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30-cardhu.dtsi @@ -52,22 +52,6 @@ nvidia,pull = <2>; nvidia,tristate = <0>; }; - sdmmc3_clk_pa6 { - nvidia,pins = "sdmmc3_clk_pa6"; - nvidia,function = "sdmmc3"; - nvidia,pull = <0>; - nvidia,tristate = <0>; - }; - sdmmc3_cmd_pa7 { - nvidia,pins = "sdmmc3_cmd_pa7", - "sdmmc3_dat0_pb7", - "sdmmc3_dat1_pb6", - "sdmmc3_dat2_pb5", - "sdmmc3_dat3_pb4"; - nvidia,function = "sdmmc3"; - nvidia,pull = <2>; - nvidia,tristate = <0>; - }; sdmmc4_clk_pcc4 { nvidia,pins = "sdmmc4_clk_pcc4", "sdmmc4_rst_n_pcc3"; @@ -97,15 +81,6 @@ nvidia,pull = <0>; nvidia,tristate = <0>; }; - sdio3 { - nvidia,pins = "drive_sdio3"; - nvidia,high-speed-mode = <0>; - nvidia,schmitt = <0>; - nvidia,pull-down-strength = <46>; - nvidia,pull-up-strength = <42>; - nvidia,slew-rate-rising = <1>; - nvidia,slew-rate-falling = <1>; - }; }; }; @@ -275,16 +250,6 @@ }; }; - spi@7000da00 { - status = "okay"; - spi-max-frequency = <25000000>; - spi-flash@1 { - compatible = "winbond,w25q32"; - reg = <1>; - spi-max-frequency = <20000000>; - }; - }; - ahub { i2s@70080400 { status = "okay"; @@ -419,8 +384,6 @@ regulator-name = "vdd_com"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-boot-on; enable-active-high; gpio = <&gpio 24 0>; /* gpio PD0 */ vin-supply = <&sys_3v3_reg>; diff --git a/trunk/arch/arm/boot/dts/tegra30.dtsi b/trunk/arch/arm/boot/dts/tegra30.dtsi index 529fdb82dfdb..fed8dca1692d 100644 --- a/trunk/arch/arm/boot/dts/tegra30.dtsi +++ b/trunk/arch/arm/boot/dts/tegra30.dtsi @@ -4,99 +4,6 @@ compatible = "nvidia,tegra30"; interrupt-parent = <&intc>; - host1x { - compatible = "nvidia,tegra30-host1x", "simple-bus"; - reg = <0x50000000 0x00024000>; - interrupts = <0 65 0x04 /* mpcore syncpt */ - 0 67 0x04>; /* mpcore general */ - - #address-cells = <1>; - #size-cells = <1>; - - ranges = <0x54000000 0x54000000 0x04000000>; - - mpe { - compatible = "nvidia,tegra30-mpe"; - reg = <0x54040000 0x00040000>; - interrupts = <0 68 0x04>; - }; - - vi { - compatible = "nvidia,tegra30-vi"; - reg = <0x54080000 0x00040000>; - interrupts = <0 69 0x04>; - }; - - epp { - compatible = "nvidia,tegra30-epp"; - reg = <0x540c0000 0x00040000>; - interrupts = <0 70 0x04>; - }; - - isp { - compatible = "nvidia,tegra30-isp"; - reg = <0x54100000 0x00040000>; - interrupts = <0 71 0x04>; - }; - - gr2d { - compatible = "nvidia,tegra30-gr2d"; - reg = <0x54140000 0x00040000>; - interrupts = <0 72 0x04>; - }; - - gr3d { - compatible = "nvidia,tegra30-gr3d"; - reg = <0x54180000 0x00040000>; - }; - - dc@54200000 { - compatible = "nvidia,tegra30-dc"; - reg = <0x54200000 0x00040000>; - interrupts = <0 73 0x04>; - - rgb { - status = "disabled"; - }; - }; - - dc@54240000 { - compatible = "nvidia,tegra30-dc"; - reg = <0x54240000 0x00040000>; - interrupts = <0 74 0x04>; - - rgb { - status = "disabled"; - }; - }; - - hdmi { - compatible = "nvidia,tegra30-hdmi"; - reg = <0x54280000 0x00040000>; - interrupts = <0 75 0x04>; - status = "disabled"; - }; - - tvo { - compatible = "nvidia,tegra30-tvo"; - reg = <0x542c0000 0x00040000>; - interrupts = <0 76 0x04>; - status = "disabled"; - }; - - dsi { - compatible = "nvidia,tegra30-dsi"; - reg = <0x54300000 0x00040000>; - status = "disabled"; - }; - }; - - timer@50004600 { - compatible = "arm,cortex-a9-twd-timer"; - reg = <0x50040600 0x20>; - interrupts = <1 13 0xf04>; - }; - cache-controller@50043000 { compatible = "arm,pl310-cache"; reg = <0x50043000 0x1000>; @@ -114,17 +21,6 @@ #interrupt-cells = <3>; }; - timer@60005000 { - compatible = "nvidia,tegra30-timer", "nvidia,tegra20-timer"; - reg = <0x60005000 0x400>; - interrupts = <0 0 0x04 - 0 1 0x04 - 0 41 0x04 - 0 42 0x04 - 0 121 0x04 - 0 122 0x04>; - }; - apbdma: dma { compatible = "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma"; reg = <0x6000a000 0x1400>; @@ -236,12 +132,6 @@ #pwm-cells = <2>; }; - rtc { - compatible = "nvidia,tegra30-rtc", "nvidia,tegra20-rtc"; - reg = <0x7000e000 0x100>; - interrupts = <0 2 0x04>; - }; - i2c@7000c000 { compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; reg = <0x7000c000 0x100>; @@ -287,66 +177,6 @@ status = "disabled"; }; - spi@7000d400 { - compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; - reg = <0x7000d400 0x200>; - interrupts = <0 59 0x04>; - nvidia,dma-request-selector = <&apbdma 15>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000d600 { - compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; - reg = <0x7000d600 0x200>; - interrupts = <0 82 0x04>; - nvidia,dma-request-selector = <&apbdma 16>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000d800 { - compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; - reg = <0x7000d480 0x200>; - interrupts = <0 83 0x04>; - nvidia,dma-request-selector = <&apbdma 17>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000da00 { - compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; - reg = <0x7000da00 0x200>; - interrupts = <0 93 0x04>; - nvidia,dma-request-selector = <&apbdma 18>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000dc00 { - compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; - reg = <0x7000dc00 0x200>; - interrupts = <0 94 0x04>; - nvidia,dma-request-selector = <&apbdma 27>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - - spi@7000de00 { - compatible = "nvidia,tegra30-slink", "nvidia,tegra20-slink"; - reg = <0x7000de00 0x200>; - interrupts = <0 79 0x04>; - nvidia,dma-request-selector = <&apbdma 28>; - #address-cells = <1>; - #size-cells = <0>; - status = "disabled"; - }; - pmc { compatible = "nvidia,tegra20-pmc", "nvidia,tegra30-pmc"; reg = <0x7000e400 0x400>; diff --git a/trunk/arch/arm/boot/dts/u9540.dts b/trunk/arch/arm/boot/dts/u9540.dts deleted file mode 100644 index 95892ec6c342..000000000000 --- a/trunk/arch/arm/boot/dts/u9540.dts +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2012 ST-Ericsson AB - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "dbx5x0.dtsi" - -/ { - model = "ST-Ericsson U9540 platform with Device Tree"; - compatible = "st-ericsson,u9540"; - - memory { - reg = <0x00000000 0x20000000>; - }; - - soc-u9500 { - uart@80120000 { - status = "okay"; - }; - - uart@80121000 { - status = "okay"; - }; - - uart@80007000 { - status = "okay"; - }; - - // External Micro SD slot - sdi0_per1@80126000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <4>; - mmc-cap-sd-highspeed; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux3_reg>; - - cd-gpios = <&gpio7 6 0x4>; // 230 - cd-inverted; - - status = "okay"; - }; - - - // WLAN SDIO channel - sdi1_per2@80118000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <50000000>; - bus-width = <4>; - - status = "okay"; - }; - - // On-board eMMC - sdi4_per2@80114000 { - arm,primecell-periphid = <0x10480180>; - max-frequency = <100000000>; - bus-width = <8>; - mmc-cap-mmc-highspeed; - vmmc-supply = <&ab8500_ldo_aux2_reg>; - - status = "okay"; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/zynq-7000.dtsi b/trunk/arch/arm/boot/dts/zynq-7000.dtsi deleted file mode 100644 index 401c1262d4ed..000000000000 --- a/trunk/arch/arm/boot/dts/zynq-7000.dtsi +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (C) 2011 Xilinx - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -/include/ "skeleton.dtsi" - -/ { - compatible = "xlnx,zynq-7000"; - - amba { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - interrupt-parent = <&intc>; - ranges; - - intc: interrupt-controller@f8f01000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; - #address-cells = <1>; - interrupt-controller; - reg = <0xF8F01000 0x1000>, - <0xF8F00100 0x100>; - }; - - L2: cache-controller { - compatible = "arm,pl310-cache"; - reg = <0xF8F02000 0x1000>; - arm,data-latency = <2 3 2>; - arm,tag-latency = <2 3 2>; - cache-unified; - cache-level = <2>; - }; - - uart0: uart@e0000000 { - compatible = "xlnx,xuartps"; - reg = <0xE0000000 0x1000>; - interrupts = <0 27 4>; - clock = <50000000>; - }; - - uart1: uart@e0001000 { - compatible = "xlnx,xuartps"; - reg = <0xE0001000 0x1000>; - interrupts = <0 50 4>; - clock = <50000000>; - }; - - slcr: slcr@f8000000 { - compatible = "xlnx,zynq-slcr"; - reg = <0xF8000000 0x1000>; - - clocks { - #address-cells = <1>; - #size-cells = <0>; - - ps_clk: ps_clk { - #clock-cells = <0>; - compatible = "fixed-clock"; - /* clock-frequency set in board-specific file */ - clock-output-names = "ps_clk"; - }; - armpll: armpll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x100 0x110>; - clock-output-names = "armpll"; - }; - ddrpll: ddrpll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x104 0x114>; - clock-output-names = "ddrpll"; - }; - iopll: iopll { - #clock-cells = <0>; - compatible = "xlnx,zynq-pll"; - clocks = <&ps_clk>; - reg = <0x108 0x118>; - clock-output-names = "iopll"; - }; - uart_clk: uart_clk { - #clock-cells = <1>; - compatible = "xlnx,zynq-periph-clock"; - clocks = <&iopll &armpll &ddrpll>; - reg = <0x154>; - clock-output-names = "uart0_ref_clk", - "uart1_ref_clk"; - }; - cpu_clk: cpu_clk { - #clock-cells = <1>; - compatible = "xlnx,zynq-cpu-clock"; - clocks = <&iopll &armpll &ddrpll>; - reg = <0x120 0x1C4>; - clock-output-names = "cpu_6x4x", - "cpu_3x2x", - "cpu_2x", - "cpu_1x"; - }; - }; - }; - - ttc0: ttc0@f8001000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "xlnx,ttc"; - reg = <0xF8001000 0x1000>; - clocks = <&cpu_clk 3>; - clock-names = "cpu_1x"; - clock-ranges; - - ttc0_0: ttc0.0 { - status = "disabled"; - reg = <0>; - interrupts = <0 10 4>; - }; - ttc0_1: ttc0.1 { - status = "disabled"; - reg = <1>; - interrupts = <0 11 4>; - }; - ttc0_2: ttc0.2 { - status = "disabled"; - reg = <2>; - interrupts = <0 12 4>; - }; - }; - - ttc1: ttc1@f8002000 { - #interrupt-parent = <&intc>; - #address-cells = <1>; - #size-cells = <0>; - compatible = "xlnx,ttc"; - reg = <0xF8002000 0x1000>; - clocks = <&cpu_clk 3>; - clock-names = "cpu_1x"; - clock-ranges; - - ttc1_0: ttc1.0 { - status = "disabled"; - reg = <0>; - interrupts = <0 37 4>; - }; - ttc1_1: ttc1.1 { - status = "disabled"; - reg = <1>; - interrupts = <0 38 4>; - }; - ttc1_2: ttc1.2 { - status = "disabled"; - reg = <2>; - interrupts = <0 39 4>; - }; - }; - }; -}; diff --git a/trunk/arch/arm/boot/dts/zynq-ep107.dts b/trunk/arch/arm/boot/dts/zynq-ep107.dts new file mode 100644 index 000000000000..574bc044f572 --- /dev/null +++ b/trunk/arch/arm/boot/dts/zynq-ep107.dts @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2011 Xilinx + * + * This software is licensed under the terms of the GNU General Public + * License version 2, as published by the Free Software Foundation, and + * may be copied, distributed, and modified under those terms. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +/ { + model = "Xilinx Zynq EP107"; + compatible = "xlnx,zynq-ep107"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&intc>; + + memory { + device_type = "memory"; + reg = <0x0 0x10000000>; + }; + + chosen { + bootargs = "console=ttyPS0,9600 root=/dev/ram rw initrd=0x800000,8M earlyprintk"; + linux,stdout-path = &uart0; + }; + + amba { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + intc: interrupt-controller@f8f01000 { + compatible = "arm,cortex-a9-gic"; + #interrupt-cells = <3>; + #address-cells = <1>; + interrupt-controller; + reg = <0xF8F01000 0x1000>, + <0xF8F00100 0x100>; + }; + + L2: cache-controller { + compatible = "arm,pl310-cache"; + reg = <0xF8F02000 0x1000>; + arm,data-latency = <2 3 2>; + arm,tag-latency = <2 3 2>; + cache-unified; + cache-level = <2>; + }; + + uart0: uart@e0000000 { + compatible = "xlnx,xuartps"; + reg = <0xE0000000 0x1000>; + interrupts = <0 27 4>; + clock = <50000000>; + }; + }; +}; diff --git a/trunk/arch/arm/boot/dts/zynq-zc702.dts b/trunk/arch/arm/boot/dts/zynq-zc702.dts deleted file mode 100644 index c772942a399a..000000000000 --- a/trunk/arch/arm/boot/dts/zynq-zc702.dts +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2011 Xilinx - * Copyright (C) 2012 National Instruments Corp. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -/dts-v1/; -/include/ "zynq-7000.dtsi" - -/ { - model = "Zynq ZC702 Development Board"; - compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000"; - - memory { - device_type = "memory"; - reg = <0x0 0x40000000>; - }; - - chosen { - bootargs = "console=ttyPS1,115200 earlyprintk"; - }; - -}; - -&ps_clk { - clock-frequency = <33333330>; -}; - -&ttc0_0 { - status = "ok"; - compatible = "xlnx,ttc-counter-clocksource"; -}; - -&ttc0_1 { - status = "ok"; - compatible = "xlnx,ttc-counter-clockevent"; -}; diff --git a/trunk/arch/arm/configs/marzen_defconfig b/trunk/arch/arm/configs/marzen_defconfig index 728a43c446f8..5b8215f424c5 100644 --- a/trunk/arch/arm/configs/marzen_defconfig +++ b/trunk/arch/arm/configs/marzen_defconfig @@ -47,8 +47,6 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set # CONFIG_PREVENT_FIRMWARE_BUILD is not set # CONFIG_FW_LOADER is not set -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set # CONFIG_NET_VENDOR_FARADAY is not set @@ -61,8 +59,9 @@ CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV is not set -CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set +# CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set @@ -79,16 +78,9 @@ CONFIG_GPIO_SYSFS=y CONFIG_THERMAL=y CONFIG_RCAR_THERMAL=y CONFIG_SSB=y -CONFIG_USB=y -CONFIG_USB_RCAR_PHY=y +# CONFIG_USB_SUPPORT is not set CONFIG_MMC=y CONFIG_MMC_SDHI=y -CONFIG_USB=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_STORAGE=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_IOMMU_SUPPORT is not set diff --git a/trunk/arch/arm/configs/mxs_defconfig b/trunk/arch/arm/configs/mxs_defconfig index 7bf535104e26..048aaca60814 100644 --- a/trunk/arch/arm/configs/mxs_defconfig +++ b/trunk/arch/arm/configs/mxs_defconfig @@ -61,8 +61,6 @@ CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_ENC28J60=y -CONFIG_USB_USBNET=y -CONFIG_USB_NET_SMSC95XX=y # CONFIG_NETDEV_1000 is not set # CONFIG_NETDEV_10000 is not set # CONFIG_WLAN is not set @@ -160,10 +158,6 @@ CONFIG_NFS_V3=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_15=y CONFIG_PRINTK_TIME=y CONFIG_FRAME_WARN=2048 CONFIG_MAGIC_SYSRQ=y diff --git a/trunk/arch/arm/configs/u8500_defconfig b/trunk/arch/arm/configs/u8500_defconfig index 231dca604737..250625d5223f 100644 --- a/trunk/arch/arm/configs/u8500_defconfig +++ b/trunk/arch/arm/configs/u8500_defconfig @@ -78,7 +78,6 @@ CONFIG_AB8500_CORE=y CONFIG_REGULATOR=y CONFIG_REGULATOR_AB8500=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_GPIO=y # CONFIG_HID_SUPPORT is not set CONFIG_USB_GADGET=y CONFIG_AB8500_USB=y diff --git a/trunk/arch/arm/include/asm/xen/interface.h b/trunk/arch/arm/include/asm/xen/interface.h index 1151188bcd83..5000397134b4 100644 --- a/trunk/arch/arm/include/asm/xen/interface.h +++ b/trunk/arch/arm/include/asm/xen/interface.h @@ -49,7 +49,6 @@ DEFINE_GUEST_HANDLE(void); DEFINE_GUEST_HANDLE(uint64_t); DEFINE_GUEST_HANDLE(uint32_t); DEFINE_GUEST_HANDLE(xen_pfn_t); -DEFINE_GUEST_HANDLE(xen_ulong_t); /* Maximum number of virtual CPUs in multi-processor guests. */ #define MAX_VIRT_CPUS 1 diff --git a/trunk/arch/arm/include/debug/imx.S b/trunk/arch/arm/include/debug/imx.S index 0c4e17d4d359..0b65d792f664 100644 --- a/trunk/arch/arm/include/debug/imx.S +++ b/trunk/arch/arm/include/debug/imx.S @@ -10,20 +10,6 @@ * published by the Free Software Foundation. * */ -#define IMX6Q_UART1_BASE_ADDR 0x02020000 -#define IMX6Q_UART2_BASE_ADDR 0x021e8000 -#define IMX6Q_UART3_BASE_ADDR 0x021ec000 -#define IMX6Q_UART4_BASE_ADDR 0x021f0000 -#define IMX6Q_UART5_BASE_ADDR 0x021f4000 - -/* - * IMX6Q_UART_BASE_ADDR is put in the middle to force the expansion - * of IMX6Q_UART##n##_BASE_ADDR. - */ -#define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR -#define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n) -#define IMX6Q_DEBUG_UART_BASE IMX6Q_UART_BASE(CONFIG_DEBUG_IMX6Q_UART_PORT) - #ifdef CONFIG_DEBUG_IMX1_UART #define UART_PADDR 0x00206000 #elif defined (CONFIG_DEBUG_IMX25_UART) @@ -36,8 +22,10 @@ #define UART_PADDR 0x73fbc000 #elif defined (CONFIG_DEBUG_IMX50_IMX53_UART) #define UART_PADDR 0x53fbc000 -#elif defined (CONFIG_DEBUG_IMX6Q_UART) -#define UART_PADDR IMX6Q_DEBUG_UART_BASE +#elif defined (CONFIG_DEBUG_IMX6Q_UART2) +#define UART_PADDR 0x021e8000 +#elif defined (CONFIG_DEBUG_IMX6Q_UART4) +#define UART_PADDR 0x021f0000 #endif /* diff --git a/trunk/arch/arm/include/debug/tegra.S b/trunk/arch/arm/include/debug/tegra.S deleted file mode 100644 index 883d7c22fd9d..000000000000 --- a/trunk/arch/arm/include/debug/tegra.S +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright (C) 2010,2011 Google, Inc. - * Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved. - * - * Author: - * Colin Cross - * Erik Gilling - * Doug Anderson - * Stephen Warren - * - * Portions based on mach-omap2's debug-macro.S - * Copyright (C) 1994-1999 Russell King - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#include - -#define UART_SHIFT 2 - -/* Physical addresses */ -#define TEGRA_CLK_RESET_BASE 0x60006000 -#define TEGRA_APB_MISC_BASE 0x70000000 -#define TEGRA_UARTA_BASE 0x70006000 -#define TEGRA_UARTB_BASE 0x70006040 -#define TEGRA_UARTC_BASE 0x70006200 -#define TEGRA_UARTD_BASE 0x70006300 -#define TEGRA_UARTE_BASE 0x70006400 -#define TEGRA_PMC_BASE 0x7000e400 - -#define TEGRA_CLK_RST_DEVICES_L (TEGRA_CLK_RESET_BASE + 0x04) -#define TEGRA_CLK_RST_DEVICES_H (TEGRA_CLK_RESET_BASE + 0x08) -#define TEGRA_CLK_RST_DEVICES_U (TEGRA_CLK_RESET_BASE + 0x0c) -#define TEGRA_CLK_OUT_ENB_L (TEGRA_CLK_RESET_BASE + 0x10) -#define TEGRA_CLK_OUT_ENB_H (TEGRA_CLK_RESET_BASE + 0x14) -#define TEGRA_CLK_OUT_ENB_U (TEGRA_CLK_RESET_BASE + 0x18) -#define TEGRA_PMC_SCRATCH20 (TEGRA_PMC_BASE + 0xa0) -#define TEGRA_APB_MISC_GP_HIDREV (TEGRA_APB_MISC_BASE + 0x804) - -/* - * Must be 1MB-aligned since a 1MB mapping is used early on. - * Must not overlap with regions in mach-tegra/io.c:tegra_io_desc[]. - */ -#define UART_VIRTUAL_BASE 0xfe100000 - -#define checkuart(rp, rv, lhu, bit, uart) \ - /* Load address of CLK_RST register */ \ - movw rp, #TEGRA_CLK_RST_DEVICES_##lhu & 0xffff ; \ - movt rp, #TEGRA_CLK_RST_DEVICES_##lhu >> 16 ; \ - /* Load value from CLK_RST register */ \ - ldr rp, [rp, #0] ; \ - /* Test UART's reset bit */ \ - tst rp, #(1 << bit) ; \ - /* If set, can't use UART; jump to save no UART */ \ - bne 90f ; \ - /* Load address of CLK_OUT_ENB register */ \ - movw rp, #TEGRA_CLK_OUT_ENB_##lhu & 0xffff ; \ - movt rp, #TEGRA_CLK_OUT_ENB_##lhu >> 16 ; \ - /* Load value from CLK_OUT_ENB register */ \ - ldr rp, [rp, #0] ; \ - /* Test UART's clock enable bit */ \ - tst rp, #(1 << bit) ; \ - /* If clear, can't use UART; jump to save no UART */ \ - beq 90f ; \ - /* Passed all tests, load address of UART registers */ \ - movw rp, #TEGRA_UART##uart##_BASE & 0xffff ; \ - movt rp, #TEGRA_UART##uart##_BASE >> 16 ; \ - /* Jump to save UART address */ \ - b 91f - - .macro addruart, rp, rv, tmp - adr \rp, 99f @ actual addr of 99f - ldr \rv, [\rp] @ linked addr is stored there - sub \rv, \rv, \rp @ offset between the two - ldr \rp, [\rp, #4] @ linked tegra_uart_config - sub \tmp, \rp, \rv @ actual tegra_uart_config - ldr \rp, [\tmp] @ Load tegra_uart_config - cmp \rp, #1 @ needs initialization? - bne 100f @ no; go load the addresses - mov \rv, #0 @ yes; record init is done - str \rv, [\tmp] - -#ifdef CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA - /* Check ODMDATA */ -10: movw \rp, #TEGRA_PMC_SCRATCH20 & 0xffff - movt \rp, #TEGRA_PMC_SCRATCH20 >> 16 - ldr \rp, [\rp, #0] @ Load PMC_SCRATCH20 - ubfx \rv, \rp, #18, #2 @ 19:18 are console type - cmp \rv, #2 @ 2 and 3 mean DCC, UART - beq 11f @ some boards swap the meaning - cmp \rv, #3 @ so accept either - bne 90f -11: ubfx \rv, \rp, #15, #3 @ 17:15 are UART ID - cmp \rv, #0 @ UART 0? - beq 20f - cmp \rv, #1 @ UART 1? - beq 21f - cmp \rv, #2 @ UART 2? - beq 22f - cmp \rv, #3 @ UART 3? - beq 23f - cmp \rv, #4 @ UART 4? - beq 24f - b 90f @ invalid -#endif - -#if defined(CONFIG_TEGRA_DEBUG_UARTA) || \ - defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA) - /* Check UART A validity */ -20: checkuart(\rp, \rv, L, 6, A) -#endif - -#if defined(CONFIG_TEGRA_DEBUG_UARTB) || \ - defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA) - /* Check UART B validity */ -21: checkuart(\rp, \rv, L, 7, B) -#endif - -#if defined(CONFIG_TEGRA_DEBUG_UARTC) || \ - defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA) - /* Check UART C validity */ -22: checkuart(\rp, \rv, H, 23, C) -#endif - -#if defined(CONFIG_TEGRA_DEBUG_UARTD) || \ - defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA) - /* Check UART D validity */ -23: checkuart(\rp, \rv, U, 1, D) -#endif - -#if defined(CONFIG_TEGRA_DEBUG_UARTE) || \ - defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA) - /* Check UART E validity */ -24: - checkuart(\rp, \rv, U, 2, E) -#endif - - /* No valid UART found */ -90: mov \rp, #0 - /* fall through */ - - /* Record whichever UART we chose */ -91: str \rp, [\tmp, #4] @ Store in tegra_uart_phys - cmp \rp, #0 @ Valid UART address? - bne 92f @ Yes, go process it - str \rp, [\tmp, #8] @ Store 0 in tegra_uart_virt - b 100f @ Done -92: and \rv, \rp, #0xffffff @ offset within 1MB section - add \rv, \rv, #UART_VIRTUAL_BASE - str \rv, [\tmp, #8] @ Store in tegra_uart_virt - movw \rv, #TEGRA_APB_MISC_GP_HIDREV & 0xffff - movt \rv, #TEGRA_APB_MISC_GP_HIDREV >> 16 - ldr \rv, [\rv, #0] @ Load HIDREV - ubfx \rv, \rv, #8, #8 @ 15:8 are SoC version - cmp \rv, #0x20 @ Tegra20? - moveq \rv, #0x75 @ Tegra20 divisor - movne \rv, #0xdd @ Tegra30 divisor - str \rv, [\tmp, #12] @ Save divisor to scratch - /* uart[UART_LCR] = UART_LCR_WLEN8 | UART_LCR_DLAB; */ - mov \rv, #UART_LCR_WLEN8 | UART_LCR_DLAB - str \rv, [\rp, #UART_LCR << UART_SHIFT] - /* uart[UART_DLL] = div & 0xff; */ - ldr \rv, [\tmp, #12] - and \rv, \rv, #0xff - str \rv, [\rp, #UART_DLL << UART_SHIFT] - /* uart[UART_DLM] = div >> 8; */ - ldr \rv, [\tmp, #12] - lsr \rv, \rv, #8 - str \rv, [\rp, #UART_DLM << UART_SHIFT] - /* uart[UART_LCR] = UART_LCR_WLEN8; */ - mov \rv, #UART_LCR_WLEN8 - str \rv, [\rp, #UART_LCR << UART_SHIFT] - b 100f - - .align -99: .word . - .word tegra_uart_config - .ltorg - - /* Load previously selected UART address */ -100: ldr \rp, [\tmp, #4] @ Load tegra_uart_phys - ldr \rv, [\tmp, #8] @ Load tegra_uart_virt - .endm - -/* - * Code below is swiped from , but add an extra - * check to make sure that the UART address is actually valid. - */ - - .macro senduart, rd, rx - cmp \rx, #0 - strneb \rd, [\rx, #UART_TX << UART_SHIFT] -1001: - .endm - - .macro busyuart, rd, rx - cmp \rx, #0 - beq 1002f -1001: ldrb \rd, [\rx, #UART_LSR << UART_SHIFT] - and \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE - teq \rd, #UART_LSR_TEMT | UART_LSR_THRE - bne 1001b -1002: - .endm - - .macro waituart, rd, rx -#ifdef FLOW_CONTROL - cmp \rx, #0 - beq 1002f -1001: ldrb \rd, [\rx, #UART_MSR << UART_SHIFT] - tst \rd, #UART_MSR_CTS - beq 1001b -1002: -#endif - .endm diff --git a/trunk/arch/arm/kernel/kprobes-test.c b/trunk/arch/arm/kernel/kprobes-test.c index 0cd63d080c7b..1862d8f2fd44 100644 --- a/trunk/arch/arm/kernel/kprobes-test.c +++ b/trunk/arch/arm/kernel/kprobes-test.c @@ -1598,7 +1598,7 @@ static int __init run_all_tests(void) { int ret = 0; - pr_info("Beginning kprobe tests...\n"); + pr_info("Begining kprobe tests...\n"); #ifndef CONFIG_THUMB2_KERNEL diff --git a/trunk/arch/arm/mach-at91/at91rm9200.c b/trunk/arch/arm/mach-at91/at91rm9200.c index 7aeb473ee539..8ce068240c69 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200.c +++ b/trunk/arch/arm/mach-at91/at91rm9200.c @@ -184,12 +184,9 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.2", &ssc2_clk), - CLKDEV_CON_DEV_ID("pclk", "fffd0000.ssc", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "fffd4000.ssc", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "fffd8000.ssc", &ssc2_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91rm9200.0", &twi_clk), /* fake hclk clock */ CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &ohci_clk), diff --git a/trunk/arch/arm/mach-at91/at91rm9200_devices.c b/trunk/arch/arm/mach-at91/at91rm9200_devices.c index 3ebc9792560c..2a1f8e67683d 100644 --- a/trunk/arch/arm/mach-at91/at91rm9200_devices.c +++ b/trunk/arch/arm/mach-at91/at91rm9200_devices.c @@ -752,7 +752,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91rm9200_ssc0_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -794,7 +794,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91rm9200_ssc1_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, @@ -836,7 +836,7 @@ static struct resource ssc2_resources[] = { }; static struct platform_device at91rm9200_ssc2_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 2, .dev = { .dma_mask = &ssc2_dmamask, diff --git a/trunk/arch/arm/mach-at91/at91sam9260.c b/trunk/arch/arm/mach-at91/at91sam9260.c index b67cd5374117..c65e7b8d7a81 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260.c +++ b/trunk/arch/arm/mach-at91/at91sam9260.c @@ -210,8 +210,7 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc_clk), - CLKDEV_CON_DEV_ID("pclk", "fffbc000.ssc", &ssc_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9260.0", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi_clk), /* more usart lookup table for DT entries */ diff --git a/trunk/arch/arm/mach-at91/at91sam9260_devices.c b/trunk/arch/arm/mach-at91/at91sam9260_devices.c index eda8d1679d40..1f6fac21b2c8 100644 --- a/trunk/arch/arm/mach-at91/at91sam9260_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9260_devices.c @@ -742,7 +742,7 @@ static struct resource ssc_resources[] = { }; static struct platform_device at91sam9260_ssc_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 0, .dev = { .dma_mask = &ssc_dmamask, diff --git a/trunk/arch/arm/mach-at91/at91sam9261.c b/trunk/arch/arm/mach-at91/at91sam9261.c index 2998a08afc2d..9d3e9b8b9926 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261.c +++ b/trunk/arch/arm/mach-at91/at91sam9261.c @@ -174,12 +174,9 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.2", &ssc2_clk), - CLKDEV_CON_DEV_ID("pclk", "fffbc000.ssc", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "fffc0000.ssc", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "fffc4000.ssc", &ssc2_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.2", &ssc2_clk), CLKDEV_CON_DEV_ID("hclk", "at91_ohci", &hck0), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9261.0", &twi_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9261_devices.c b/trunk/arch/arm/mach-at91/at91sam9261_devices.c index 92e0f861084a..6ce6d27e2442 100644 --- a/trunk/arch/arm/mach-at91/at91sam9261_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9261_devices.c @@ -706,7 +706,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91sam9261_ssc0_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -748,7 +748,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91sam9261_ssc1_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, @@ -790,7 +790,7 @@ static struct resource ssc2_resources[] = { }; static struct platform_device at91sam9261_ssc2_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 2, .dev = { .dma_mask = &ssc2_dmamask, diff --git a/trunk/arch/arm/mach-at91/at91sam9263.c b/trunk/arch/arm/mach-at91/at91sam9263.c index b9fc60d1b33a..82deb4d748b2 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263.c +++ b/trunk/arch/arm/mach-at91/at91sam9263.c @@ -186,10 +186,8 @@ static struct clk *periph_clocks[] __initdata = { static struct clk_lookup periph_clocks_lookups[] = { /* One additional fake clock for macb_hclk */ CLKDEV_CON_ID("hclk", &macb_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "fff98000.ssc", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "fff9c000.ssc", &ssc1_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk), CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk), CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9263_devices.c b/trunk/arch/arm/mach-at91/at91sam9263_devices.c index ed666f5cb01d..fb98163b9b3a 100644 --- a/trunk/arch/arm/mach-at91/at91sam9263_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9263_devices.c @@ -1199,7 +1199,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91sam9263_ssc0_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -1241,7 +1241,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91sam9263_ssc1_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, diff --git a/trunk/arch/arm/mach-at91/at91sam9g45.c b/trunk/arch/arm/mach-at91/at91sam9g45.c index d3addee43d8d..45d753d473f6 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45.c @@ -239,10 +239,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tcb0_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.0", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g10.1", &twi1_clk), - CLKDEV_CON_DEV_ID("pclk", "at91sam9g45_ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "at91sam9g45_ssc.1", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "fff9c000.ssc", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "fffa0000.ssc", &ssc1_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID(NULL, "atmel-trng", &trng_clk), CLKDEV_CON_DEV_ID(NULL, "atmel_sha", &aestdessha_clk), CLKDEV_CON_DEV_ID(NULL, "atmel_tdes", &aestdessha_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c index 827c9f2a70fb..e35964201a10 100644 --- a/trunk/arch/arm/mach-at91/at91sam9g45_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9g45_devices.c @@ -1459,7 +1459,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91sam9g45_ssc0_device = { - .name = "at91sam9g45_ssc", + .name = "ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -1501,7 +1501,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91sam9g45_ssc1_device = { - .name = "at91sam9g45_ssc", + .name = "ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, diff --git a/trunk/arch/arm/mach-at91/at91sam9rl.c b/trunk/arch/arm/mach-at91/at91sam9rl.c index eb98704db2d9..44e3a633fda7 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl.c @@ -184,10 +184,8 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk), CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk), CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.0", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "at91rm9200_ssc.1", &ssc1_clk), - CLKDEV_CON_DEV_ID("pclk", "fffc0000.ssc", &ssc0_clk), - CLKDEV_CON_DEV_ID("pclk", "fffc4000.ssc", &ssc1_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk), + CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.0", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "i2c-at91sam9g20.1", &twi1_clk), CLKDEV_CON_ID("pioA", &pioA_clk), diff --git a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c index ddf223ff35c4..160384d93db2 100644 --- a/trunk/arch/arm/mach-at91/at91sam9rl_devices.c +++ b/trunk/arch/arm/mach-at91/at91sam9rl_devices.c @@ -832,7 +832,7 @@ static struct resource ssc0_resources[] = { }; static struct platform_device at91sam9rl_ssc0_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 0, .dev = { .dma_mask = &ssc0_dmamask, @@ -874,7 +874,7 @@ static struct resource ssc1_resources[] = { }; static struct platform_device at91sam9rl_ssc1_device = { - .name = "at91rm9200_ssc", + .name = "ssc", .id = 1, .dev = { .dma_mask = &ssc1_dmamask, diff --git a/trunk/arch/arm/mach-at91/at91sam9x5.c b/trunk/arch/arm/mach-at91/at91sam9x5.c index 44a9a62dcc13..dfb2c0c13fb5 100644 --- a/trunk/arch/arm/mach-at91/at91sam9x5.c +++ b/trunk/arch/arm/mach-at91/at91sam9x5.c @@ -233,7 +233,6 @@ static struct clk_lookup periph_clocks_lookups[] = { CLKDEV_CON_DEV_ID("mci_clk", "f000c000.mmc", &mmc1_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffec00.dma-controller", &dma0_clk), CLKDEV_CON_DEV_ID("dma_clk", "ffffee00.dma-controller", &dma1_clk), - CLKDEV_CON_DEV_ID("pclk", "f0010000.ssc", &ssc_clk), CLKDEV_CON_DEV_ID(NULL, "f8010000.i2c", &twi0_clk), CLKDEV_CON_DEV_ID(NULL, "f8014000.i2c", &twi1_clk), CLKDEV_CON_DEV_ID(NULL, "f8018000.i2c", &twi2_clk), diff --git a/trunk/arch/arm/mach-at91/board-sam9g20ek.c b/trunk/arch/arm/mach-at91/board-sam9g20ek.c index 1b7dd9f688d3..7b5123802368 100644 --- a/trunk/arch/arm/mach-at91/board-sam9g20ek.c +++ b/trunk/arch/arm/mach-at91/board-sam9g20ek.c @@ -353,16 +353,6 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = { }, }; -static struct platform_device sam9g20ek_audio_device = { - .name = "at91sam9g20ek-audio", - .id = -1, -}; - -static void __init ek_add_device_audio(void) -{ - platform_device_register(&sam9g20ek_audio_device); -} - static void __init ek_board_init(void) { @@ -404,7 +394,6 @@ static void __init ek_board_init(void) at91_set_B_periph(AT91_PIN_PC1, 0); /* SSC (for WM8731) */ at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX); - ek_add_device_audio(); } MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") diff --git a/trunk/arch/arm/mach-davinci/Makefile.boot b/trunk/arch/arm/mach-davinci/Makefile.boot index 04a6c4e67b14..5c5a95a9d7d2 100644 --- a/trunk/arch/arm/mach-davinci/Makefile.boot +++ b/trunk/arch/arm/mach-davinci/Makefile.boot @@ -11,3 +11,5 @@ else params_phys-y := 0x80000100 initrd_phys-y := 0x80800000 endif + +dtb-$(CONFIG_MACH_DA8XX_DT) += da850-enbw-cmc.dtb da850-evm.dtb diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index 7211772edd9d..d4f4dbfc0e59 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -763,19 +763,16 @@ static u8 da850_iis_serializer_direction[] = { }; static struct snd_platform_data da850_evm_snd_data = { - .tx_dma_offset = 0x2000, - .rx_dma_offset = 0x2000, - .op_mode = DAVINCI_MCASP_IIS_MODE, - .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), - .tdm_slots = 2, - .serial_dir = da850_iis_serializer_direction, - .asp_chan_q = EVENTQ_0, - .ram_chan_q = EVENTQ_1, - .version = MCASP_VERSION_2, - .txnumevt = 1, - .rxnumevt = 1, - .sram_size_playback = SZ_8K, - .sram_size_capture = SZ_8K, + .tx_dma_offset = 0x2000, + .rx_dma_offset = 0x2000, + .op_mode = DAVINCI_MCASP_IIS_MODE, + .num_serializer = ARRAY_SIZE(da850_iis_serializer_direction), + .tdm_slots = 2, + .serial_dir = da850_iis_serializer_direction, + .asp_chan_q = EVENTQ_0, + .version = MCASP_VERSION_2, + .txnumevt = 1, + .rxnumevt = 1, }; static const short da850_evm_mcasp_pins[] __initconst = { @@ -1513,7 +1510,6 @@ static __init void da850_evm_init(void) pr_warning("da850_evm_init: mcasp mux setup failed: %d\n", ret); - da850_evm_snd_data.sram_pool = sram_get_gen_pool(); da8xx_register_mcasp(0, &da850_evm_snd_data); ret = davinci_cfg_reg_list(da850_lcdcntl_pins); diff --git a/trunk/arch/arm/mach-exynos/Kconfig b/trunk/arch/arm/mach-exynos/Kconfig index 91d5b6f1d5af..070c7b6d3d86 100644 --- a/trunk/arch/arm/mach-exynos/Kconfig +++ b/trunk/arch/arm/mach-exynos/Kconfig @@ -63,7 +63,6 @@ config SOC_EXYNOS5250 depends on ARCH_EXYNOS5 select S5P_PM if PM select S5P_SLEEP if PM - select S5P_DEV_MFC select SAMSUNG_DMADEV help Enable EXYNOS5250 SoC support diff --git a/trunk/arch/arm/mach-exynos/Makefile b/trunk/arch/arm/mach-exynos/Makefile index b189881657ec..66135eedf491 100644 --- a/trunk/arch/arm/mach-exynos/Makefile +++ b/trunk/arch/arm/mach-exynos/Makefile @@ -52,6 +52,7 @@ obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o obj-$(CONFIG_EXYNOS_DEV_DMA) += dma.o obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o +obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o diff --git a/trunk/arch/arm/mach-exynos/clock-exynos4.c b/trunk/arch/arm/mach-exynos/clock-exynos4.c index efead60b9436..fa8a13405c94 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos4.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos4.c @@ -575,10 +575,6 @@ static struct clk exynos4_init_clocks_off[] = { .name = "adc", .enable = exynos4_clk_ip_peril_ctrl, .ctrlbit = (1 << 15), - }, { - .name = "tmu_apbif", - .enable = exynos4_clk_ip_perir_ctrl, - .ctrlbit = (1 << 17), }, { .name = "keypad", .enable = exynos4_clk_ip_perir_ctrl, diff --git a/trunk/arch/arm/mach-exynos/clock-exynos5.c b/trunk/arch/arm/mach-exynos/clock-exynos5.c index 7652f5d78a56..4478757b9301 100644 --- a/trunk/arch/arm/mach-exynos/clock-exynos5.c +++ b/trunk/arch/arm/mach-exynos/clock-exynos5.c @@ -196,11 +196,6 @@ static int exynos5_clk_ip_isp1_ctrl(struct clk *clk, int enable) return s5p_gatectrl(EXYNOS5_CLKGATE_IP_ISP1, clk, enable); } -static int exynos5_clk_hdmiphy_ctrl(struct clk *clk, int enable) -{ - return s5p_gatectrl(S5P_HDMI_PHY_CONTROL, clk, enable); -} - /* Core list of CMU_CPU side */ static struct clksrc_clk exynos5_clk_mout_apll = { @@ -620,11 +615,6 @@ static struct clk exynos5_init_clocks_off[] = { .parent = &exynos5_clk_aclk_66.clk, .enable = exynos5_clk_ip_peric_ctrl, .ctrlbit = (1 << 24), - }, { - .name = "tmu_apbif", - .parent = &exynos5_clk_aclk_66.clk, - .enable = exynos5_clk_ip_peris_ctrl, - .ctrlbit = (1 << 21), }, { .name = "rtc", .parent = &exynos5_clk_aclk_66.clk, @@ -674,22 +664,17 @@ static struct clk exynos5_init_clocks_off[] = { .ctrlbit = (1 << 25), }, { .name = "mfc", - .devname = "s5p-mfc-v6", + .devname = "s5p-mfc", .enable = exynos5_clk_ip_mfc_ctrl, .ctrlbit = (1 << 0), }, { .name = "hdmi", - .devname = "exynos5-hdmi", + .devname = "exynos4-hdmi", .enable = exynos5_clk_ip_disp1_ctrl, .ctrlbit = (1 << 6), - }, { - .name = "hdmiphy", - .devname = "exynos5-hdmi", - .enable = exynos5_clk_hdmiphy_ctrl, - .ctrlbit = (1 << 0), }, { .name = "mixer", - .devname = "exynos5-mixer", + .devname = "s5p-mixer", .enable = exynos5_clk_ip_disp1_ctrl, .ctrlbit = (1 << 5), }, { diff --git a/trunk/arch/arm/mach-exynos/common.c b/trunk/arch/arm/mach-exynos/common.c index ddd4b72c6f9a..e05f6cca2c9b 100644 --- a/trunk/arch/arm/mach-exynos/common.c +++ b/trunk/arch/arm/mach-exynos/common.c @@ -680,8 +680,6 @@ void __init exynos5_init_irq(void) * uses GIC instead of VIC. */ s5p_init_irq(NULL, 0); - - gic_arch_extn.irq_set_wake = s3c_irq_wake; } struct bus_type exynos_subsys = { @@ -1022,14 +1020,11 @@ static int __init exynos_init_irq_eint(void) * platforms switch over to using the pinctrl driver, the wakeup * interrupt support code here can be completely removed. */ - static const struct of_device_id exynos_pinctrl_ids[] = { - { .compatible = "samsung,pinctrl-exynos4210", }, - { .compatible = "samsung,pinctrl-exynos4x12", }, - }; struct device_node *pctrl_np, *wkup_np; + const char *pctrl_compat = "samsung,pinctrl-exynos4210"; const char *wkup_compat = "samsung,exynos4210-wakeup-eint"; - for_each_matching_node(pctrl_np, exynos_pinctrl_ids) { + for_each_compatible_node(pctrl_np, NULL, pctrl_compat) { if (of_device_is_available(pctrl_np)) { wkup_np = of_find_compatible_node(pctrl_np, NULL, wkup_compat); diff --git a/trunk/arch/arm/mach-exynos/cpuidle.c b/trunk/arch/arm/mach-exynos/cpuidle.c index 8e4ec21ef2cf..cff0595d0d35 100644 --- a/trunk/arch/arm/mach-exynos/cpuidle.c +++ b/trunk/arch/arm/mach-exynos/cpuidle.c @@ -116,8 +116,7 @@ static int exynos4_enter_core0_aftr(struct cpuidle_device *dev, cpu_suspend(0, idle_finisher); #ifdef CONFIG_SMP - if (!soc_is_exynos5250()) - scu_enable(S5P_VA_SCU); + scu_enable(S5P_VA_SCU); #endif cpu_pm_exit(); diff --git a/trunk/arch/arm/mach-exynos/dev-drm.c b/trunk/arch/arm/mach-exynos/dev-drm.c new file mode 100644 index 000000000000..17c9c6ecc2e0 --- /dev/null +++ b/trunk/arch/arm/mach-exynos/dev-drm.c @@ -0,0 +1,29 @@ +/* + * linux/arch/arm/mach-exynos/dev-drm.c + * + * Copyright (c) 2012 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * EXYNOS - core DRM device + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#include +#include +#include + +#include + +static u64 exynos_drm_dma_mask = DMA_BIT_MASK(32); + +struct platform_device exynos_device_drm = { + .name = "exynos-drm", + .dev = { + .dma_mask = &exynos_drm_dma_mask, + .coherent_dma_mask = DMA_BIT_MASK(32), + } +}; diff --git a/trunk/arch/arm/mach-exynos/hotplug.c b/trunk/arch/arm/mach-exynos/hotplug.c index c3f825b27947..f4d7dd20cdac 100644 --- a/trunk/arch/arm/mach-exynos/hotplug.c +++ b/trunk/arch/arm/mach-exynos/hotplug.c @@ -20,11 +20,10 @@ #include #include -#include #include "common.h" -static inline void cpu_enter_lowpower_a9(void) +static inline void cpu_enter_lowpower(void) { unsigned int v; @@ -46,35 +45,6 @@ static inline void cpu_enter_lowpower_a9(void) : "cc"); } -static inline void cpu_enter_lowpower_a15(void) -{ - unsigned int v; - - asm volatile( - " mrc p15, 0, %0, c1, c0, 0\n" - " bic %0, %0, %1\n" - " mcr p15, 0, %0, c1, c0, 0\n" - : "=&r" (v) - : "Ir" (CR_C) - : "cc"); - - flush_cache_louis(); - - asm volatile( - /* - * Turn off coherency - */ - " mrc p15, 0, %0, c1, c0, 1\n" - " bic %0, %0, %1\n" - " mcr p15, 0, %0, c1, c0, 1\n" - : "=&r" (v) - : "Ir" (0x40) - : "cc"); - - isb(); - dsb(); -} - static inline void cpu_leave_lowpower(void) { unsigned int v; @@ -133,20 +103,11 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious) void __ref exynos_cpu_die(unsigned int cpu) { int spurious = 0; - int primary_part = 0; /* - * we're ready for shutdown now, so do it. - * Exynos4 is A9 based while Exynos5 is A15; check the CPU part - * number by reading the Main ID register and then perform the - * appropriate sequence for entering low power. + * we're ready for shutdown now, so do it */ - asm("mrc p15, 0, %0, c0, c0, 0" : "=r"(primary_part) : : "cc"); - if ((primary_part & 0xfff0) == 0xc0f0) - cpu_enter_lowpower_a15(); - else - cpu_enter_lowpower_a9(); - + cpu_enter_lowpower(); platform_do_lowpower(cpu, &spurious); /* diff --git a/trunk/arch/arm/mach-exynos/include/mach/irqs.h b/trunk/arch/arm/mach-exynos/include/mach/irqs.h index 1f4dc35cd4b9..e0f0ae3e0cf9 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/irqs.h +++ b/trunk/arch/arm/mach-exynos/include/mach/irqs.h @@ -136,9 +136,6 @@ #define EXYNOS4_IRQ_TSI IRQ_SPI(115) #define EXYNOS4_IRQ_SATA IRQ_SPI(116) -#define EXYNOS4_IRQ_TMU_TRIG0 COMBINER_IRQ(2, 4) -#define EXYNOS4_IRQ_TMU_TRIG1 COMBINER_IRQ(3, 4) - #define EXYNOS4_IRQ_SYSMMU_MDMA0_0 COMBINER_IRQ(4, 0) #define EXYNOS4_IRQ_SYSMMU_SSS_0 COMBINER_IRQ(4, 1) #define EXYNOS4_IRQ_SYSMMU_FIMC0_0 COMBINER_IRQ(4, 2) diff --git a/trunk/arch/arm/mach-exynos/include/mach/map.h b/trunk/arch/arm/mach-exynos/include/mach/map.h index 1df6abbf53b8..61b74e12d12b 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/map.h +++ b/trunk/arch/arm/mach-exynos/include/mach/map.h @@ -89,8 +89,6 @@ #define EXYNOS4_PA_TWD 0x10500600 #define EXYNOS4_PA_L2CC 0x10502000 -#define EXYNOS4_PA_TMU 0x100C0000 - #define EXYNOS4_PA_MDMA0 0x10810000 #define EXYNOS4_PA_MDMA1 0x12850000 #define EXYNOS4_PA_S_MDMA1 0x12840000 diff --git a/trunk/arch/arm/mach-exynos/mach-armlex4210.c b/trunk/arch/arm/mach-exynos/mach-armlex4210.c index b938f9fc1dd1..3f37a5e8a1f4 100644 --- a/trunk/arch/arm/mach-exynos/mach-armlex4210.c +++ b/trunk/arch/arm/mach-exynos/mach-armlex4210.c @@ -147,6 +147,7 @@ static struct platform_device *armlex4210_devices[] __initdata = { &s3c_device_hsmmc3, &s3c_device_rtc, &s3c_device_wdt, + &samsung_asoc_dma, &armlex4210_smsc911x, &exynos4_device_ahci, }; diff --git a/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c b/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c index 92757ff817ae..6df99c06419d 100644 --- a/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c +++ b/trunk/arch/arm/mach-exynos/mach-exynos4-dt.c @@ -78,8 +78,6 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = { OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL), - OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU, - "exynos-tmu", NULL), {}, }; @@ -97,8 +95,6 @@ static void __init exynos4_dt_machine_init(void) static char const *exynos4_dt_compat[] __initdata = { "samsung,exynos4210", - "samsung,exynos4212", - "samsung,exynos4412", NULL }; diff --git a/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c b/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c index 929de766d490..f1326be80b91 100644 --- a/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/trunk/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -12,8 +12,6 @@ #include #include #include -#include -#include #include #include @@ -21,7 +19,6 @@ #include #include -#include #include "common.h" @@ -51,20 +48,6 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "s3c2440-i2c.0", NULL), OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(1), "s3c2440-i2c.1", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(2), - "s3c2440-i2c.2", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(3), - "s3c2440-i2c.3", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(4), - "s3c2440-i2c.4", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(5), - "s3c2440-i2c.5", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(6), - "s3c2440-i2c.6", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-i2c", EXYNOS5_PA_IIC(7), - "s3c2440-i2c.7", NULL), - OF_DEV_AUXDATA("samsung,s3c2440-hdmiphy-i2c", EXYNOS5_PA_IIC(8), - "s3c2440-hdmiphy-i2c", NULL), OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI0, "dw_mmc.0", NULL), OF_DEV_AUXDATA("samsung,exynos5250-dw-mshc", EXYNOS5_PA_DWMCI1, @@ -79,12 +62,6 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "exynos4210-spi.1", NULL), OF_DEV_AUXDATA("samsung,exynos4210-spi", EXYNOS5_PA_SPI2, "exynos4210-spi.2", NULL), - OF_DEV_AUXDATA("samsung,exynos5-sata-ahci", 0x122F0000, - "exynos5-sata", NULL), - OF_DEV_AUXDATA("samsung,exynos5-sata-phy", 0x12170000, - "exynos5-sata-phy", NULL), - OF_DEV_AUXDATA("samsung,exynos5-sata-phy-i2c", 0x121D0000, - "exynos5-sata-phy-i2c", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL), @@ -96,13 +73,6 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "exynos-gsc.2", NULL), OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3, "exynos-gsc.3", NULL), - OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, - "exynos5-hdmi", NULL), - OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000, - "exynos5-mixer", NULL), - OF_DEV_AUXDATA("samsung,mfc-v6", 0x11000000, "s5p-mfc-v6", NULL), - OF_DEV_AUXDATA("samsung,exynos5250-tmu", 0x10060000, - "exynos-tmu", NULL), {}, }; @@ -138,17 +108,6 @@ static char const *exynos5_dt_compat[] __initdata = { NULL }; -static void __init exynos5_reserve(void) -{ - struct s5p_mfc_dt_meminfo mfc_mem; - - /* Reserve memory for MFC only if it's available */ - mfc_mem.compatible = "samsung,mfc-v6"; - if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem)) - s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff, - mfc_mem.lsize); -} - DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") /* Maintainer: Kukjin Kim */ .init_irq = exynos5_init_irq, @@ -160,5 +119,4 @@ DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)") .timer = &exynos4_timer, .dt_compat = exynos5_dt_compat, .restart = exynos5_restart, - .reserve = exynos5_reserve, MACHINE_END diff --git a/trunk/arch/arm/mach-exynos/mach-nuri.c b/trunk/arch/arm/mach-exynos/mach-nuri.c index 27d4ed8b116e..69359a0c8a1c 100644 --- a/trunk/arch/arm/mach-exynos/mach-nuri.c +++ b/trunk/arch/arm/mach-exynos/mach-nuri.c @@ -1326,6 +1326,9 @@ static struct platform_device *nuri_devices[] __initdata = { &cam_vdda_fixed_rdev, &cam_8m_12v_fixed_rdev, &exynos4_bus_devfreq, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif }; static void __init nuri_map_io(void) diff --git a/trunk/arch/arm/mach-exynos/mach-origen.c b/trunk/arch/arm/mach-exynos/mach-origen.c index e6f4191cd14c..c606080b5dfa 100644 --- a/trunk/arch/arm/mach-exynos/mach-origen.c +++ b/trunk/arch/arm/mach-exynos/mach-origen.c @@ -711,6 +711,9 @@ static struct platform_device *origen_devices[] __initdata = { &s5p_device_mfc_l, &s5p_device_mfc_r, &s5p_device_mixer, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif &exynos4_device_ohci, &origen_device_gpiokeys, &origen_lcd_hv070wsa, diff --git a/trunk/arch/arm/mach-exynos/mach-smdk4x12.c b/trunk/arch/arm/mach-exynos/mach-smdk4x12.c index a1555a73c7af..ddb92631252d 100644 --- a/trunk/arch/arm/mach-exynos/mach-smdk4x12.c +++ b/trunk/arch/arm/mach-exynos/mach-smdk4x12.c @@ -317,6 +317,9 @@ static struct platform_device *smdk4x12_devices[] __initdata = { &s5p_device_mfc, &s5p_device_mfc_l, &s5p_device_mfc_r, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif &samsung_device_keypad, }; diff --git a/trunk/arch/arm/mach-exynos/mach-smdkv310.c b/trunk/arch/arm/mach-exynos/mach-smdkv310.c index b7384241fb03..8dd6a1e8030d 100644 --- a/trunk/arch/arm/mach-exynos/mach-smdkv310.c +++ b/trunk/arch/arm/mach-exynos/mach-smdkv310.c @@ -300,6 +300,9 @@ static struct platform_device *smdkv310_devices[] __initdata = { &s5p_device_fimc_md, &s5p_device_g2d, &s5p_device_jpeg, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif &exynos4_device_ac97, &exynos4_device_i2s0, &exynos4_device_ohci, @@ -308,6 +311,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { &s5p_device_mfc_l, &s5p_device_mfc_r, &exynos4_device_spdif, + &samsung_asoc_dma, &samsung_asoc_idma, &s5p_device_fimd0, &smdkv310_device_audio, diff --git a/trunk/arch/arm/mach-exynos/mach-universal_c210.c b/trunk/arch/arm/mach-exynos/mach-universal_c210.c index 9e3340f18950..2d6bc83d5c99 100644 --- a/trunk/arch/arm/mach-exynos/mach-universal_c210.c +++ b/trunk/arch/arm/mach-exynos/mach-universal_c210.c @@ -1080,6 +1080,9 @@ static struct platform_device *universal_devices[] __initdata = { &s5p_device_onenand, &s5p_device_fimd0, &s5p_device_jpeg, +#ifdef CONFIG_DRM_EXYNOS + &exynos_device_drm, +#endif &s3c_device_usb_hsotg, &s5p_device_mfc, &s5p_device_mfc_l, diff --git a/trunk/arch/arm/mach-exynos/pm.c b/trunk/arch/arm/mach-exynos/pm.c index 8df6ec547f78..c06c992943a1 100644 --- a/trunk/arch/arm/mach-exynos/pm.c +++ b/trunk/arch/arm/mach-exynos/pm.c @@ -81,9 +81,6 @@ static int exynos_cpu_suspend(unsigned long arg) outer_flush_all(); #endif - if (soc_is_exynos5250()) - flush_cache_all(); - /* issue the standby signal into the pm unit. */ cpu_do_idle(); @@ -315,10 +312,6 @@ static void exynos_pm_resume(void) } early_wakeup: - - /* Clear SLEEP mode set in INFORM1 */ - __raw_writel(0x0, S5P_INFORM1); - return; } diff --git a/trunk/arch/arm/mach-exynos/pm_domains.c b/trunk/arch/arm/mach-exynos/pm_domains.c index 9f1351de52f7..c0bc83a7663e 100644 --- a/trunk/arch/arm/mach-exynos/pm_domains.c +++ b/trunk/arch/arm/mach-exynos/pm_domains.c @@ -19,8 +19,6 @@ #include #include #include -#include -#include #include #include @@ -85,88 +83,12 @@ static struct exynos_pm_domain PD = { \ } #ifdef CONFIG_OF -static void exynos_add_device_to_domain(struct exynos_pm_domain *pd, - struct device *dev) -{ - int ret; - - dev_dbg(dev, "adding to power domain %s\n", pd->pd.name); - - while (1) { - ret = pm_genpd_add_device(&pd->pd, dev); - if (ret != -EAGAIN) - break; - cond_resched(); - } - - pm_genpd_dev_need_restore(dev, true); -} - -static void exynos_remove_device_from_domain(struct device *dev) -{ - struct generic_pm_domain *genpd = dev_to_genpd(dev); - int ret; - - dev_dbg(dev, "removing from power domain %s\n", genpd->name); - - while (1) { - ret = pm_genpd_remove_device(genpd, dev); - if (ret != -EAGAIN) - break; - cond_resched(); - } -} - -static void exynos_read_domain_from_dt(struct device *dev) -{ - struct platform_device *pd_pdev; - struct exynos_pm_domain *pd; - struct device_node *node; - - node = of_parse_phandle(dev->of_node, "samsung,power-domain", 0); - if (!node) - return; - pd_pdev = of_find_device_by_node(node); - if (!pd_pdev) - return; - pd = platform_get_drvdata(pd_pdev); - exynos_add_device_to_domain(pd, dev); -} - -static int exynos_pm_notifier_call(struct notifier_block *nb, - unsigned long event, void *data) -{ - struct device *dev = data; - - switch (event) { - case BUS_NOTIFY_BIND_DRIVER: - if (dev->of_node) - exynos_read_domain_from_dt(dev); - - break; - - case BUS_NOTIFY_UNBOUND_DRIVER: - exynos_remove_device_from_domain(dev); - - break; - } - return NOTIFY_DONE; -} - -static struct notifier_block platform_nb = { - .notifier_call = exynos_pm_notifier_call, -}; - static __init int exynos_pm_dt_parse_domains(void) { - struct platform_device *pdev; struct device_node *np; for_each_compatible_node(np, NULL, "samsung,exynos4210-pd") { struct exynos_pm_domain *pd; - int on; - - pdev = of_find_device_by_node(np); pd = kzalloc(sizeof(*pd), GFP_KERNEL); if (!pd) { @@ -175,22 +97,15 @@ static __init int exynos_pm_dt_parse_domains(void) return -ENOMEM; } - pd->pd.name = kstrdup(np->name, GFP_KERNEL); - pd->name = pd->pd.name; + if (of_get_property(np, "samsung,exynos4210-pd-off", NULL)) + pd->is_off = true; + pd->name = np->name; pd->base = of_iomap(np, 0); pd->pd.power_off = exynos_pd_power_off; pd->pd.power_on = exynos_pd_power_on; pd->pd.of_node = np; - - platform_set_drvdata(pdev, pd); - - on = __raw_readl(pd->base + 0x4) & S5P_INT_LOCAL_PWR_EN; - - pm_genpd_init(&pd->pd, NULL, !on); + pm_genpd_init(&pd->pd, NULL, false); } - - bus_register_notifier(&platform_bus_type, &platform_nb); - return 0; } #else diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig index 1ad0d76de8c7..4e24b8c77eb4 100644 --- a/trunk/arch/arm/mach-imx/Kconfig +++ b/trunk/arch/arm/mach-imx/Kconfig @@ -272,13 +272,6 @@ config MACH_EUKREA_MBIMXSD25_BASEBOARD endchoice -config MACH_IMX25_DT - bool "Support i.MX25 platforms from device tree" - select SOC_IMX25 - help - Include support for Freescale i.MX25 based platforms - using the device tree for discovery - comment "MX27 platforms:" config MACH_MX27ADS @@ -838,14 +831,7 @@ config SOC_IMX53 config SOC_IMX6Q bool "i.MX6 Quad support" - select ARCH_HAS_CPUFREQ - select ARCH_HAS_OPP select ARM_CPU_SUSPEND if PM - select ARM_ERRATA_743622 - select ARM_ERRATA_751472 - select ARM_ERRATA_754322 - select ARM_ERRATA_764369 if SMP - select ARM_ERRATA_775420 select ARM_GIC select COMMON_CLK select CPU_V7 @@ -857,10 +843,6 @@ config SOC_IMX6Q select MFD_SYSCON select PINCTRL select PINCTRL_IMX6Q - select PL310_ERRATA_588369 if CACHE_PL310 - select PL310_ERRATA_727915 if CACHE_PL310 - select PL310_ERRATA_769419 if CACHE_PL310 - select PM_OPP if PM help This enables support for Freescale i.MX6 Quad processor. diff --git a/trunk/arch/arm/mach-imx/Makefile b/trunk/arch/arm/mach-imx/Makefile index 0634b3152c24..fe47b71469c9 100644 --- a/trunk/arch/arm/mach-imx/Makefile +++ b/trunk/arch/arm/mach-imx/Makefile @@ -50,7 +50,6 @@ obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o obj-$(CONFIG_MACH_EUKREA_CPUIMX25SD) += mach-eukrea_cpuimx25.o obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o -obj-$(CONFIG_MACH_IMX25_DT) += imx25-dt.o # i.MX27 based machines obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o diff --git a/trunk/arch/arm/mach-imx/clk-imx25.c b/trunk/arch/arm/mach-imx/clk-imx25.c index b197aa73dc4b..bc885801cd68 100644 --- a/trunk/arch/arm/mach-imx/clk-imx25.c +++ b/trunk/arch/arm/mach-imx/clk-imx25.c @@ -23,9 +23,6 @@ #include #include #include -#include -#include -#include #include "clk.h" #include "common.h" @@ -58,8 +55,6 @@ #define ccm(x) (CRM_BASE + (x)) -static struct clk_onecell_data clk_data; - static const char *cpu_sel_clks[] = { "mpll", "mpll_cpu_3_4", }; static const char *per_sel_clks[] = { "ahb", "upll", }; @@ -69,30 +64,24 @@ enum mx25_clks { per7_sel, per8_sel, per9_sel, per10_sel, per11_sel, per12_sel, per13_sel, per14_sel, per15_sel, per0, per1, per2, per3, per4, per5, per6, per7, per8, per9, per10, per11, per12, per13, per14, per15, - csi_ipg_per, epit_ipg_per, esai_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per, - gpt_ipg_per, i2c_ipg_per, lcdc_ipg_per, nfc_ipg_per, owire_ipg_per, - pwm_ipg_per, sim1_ipg_per, sim2_ipg_per, ssi1_ipg_per, ssi2_ipg_per, - uart_ipg_per, ata_ahb, reserved1, csi_ahb, emi_ahb, esai_ahb, esdhc1_ahb, - esdhc2_ahb, fec_ahb, lcdc_ahb, rtic_ahb, sdma_ahb, slcdc_ahb, usbotg_ahb, - reserved2, reserved3, reserved4, reserved5, can1_ipg, can2_ipg, csi_ipg, - cspi1_ipg, cspi2_ipg, cspi3_ipg, dryice_ipg, ect_ipg, epit1_ipg, epit2_ipg, - reserved6, esdhc1_ipg, esdhc2_ipg, fec_ipg, reserved7, reserved8, reserved9, - gpt1_ipg, gpt2_ipg, gpt3_ipg, gpt4_ipg, reserved10, reserved11, reserved12, - iim_ipg, reserved13, reserved14, kpp_ipg, lcdc_ipg, reserved15, pwm1_ipg, - pwm2_ipg, pwm3_ipg, pwm4_ipg, rngb_ipg, reserved16, scc_ipg, sdma_ipg, - sim1_ipg, sim2_ipg, slcdc_ipg, spba_ipg, ssi1_ipg, ssi2_ipg, tsc_ipg, - uart1_ipg, uart2_ipg, uart3_ipg, uart4_ipg, uart5_ipg, reserved17, - wdt_ipg, clk_max + csi_ipg_per, esdhc1_ipg_per, esdhc2_ipg_per, gpt_ipg_per, i2c_ipg_per, + lcdc_ipg_per, nfc_ipg_per, ssi1_ipg_per, ssi2_ipg_per, uart_ipg_per, + csi_ahb, esdhc1_ahb, esdhc2_ahb, fec_ahb, lcdc_ahb, sdma_ahb, + usbotg_ahb, can1_ipg, can2_ipg, csi_ipg, cspi1_ipg, cspi2_ipg, + cspi3_ipg, dryice_ipg, esdhc1_ipg, esdhc2_ipg, fec_ipg, iim_ipg, + kpp_ipg, lcdc_ipg, pwm1_ipg, pwm2_ipg, pwm3_ipg, pwm4_ipg, sdma_ipg, + ssi1_ipg, ssi2_ipg, tsc_ipg, uart1_ipg, uart2_ipg, uart3_ipg, + uart4_ipg, uart5_ipg, wdt_ipg, clk_max }; static struct clk *clk[clk_max]; -static int __init __mx25_clocks_init(unsigned long osc_rate) +int __init mx25_clocks_init(void) { int i; clk[dummy] = imx_clk_fixed("dummy", 0); - clk[osc] = imx_clk_fixed("osc", osc_rate); + clk[osc] = imx_clk_fixed("osc", 24000000); clk[mpll] = imx_clk_pllv1("mpll", "osc", ccm(CCM_MPCTL)); clk[upll] = imx_clk_pllv1("upll", "osc", ccm(CCM_UPCTL)); clk[mpll_cpu_3_4] = imx_clk_fixed_factor("mpll_cpu_3_4", "mpll", 3, 4); @@ -134,36 +123,22 @@ static int __init __mx25_clocks_init(unsigned long osc_rate) clk[per14] = imx_clk_divider("per14", "per14_sel", ccm(CCM_PCDR3), 16, 6); clk[per15] = imx_clk_divider("per15", "per15_sel", ccm(CCM_PCDR3), 24, 6); clk[csi_ipg_per] = imx_clk_gate("csi_ipg_per", "per0", ccm(CCM_CGCR0), 0); - clk[epit_ipg_per] = imx_clk_gate("epit_ipg_per", "per1", ccm(CCM_CGCR0), 1); - clk[esai_ipg_per] = imx_clk_gate("esai_ipg_per", "per2", ccm(CCM_CGCR0), 2); clk[esdhc1_ipg_per] = imx_clk_gate("esdhc1_ipg_per", "per3", ccm(CCM_CGCR0), 3); clk[esdhc2_ipg_per] = imx_clk_gate("esdhc2_ipg_per", "per4", ccm(CCM_CGCR0), 4); clk[gpt_ipg_per] = imx_clk_gate("gpt_ipg_per", "per5", ccm(CCM_CGCR0), 5); clk[i2c_ipg_per] = imx_clk_gate("i2c_ipg_per", "per6", ccm(CCM_CGCR0), 6); clk[lcdc_ipg_per] = imx_clk_gate("lcdc_ipg_per", "per7", ccm(CCM_CGCR0), 7); clk[nfc_ipg_per] = imx_clk_gate("nfc_ipg_per", "per8", ccm(CCM_CGCR0), 8); - clk[owire_ipg_per] = imx_clk_gate("owire_ipg_per", "per9", ccm(CCM_CGCR0), 9); - clk[pwm_ipg_per] = imx_clk_gate("pwm_ipg_per", "per10", ccm(CCM_CGCR0), 10); - clk[sim1_ipg_per] = imx_clk_gate("sim1_ipg_per", "per11", ccm(CCM_CGCR0), 11); - clk[sim2_ipg_per] = imx_clk_gate("sim2_ipg_per", "per12", ccm(CCM_CGCR0), 12); clk[ssi1_ipg_per] = imx_clk_gate("ssi1_ipg_per", "per13", ccm(CCM_CGCR0), 13); clk[ssi2_ipg_per] = imx_clk_gate("ssi2_ipg_per", "per14", ccm(CCM_CGCR0), 14); clk[uart_ipg_per] = imx_clk_gate("uart_ipg_per", "per15", ccm(CCM_CGCR0), 15); - clk[ata_ahb] = imx_clk_gate("ata_ahb", "ahb", ccm(CCM_CGCR0), 16); - /* CCM_CGCR0(17): reserved */ clk[csi_ahb] = imx_clk_gate("csi_ahb", "ahb", ccm(CCM_CGCR0), 18); - clk[emi_ahb] = imx_clk_gate("emi_ahb", "ahb", ccm(CCM_CGCR0), 19); - clk[esai_ahb] = imx_clk_gate("esai_ahb", "ahb", ccm(CCM_CGCR0), 20); clk[esdhc1_ahb] = imx_clk_gate("esdhc1_ahb", "ahb", ccm(CCM_CGCR0), 21); clk[esdhc2_ahb] = imx_clk_gate("esdhc2_ahb", "ahb", ccm(CCM_CGCR0), 22); clk[fec_ahb] = imx_clk_gate("fec_ahb", "ahb", ccm(CCM_CGCR0), 23); clk[lcdc_ahb] = imx_clk_gate("lcdc_ahb", "ahb", ccm(CCM_CGCR0), 24); - clk[rtic_ahb] = imx_clk_gate("rtic_ahb", "ahb", ccm(CCM_CGCR0), 25); clk[sdma_ahb] = imx_clk_gate("sdma_ahb", "ahb", ccm(CCM_CGCR0), 26); - clk[slcdc_ahb] = imx_clk_gate("slcdc_ahb", "ahb", ccm(CCM_CGCR0), 27); clk[usbotg_ahb] = imx_clk_gate("usbotg_ahb", "ahb", ccm(CCM_CGCR0), 28); - /* CCM_CGCR0(29-31): reserved */ - /* CCM_CGCR1(0): reserved in datasheet, used as audmux in FSL kernel */ clk[can1_ipg] = imx_clk_gate("can1_ipg", "ipg", ccm(CCM_CGCR1), 2); clk[can2_ipg] = imx_clk_gate("can2_ipg", "ipg", ccm(CCM_CGCR1), 3); clk[csi_ipg] = imx_clk_gate("csi_ipg", "ipg", ccm(CCM_CGCR1), 4); @@ -171,41 +146,17 @@ static int __init __mx25_clocks_init(unsigned long osc_rate) clk[cspi2_ipg] = imx_clk_gate("cspi2_ipg", "ipg", ccm(CCM_CGCR1), 6); clk[cspi3_ipg] = imx_clk_gate("cspi3_ipg", "ipg", ccm(CCM_CGCR1), 7); clk[dryice_ipg] = imx_clk_gate("dryice_ipg", "ipg", ccm(CCM_CGCR1), 8); - clk[ect_ipg] = imx_clk_gate("ect_ipg", "ipg", ccm(CCM_CGCR1), 9); - clk[epit1_ipg] = imx_clk_gate("epit1_ipg", "ipg", ccm(CCM_CGCR1), 10); - clk[epit2_ipg] = imx_clk_gate("epit2_ipg", "ipg", ccm(CCM_CGCR1), 11); - /* CCM_CGCR1(12): reserved in datasheet, used as esai in FSL kernel */ clk[esdhc1_ipg] = imx_clk_gate("esdhc1_ipg", "ipg", ccm(CCM_CGCR1), 13); clk[esdhc2_ipg] = imx_clk_gate("esdhc2_ipg", "ipg", ccm(CCM_CGCR1), 14); clk[fec_ipg] = imx_clk_gate("fec_ipg", "ipg", ccm(CCM_CGCR1), 15); - /* CCM_CGCR1(16): reserved in datasheet, used as gpio1 in FSL kernel */ - /* CCM_CGCR1(17): reserved in datasheet, used as gpio2 in FSL kernel */ - /* CCM_CGCR1(18): reserved in datasheet, used as gpio3 in FSL kernel */ - clk[gpt1_ipg] = imx_clk_gate("gpt1_ipg", "ipg", ccm(CCM_CGCR1), 19); - clk[gpt2_ipg] = imx_clk_gate("gpt2_ipg", "ipg", ccm(CCM_CGCR1), 20); - clk[gpt3_ipg] = imx_clk_gate("gpt3_ipg", "ipg", ccm(CCM_CGCR1), 21); - clk[gpt4_ipg] = imx_clk_gate("gpt4_ipg", "ipg", ccm(CCM_CGCR1), 22); - /* CCM_CGCR1(23): reserved in datasheet, used as i2c1 in FSL kernel */ - /* CCM_CGCR1(24): reserved in datasheet, used as i2c2 in FSL kernel */ - /* CCM_CGCR1(25): reserved in datasheet, used as i2c3 in FSL kernel */ clk[iim_ipg] = imx_clk_gate("iim_ipg", "ipg", ccm(CCM_CGCR1), 26); - /* CCM_CGCR1(27): reserved in datasheet, used as iomuxc in FSL kernel */ - /* CCM_CGCR1(28): reserved in datasheet, used as kpp in FSL kernel */ clk[kpp_ipg] = imx_clk_gate("kpp_ipg", "ipg", ccm(CCM_CGCR1), 28); clk[lcdc_ipg] = imx_clk_gate("lcdc_ipg", "ipg", ccm(CCM_CGCR1), 29); - /* CCM_CGCR1(30): reserved in datasheet, used as owire in FSL kernel */ clk[pwm1_ipg] = imx_clk_gate("pwm1_ipg", "ipg", ccm(CCM_CGCR1), 31); clk[pwm2_ipg] = imx_clk_gate("pwm2_ipg", "ipg", ccm(CCM_CGCR2), 0); clk[pwm3_ipg] = imx_clk_gate("pwm3_ipg", "ipg", ccm(CCM_CGCR2), 1); clk[pwm4_ipg] = imx_clk_gate("pwm4_ipg", "ipg", ccm(CCM_CGCR2), 2); - clk[rngb_ipg] = imx_clk_gate("rngb_ipg", "ipg", ccm(CCM_CGCR2), 3); - /* CCM_CGCR2(4): reserved in datasheet, used as rtic in FSL kernel */ - clk[scc_ipg] = imx_clk_gate("scc_ipg", "ipg", ccm(CCM_CGCR2), 5); clk[sdma_ipg] = imx_clk_gate("sdma_ipg", "ipg", ccm(CCM_CGCR2), 6); - clk[sim1_ipg] = imx_clk_gate("sim1_ipg", "ipg", ccm(CCM_CGCR2), 7); - clk[sim2_ipg] = imx_clk_gate("sim2_ipg", "ipg", ccm(CCM_CGCR2), 8); - clk[slcdc_ipg] = imx_clk_gate("slcdc_ipg", "ipg", ccm(CCM_CGCR2), 9); - clk[spba_ipg] = imx_clk_gate("spba_ipg", "ipg", ccm(CCM_CGCR2), 10); clk[ssi1_ipg] = imx_clk_gate("ssi1_ipg", "ipg", ccm(CCM_CGCR2), 11); clk[ssi2_ipg] = imx_clk_gate("ssi2_ipg", "ipg", ccm(CCM_CGCR2), 12); clk[tsc_ipg] = imx_clk_gate("tsc_ipg", "ipg", ccm(CCM_CGCR2), 13); @@ -214,7 +165,6 @@ static int __init __mx25_clocks_init(unsigned long osc_rate) clk[uart3_ipg] = imx_clk_gate("uart3_ipg", "ipg", ccm(CCM_CGCR2), 16); clk[uart4_ipg] = imx_clk_gate("uart4_ipg", "ipg", ccm(CCM_CGCR2), 17); clk[uart5_ipg] = imx_clk_gate("uart5_ipg", "ipg", ccm(CCM_CGCR2), 18); - /* CCM_CGCR2(19): reserved in datasheet, but used as wdt in FSL kernel */ clk[wdt_ipg] = imx_clk_gate("wdt_ipg", "ipg", ccm(CCM_CGCR2), 19); for (i = 0; i < ARRAY_SIZE(clk); i++) @@ -222,18 +172,6 @@ static int __init __mx25_clocks_init(unsigned long osc_rate) pr_err("i.MX25 clk %d: register failed with %ld\n", i, PTR_ERR(clk[i])); - clk_prepare_enable(clk[emi_ahb]); - - clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0"); - clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0"); - - return 0; -} - -int __init mx25_clocks_init(void) -{ - __mx25_clocks_init(24000000); - /* i.mx25 has the i.mx21 type uart */ clk_register_clkdev(clk[uart1_ipg], "ipg", "imx21-uart.0"); clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.0"); @@ -245,6 +183,8 @@ int __init mx25_clocks_init(void) clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.3"); clk_register_clkdev(clk[uart5_ipg], "ipg", "imx21-uart.4"); clk_register_clkdev(clk[uart_ipg_per], "per", "imx21-uart.4"); + clk_register_clkdev(clk[ipg], "ipg", "imx-gpt.0"); + clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0"); clk_register_clkdev(clk[ipg], "ipg", "mxc-ehci.0"); clk_register_clkdev(clk[usbotg_ahb], "ahb", "mxc-ehci.0"); clk_register_clkdev(clk[usb_div], "per", "mxc-ehci.0"); @@ -302,40 +242,5 @@ int __init mx25_clocks_init(void) clk_register_clkdev(clk[iim_ipg], "iim", NULL); mxc_timer_init(MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), MX25_INT_GPT1); - - return 0; -} - -int __init mx25_clocks_init_dt(void) -{ - struct device_node *np; - void __iomem *base; - int irq; - unsigned long osc_rate = 24000000; - - /* retrieve the freqency of fixed clocks from device tree */ - for_each_compatible_node(np, NULL, "fixed-clock") { - u32 rate; - if (of_property_read_u32(np, "clock-frequency", &rate)) - continue; - - if (of_device_is_compatible(np, "fsl,imx-osc")) - osc_rate = rate; - } - - np = of_find_compatible_node(NULL, NULL, "fsl,imx25-ccm"); - clk_data.clks = clk; - clk_data.clk_num = ARRAY_SIZE(clk); - of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data); - - __mx25_clocks_init(osc_rate); - - np = of_find_compatible_node(NULL, NULL, "fsl,imx25-gpt"); - base = of_iomap(np, 0); - WARN_ON(!base); - irq = irq_of_parse_and_map(np, 0); - - mxc_timer_init(base, irq); - return 0; } diff --git a/trunk/arch/arm/mach-imx/clk-imx6q.c b/trunk/arch/arm/mach-imx/clk-imx6q.c index 7f2c10c7413a..448476958e7f 100644 --- a/trunk/arch/arm/mach-imx/clk-imx6q.c +++ b/trunk/arch/arm/mach-imx/clk-imx6q.c @@ -424,7 +424,6 @@ int __init mx6q_clocks_init(void) clk_register_clkdev(clk[cko1_sel], "cko1_sel", NULL); clk_register_clkdev(clk[ahb], "ahb", NULL); clk_register_clkdev(clk[cko1], "cko1", NULL); - clk_register_clkdev(clk[arm], NULL, "cpu0"); /* * The gpmi needs 100MHz frequency in the EDO/Sync mode, diff --git a/trunk/arch/arm/mach-imx/common.h b/trunk/arch/arm/mach-imx/common.h index 7191ab4434e5..ef8db6b34841 100644 --- a/trunk/arch/arm/mach-imx/common.h +++ b/trunk/arch/arm/mach-imx/common.h @@ -66,7 +66,6 @@ extern int mx51_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); extern int mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2); -extern int mx25_clocks_init_dt(void); extern int mx27_clocks_init_dt(void); extern int mx31_clocks_init_dt(void); extern int mx51_clocks_init_dt(void); diff --git a/trunk/arch/arm/mach-imx/imx25-dt.c b/trunk/arch/arm/mach-imx/imx25-dt.c deleted file mode 100644 index e17dfbc42192..000000000000 --- a/trunk/arch/arm/mach-imx/imx25-dt.c +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2012 Sascha Hauer, Pengutronix - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -#include -#include -#include -#include -#include -#include "common.h" -#include "mx25.h" - -static void __init imx25_dt_init(void) -{ - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - -static void __init imx25_timer_init(void) -{ - mx25_clocks_init_dt(); -} - -static struct sys_timer imx25_timer = { - .init = imx25_timer_init, -}; - -static const char * const imx25_dt_board_compat[] __initconst = { - "fsl,imx25", - NULL -}; - -DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)") - .map_io = mx25_map_io, - .init_early = imx25_init_early, - .init_irq = mx25_init_irq, - .handle_irq = imx25_handle_irq, - .timer = &imx25_timer, - .init_machine = imx25_dt_init, - .dt_compat = imx25_dt_board_compat, - .restart = mxc_restart, -MACHINE_END diff --git a/trunk/arch/arm/mach-imx/lluart.c b/trunk/arch/arm/mach-imx/lluart.c index 2fdc9bf2fb5e..5f1510363ee7 100644 --- a/trunk/arch/arm/mach-imx/lluart.c +++ b/trunk/arch/arm/mach-imx/lluart.c @@ -17,25 +17,17 @@ #include "hardware.h" -#define IMX6Q_UART1_BASE_ADDR 0x02020000 -#define IMX6Q_UART2_BASE_ADDR 0x021e8000 -#define IMX6Q_UART3_BASE_ADDR 0x021ec000 -#define IMX6Q_UART4_BASE_ADDR 0x021f0000 -#define IMX6Q_UART5_BASE_ADDR 0x021f4000 - -/* - * IMX6Q_UART_BASE_ADDR is put in the middle to force the expansion - * of IMX6Q_UART##n##_BASE_ADDR. - */ -#define IMX6Q_UART_BASE_ADDR(n) IMX6Q_UART##n##_BASE_ADDR -#define IMX6Q_UART_BASE(n) IMX6Q_UART_BASE_ADDR(n) -#define IMX6Q_DEBUG_UART_BASE IMX6Q_UART_BASE(CONFIG_DEBUG_IMX6Q_UART_PORT) - static struct map_desc imx_lluart_desc = { -#ifdef CONFIG_DEBUG_IMX6Q_UART - .virtual = IMX_IO_P2V(IMX6Q_DEBUG_UART_BASE), - .pfn = __phys_to_pfn(IMX6Q_DEBUG_UART_BASE), - .length = 0x4000, +#ifdef CONFIG_DEBUG_IMX6Q_UART2 + .virtual = MX6Q_IO_P2V(MX6Q_UART2_BASE_ADDR), + .pfn = __phys_to_pfn(MX6Q_UART2_BASE_ADDR), + .length = MX6Q_UART2_SIZE, + .type = MT_DEVICE, +#endif +#ifdef CONFIG_DEBUG_IMX6Q_UART4 + .virtual = MX6Q_IO_P2V(MX6Q_UART4_BASE_ADDR), + .pfn = __phys_to_pfn(MX6Q_UART4_BASE_ADDR), + .length = MX6Q_UART4_SIZE, .type = MT_DEVICE, #endif }; diff --git a/trunk/arch/arm/mach-imx/mach-imx6q.c b/trunk/arch/arm/mach-imx/mach-imx6q.c index 4eb1b3ac794c..cce33e433bd1 100644 --- a/trunk/arch/arm/mach-imx/mach-imx6q.c +++ b/trunk/arch/arm/mach-imx/mach-imx6q.c @@ -38,40 +38,6 @@ #include "cpuidle.h" #include "hardware.h" -#define IMX6Q_ANALOG_DIGPROG 0x260 - -static int imx6q_revision(void) -{ - struct device_node *np; - void __iomem *base; - static u32 rev; - - if (!rev) { - np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-anatop"); - if (!np) - return IMX_CHIP_REVISION_UNKNOWN; - base = of_iomap(np, 0); - if (!base) { - of_node_put(np); - return IMX_CHIP_REVISION_UNKNOWN; - } - rev = readl_relaxed(base + IMX6Q_ANALOG_DIGPROG); - iounmap(base); - of_node_put(np); - } - - switch (rev & 0xff) { - case 0: - return IMX_CHIP_REVISION_1_0; - case 1: - return IMX_CHIP_REVISION_1_1; - case 2: - return IMX_CHIP_REVISION_1_2; - default: - return IMX_CHIP_REVISION_UNKNOWN; - } -} - void imx6q_restart(char mode, const char *cmd) { struct device_node *np; @@ -238,7 +204,6 @@ static void __init imx6q_timer_init(void) { mx6q_clocks_init(); twd_local_timer_of_register(); - imx_print_silicon_rev("i.MX6Q", imx6q_revision()); } static struct sys_timer imx6q_timer = { diff --git a/trunk/arch/arm/mach-imx/mx6q.h b/trunk/arch/arm/mach-imx/mx6q.h index 19d3f54db5af..f7e7dbac8f4b 100644 --- a/trunk/arch/arm/mach-imx/mx6q.h +++ b/trunk/arch/arm/mach-imx/mx6q.h @@ -27,5 +27,9 @@ #define MX6Q_CCM_SIZE 0x4000 #define MX6Q_ANATOP_BASE_ADDR 0x020c8000 #define MX6Q_ANATOP_SIZE 0x1000 +#define MX6Q_UART2_BASE_ADDR 0x021e8000 +#define MX6Q_UART2_SIZE 0x4000 +#define MX6Q_UART4_BASE_ADDR 0x021f0000 +#define MX6Q_UART4_SIZE 0x4000 #endif /* __MACH_MX6Q_H__ */ diff --git a/trunk/arch/arm/mach-kirkwood/Kconfig b/trunk/arch/arm/mach-kirkwood/Kconfig index 503d7dd944ff..d018ad4bcc3c 100644 --- a/trunk/arch/arm/mach-kirkwood/Kconfig +++ b/trunk/arch/arm/mach-kirkwood/Kconfig @@ -46,11 +46,6 @@ config MACH_GURUPLUG config ARCH_KIRKWOOD_DT bool "Marvell Kirkwood Flattened Device Tree" - select POWER_SUPPLY - select POWER_RESET - select POWER_RESET_GPIO - select REGULATOR - select REGULATOR_FIXED_VOLTAGE select USE_OF help Say 'Y' here if you want your kernel to support the diff --git a/trunk/arch/arm/mach-kirkwood/board-dnskw.c b/trunk/arch/arm/mach-kirkwood/board-dnskw.c index a1aa87f09180..43d16d6714b8 100644 --- a/trunk/arch/arm/mach-kirkwood/board-dnskw.c +++ b/trunk/arch/arm/mach-kirkwood/board-dnskw.c @@ -17,11 +17,51 @@ #include #include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data dnskw_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; +static unsigned int dnskw_mpp_config[] __initdata = { + MPP13_UART1_TXD, /* Custom ... */ + MPP14_UART1_RXD, /* ... Controller (DNS-320 only) */ + MPP20_SATA1_ACTn, /* LED: White Right HDD */ + MPP21_SATA0_ACTn, /* LED: White Left HDD */ + MPP24_GPIO, + MPP25_GPIO, + MPP26_GPIO, /* LED: Power */ + MPP27_GPIO, /* LED: Red Right HDD */ + MPP28_GPIO, /* LED: Red Left HDD */ + MPP29_GPIO, /* LED: Red USB (DNS-325 only) */ + MPP30_GPIO, + MPP31_GPIO, + MPP32_GPIO, + MPP33_GPO, + MPP34_GPIO, /* Button: Front power */ + MPP35_GPIO, /* LED: Red USB (DNS-320 only) */ + MPP36_GPIO, /* Power: Turn off board */ + MPP37_GPIO, /* Power: Turn back on after power failure */ + MPP38_GPIO, + MPP39_GPIO, /* Power: SATA0 */ + MPP40_GPIO, /* Power: SATA1 */ + MPP41_GPIO, /* SATA0 present */ + MPP42_GPIO, /* SATA1 present */ + MPP43_GPIO, /* LED: White USB */ + MPP44_GPIO, /* Fan: Tachometer Pin */ + MPP45_GPIO, /* Fan: high speed */ + MPP46_GPIO, /* Fan: low speed */ + MPP47_GPIO, /* Button: Back unmount */ + MPP48_GPIO, /* Button: Back reset */ + MPP49_GPIO, /* Temp Alarm (DNS-325) Pin of U5 (DNS-320) */ + 0 +}; + +static void dnskw_power_off(void) +{ + gpio_set_value(36, 1); +} + /* Register any GPIO for output and set the value */ static void __init dnskw_gpio_register(unsigned gpio, char *name, int def) { @@ -36,8 +76,22 @@ static void __init dnskw_gpio_register(unsigned gpio, char *name, int def) void __init dnskw_init(void) { + kirkwood_mpp_conf(dnskw_mpp_config); + + kirkwood_ehci_init(); kirkwood_ge00_init(&dnskw_ge00_data); + /* Register power-off GPIO. */ + if (gpio_request(36, "dnskw:power:off") == 0 + && gpio_direction_output(36, 0) == 0) + pm_power_off = dnskw_power_off; + else + pr_err("dnskw: failed to configure power-off GPIO\n"); + + /* Ensure power is supplied to both HDDs */ + dnskw_gpio_register(39, "dnskw:power:sata0", 1); + dnskw_gpio_register(40, "dnskw:power:sata1", 1); + /* Set NAS to turn back on after a power failure */ dnskw_gpio_register(37, "dnskw:power:recover", 1); } diff --git a/trunk/arch/arm/mach-kirkwood/board-dockstar.c b/trunk/arch/arm/mach-kirkwood/board-dockstar.c index d7196db33984..6912882b0aa9 100644 --- a/trunk/arch/arm/mach-kirkwood/board-dockstar.c +++ b/trunk/arch/arm/mach-kirkwood/board-dockstar.c @@ -17,16 +17,32 @@ #include #include #include +#include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data dockstar_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), }; +static unsigned int dockstar_mpp_config[] __initdata = { + MPP29_GPIO, /* USB Power Enable */ + MPP46_GPIO, /* LED green */ + MPP47_GPIO, /* LED orange */ + 0 +}; + void __init dockstar_dt_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(dockstar_mpp_config); + + if (gpio_request(29, "USB Power Enable") != 0 || + gpio_direction_output(29, 1) != 0) + pr_err("can't setup GPIO 29 (USB Power Enable)\n"); + kirkwood_ehci_init(); + kirkwood_ge00_init(&dockstar_ge00_data); } diff --git a/trunk/arch/arm/mach-kirkwood/board-dreamplug.c b/trunk/arch/arm/mach-kirkwood/board-dreamplug.c index 08248e24ffcd..8a8ebe09e512 100644 --- a/trunk/arch/arm/mach-kirkwood/board-dreamplug.c +++ b/trunk/arch/arm/mach-kirkwood/board-dreamplug.c @@ -17,6 +17,7 @@ #include #include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data dreamplug_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), @@ -30,11 +31,25 @@ static struct mvsdio_platform_data dreamplug_mvsdio_data = { /* unfortunately the CD signal has not been connected */ }; +static unsigned int dreamplug_mpp_config[] __initdata = { + MPP0_SPI_SCn, + MPP1_SPI_MOSI, + MPP2_SPI_SCK, + MPP3_SPI_MISO, + MPP47_GPIO, /* Bluetooth LED */ + MPP48_GPIO, /* Wifi LED */ + MPP49_GPIO, /* Wifi AP LED */ + 0 +}; + void __init dreamplug_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(dreamplug_mpp_config); + + kirkwood_ehci_init(); kirkwood_ge00_init(&dreamplug_ge00_data); kirkwood_ge01_init(&dreamplug_ge01_data); kirkwood_sdio_init(&dreamplug_mvsdio_data); diff --git a/trunk/arch/arm/mach-kirkwood/board-goflexnet.c b/trunk/arch/arm/mach-kirkwood/board-goflexnet.c index 9db979aec82e..5dcd0d62aa42 100644 --- a/trunk/arch/arm/mach-kirkwood/board-goflexnet.c +++ b/trunk/arch/arm/mach-kirkwood/board-goflexnet.c @@ -19,16 +19,40 @@ #include #include #include +#include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data goflexnet_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), }; +static unsigned int goflexnet_mpp_config[] __initdata = { + MPP29_GPIO, /* USB Power Enable */ + MPP47_GPIO, /* LED Orange */ + MPP46_GPIO, /* LED Green */ + MPP45_GPIO, /* LED Left Capacity 3 */ + MPP44_GPIO, /* LED Left Capacity 2 */ + MPP43_GPIO, /* LED Left Capacity 1 */ + MPP42_GPIO, /* LED Left Capacity 0 */ + MPP41_GPIO, /* LED Right Capacity 3 */ + MPP40_GPIO, /* LED Right Capacity 2 */ + MPP39_GPIO, /* LED Right Capacity 1 */ + MPP38_GPIO, /* LED Right Capacity 0 */ + 0 +}; + void __init goflexnet_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(goflexnet_mpp_config); + + if (gpio_request(29, "USB Power Enable") != 0 || + gpio_direction_output(29, 1) != 0) + pr_err("can't setup GPIO 29 (USB Power Enable)\n"); + kirkwood_ehci_init(); + kirkwood_ge00_init(&goflexnet_ge00_data); } diff --git a/trunk/arch/arm/mach-kirkwood/board-ib62x0.c b/trunk/arch/arm/mach-kirkwood/board-ib62x0.c index 9f6f496380d8..6d3a56421142 100644 --- a/trunk/arch/arm/mach-kirkwood/board-ib62x0.c +++ b/trunk/arch/arm/mach-kirkwood/board-ib62x0.c @@ -14,17 +14,52 @@ #include #include #include +#include #include #include "common.h" +#include "mpp.h" + +#define IB62X0_GPIO_POWER_OFF 24 static struct mv643xx_eth_platform_data ib62x0_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; +static unsigned int ib62x0_mpp_config[] __initdata = { + MPP0_NF_IO2, + MPP1_NF_IO3, + MPP2_NF_IO4, + MPP3_NF_IO5, + MPP4_NF_IO6, + MPP5_NF_IO7, + MPP18_NF_IO0, + MPP19_NF_IO1, + MPP22_GPIO, /* OS LED red */ + MPP24_GPIO, /* Power off device */ + MPP25_GPIO, /* OS LED green */ + MPP27_GPIO, /* USB transfer LED */ + MPP28_GPIO, /* Reset button */ + MPP29_GPIO, /* USB Copy button */ + 0 +}; + +static void ib62x0_power_off(void) +{ + gpio_set_value(IB62X0_GPIO_POWER_OFF, 1); +} + void __init ib62x0_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(ib62x0_mpp_config); + + kirkwood_ehci_init(); kirkwood_ge00_init(&ib62x0_ge00_data); + if (gpio_request(IB62X0_GPIO_POWER_OFF, "ib62x0:power:off") == 0 && + gpio_direction_output(IB62X0_GPIO_POWER_OFF, 0) == 0) + pm_power_off = ib62x0_power_off; + else + pr_err("board-ib62x0: failed to configure power-off GPIO\n"); } diff --git a/trunk/arch/arm/mach-kirkwood/board-iconnect.c b/trunk/arch/arm/mach-kirkwood/board-iconnect.c index c8ebde4919e2..24f5aa7f698b 100644 --- a/trunk/arch/arm/mach-kirkwood/board-iconnect.c +++ b/trunk/arch/arm/mach-kirkwood/board-iconnect.c @@ -13,13 +13,31 @@ #include #include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data iconnect_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(11), }; +static unsigned int iconnect_mpp_config[] __initdata = { + MPP12_GPIO, + MPP35_GPIO, + MPP41_GPIO, + MPP42_GPIO, + MPP43_GPIO, + MPP44_GPIO, + MPP45_GPIO, + MPP46_GPIO, + MPP47_GPIO, + MPP48_GPIO, + 0 +}; + void __init iconnect_init(void) { + kirkwood_mpp_conf(iconnect_mpp_config); + + kirkwood_ehci_init(); kirkwood_ge00_init(&iconnect_ge00_data); } diff --git a/trunk/arch/arm/mach-kirkwood/board-iomega_ix2_200.c b/trunk/arch/arm/mach-kirkwood/board-iomega_ix2_200.c index f655b2637b0e..e4ed62c28f54 100644 --- a/trunk/arch/arm/mach-kirkwood/board-iomega_ix2_200.c +++ b/trunk/arch/arm/mach-kirkwood/board-iomega_ix2_200.c @@ -13,6 +13,7 @@ #include #include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data iomega_ix2_200_ge00_data = { .phy_addr = MV643XX_ETH_PHY_NONE, @@ -20,10 +21,35 @@ static struct mv643xx_eth_platform_data iomega_ix2_200_ge00_data = { .duplex = DUPLEX_FULL, }; +static unsigned int iomega_ix2_200_mpp_config[] __initdata = { + MPP12_GPIO, /* Reset Button */ + MPP14_GPIO, /* Power Button */ + MPP15_GPIO, /* Backup LED (blue) */ + MPP16_GPIO, /* Power LED (white) */ + MPP35_GPIO, /* OTB Button */ + MPP36_GPIO, /* Rebuild LED (white) */ + MPP37_GPIO, /* Health LED (red) */ + MPP38_GPIO, /* SATA LED brightness control 1 */ + MPP39_GPIO, /* SATA LED brightness control 2 */ + MPP40_GPIO, /* Backup LED brightness control 1 */ + MPP41_GPIO, /* Backup LED brightness control 2 */ + MPP42_GPIO, /* Power LED brightness control 1 */ + MPP43_GPIO, /* Power LED brightness control 2 */ + MPP44_GPIO, /* Health LED brightness control 1 */ + MPP45_GPIO, /* Health LED brightness control 2 */ + MPP46_GPIO, /* Rebuild LED brightness control 1 */ + MPP47_GPIO, /* Rebuild LED brightness control 2 */ + 0 +}; + void __init iomega_ix2_200_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(iomega_ix2_200_mpp_config); + + kirkwood_ehci_init(); + kirkwood_ge01_init(&iomega_ix2_200_ge00_data); } diff --git a/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c b/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c index 44e4605ba0bf..f7d32834b757 100644 --- a/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c +++ b/trunk/arch/arm/mach-kirkwood/board-km_kirkwood.c @@ -18,14 +18,26 @@ #include #include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), }; +static unsigned int km_kirkwood_mpp_config[] __initdata = { + MPP8_GPIO, /* I2C SDA */ + MPP9_GPIO, /* I2C SCL */ + 0 +}; + void __init km_kirkwood_init(void) { struct clk *sata_clk; + /* + * Basic setup. Needs to be called early. + */ + kirkwood_mpp_conf(km_kirkwood_mpp_config); + /* * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing * SATA bits (14-15) of the Clock Gating Control Register. Since these @@ -40,5 +52,6 @@ void __init km_kirkwood_init(void) if (!IS_ERR(sata_clk)) sata_clk->flags |= CLK_IGNORE_UNUSED; + kirkwood_ehci_init(); kirkwood_ge00_init(&km_kirkwood_ge00_data); } diff --git a/trunk/arch/arm/mach-kirkwood/board-lsxl.c b/trunk/arch/arm/mach-kirkwood/board-lsxl.c index 4ec8b7ae784a..7e18cad9b796 100644 --- a/trunk/arch/arm/mach-kirkwood/board-lsxl.c +++ b/trunk/arch/arm/mach-kirkwood/board-lsxl.c @@ -15,7 +15,9 @@ #include #include #include +#include #include "common.h" +#include "mpp.h" static struct mv643xx_eth_platform_data lsxl_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), @@ -25,6 +27,23 @@ static struct mv643xx_eth_platform_data lsxl_ge01_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; +static unsigned int lsxl_mpp_config[] __initdata = { + MPP10_GPO, /* HDD Power Enable */ + MPP11_GPIO, /* USB Vbus Enable */ + MPP18_GPO, /* FAN High Enable# */ + MPP19_GPO, /* FAN Low Enable# */ + MPP36_GPIO, /* Function Blue LED */ + MPP37_GPIO, /* Alarm LED */ + MPP38_GPIO, /* Info LED */ + MPP39_GPIO, /* Power LED */ + MPP40_GPIO, /* Fan Lock */ + MPP41_GPIO, /* Function Button */ + MPP42_GPIO, /* Power Switch */ + MPP43_GPIO, /* Power Auto Switch */ + MPP48_GPIO, /* Function Red LED */ + 0 +}; + /* * On the LS-XHL/LS-CHLv2, the shutdown process is following: * - Userland monitors key events until the power switch goes to off position @@ -38,12 +57,21 @@ static void lsxl_power_off(void) kirkwood_restart('h', NULL); } +#define LSXL_GPIO_HDD_POWER 10 +#define LSXL_GPIO_USB_POWER 11 + void __init lsxl_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(lsxl_mpp_config); + + /* usb and sata power on */ + gpio_set_value(LSXL_GPIO_USB_POWER, 1); + gpio_set_value(LSXL_GPIO_HDD_POWER, 1); + kirkwood_ehci_init(); kirkwood_ge00_init(&lsxl_ge00_data); kirkwood_ge01_init(&lsxl_ge01_data); diff --git a/trunk/arch/arm/mach-kirkwood/board-mplcec4.c b/trunk/arch/arm/mach-kirkwood/board-mplcec4.c index 56bfe5a1605a..e78a227468e6 100644 --- a/trunk/arch/arm/mach-kirkwood/board-mplcec4.c +++ b/trunk/arch/arm/mach-kirkwood/board-mplcec4.c @@ -24,16 +24,52 @@ static struct mv643xx_eth_platform_data mplcec4_ge01_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(2), }; +static unsigned int mplcec4_mpp_config[] __initdata = { + MPP0_NF_IO2, + MPP1_NF_IO3, + MPP2_NF_IO4, + MPP3_NF_IO5, + MPP4_NF_IO6, + MPP5_NF_IO7, + MPP6_SYSRST_OUTn, + MPP7_GPO, /* Status LED Green High Active */ + MPP10_UART0_TXD, + MPP11_UART0_RXD, + MPP12_SD_CLK, + MPP13_SD_CMD, /* Alt UART1_TXD */ + MPP14_SD_D0, /* Alt UART1_RXD */ + MPP15_SD_D1, + MPP16_SD_D2, + MPP17_SD_D3, + MPP18_NF_IO0, + MPP19_NF_IO1, + MPP28_GPIO, /* Input SYS_POR_DET (active High) */ + MPP29_GPIO, /* Input SYS_RTC_INT (active High) */ + MPP34_SATA1_ACTn, + MPP35_SATA0_ACTn, + MPP40_GPIO, /* LED User1 orange */ + MPP41_GPIO, /* LED User1 green */ + MPP44_GPIO, /* LED User0 orange */ + MPP45_GPIO, /* LED User0 green */ + MPP46_GPIO, /* Status LED Yellow High Active */ + MPP47_GPIO, /* SD_CD# (in/IRQ)*/ + 0 +}; + + static struct mvsdio_platform_data mplcec4_mvsdio_data = { .gpio_card_detect = 47, /* MPP47 used as SD card detect */ }; + void __init mplcec4_init(void) { /* * Basic setup. Needs to be called early. */ + kirkwood_mpp_conf(mplcec4_mpp_config); + kirkwood_ehci_init(); kirkwood_ge00_init(&mplcec4_ge00_data); kirkwood_ge01_init(&mplcec4_ge01_data); kirkwood_sdio_init(&mplcec4_mvsdio_data); diff --git a/trunk/arch/arm/mach-kirkwood/board-ns2.c b/trunk/arch/arm/mach-kirkwood/board-ns2.c index 8821720ab5a4..78596c4f76d2 100644 --- a/trunk/arch/arm/mach-kirkwood/board-ns2.c +++ b/trunk/arch/arm/mach-kirkwood/board-ns2.c @@ -73,6 +73,7 @@ void __init ns2_init(void) */ kirkwood_mpp_conf(ns2_mpp_config); + kirkwood_ehci_init(); if (of_machine_is_compatible("lacie,netspace_lite_v2") || of_machine_is_compatible("lacie,netspace_mini_v2")) ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); diff --git a/trunk/arch/arm/mach-kirkwood/board-nsa310.c b/trunk/arch/arm/mach-kirkwood/board-nsa310.c index f58d2e1a4042..027ce83f3fe5 100644 --- a/trunk/arch/arm/mach-kirkwood/board-nsa310.c +++ b/trunk/arch/arm/mach-kirkwood/board-nsa310.c @@ -85,6 +85,10 @@ void __init nsa310_init(void) nsa310_gpio_init(); + /* this can be removed once the mainline kirkwood.dtsi gets + * the ehci configuration by default */ + kirkwood_ehci_init(); + kirkwood_pcie_id(&dev, &rev); i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info)); diff --git a/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c b/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c index 815fc6451d52..e807e8cfdd44 100644 --- a/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c +++ b/trunk/arch/arm/mach-kirkwood/board-openblocks_a6.c @@ -55,8 +55,8 @@ static unsigned int openblocks_a6_mpp_config[] __initdata = { MPP38_GPIO, /* INIT */ MPP39_GPIO, /* USB OC */ MPP41_GPIO, /* LED: Red */ - MPP42_GPIO, /* LED: Green */ - MPP43_GPIO, /* LED: Yellow */ + MPP42_GPIO, /* LED: Yellow */ + MPP43_GPIO, /* LED: Green */ 0, }; @@ -66,5 +66,6 @@ void __init openblocks_a6_init(void) * Basic setup. Needs to be called early. */ kirkwood_mpp_conf(openblocks_a6_mpp_config); + kirkwood_ehci_init(); kirkwood_ge00_init(&openblocks_ge00_data); } diff --git a/trunk/arch/arm/mach-kirkwood/board-ts219.c b/trunk/arch/arm/mach-kirkwood/board-ts219.c index acb0187c7ee1..f3bfedae3a20 100644 --- a/trunk/arch/arm/mach-kirkwood/board-ts219.c +++ b/trunk/arch/arm/mach-kirkwood/board-ts219.c @@ -23,21 +23,47 @@ #include #include #include "common.h" +#include "mpp.h" #include "tsx1x-common.h" static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; +static unsigned int qnap_ts219_mpp_config[] __initdata = { + MPP0_SPI_SCn, + MPP1_SPI_MOSI, + MPP2_SPI_SCK, + MPP3_SPI_MISO, + MPP4_SATA1_ACTn, + MPP5_SATA0_ACTn, + MPP8_TW0_SDA, + MPP9_TW0_SCK, + MPP10_UART0_TXD, + MPP11_UART0_RXD, + MPP13_UART1_TXD, /* PIC controller */ + MPP14_UART1_RXD, /* PIC controller */ + MPP15_GPIO, /* USB Copy button (on devices with 88F6281) */ + MPP16_GPIO, /* Reset button (on devices with 88F6281) */ + MPP36_GPIO, /* RAM: 0: 256 MB, 1: 512 MB */ + MPP37_GPIO, /* Reset button (on devices with 88F6282) */ + MPP43_GPIO, /* USB Copy button (on devices with 88F6282) */ + MPP44_GPIO, /* Board ID: 0: TS-11x, 1: TS-21x */ + 0 +}; + void __init qnap_dt_ts219_init(void) { u32 dev, rev; + kirkwood_mpp_conf(qnap_ts219_mpp_config); + kirkwood_pcie_id(&dev, &rev); if (dev == MV88F6282_DEV_ID) qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0); kirkwood_ge00_init(&qnap_ts219_ge00_data); + kirkwood_ehci_init(); pm_power_off = qnap_tsx1x_power_off; } diff --git a/trunk/arch/arm/mach-kirkwood/board-usi_topkick.c b/trunk/arch/arm/mach-kirkwood/board-usi_topkick.c index 15e69fcde9f4..e2ec9d891fe3 100644 --- a/trunk/arch/arm/mach-kirkwood/board-usi_topkick.c +++ b/trunk/arch/arm/mach-kirkwood/board-usi_topkick.c @@ -76,6 +76,7 @@ void __init usi_topkick_init(void) /* SATA0 power enable */ gpio_set_value(TOPKICK_SATA0_PWR_ENABLE, 1); + kirkwood_ehci_init(); kirkwood_ge00_init(&topkick_ge00_data); kirkwood_sdio_init(&topkick_mvsdio_data); } diff --git a/trunk/arch/arm/mach-mxs/mach-mxs.c b/trunk/arch/arm/mach-mxs/mach-mxs.c index 98070370d602..4748ec551a68 100644 --- a/trunk/arch/arm/mach-mxs/mach-mxs.c +++ b/trunk/arch/arm/mach-mxs/mach-mxs.c @@ -100,25 +100,6 @@ static struct fb_videomode apx4devkit_video_modes[] = { }, }; -static struct fb_videomode apf28dev_video_modes[] = { - { - .name = "LW700", - .refresh = 60, - .xres = 800, - .yres = 480, - .pixclock = 30303, /* picosecond */ - .left_margin = 96, - .right_margin = 96, /* at least 3 & 1 */ - .upper_margin = 0x14, - .lower_margin = 0x15, - .hsync_len = 64, - .vsync_len = 4, - .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | - FB_SYNC_DATA_ENABLE_HIGH_ACT | - FB_SYNC_DOTCLK_FAILING_ACT, - }, -}; - static struct mxsfb_platform_data mxsfb_pdata __initdata; /* @@ -179,7 +160,6 @@ static struct sys_timer imx28_timer = { enum mac_oui { OUI_FSL, OUI_DENX, - OUI_CRYSTALFONTZ, }; static void __init update_fec_mac_prop(enum mac_oui oui) @@ -195,12 +175,8 @@ static void __init update_fec_mac_prop(enum mac_oui oui) np = of_find_compatible_node(from, NULL, "fsl,imx28-fec"); if (!np) return; - from = np; - if (of_get_property(np, "local-mac-address", NULL)) - continue; - newmac = kzalloc(sizeof(*newmac) + 6, GFP_KERNEL); if (!newmac) return; @@ -229,11 +205,6 @@ static void __init update_fec_mac_prop(enum mac_oui oui) macaddr[1] = 0xe5; macaddr[2] = 0x4e; break; - case OUI_CRYSTALFONTZ: - macaddr[0] = 0x58; - macaddr[1] = 0xb9; - macaddr[2] = 0xe1; - break; } val = ocotp[i]; macaddr[3] = (val >> 16) & 0xff; @@ -290,11 +261,6 @@ static void __init m28evk_init(void) mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT; } -static void __init sc_sps1_init(void) -{ - enable_clk_enet_out(); -} - static int apx4devkit_phy_fixup(struct phy_device *phy) { phy->dev_flags |= MICREL_PHY_50MHZ_CLK; @@ -389,22 +355,6 @@ static void __init tx28_post_init(void) pinctrl_put(pctl); } -static void __init cfa10049_init(void) -{ - enable_clk_enet_out(); - update_fec_mac_prop(OUI_CRYSTALFONTZ); -} - -static void __init apf28_init(void) -{ - enable_clk_enet_out(); - - mxsfb_pdata.mode_list = apf28dev_video_modes; - mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes); - mxsfb_pdata.default_bpp = 16; - mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT; -} - static void __init mxs_machine_init(void) { if (of_machine_is_compatible("fsl,imx28-evk")) @@ -415,12 +365,6 @@ static void __init mxs_machine_init(void) m28evk_init(); else if (of_machine_is_compatible("bluegiga,apx4devkit")) apx4devkit_init(); - else if (of_machine_is_compatible("crystalfontz,cfa10049")) - cfa10049_init(); - else if (of_machine_is_compatible("armadeus,imx28-apf28")) - apf28_init(); - else if (of_machine_is_compatible("schulercontrol,imx28-sps1")) - sc_sps1_init(); of_platform_populate(NULL, of_default_bus_match_table, mxs_auxdata_lookup, NULL); diff --git a/trunk/arch/arm/mach-mxs/timer.c b/trunk/arch/arm/mach-mxs/timer.c index 856f4c796061..7c3792613392 100644 --- a/trunk/arch/arm/mach-mxs/timer.c +++ b/trunk/arch/arm/mach-mxs/timer.c @@ -29,7 +29,6 @@ #include #include -#include #include #include @@ -234,22 +233,15 @@ static struct clocksource clocksource_mxs = { .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; -static u32 notrace mxs_read_sched_clock_v2(void) -{ - return ~readl_relaxed(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1)); -} - static int __init mxs_clocksource_init(struct clk *timer_clk) { unsigned int c = clk_get_rate(timer_clk); if (timrot_is_v1()) clocksource_register_hz(&clocksource_mxs, c); - else { + else clocksource_mmio_init(mxs_timrot_base + HW_TIMROT_RUNNING_COUNTn(1), "mxs_timer", c, 200, 32, clocksource_mmio_readl_down); - setup_sched_clock(mxs_read_sched_clock_v2, 32, c); - } return 0; } diff --git a/trunk/arch/arm/mach-netx/xc.c b/trunk/arch/arm/mach-netx/xc.c index f1c972d87bac..e4cfb7e5361d 100644 --- a/trunk/arch/arm/mach-netx/xc.c +++ b/trunk/arch/arm/mach-netx/xc.c @@ -136,7 +136,7 @@ int xc_request_firmware(struct xc *x) if (head->magic != 0x4e657458) { if (head->magic == 0x5874654e) { dev_err(x->dev, - "firmware magic is 'XteN'. Endianness problems?\n"); + "firmware magic is 'XteN'. Endianess problems?\n"); ret = -ENODEV; goto exit_release_firmware; } diff --git a/trunk/arch/arm/mach-nomadik/Kconfig b/trunk/arch/arm/mach-nomadik/Kconfig index 706dc5727bbe..c744946ef022 100644 --- a/trunk/arch/arm/mach-nomadik/Kconfig +++ b/trunk/arch/arm/mach-nomadik/Kconfig @@ -4,7 +4,7 @@ menu "Nomadik boards" config MACH_NOMADIK_8815NHK bool "ST 8815 Nomadik Hardware Kit (evaluation board)" - select CLKSRC_NOMADIK_MTU + select HAS_MTU select NOMADIK_8815 endmenu diff --git a/trunk/arch/arm/mach-nomadik/board-nhk8815.c b/trunk/arch/arm/mach-nomadik/board-nhk8815.c index 5ccdf53c5a9d..22ef8a1abe08 100644 --- a/trunk/arch/arm/mach-nomadik/board-nhk8815.c +++ b/trunk/arch/arm/mach-nomadik/board-nhk8815.c @@ -25,16 +25,18 @@ #include #include #include -#include -#include #include #include #include #include +#include #include #include + +#include + +#include #include -#include #include "cpu-8815.h" @@ -258,7 +260,7 @@ static void __init nomadik_timer_init(void) src_cr |= SRC_CR_INIT_VAL; writel(src_cr, io_p2v(NOMADIK_SRC_BASE)); - nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE), IRQ_MTU0); + nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE)); } static struct sys_timer nomadik_timer = { diff --git a/trunk/arch/arm/mach-nomadik/include/mach/irqs.h b/trunk/arch/arm/mach-nomadik/include/mach/irqs.h index b549d0571548..a118e615f865 100644 --- a/trunk/arch/arm/mach-nomadik/include/mach/irqs.h +++ b/trunk/arch/arm/mach-nomadik/include/mach/irqs.h @@ -72,7 +72,7 @@ #define NOMADIK_NR_GPIO 128 /* last 4 not wired to pins */ #define NOMADIK_GPIO_TO_IRQ(gpio) ((gpio) + NOMADIK_GPIO_OFFSET) #define NOMADIK_IRQ_TO_GPIO(irq) ((irq) - NOMADIK_GPIO_OFFSET) -#define NOMADIK_NR_IRQS NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO) +#define NR_IRQS NOMADIK_GPIO_TO_IRQ(NOMADIK_NR_GPIO) /* Following two are used by entry_macro.S, to access our dual-vic */ #define VIC_REG_IRQSR0 0 diff --git a/trunk/arch/arm/mach-omap1/board-h2.c b/trunk/arch/arm/mach-omap1/board-h2.c index 2274bd677efc..4953cf7a5123 100644 --- a/trunk/arch/arm/mach-omap1/board-h2.c +++ b/trunk/arch/arm/mach-omap1/board-h2.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-h3.c b/trunk/arch/arm/mach-omap1/board-h3.c index 1051935f0aac..563ba167bb16 100644 --- a/trunk/arch/arm/mach-omap1/board-h3.c +++ b/trunk/arch/arm/mach-omap1/board-h3.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-palmte.c b/trunk/arch/arm/mach-omap1/board-palmte.c index c33dceb46607..584b6fab894b 100644 --- a/trunk/arch/arm/mach-omap1/board-palmte.c +++ b/trunk/arch/arm/mach-omap1/board-palmte.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-palmtt.c b/trunk/arch/arm/mach-omap1/board-palmtt.c index 2948b0ee4be8..fbc986bfe69e 100644 --- a/trunk/arch/arm/mach-omap1/board-palmtt.c +++ b/trunk/arch/arm/mach-omap1/board-palmtt.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-palmz71.c b/trunk/arch/arm/mach-omap1/board-palmz71.c index 7a05895c0be3..60d917a93763 100644 --- a/trunk/arch/arm/mach-omap1/board-palmz71.c +++ b/trunk/arch/arm/mach-omap1/board-palmz71.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-omap1/board-sx1.c b/trunk/arch/arm/mach-omap1/board-sx1.c index 20ed52ae1714..1ebc7e08d6e5 100644 --- a/trunk/arch/arm/mach-omap1/board-sx1.c +++ b/trunk/arch/arm/mach-omap1/board-sx1.c @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/trunk/arch/arm/mach-omap1/dma.c b/trunk/arch/arm/mach-omap1/dma.c index e190611e4b46..978aed85d328 100644 --- a/trunk/arch/arm/mach-omap1/dma.c +++ b/trunk/arch/arm/mach-omap1/dma.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-omap1/io.c b/trunk/arch/arm/mach-omap1/io.c index 499b8accb83d..5a3b80617a11 100644 --- a/trunk/arch/arm/mach-omap1/io.c +++ b/trunk/arch/arm/mach-omap1/io.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include "iomap.h" #include "common.h" diff --git a/trunk/arch/arm/mach-omap1/lcd_dma.c b/trunk/arch/arm/mach-omap1/lcd_dma.c index 77924be37d41..7ed8c1857d56 100644 --- a/trunk/arch/arm/mach-omap1/lcd_dma.c +++ b/trunk/arch/arm/mach-omap1/lcd_dma.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-omap1/mcbsp.c b/trunk/arch/arm/mach-omap1/mcbsp.c index b0d4723c9a90..c6d8fdf92e9c 100644 --- a/trunk/arch/arm/mach-omap1/mcbsp.c +++ b/trunk/arch/arm/mach-omap1/mcbsp.c @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include "soc.h" #include diff --git a/trunk/arch/arm/mach-omap1/pm.c b/trunk/arch/arm/mach-omap1/pm.c index 7a7690ab6cb8..66d663a6ef3a 100644 --- a/trunk/arch/arm/mach-omap1/pm.c +++ b/trunk/arch/arm/mach-omap1/pm.c @@ -52,7 +52,7 @@ #include #include -#include +#include #include #include diff --git a/trunk/arch/arm/mach-omap2/Kconfig b/trunk/arch/arm/mach-omap2/Kconfig index be0f62bf9037..2265e5826883 100644 --- a/trunk/arch/arm/mach-omap2/Kconfig +++ b/trunk/arch/arm/mach-omap2/Kconfig @@ -34,7 +34,6 @@ config ARCH_OMAP2 select CPU_V6 select MULTI_IRQ_HANDLER select SOC_HAS_OMAP2_SDRC - select COMMON_CLK config ARCH_OMAP3 bool "TI OMAP3" @@ -48,7 +47,6 @@ config ARCH_OMAP3 select PM_OPP if PM select PM_RUNTIME if CPU_IDLE select SOC_HAS_OMAP2_SDRC - select COMMON_CLK select USB_ARCH_HAS_EHCI if USB_SUPPORT config ARCH_OMAP4 @@ -70,7 +68,6 @@ config ARCH_OMAP4 select PM_OPP if PM select PM_RUNTIME if CPU_IDLE select USB_ARCH_HAS_EHCI if USB_SUPPORT - select COMMON_CLK config SOC_OMAP5 bool "TI OMAP5" @@ -80,7 +77,6 @@ config SOC_OMAP5 select CPU_V7 select HAVE_SMP select SOC_HAS_REALTIME_COUNTER - select COMMON_CLK comment "OMAP Core Type" depends on ARCH_OMAP2 @@ -115,7 +111,6 @@ config SOC_AM33XX select ARM_CPU_SUSPEND if PM select CPU_V7 select MULTI_IRQ_HANDLER - select COMMON_CLK config OMAP_PACKAGE_ZAF bool diff --git a/trunk/arch/arm/mach-omap2/Makefile b/trunk/arch/arm/mach-omap2/Makefile index a8004f33b7e2..b455ffc12ebe 100644 --- a/trunk/arch/arm/mach-omap2/Makefile +++ b/trunk/arch/arm/mach-omap2/Makefile @@ -160,17 +160,17 @@ obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpllcore.o obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_virt_prcm_set.o obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_apll.o clkt2xxx_osc.o obj-$(CONFIG_ARCH_OMAP2) += clkt2xxx_dpll.o clkt_iclk.o -obj-$(CONFIG_SOC_OMAP2420) += cclock2420_data.o -obj-$(CONFIG_SOC_OMAP2430) += clock2430.o cclock2430_data.o +obj-$(CONFIG_SOC_OMAP2420) += clock2420_data.o +obj-$(CONFIG_SOC_OMAP2430) += clock2430.o clock2430_data.o obj-$(CONFIG_ARCH_OMAP3) += $(clock-common) clock3xxx.o obj-$(CONFIG_ARCH_OMAP3) += clock34xx.o clkt34xx_dpll3m2.o obj-$(CONFIG_ARCH_OMAP3) += clock3517.o clock36xx.o -obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o cclock3xxx_data.o +obj-$(CONFIG_ARCH_OMAP3) += dpll3xxx.o clock3xxx_data.o obj-$(CONFIG_ARCH_OMAP3) += clkt_iclk.o -obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) cclock44xx_data.o +obj-$(CONFIG_ARCH_OMAP4) += $(clock-common) clock44xx_data.o obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o -obj-$(CONFIG_SOC_AM33XX) += cclock33xx_data.o +obj-$(CONFIG_SOC_AM33XX) += clock33xx_data.o obj-$(CONFIG_SOC_OMAP5) += $(clock-common) obj-$(CONFIG_SOC_OMAP5) += dpll3xxx.o dpll44xx.o diff --git a/trunk/arch/arm/mach-omap2/board-3430sdp.c b/trunk/arch/arm/mach-omap2/board-3430sdp.c index 7b201546834d..6601754f9512 100644 --- a/trunk/arch/arm/mach-omap2/board-3430sdp.c +++ b/trunk/arch/arm/mach-omap2/board-3430sdp.c @@ -31,7 +31,7 @@ #include #include "common.h" -#include +#include #include