Commit Graph

5080 Commits

Author SHA1 Message Date
Chanwoo Choi 10ea1f1833 ARM: dts: Add GPS_ALIVE power domain for exynos4x12
This patch add GPS_ALIVE power domain for Exynos4x12 SoC. GPS_ALIVE power domain
include GPS_BLK for GPS IP. Exynos SoC used generic power-domain driver to
control power domain. After completed kernel booting, Exynos power-domain driver
disable un-used power domain to reduce power-consumption/leak.

If GPS_ALIVE power domain isn't registered to Exynos power-domain driver,
happen power-leakage because GPS_ALIVE_CONFIGURATION is default power on state.

- 0x10023D00 : GPS_ALIVE_CONFIGURATION register address

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:58 +09:00
Chanwoo Choi be929999fd ARM: dts: Add PMU dt data to support PMU for exynos4x12
ARM CPU has its own performance profiling unit(PMU, Perforamnce Monitoring Unit).
This patch add PMU dt data to support PMU which count cache hit and miss events.

PMU interrput list of Exynos4212
- <2 2> : INTG2[2] - PMUIRQ[0] for CPU0
- <3 2> : INTG3[2] - PMUIRQ[1] for CPU1

PMU interrput list of Exynos4412
- <2 2> : INTG2[2], PMUIRQ[0] for CPU0
- <3 2> : INTG3[2], PMUIRQ[1] for CPU1
- <18 2> : INTG18[2], PMUIRQ[2] : CPU2
- <19 2> : INTG19[2], PMUIRQ[3] : CPU3

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:58 +09:00
Chanwoo Choi c63c574330 ARM: dts: Add ADC's dt data to read raw data for exynos4x12
This patch add ADC(Analog to Digital Converter)'s dt data to get raw data
with IIO subsystem. Usually, ADC is used to check temperature, jack type
and so on.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2014-03-18 06:25:58 +09:00
Greg Kroah-Hartman e40bffaeae Merge 3.14-rc7 into staging-next
This resolves a merge issue with drivers/staging/cxt1e1/linux.c that was
fixed in a report from Stephen Rothwell

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-17 11:27:39 -07:00
Arnd Bergmann 397d77a566 First batch of AT91 cleanup for 3.15
- some updates on the defconfig front
 - two SoCs converted to Device Tree: sam9261 and sam9rl
   (with use of CCF!)
 - a little PWM clock update that goes on top of this
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTIJ7GAAoJEAf03oE53VmQ3xgIAMtWSo91ENlnr38ZtEN+J71j
 lrUdI/0sfv4pY2Dw0VbrnFS4hNmvM25C4dIR7SxU3iOnIC0vzzkPqs2hdRHwUY6y
 pw9NsnF3kW950vf/M6nDmHxQpwKZOCpABs5EDjO6S4Ky6sze4IPog+vb5Y7ovGCl
 LSqL9col3RCHIGyBWq77T3/NbWKOrz67Fy3eqJRyio7H8zYaEGnIrm2jPXYwtToT
 /FB9sZUunjYwdTRdGNhRiTHWktwlr4i4f8woHTZg85MGKY6DOsZgxzUvCXdGBeJx
 XaQ70hE8BF78Lglx8WUBgxowxJ1FvehxxcfzoYAVafwMlik+tSd3l0Zq3Sf6xD8=
 =Q3FC
 -----END PGP SIGNATURE-----

Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup

Merge "First batch of AT91 cleanup for 3.15" from Nicolas Ferre:

- some updates on the defconfig front
- two SoCs converted to Device Tree: sam9261 and sam9rl
  (with use of CCF!)
- a little PWM clock update that goes on top of this

* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
  ARM: at91: add PWM clock
  ARM: at91: move sam9261 SoC to common clk
  ARM: at91: prepare common clk transition for sam9261 SoC
  ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
  ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
  ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
  ARM: at91: dt: Add at91sam9261 dt SoC support
  ARM: at91: switch sam9rl to common clock framework
  ARM: at91/dt: define main clk frequency of at91sam9rlek
  ARM: at91/dt: define at91sam9rl clocks
  ARM: at91: prepare common clk transition for sam9rl SoCs
  ARM: at91: prepare sam9 dt boards transition to common clk
  ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
  ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
  ARM: at91: Add at91sam9rl DT SoC support
  ARM: at91: prepare at91sam9rl DT transition
  ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
  ARM: at91/defconfig: remove useless configuration in at91sam9260_9g20_defconfig
  ARM: at91/defconfig: refresh at91sam9rl_defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:38:07 +01:00
Arnd Bergmann 22261b22f4 ARM: mach-bcm: dt updates for 3.15 - part 2
- BCM21664 SoC support
 - BCM59056 PMU support
 - BCM281xx reboot fix
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTI1oAAAoJEOfTILNwq7R4Eu8P/1nXYhNyzRyn1vLc2GuJrq2O
 jqD5wd4P2gUstaFtkm7DOXQq3Nui+kC+Bze3H1OkoPgblZ3PgtRJJXuVqJJl/7Ls
 cqrTcYiD7/2dk+KXGUUDSfNVowIeZYGRKBtB7MkVylPsLBlF7DKBlXS0MObYAwuI
 HlC98bwIHwkFeuF6JmqefnUF+yNaHHdLgLCfMfT65A4TIYvcUT851B0hb2ZzuHGx
 xigGlkKBX4xtExB2Q5rdQPnqFboXKNChCZ4/ckm2cHLZqKCDvNiqCXseDsI3ehm9
 7l8S+KVltxBaPBqPS3sOWlfuMBEME3+agrryyqJwr8WYfd7tubvYMWOHzGY/TdJv
 FkehEaSTXF9x6OgSCcRe2NaE+o9csFWbvfHBkbvYm4N2jKqrVVLymfqN77dIbmad
 8GR767kfgL3rSQBlJU0T0VxeupXbBrIergplWLMZGwTy/2jeWsjY2bckpmeHu4xP
 2KMwbqvNa8Wb2+WI0Pjap48rTqqEtYvKJRt8eX7eCNHHoHFQy3LVL1tRhCzr9ZT+
 mnoeDxX1qCMHoKzGTSlTQOqJXJitQpcvEDyPns4Sx61adAGuFClm9381e3N4r/CQ
 BgBtJMs+RpY12jlMLN0Gdcj2blowyhidudClELBzhfpqy/PYFGbkxoCdovj1+f/F
 zeZB1F7plWbt8Pf+3aTU
 =r/HW
 -----END PGP SIGNATURE-----

Merge tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm into next/dt

Merge "ARM: mach-bcm: dt updates for 3.15 - part 2" from Matt Porter:

- BCM21664 SoC support
- BCM59056 PMU support
- BCM281xx reboot fix

* tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm:
  ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
  ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
  ARM: dts: bcm21664: Add device tree files.
  ARM: DT: bcm21664: Device tree bindings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:19:23 +01:00
Arnd Bergmann 38edc2da50 Updates to the .dts files to support more Gumstix boards.
These are sent separately from the rest of the .dts changes
 as these depend on the fixes merged into v3.14-rc4, and
 needed a bit more time to get updated on the fixes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIMPtAAoJEBvUPslcq6VzYzUP/R/CjdMRley2yjwnxkZ/pk6w
 cUitKvWpVcu4M7VMaEsGj7x33PuvYF3Ukn2RLX5/XrWEI+4ec6Ny3cWOAiRr8pmv
 7ojBfNTtM3l8wRlJE/cZ5tfX+24nc6Ofufwi0ax+LoFZEh/JNdWXzFwd68mlxlCM
 NlQakcwN3ReZ4y30C8vZJmQwLqiIw0LDFOoBPB9C7Zgc735brQBm5fnzVFJWrnq0
 RIIB5hWJ+fmyP3jHRN5XmNLPEMKULK7GUgX1UMF99imQf548agYvstbazZVRVr6D
 i1Tkq/9W8UTT1wrUYfagr94Oj61vyqSUZJm5pHjehi+hfUkvHX4sxLup+WXIIA9L
 LObz368BaHGQ7FrryEe/FYZdnmjaluK1nw4Huobnv5GXvp6XPG36yEo9L6LbiNvK
 +uRnV2k+OdJ9cHIYwxNQC7dNcr+qHvTWGOrU3Q++OAVi+dClUO7G0/+xh5NQbsBA
 jApGa8FQrk4S5jgNEFzFnpj4XPTE/88pbrQfZq5RsGQ+P1Jx5r9dbzndVft+b1C2
 uC0tLsJDX3RJCbk4N0JZACygaIvVfH4sybf34FTDP19r9eKWKSpHjHZAtnJ7AIss
 Iz0AxxKnUFwy3Kx01DN8vZeLt0wRF2THn+nOkqM0ZO5r1ptNa1dBHXkrWVP5gybn
 WnN9onC6O4Wa2wEvCxVd
 =rAdr
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Updates to the .dts files to support more Gumstix boards.

These are sent separately from the rest of the .dts changes
as these depend on the fixes merged into v3.14-rc4, and
needed a bit more time to get updated on the fixes.

* tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Add support for the Overo Summit
  ARM: dts: Add support for the Overo Chestnut43
  ARM: dts: Add support for the Overo Alto35
  ARM: dts: Add support for the Overo Gallop43
  ARM: dts: Add support for the Overo Palo43
  ARM: dts: overo: Add LIS33DE accelerometer
  ARM: dts: overo: Create a file for common Gumstix peripherals
  ARM: dts: overo: Push uart3 pinmux down to expansion board
  ARM: dts: omap3-tobi: Add AT24C01 EEPROM
  ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
  ARM: dts: omap: Add common file for SMSC9221
  ARM: dts: omap3-overo: Add HSUSB PHY
  ARM: dts: omap3-overo: Enable WiFi/BT combo
  ARM: dts: omap3-overo: Add missing pinctrl
  ARM: dts: omap3-tobi: Add missing pinctrl
  ARM: dts: overo: reorganize include files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Conflicts:
	arch/arm/boot/dts/omap3-overo.dtsi
2014-03-17 15:17:07 +01:00
Arnd Bergmann 937b5991ca Device tree related changes to the omap iommu driver as that
is finally getting updated. Also few trivial board related
 .dts updates to add more devices.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIMSBAAoJEBvUPslcq6VzimEP/2cJDRk76e+/kTvAmtl5L9JS
 Z1QaM/YZ6dObHjZmrkeh0HbiFV61aJvESXyEtET70FBDZmWJJICGlR+weQH9dGOk
 ejjsB14AdYiHDMRpp37V8M0xiZaUy0bUqEwwBCSE8HiTAM7lMluokXGZvKCRzxUQ
 aTUhekdIPVBLtdgIU9/2o194chpM7CEUlIlveam8IL5xpjLJguywgsjniM/xl0ni
 JcGaJM736HifgtOLCdIaWJ9SUk+UzmZ2cpP5auxt5+RAT1Omv3I2ztW8HTHMFNsK
 iRcmEiXlJus6itpJ0jroLksL1apoFpm3XKKIOTkIL2pD+UM10M/iYdf/r46EUY/Y
 pXABRkPIrYldgOMHrsFMCSxHfQJ7bqCs/Bs/mlJL90FwbB+akHFyuCuOTfLyaROQ
 RqmtGJQt+Y62QBtXdhoQ3OpOwNSxNlWgXyv0UoyE4ZHaaeoSwMjuLbqE/W0d4L+z
 CQdJLYWjKanWJkBZ/q6pYt5GKmW/oakDkHt28yI5rqwlWS3BUSgZQ5ghi12RPArG
 E2hBzoaVRl030nHNtjcz7sO5xBFnEvqzy3/XcWzeByjl1XlWtfxokVPxBB46aXcm
 sySlPnZGSJBY8S6Fnqs8/0hqQK+QLUfsZlXyvCYAWBVZGZ1OdzCdfR46dCx5xubD
 t7bGfgTMGSIiskjCxdU7
 =5f7K
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren:

Device tree related changes to the omap iommu driver as that
is finally getting updated. Also few trivial board related
.dts updates to add more devices.

* tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
  ARM: dts: am335x-evmsk: enable DMA controller for USB
  ARM: dts: OMAP5: Add IOMMU nodes
  ARM: dts: OMAP4: Add IOMMU nodes
  ARM: dts: OMAP3: Add IVA IOMMU node
  ARM: dts: OMAP3: Update ISP IOMMU node
  ARM: OMAP2+: extend iommu pdata-quirks to OMAP5
  ARM: OMAP5: hwmod data: add mmu data for ipu & dsp
  ARM: OMAP2+: use pdata quirks for iommu reset lines
  ARM: OMAP2+: change the ISP device archdata MMU name for DT
  ARM: OMAP3: fix iva mmu programming issues
  ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:11:10 +01:00
Arnd Bergmann a38f8913da Allwinner DT additions for 3.15, take 2:
- Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
   - Addition of the I2C for the A31
   - Addition USB Host mode for the A10, A10s, A13 and A20
   - Addition of SATA support for the A10 and A20
   - Change of compatible for the watchdog
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTIdlxAAoJEBx+YmzsjxAgxg0P/jffCG55oTWWyVcvXqcyXwtz
 TS2pe6gUYSQIExd0wnFSWBQzCC0262vuA5oC9UzKya13j4RzrlFlHJzyrFSCuMWy
 FW1Nb1n+QHyQL1xtn8eLpU1vnTrh20xm87UGNqVugzL7pDZ2rbtLs2VEvpHYs7LX
 R36fM1GSe0QFPZS+43f8jQEl0sViB+mmYjHqVOGmyOAfZt6tDtqk5FsTvzBivfxN
 qMuw2Q6cA/zEGI6RrxmC+LU4+MjQScBbibKbij8EcsJ7QysktxeLWAaP/yKkTBCc
 JnMWuDjH6kUHCsKodgFms4WKQuHPh6oYZwaQLHofIMh1lHn31H+gjQSre1mwOZCp
 DJPdVenZKCyIGHwu+Ezzm8CGkzOGnDHywSeg+pDunUWoNiIm9yUpUCMvUX31tXgR
 eARZlXQXAS0PO57XVwwaTixqBKx/LTVJC3L4Sm+zI5RGn7jl+Rgtqpg9gWyXvzZL
 kJLJaNkoBayWRT5YXOdHb5TSCTp5YPSZMDzSFoQ4sKKj+sLKVyTW8YRHYqaiW8SG
 Bk4ULaGMSC6jJ+8sa1zqeXXXrMC04c1jMM4ywXcw66TOxAlWDjsUhkLhVJW/sxKb
 ipKem0NEe70YK6QTRq0SLo6nrY5LFdkr57OvKiGs/lj3bnXWX66aA/aHZlPsFkRc
 Y1grULUQVBHSMJ81TvWr
 =8O2D
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dt

Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard:

  - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
  - Addition of the I2C for the A31
  - Addition USB Host mode for the A10, A10s, A13 and A20
  - Addition of SATA support for the A10 and A20
  - Change of compatible for the watchdog

* tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux: (23 commits)
  ARM: sunxi: dt: Update the watchdog compatibles
  ARM: sun6i: colombus: Enable the I2C controllers
  ARM: sun6i: Enable the I2C muxing options
  ARM: sun6i: Enable the I2C controllers
  ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
  ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
  ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
  ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
  ARM: sun7i: dt: Add USB host nodes to cubietruck dts
  ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
  ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
  ARM: sun4i: dt: Add USB host nodes to pcduino.dts
  ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
  ARM: sun4i: dt: Add USB host nodes to hackberry dts
  ARM: sun4i: dt: Add USB host nodes to cubieboard dts
  ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts
  ARM: sun7i: dt: Add USB host bindings
  ARM: sun5i: dt: Add USB host bindings
  ARM: sun4i: dt: Add USB host bindings
  ...

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:08:59 +01:00
Arnd Bergmann 542798cdd5 First batch of AT91 DT material for 3.15
- activate DMA for NAND flash controller
 - some binding documentation update for usba and ADC (iio) drivers
 - removal of some deprecated ADC (iio) properties
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTIYEQAAoJEAf03oE53VmQ3rsH/2dODKyRW80skncy+qUGA4KW
 7QWxK6roBmg6GRDIJRbHcsMopBDkNw/qJYRO8ejsaULwG6hYAfhjSRSscLMvQuDp
 atE/0IMDDSZC6uvzo554oQcrnkKJhTCC0DQJOYXlRnBExCTYQjaK1CChRB0Fz7In
 zABDXzKDi0/AbE9ngWIDDqqxsRF8rKbxivv4KFXZyp3bQcKzR24IQtSAbEC5aCBW
 pnmAwfOKm0DUn3gaDAwWSrHTmX9OxCWl9zpr3MxAamvBK8As8OKfFtDf4VDkf9GZ
 1RUF0fQHfD9UOBcrjiGUFONAww1+g9Femt+z298omaZycttcgUB2x100jqZsJEY=
 =fe38
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre:

- activate DMA for NAND flash controller
- some binding documentation update for usba and ADC (iio) drivers
- removal of some deprecated ADC (iio) properties

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: at91-cosino: remove useless adc properties
  ARM: at91/dt: sama5d3: remove useless adc properties
  ARM: at91/dt: at91sam9x5: remove useless adc properties
  ARM: at91/dt: at91sam9g45: remove useless adc properties
  ARM: at91/dt: at91sam9260: remove useless adc properties
  ARM: at91/dt: at91-ariag25: remove useless adc properties
  Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt
  Documentation: dt: iio: improve atmel-adc documentation
  ARM: at91: sama5d3: get rid of atmel_tsadcc driver
  ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning
  ARM: at91/DT: add NAND + DMA property

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 15:05:35 +01:00
Chris Ball 2b5cc85135 Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"
This reverts commit d9c3f5df53, which
should not have been merged via mmc-next.  It's in arm-soc instead now.
2014-03-17 09:04:57 -04:00
Arnd Bergmann 0f4d5641a6 Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #5)" from Jason Cooper:

 - mvebu

    - 38x
       - add 2GHz fixed clock, core divider clock, and nand controller

    - 385
       - add nand controller and partitions to 385-DB board

* tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable NAND controller in Armada 385-DB
  ARM: mvebu: Add support for NAND controller in Armada 38x SoC
  ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
  ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 12:21:17 +01:00
Arnd Bergmann 64d865f403 Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt
Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper:

 - dove
    - add system controller node
    - drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI

 - mvebu
    - XP/370
       - change default PCIe apertures
       - switch GP and DB boards internal registers to 0xf1000000
       - correct RAM size on Matrix board
    - 385
       - correct phy connection type for DB board
       - add RD board

* tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu:
  ARM: dove: drop pinctrl PMU reg property
  ARM: mvebu: add Device Tree for the Armada 385 RD board
  ARM: mvebu: use the correct phy connection mode on Armada 385 DB
  ARM: mvebu: the Armada XP Matrix board has 4 GB
  ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
  ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
  ARM: mvebu: change the default PCIe apertures for Armada 370/XP
  ARM: dove: add system controller node

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 12:20:27 +01:00
Arnd Bergmann 54cab10f63 Merge branch 'mvebu/soc3' into next/dt
The dts Makefile has a bunch of nasty conflicts, attempt to resolve
these now to avoid trouble later.

Conflicts:
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 12:13:09 +01:00
Arnd Bergmann e887ae25b0 mvebu dt changes for v3.15 (incremental pull #3)
- mvebu
     - merge armada 375, 380, 385 boards (mvebu/dt-3xx)
 
  - kirkwood
     - Add many Synology NAS boards
     - add board HP T5325
     - add L2 cache node
     - add system-controller node
     - add audio node
 
  - dove
     - add pinctrl and global-config register
 
 Depends:
  - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
     - removed dove PMU interrupt controller
 
 Conflicts:
  - mvebu/soc (arch/arm/boot/dts/Makefile)
     - add/add conflict.
     - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFTyxAAoJEP45WPkGe8ZnDnwP/j1mxhzK7jY6KHJlY79Z/Bjr
 ZXGcVZIcmzYQMEaEcpT1lMtzQnxRf9xqd8JMr2k33oNe0uzEOp6wiSfIkw7aldkV
 s2ZGp0PjaVhJZqhgzbH0LJhid73RRBTCUGNrzCYDQt9BWkvJygnP7iFjNHQzijVJ
 UjpXhxVdVXpx9RTVwgcHs7GtDskrUhiPBlDcJePuk3q8oRwNJA+jDiWxBTALtABd
 JdvpaNW4RHFR1KAoHTqxhFuS61W+DF3IQalH8PpcYHYV/MXs1QByP1nbEira7Dav
 HuIgGtiltfObMHN6DrU4uPQFvb0Ab13q5WoZmW4bR9Y01wpM5TgOQxXpLZi/aCbV
 dr4UmbcUSo9MDCMZvOEIHC+7FW5LutVNt4IwqQN/bJQyK1aZMjJTS4aVxmU+2Vl+
 mIaPyh3ePXAtGEg3Ai7iWfbEMANKz2qoqShckxbqEPLsDCeYY4ar9TnUHHSc8Mat
 LskwGE25ACcaQkf1vFkZNSaezEiB9yai37yGKu83FyYk8Vi/hsLxeb6EBHKULC//
 8uU4abC12nw8KAX/sHStjMKa64upoyycczVxhKjwLPmgwSSW47m8ZyE+tzxpNBE3
 4oBLB4C9lCouUXrpOxkkRv0uSSeJ/1dW8IhSxFWQuNRi2rl2KJsKzYKIWLEjNbqT
 YrrarK14xpMewjJduvat
 =38NX
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt

Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:

 - mvebu
    - merge armada 375, 380, 385 boards (mvebu/dt-3xx)

 - kirkwood
    - Add many Synology NAS boards
    - add board HP T5325
    - add L2 cache node
    - add system-controller node
    - add audio node

 - dove
    - add pinctrl and global-config register

Depends:
 - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
    - removed dove PMU interrupt controller

Conflicts:
 - mvebu/soc (arch/arm/boot/dts/Makefile)
    - add/add conflict.
    - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)

* tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add dts file describing HP T5325 thin client
  ARM: kirkwood: Add i2c alias so setting bus number
  ARM: kirkwood: Add audio node to kirkwood.dtsi
  ARM: mvebu: select dtbs from MACH_ARMADA_*
  ARM: dove: add global-config register node
  ARM: dove: add additional pinctrl registers
  ARM: mvebu: Instantiate system controller in kirkwood.dtsi
  ARM: kirkwood: Instantiate L2 cache from DT.
  ARM: mvebu: use macros for interrupt flags on Armada 375/38x
  ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
  ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
  ARM: Kirkwood: Add support for many Synology NAS devices
  DT: i2c: Trivial: Add sii,s35390a
  DT: Vendor prefixes: Add ricoh, qnap, sii and synology
  ARM: dove: dt: revert PMU interrupt controller node
  ARM: mvebu: add Device Tree for the Armada 385 DB board
  ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
  ARM: mvebu: add Device Tree for the Armada 375 DB board
  ARM: mvebu: add Device Tree description of the Armada 375 SoC
  ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260

Conflicts:
	Documentation/devicetree/bindings/vendor-prefixes.txt
	arch/arm/boot/dts/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 11:05:37 +01:00
Arnd Bergmann e7f274dccf mvebu soc changes for v3.15 (incremental #3)
- dove
     - move devicetree code from mach-dove/ to mach-mvebu/ :-)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGfujAAoJEP45WPkGe8ZnuKMP/R/KTnuK1sODQFoBQOqNYFLI
 8OnPourU4NDt7zdff+AAP+P2v3Cbr8/FPCcLXoZyFPPqGcnhx7KYKchOZ5SEaOSo
 VvUiKqsiuN01WutHGxtyYMU6g0HSxouH0U3rw9NLpFYkZEyWFLlVrPK1lIiVcsyv
 LMh6V7RKGathSLDRR2dUFlJhvfCDUpzfOnCVXuVmcKM3MuNEPTWaQNZ1JPPhCGF4
 gIwLiQqxrXGwaM3c7zLjHSvkK+TTmWirCRgU+VfxuSa+KB88NMbDjQ4TBv8zijKF
 vbFuGx2LO+T6HLrWlCPVDHV81dsivZydnW0GnNeTeO4wQMR2dgCfd9MWczFhE234
 qVmHT90V0fRLh2ly93zdDJC48i3aY6KainupODKB17TpDGX5Ua5iNdpdpv15ExAo
 5hgCvyeDlu2NLh66NBz7LL2giqDFL9SB3qQBExQbm4Ucv7JCnhTn9tQyyfuZX8UB
 RhMuiFv2ewgDLC+5kkPfVA90xanbSV1EpgNGY9GrSSB+0U+cXcXHCVvPzdJ8M60L
 ukknoQnbHlNw8IeWu6BqqyzZ1Eg8z8hmwwcBK1O6xGGjSyY8XKCKEHhwaLrsBQcW
 QkPHXmg5q8TdUGp32ieuMzCzza46C/3xwPbk+u/ZiTrBFyu62dqy92IEatneyLTO
 9jrz6J52uvHrAMy2Y4Ti
 =2I0p
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu into next/soc

Merge "mvebu soc changes for v3.15 (incremental #3)" from Jason Cooper:

 - dove
    - move devicetree code from mach-dove/ to mach-mvebu/ :-)

* tag 'mvebu-soc-3.15-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: move DT Dove to MVEBU

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:53:49 +01:00
Arnd Bergmann d4324ce357 mvebu soc changes for v3.15 (incremental pull #2)
- mvebu
     - Add Armada 375, 380 and 385 SoCs
 
  - kirkwood
     - move kirkwood DT support to mach-mvebu
     - add mostly DT support for HP T5325 thin client
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJTEVsQAAoJEP45WPkGe8ZnWhIP/2fBX1zLHThHf9ekmVHr/ikC
 pQ7NCS2abYAjuTU56ph9aW6WgFCf05+DicKKdI+sPbuispgSCyeqktXNVB6dIsGa
 LV9xPo4yZRlO6iW4GnMk6/c/F0ZBtMbT5bEoyk9B102WgGP28VBHK9V/BuX/SGIW
 R9dc5jee1VNN86ATpEexd+QAREJa0tDtRcTzFIliUsjSB1pS0LdrkTywfGnAShUa
 xcFHzIGJKIzcA+9c0pz8mDeFeooGmPDSlu+AOCXz0hQOffyaqpJ+fOqHHWRGFP3S
 EeJYPMaYN5Ge1d37OHu6CB843ikydjZWG415+5fEJWgTx/EWNgoypqX9M4npv/EZ
 ASnFrktql8ZusmqkJFuV8q1HC3D/DbWlnwgPC7b4UWLroW6cfqDt9zq+eY0tpBJE
 GgiwjEDbQ7Aw7GsOv6fCw1jIHlfAFdtv6XQT9Yp+qAPzUoyS1HI+ms1pTbChYz/c
 D2tF8rL2v3wYSMeCHLOEgJbcCPxujoZieq57VjfZ8i2sG9QiOAdkEvy+khnuvW8T
 thzxsNWYgNIYyYlkqt3yOT4xqFjrCVB95mN5NhhPsoE28DReXFEXz8+hL7eHrxtI
 vFlmW6ukPlzD9HlXS+6jqOzhX53mYN5L3RoZHPaSP/yGQT7I/gTb7cK8V6Ig7Rsy
 AcesuaH1VMa9+RtRTPxQ
 =CtOj
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu into next/soc

Merge "mvebu soc changes for v3.15 (incremental pull #2)" from Jason Cooper:

 - mvebu
    - Add Armada 375, 380 and 385 SoCs

 - kirkwood
    - move kirkwood DT support to mach-mvebu
    - add mostly DT support for HP T5325 thin client

* tag 'mvebu-soc-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: kirkwood: Add HP T5325 thin client
  ARM: kirkwood: select dtbs based on SoC
  ARM: kirkwood: Remove redundant kexec code
  ARM: mvebu: Armada 375/38x depend on MULTI_V7
  ARM: mvebu: Simplify headers and make local
  ARM: mvebu: Enable mvebu-soc-id on Kirkwood
  ARM: mvebu: Let kirkwood use the system controller for restart
  ARM: mvebu: Move kirkwood DT boards into mach-mvebu
  ARM: MM Enable building Feroceon L2 cache controller with ARCH_MVEBU
  ARM: Fix default CPU selection for ARCH_MULTI_V5
  ARM: MM: Add DT binding for Feroceon L2 cache
  ARM: orion: Move cache-feroceon-l2.h out of plat-orion
  ARM: mvebu: Add ARCH_MULTI_V7 to SoCs
  ARM: kirkwood: ioremap memory control register
  ARM: kirkwood: ioremap the cpu_config register before using it.
  ARM: kirkwood: Separate board-dt from common and pcie code.
  ARM: kirkwood: Drop printing the SoC type and revision
  ARM: kirkwood: Convert mv88f6281gtw_ge switch setup to DT
  ARM: kirkwood: Give pm.c its own header file.
  ARM: mvebu: Rename the ARCH_MVEBU menu option

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:49:14 +01:00
Arnd Bergmann de65ded49e SOCFPGA updates for 3.15 version 2:
*Update SOCFPGA DTS to include ethernet, sd/mmc, and clock fixes
 *Add stmmac ethernet glue layer
 *Update socfpga_defconfig to include sd/mmc, and micrel_phy
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTHUB/AAoJEBmUBAuBoyj0jvUQAJ2l8RYqyBdf4vOtr2+SWcr+
 Oq7GovRYG0uIihzaYSQRzVh7gCRahP5iyMkxd0vd2NVqxmFSP7qRnErB/Oc+VZvn
 gK3LXzXXQZOBh9WSA6D/2NkxhJ/OjnSXhWMfIvYomOlwrpwZAzpQX/wWUGCPCUr/
 /woJC5XFRWGudyr7/f6EDsy63H0DL58oATDXLRxXYy6UCme2gJlSjWJOVLJp1MDI
 vSJG5b1uqFtcg9cghgXkJXc/QCreyW0sWAla/Jyr8M8OfO8IZ0Mw94HVT8JaYjkJ
 iDDLie61IyYXJwC96KAWfnbhvL3+J71gfh8HKqqC5OW94PM/KvGOR1GaUr65rfqf
 jMivoKNJXb7NTN09z6YB+rjHxMv3F7UBOJKyfsNRACOJmQHaSBxjBEGQ//AQm9SZ
 Aq41OJx9cGjJRG7lG+M0k6N6LTcNP9QqTFe/ccno32aTscPY++bhKxPeLJRWgtQL
 YvuxB3p6BEkNfYZ/3c35UCyhkjcvRaXa4TvscRcdR8jrBNaHfveT7O8OvsZPz9BO
 hgt0c7HZehdiCmJYKa92ZFRgxEHmxL/ZS6CuD6PNO17/5SN2WcS7+wigaPlr/4Hr
 oVZD6tzzt/cxcjcZ2KirnPUcvFRPrpFiI1UM17xILuT4onlpBX3rxQQlCGF7fugD
 PdNLQg/XY3mvK54vlFn1
 =0sQZ
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next into next/drivers

Merge "SOCFPGA updates for 3.15 version 2" from Dinh Nguyen:

*Update SOCFPGA DTS to include ethernet, sd/mmc, and clock fixes
*Add stmmac ethernet glue layer
*Update socfpga_defconfig to include sd/mmc, and micrel_phy

* tag 'socfpga_updates_for_3.15_v2' of git://git.rocketboards.org/linux-socfpga-next:
  dts: socfpga: Add sysmgr node so the gmac can use to reference
  dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
  dts: socfpga: Update clock entry to support multiple parents
  ARM: socfpga: Update socfpga_defconfig
  dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
  net: stmmac: Add SOCFPGA glue driver

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:26:40 +01:00
Arnd Bergmann 3c883ef345 Two more dt related efm32 fixes
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABCAAGBQJTI2uWAAoJEOLc3ZEyZpvWwWMP/1Ctb7sYvk3NDSQf4/TCI7sy
 stb4nfuIn6/uDFAFHRbMDnTZbt+sF9w+mNkb7lPHoiXu7MAXW1agHjdP/o46RuWd
 4a+4eL24VSZiJ2h8FryowQ9YGMusJRngZKAZ/nVXFQ1J7kc+vNl2b2tkV7KD44JI
 CPwMTVUHeyb4a48hDfPo+O+bpqen0FP2I3Yo0XPFhi1s8Je2qMEb18K7JSKNHvXg
 TLMfbNCpW+hiicQoBx4aDLQilRxpy7/VrGOU4x+fHax8co8qpRNFFX7r+bguhmYE
 fQULZKfCybdynBi5puxccuaZCbxWFjVhHSIJvbhF/qY15Gg8Q4AJVmqsazpa71Jc
 bC/TAXb+R5bNlqNBO3rhAR2j8ZDRLHbdn1NHF8S34Ck4JeI9NUNH6gJ22Bess/wi
 A91B0SADHRibzTL6iKVff8f2zf9jsWUmX4pVI5eI7N7p4Lj8/eUmb7YT56Wy5YP2
 8OQ09JWezd5Il7kPRxW+OJbMgxyVFm9LIqtoVUO5cbQabS42c4nXEzQtBXDa7QvY
 Ouh9jp/+yFXoqA1FbpBwbr6pe52Dc27byJ1QAg3zBNnB1eJ2M5pYqXREAbF2weWb
 PzvsxgU3WGM0OIzeYmSmptd0K5LHE6Tva6L0ofOd4UMMQTVB8MVSXsgW9OAgQw5B
 6VrZOQJFIM+B8sk9Nq7m
 =vy3D
 -----END PGP SIGNATURE-----

Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dt

Merge "Two more dt related efm32 fixes" from Uwe Kleine-König:

* tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux:
  ARM: efm32: properly namespace i2c location property
  ARM: efm32: fix unit address part in USART2 device nodes' names

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-03-17 10:14:46 +01:00
Olof Johansson c5d326c22b Fourth Round of Renesas ARM Based SoC DT Updates for v3.15
* r8a7791 (R-Car M2) based koelsch board
   - Add SDHI devices
   - Add ethernet
 
 * r8a7791 (R-Car M2) SoC
   - Correct clock index for i2c5
 
 * r8a7790 (R-Car H2) based lager board
   - Add ethernet
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTF/wVAAoJENfPZGlqN0++HhUP+wY2kBbinZt+hOcn5zCnWMyY
 qU/089dn0nWMVl3TiKR3508XV52jP9o2pBxt1BTMzAyVsggzvr2WVtyGqGtpZTg+
 Caw8IGqtljo4KOSdqPMVS/S3uBBxkvBm/wJREuUpTNrAfS/m/8O8IwcSpKwREPBV
 /B/MdBhhDhToKQ8Qxy9zgylhqVZkggHLjgwNteQmene5iddzh6IxXM/eX6z4QOCR
 dI8WoBAZuLMuBZ4R573rxYnhwfwl9Jbqh5BmYEDkYo7tusJfMZPuluFcwTUyjt0F
 56EmC6LR1cAqH9NCbTb+B5zWLAQCSKfdUWAjwMF57RORx9RU/nXv3HziGGii7GZg
 AfsVt5FNBhv0HU7gT8ZZK1fmfy88+4V9RSfzXmgsoapkMbc7zSq63bKfbr6/Imcl
 +ygQZUNInfWMlDIBAGs19RAz/6QDhtQRnwhAr2vg2H9/ImvWmxq3VOvqBJ+UXmhQ
 tQjeZBvJ5poUEA8d0UyilTeudozqXKApgkIAPYRd0Jhz/8qtVaqcAF+BgNWH9Kf6
 Ut3aNr0754POPz/Rv3wfnbRQm3mZbKWeVDpYjGI4Uksj9loJChh+PPMsWCZk+7Fl
 N0P/qk9mGQAOWemIBjReP4U7SEvKo4PrxYnyGZFHvO1cJbVPQW75Dn1OKQtviD6a
 lhZpq5IPD9ezJoAPGeIA
 =iKA+
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Fourth Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:

* r8a7791 (R-Car M2) based koelsch board
  - Add SDHI devices
  - Add ethernet

* r8a7791 (R-Car M2) SoC
  - Correct clock index for i2c5

* r8a7790 (R-Car H2) based lager board
  - Add ethernet

* tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Add SDHI devices for Koelsch DTS
  ARM: shmobile: Add SDHI devices to r8a7791 DTSI
  ARM: shmobile: r8a7791: fix clock index for i2c5
  ARM: shmobile: koelsch: add Ether DT support
  ARM: shmobile: r8a7791: add Ether DT support
  ARM: shmobile: lager: add Ether DT support
  ARM: shmobile: r8a7790: add Ether DT support

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:46:17 -07:00
Olof Johansson 6020dd9b01 Renesas ARM Based SoC Clock Updates for v3.15
* r7s72100 SoC (RZ/A1H)
   - Add clock for SH Ethernet
   - Add RSPI clocks
 
 * r8a7791 (R-Car M2)
   - Add QSPI and SDHI clocks
 
 * r8a7790 (R-Car H2)
   - Add audio clock
   - Remove legacy DT clocks
   - Correct SYS DMAC clock defines
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTDZ1pAAoJENfPZGlqN0++O98P/R7NOBCLZFI6w7I8eolsuaKQ
 WMxuqQbX0TUEfnLwN8B23gkEW6008Lfq0c5PTtJRMG7WDyspB1NfrHWxuGbXfe3f
 u0CBtsRVBleHj7CFyGUKW6d5aoPY04S4+296RF80dDyk95xjlGI7TIX+JCr5yg0u
 hylB15nw+KKD/UzW6MBmiq+HVqsObkJ2rKyNAWRtzwdAvgO6wOWZHUSR01dF0AaO
 n1h8GDVmGfahCHhhP1qNrMRyR8qJ6MNVJpGXXTdiyI1S3ON3CpJFvXbjIcg0tfUD
 crQw1zGR7WTY+7ga7uqdQj3YpvOxexh8YFFvPYZcerOW/bhlrancW4q15OgsNlM2
 tl2j59naW1mnqPUTKnfM0yX6qZN0ILL6/yoLmVCvHmO/cJpfajoQ5vuIk9OMiTmx
 S/zx/BGlCZ6olTiT/7+l6Jn/yctrutS43UhP1qqIPHneX1XM3PHOT3R8TlcrYgOq
 i2Ugd5QzSKZx3tfpsvu60UlAKYqprs24i/DK0UluJVdgN9Uerx/ArAUR21YIZcBT
 fJ8pjMJi471CCcstFAVWQETs3iGqPCDFZiwGCrbV/rwPLAO07k/sdf3hZibN8c/g
 yOa1ezIPcEbLCw4F+O2SVUbnX1cIeS0nPpOcAHaPZsg2hZ8mx70U1k6fO+Z+Assr
 mlM7KQJ8FMC/ZBNGQAJa
 =+nyz
 -----END PGP SIGNATURE-----

Merge tag 'renesas-clock-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers

Merge "Renesas ARM Based SoC Clock Updates for v3.15" from Simon Horman:

* r7s72100 SoC (RZ/A1H)
  - Add clock for SH Ethernet
  - Add RSPI clocks

* r8a7791 (R-Car M2)
  - Add QSPI and SDHI clocks

* r8a7790 (R-Car H2)
  - Add audio clock
  - Remove legacy DT clocks
  - Correct SYS DMAC clock defines

* tag 'renesas-clock-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove legacy r8a7790 DT clocks
  ARM: shmobile: Add r8a7791 legacy SDHI clocks
  ARM: shmobile: r8a7790: Correct SYS DMAC clock defines
  ARM: shmobile: r7s72100: Add clock for r7s72100-ether
  ARM: shmobile: r8a7791 clock: add QSPI clocks
  ARM: shmobile: r7s72100 clock: Add RSPI clocks for DT
  ARM: shmobile: r7s72100 clock: Add RSPI clocks
  ARM: shmobile: r8a7790: add audio clock
  ARM: shmobile: r8a7778: add audio clock in new style

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:36:37 -07:00
Olof Johansson 46d34000e3 Third Round of Renesas ARM Based SoC DT Updates for v3.15
* r7s72100 SoC (RZ/A1H)
   - Add nodes for i2c controllers to DT
 
 * r7s72100 (RZ/A1H) based Genmai board
   - genmai: adapt dts to use native i2c driver
 
 * r8a7791 SoC (R-Car M2)
   - Remove superfluous interrupt-parents
 
 * r8a7791 (R-Car M2) based Koelsch board
   - Add i2c2 bus to DT
   - Add DU device to DT
 
 * r8a7790 SoC (R-Car H2)
   - Add i2c aliases
   - Remove superfluous interrupt-parents
   - Add QSPI node
 
 * r8a7790 SoC (R-Car M2) based Lager
   - Add DU, SDHI0/1 and QSPI to DT
 
 * r8a7778 SoC (R-Car M1)
   - Remove duplicate i2c nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTBulKAAoJENfPZGlqN0++X30P/RXo2X9udCzr+bDphjoJoNiw
 m9u64qzYtKBoapJGXo2U4d9lwEWKrOrmL6ViZZlYG/kuoZae5IZE8ZO2zGG5E/fg
 4Q5g8StXytH8Q+Lxgs5dL3y5+O8uQz1dyieiWyWTfm+I1FqveSz7D7mmWx5/iR1D
 bNl2gQ3PZYDTtjaMQTs7muv8/DkOEhX72DucObcMGEQEEfyuJtHvW9kPoim9UH5n
 fI8hwKcu95EWKerjnElnuy3LR7u8IAIDLXWL+V/CCYb6sU40EggdgAKfx3ilWHpn
 rfYuD2XFxndFIUQNAGxlmR4V3QfrwSKIkEdatEa19mj6CEmSVqii93dDB7I8uD8f
 rkWU64ALtgSBQE+p71tRGZzaQ9yguW5yzctNBynXKedswXcDc7EdZtLsSSSeSLjN
 4Ao3ZollSd5CBuTmfBLnWFBpm0wJItJhR6n4BUXTR2MN5pBE4YfeyW8Z3efJdQPW
 VnTNVYUMBboRIpsvMDLTNxquq3PhNNDOZ3CGLECEPv43n/zcpJua6rw20BwyTtSj
 I0B1t5Boy2pbur87pEMtDjLVhDZ8cRxEVkvOfSqLCb+At54nMYfvvzxqKdQul8tj
 hGItX4VD4YZ13Kb5QCX4buSVFzZA9rrKQPMDBwuoAvEBSMRINXzWBPflrxbE7iUB
 bXRRxVJaqLeDrFJqAA8z
 =xQU/
 -----END PGP SIGNATURE-----

Merge tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
Horman:

* r7s72100 SoC (RZ/A1H)
  - Add nodes for i2c controllers to DT

* r7s72100 (RZ/A1H) based Genmai board
  - genmai: adapt dts to use native i2c driver

* r8a7791 SoC (R-Car M2)
  - Remove superfluous interrupt-parents

* r8a7791 (R-Car M2) based Koelsch board
  - Add i2c2 bus to DT
  - Add DU device to DT

* r8a7790 SoC (R-Car H2)
  - Add i2c aliases
  - Remove superfluous interrupt-parents
  - Add QSPI node

* r8a7790 SoC (R-Car M2) based Lager
  - Add DU, SDHI0/1 and QSPI to DT

* r8a7778 SoC (R-Car M1)
  - Remove duplicate i2c nodes

* tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: genmai: adapt dts to use native i2c driver
  ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
  ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
  ARM: shmobile: r8a7791: add i2c master nodes to dtsi
  ARM: shmobile: r8a7790: add i2c aliases to dtsi
  ARM: shmobile: r8a7790: remove superfluous interrupt-parents
  ARM: shmobile: r8a7791: remove superfluous interrupt-parents
  ARM: shmobile: koelsch-reference: Add DU device to DTS
  ARM: shmobile: lager: Add DU device to DTS
  ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
  ARM: shmobile: lager: add SDHI0/2 support on DTS
  ARM: shmobile: lager dts: Add QSPI nodes
  ARM: shmobile: r8a7790 dtsi: Add QSPI node

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-17 00:16:56 -07:00
Matt Porter a97d67d1c4 ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
The BCM28155-AP board has a bootloader that expects the camldo1
regulator to be enabled on entry. Currently, the camldo1 regulator
is disabled when no longer in use as is the case during a reboot /
warm reset. This causes the early bootloader to hang upon entry. Add
regulator-always-on to the camldo1 constraint to fix reboot.

Reported-by: Alex Elder <elder@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
Tested-by: Alex Elder <elder@linaro.org>
2014-03-14 12:22:39 -04:00
Matt Porter a51b4c0199 ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
Add a dtsi to support the BCM590xx PMUs used by the BCM281xx family
of SoCs. Enable regulators for use with the dwc2 and sdhci on
bcm28155-ap.

Signed-off-by: Tim Kryger <tim.kryger@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
2014-03-14 12:22:38 -04:00
Markus Mayer 2eba905e86 ARM: dts: bcm21664: Add device tree files.
Add device tree files for the Broadcom BCM21664 SoC.

Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-14 12:22:37 -04:00
Uwe Kleine-König 35c3a9c807 ARM: efm32: properly namespace i2c location property
Wolfram Sang pointed out during review of an efm32-i2c driver that the
property to specify the set of pins has a too general name. As several
other efm32 peripherals also have a similar register bit field, add an
"efm32" namespace.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2014-03-14 16:04:30 +01:00
Uwe Kleine-König 64afb24991 ARM: efm32: fix unit address part in USART2 device nodes' names
While removing the 0x prefixes in the unit addresses in reply to a review
comment, I must somehow have messed up these two. Uups.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2014-03-14 16:04:15 +01:00
Maxime Ripard 09504a7d76 ARM: sunxi: dt: Convert to the new irq controller compatibles
Switch the device tree to the new compatibles introduced in the irqchip drivers
to have a common pattern accross all Allwinner SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2014-03-14 13:43:33 +01:00
Ezequiel Garcia 4de29e6369 ARM: mvebu: Enable NAND controller in Armada 385-DB
The Armada 385-DB board has a NAND flash, so enable it in the
devicetree and add the partitions as prepared in the factory images.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-6-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:17 +00:00
Ezequiel Garcia 93b5577e50 ARM: mvebu: Add support for NAND controller in Armada 38x SoC
The Armada 38x SoC family has a NAND controller, compatible
with the controller in Armada 370/375/XP SoCs. Add support for
it in the devicetree file.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-5-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:16 +00:00
Ezequiel Garcia d6bd4b4cb3 ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
The Armada 38x SoC family has a clock provider called "Core Divider",
derived from the fixed 2 GHz main PLL clock. This is similar to the
one on A370, A375 and AXP.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-4-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:16 +00:00
Ezequiel Garcia 5bc94c992a ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
Armada 38x SoCs have a 2 GHz fixed main PLL that is used to feed
other clocks. This commit adds a DT representation of this clock
through a fixed-clock compatible node.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Link: https://lkml.kernel.org/r/1394742273-5113-3-git-send-email-ezequiel.garcia@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-13 23:37:15 +00:00
Roger Quadros 051fc06dfa mfd: omap-usb-host: Use clock names as per function for reference clocks
Use a meaningful name for the reference clocks so that it indicates the
function.

Update the OMAP4+ USB Host node as well to be in sync with the changes.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
2014-03-13 22:25:45 +00:00
Mugunthan V N 8abcdd680d ARM: dts: am33xx: correcting dt node unit address for usb
DT node's unit address should be its own register offset address to make it a
unique across the system. This patch corrects the incorrect USB entries with
correct register offset for unit address.

Cc: stable@vger.kernel.org # v3.12+
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 13:41:51 -07:00
Florian Vaussard 7b8b6af169 ARM: dts: omap4/5: Use l3_ick for the gpmc node
The GPMC clock is derived from l3_ick. The simplest solution is
to reference directly l3_ick to provide the GPMC fck in order to
get correct timings. The real management of the clock is left to
hwmod.

Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-13 13:41:50 -07:00
Maxime Ripard ca5d04d908 ARM: sunxi: dt: Update the watchdog compatibles
The watchdog compatibles were following a different pattern than the one found
in the other devices. Now that the driver supports the right pattern, switch to
it in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-13 11:28:34 +01:00
Alexandre Belloni 1d33a2c9e9 ARM: at91/dt: at91-cosino: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver.

Cc: Rodolfo Giometti <giometti@linux.it>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 19:11:29 +01:00
Alexandre Belloni b3b84decec ARM: at91/dt: sama5d3: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver and fix
the atmel,adc-use-external-triggers property name.

Also, add #address-cells, #size-cells and a reg for each trigger to comply to
the ePAPR.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 19:11:29 +01:00
Alexandre Belloni ce1e8d3d91 ARM: at91/dt: at91sam9x5: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver and fix
the atmel,adc-use-external-triggers property name.

Also, add #address-cells, #size-cells and a reg for each trigger to comply to
the ePAPR.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 19:11:29 +01:00
Alexandre Belloni e1abeb72b9 ARM: at91/dt: at91sam9g45: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver.

Also, add #address-cells, #size-cells and a reg for each trigger to comply to
the ePAPR.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 19:11:29 +01:00
Alexandre Belloni e568d69875 ARM: at91/dt: at91sam9260: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver.

Also, add #address-cells, #size-cells and a reg for each trigger to comply to
the ePAPR.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 19:11:28 +01:00
Alexandre Belloni e33b49c7d2 ARM: at91/dt: at91-ariag25: remove useless adc properties
Remove the properties that are not used anymore by the at91_adc driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 19:11:28 +01:00
Stefan Roese e1902bbe44 ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
Add support for the MMC2/SDIO WiFi Libertas (Marvell) module available
on the CM-T3530 SOM.

Cc: Dmitry Lifshitz <lifshitz@compulab.co.il>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Stefan Roese <sr@denx.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:40:37 -07:00
Yegor Yefremov cae2a9e3ab ARM: dts: am335x-evmsk: enable DMA controller for USB
Enable DMA controller for USB

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:37:59 -07:00
Florian Vaussard 28b191118c ARM: dts: Add support for the Overo Summit
Summit is an expansion board for Gumstix Overo products.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:16 -07:00
Florian Vaussard 1c29b9e664 ARM: dts: Add support for the Overo Chestnut43
Chestnut43 is an expansion board for Gumstix Overo products.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:15 -07:00
Florian Vaussard 2e591ca01c ARM: dts: Add support for the Overo Alto35
Alto35 is an expansion board for Gumstix Overo products.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:14 -07:00
Florian Vaussard 2185bc7509 ARM: dts: Add support for the Overo Gallop43
Gallop43 is an expansion board for Gumstix Overo products.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:14 -07:00
Florian Vaussard 22888e02a2 ARM: dts: Add support for the Overo Palo43
Palo43 is an expansion board for Gumstix Overo products.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:13 -07:00
Florian Vaussard 72a5cf147d ARM: dts: overo: Add LIS33DE accelerometer
The LIS33DE accelerometer is used on several Gumstix expansion boards,
thus add the DT node to omap3-overo-common-peripherals.dtsi.

For the boards that do not have the accelerometer (like Tobi), mark the
status as disabled.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:12 -07:00
Florian Vaussard 385306cc3e ARM: dts: overo: Create a file for common Gumstix peripherals
Gumstix expansion boards share a couple of peripherals:
- uart3 is used for the console
- AT24C01 EEPROM on i2c3

Use this file for overo-tobi.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:21:12 -07:00
Florian Vaussard 1afb89746c ARM: dts: overo: Push uart3 pinmux down to expansion board
UART3 is used by expansion boards to get a tty console. Thus, the
pinmux should be defined by expansion boards, instead of being
imposed by the processor board.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:18:16 -07:00
Florian Vaussard 7a5cfb2744 ARM: dts: omap3-tobi: Add AT24C01 EEPROM
Add the AT24C01 EEPROM node populated on most Gumstix expansion board.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:18:16 -07:00
Florian Vaussard c3fba2d05b ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
Use the timings provided by omap-gpmc-smsc9221. This does not change
the timings, but it avoids code duplication.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:18:16 -07:00
Florian Vaussard aac9aa37e5 ARM: dts: omap: Add common file for SMSC9221
Some devices (SMSC9217, SMSC9218 and SMSC9221 at least) have better
timings, allowing a higher transfer speed. Create a common file
with these timings.

Performance results with iperf:

- omap-gpmc-smsc911x.dtsi => 54.9 Mbps
- omap-gpmc-smsc9221.dtsi => 92.7 Mbps

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:18:16 -07:00
Florian Vaussard dd4051bd2d ARM: dts: omap3-overo: Add HSUSB PHY
Add the High-Speed USB PHY.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Acked-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:17:27 -07:00
Florian Vaussard 94647a3012 ARM: dts: omap3-overo: Enable WiFi/BT combo
MMC2 is used by the on-board WiFi module populated on some boards
(based on Marvell Libertas 8688 SDIO). The Bluetooth is connected
to UART2.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:17:27 -07:00
Florian Vaussard fc1772262a ARM: dts: omap3-overo: Add missing pinctrl
Add missing pinctrl entries for:
- i2c1
- mmc1

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:17:26 -07:00
Florian Vaussard bbde8f2436 ARM: dts: omap3-tobi: Add missing pinctrl
Add missing pinctrl entries:
- i2c3

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:17:25 -07:00
Florian Vaussard af3c0380eb ARM: dts: overo: reorganize include files
Currently, overo-related include files are organized as follow:

                     omap3-overo.dtsi
                             |
                             |
omap34xx.dtsi   omap3-overo-tobi-common.dtsi   omap36xx.dtsi
      |              |                 |             |
      ---------------                  ---------------
              |                                |
    omap3-overo-tobi.dts          omap3-overo-storm-tobi.dts

This is unpractical when one has to deal with SoC-specific pinmux
belonging to the omap3_pmx_core2 (defined in omap34xx/omap36xx),
for pins related to the processor board. With the current
hierarchy, such pinmux has to be defined in the expansion board's
.dts, which is not logical.

This patches reorganizes the files to add (yet another) abstraction
layer between the processor and the expansion boards.

omap34xx.dtsi       omap3-overo-base.dtsi      omap36xx.dtsi
      |              |                 |             |
      ---------------                  ---------------
              |                                |
      omap3-overo.dtsi               omap3-overo-storm.dtsi
              |                                |
      --------                                  ------
      |         omap3-overo-tobi-common.dtsi         |
      |              |                 |             |
      ---------------                  ---------------
              |                                |
    omap3-overo-tobi.dts          omap3-overo-storm-tobi.dts

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 10:17:25 -07:00
Suman Anna 2dcfa56e82 ARM: dts: OMAP5: Add IOMMU nodes
The IOMMU DT nodes have been added for the DSP and IPU
subsystems. The MMUs in OMAP5 are identical to those in
OMAP4, including the bus error back capability on IPU.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 09:50:58 -07:00
Florian Vaussard 21bd85a18a ARM: dts: OMAP4: Add IOMMU nodes
Add the IOMMU nodes for the DSP and IPU subsystems. The MMU
within the IPU sub-system also supports a bus error back
capability, not available on the DSP MMU.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: IPU bus error back addition]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 09:50:50 -07:00
Florian Vaussard 40ac051d11 ARM: dts: OMAP3: Add IVA IOMMU node
Add the DT node for the IOMMU within the DSP subsystem. The entry
is disabled to keep in line with the hwmod usage as intended by
the deprecated CONFIG_OMAP_IOMMU_IVA2 flag.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: split the entry and disable the node]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 09:50:39 -07:00
Florian Vaussard b7cd959786 ARM: dts: OMAP3: Update ISP IOMMU node
Update the IOMMU node for the camera subsystem as per the
OMAP IOMMU bindings.

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
[s-anna@ti.com: corrected interrupt number]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-12 09:50:29 -07:00
Ludovic Desroches 9879b96d4c ARM: at91: sama5d3: get rid of atmel_tsadcc driver
Touchscreen support for at91_adc has been introduced so we can get rid of
atmel_tsadcc.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 15:16:52 +01:00
Jean-Jacques Hiblot 109364af15 ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
This patch implements a DTS to boot a at91sam9261ek with a dt-enabled
kernel (at91_dt_defconfig).
supported features are:
* dbgu
* lcdc
* usb host
* usb gadget,
* spi dataflash
* nand flash
* touchscreen
* leds
* user buttons

In the TODO list:
* dm9000 (ethernet)
* audio
* mmc

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 14:36:14 +01:00
Jean-Jacques Hiblot 360ccb309a ARM: at91: dt: Add at91sam9261 dt SoC support
This patch adds support for the Device Tree on a sam9261-based platform

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 14:30:22 +01:00
Alexandre Belloni 42be95ff30 ARM: at91/dt: define main clk frequency of at91sam9rlek
Define the main clock frequency for the new main clock node in
at91sam9rlek.dts

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 11:31:05 +01:00
Alexandre Belloni 8dc5d8e8f7 ARM: at91/dt: define at91sam9rl clocks
Define at91sam9rl clocks in at91sam9rl dtsi file.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 11:30:59 +01:00
Alexandre Belloni 26489729a6 ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
Add a device tree for the at91sam9rl-ek. For now it supports:
 - MMC
 - dbgu
 - usart1
 - watchdog
 - nand
 - leds
 - buttons

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 11:30:38 +01:00
Alexandre Belloni 7aff448f3e ARM: at91: Add at91sam9rl DT SoC support
This adds preliminary DT support for the at91sam9rl.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
2014-03-12 11:30:27 +01:00
Soren Brinkmann cd32529587 arm: zynq: Add support for cpufreq
The generic cpufreq-cpu0 driver can scale the CPU frequency on Zynq
SOCs. Add the required platform device to the BSP and appropriate
OPPs to the dts.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Cc: Kumar Gala <galak@codeaurora.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: devicetree@vger.kernel.org
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Michal Simek <michal.simek@xilinx.com>
2014-03-11 23:10:28 +01:00
Maxime Ripard b4f26440d9 ARM: sunxi: dt: Convert to the new clocksource compatible
Switch the device tree to the new compatibles introduced in the timer driver
to have a common pattern accross all Allwinner SoCs.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
2014-03-11 23:04:50 +01:00
Olof Johansson 813004a3f1 arm: Xilinx Zynq dt patches for v3.15
- Define fclk-enable property
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iEYEABECAAYFAlMGGzAACgkQykllyylKDCGQ8QCePYiY0VQN7yn7z2WZ2preAClx
 KDUAnilZJyUjsJpuXXusByxPDTOaJlYJ
 =5NA7
 -----END PGP SIGNATURE-----

Merge tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx into next/dt

Merge "arm: Xilinx Zynq dt patches for v3.15" from Michal Simek:

- Define fclk-enable property

* tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx:
  arm: dt: zynq: Add fclk-enable property to clkc node

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11 14:21:43 -07:00
Olof Johansson 891f18661a Part two of omap device tree changes enabling driver features
in the dts files.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGgeNAAoJEBvUPslcq6VzbUUQAIUaGol4O4YDhJn/94ArIKlE
 +IoIfsIGaVsP2e+Dzgqtjj7PXXmEPrSy3iQEVFXwshqt5eB2I33uSJXQxSIXwxTi
 i35sCFmF4wLmznh4uJZvj2/0hpimJp5mBRQpnEnueMik+Tg8puRnAsnC/7us3eVT
 pDkzKmNhibZVoz38SNSVC9+Qmv670RtOXEFIB01yfeXtSy57BQytRgHZqA893bUw
 q94+bWHusHcAKsUNsijXkDPrBEvyAgqyzz+ynVN9zJ64LaT7MDym8LUN5ud1z5Wd
 Q1hlo38wPDf23ipJxxI2p0HZ1PQ9oXPbrDNw8PuExoFBqJpSpMpZqRHxpYOrw/0U
 uReQ9opGh+pbCm/eJYEp8CQ22nX2Pswdquozczjp6AICL4lyjYlH5o/3pIaL7cIE
 RJ/lxL1OaFtOzQILHgQtzWuFXvs6xHGfHUCSHbJzwBp5+11p61vV2bcL0QqFHw5q
 Io0ookcnJaideiXrxWdfVSmNQz8Rc5VEKqkCh43S06SufaMmfbnbpDP5ZO27zofz
 HuXV6SRlAZbshtBEQsUnx8u9icLW7V23Hj9D+/13bFxn8Sk+63/UEvoCfiPkeZXj
 hKdk3XZRrwzKVlugFGqqdlrnmc8ZKXwYcKhYBsPtdm+cGA1YphPRQGAgVa9ctWdG
 c208VrT83bnwpc5Te10I
 =g3T0
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "omap device tree changes for v3.15, part 2" from Tony Lindgren:

Part two of omap device tree changes enabling driver features
in the dts files.

* tag 'omap-for-v3.15/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-evmsk: enable dual_emac mode
  ARM: dts: DRA7: Add device nodes for ABB
  ARM: dts: OMAP4: Add device nodes for ABB
  ARM: dts: OMAP36xx: Add device node for ABB
  ARM: dts: am43x-epos-evm: add SD card hotplug support
  ARM: dts: am335x-evm: add SD card hotplug support
  ARM: dts: am437x gp-evm: add sd card dt nodes
  ARM: dts: omap5: added dt properties to adapt to the new phy framwork
  ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
  ARM: dts: Update echi-omap DT binding example usage
  ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes
  ARM: OMAP2+: Remove legacy_init_ehci_clk()
  ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11 13:33:04 -07:00
Olof Johansson fdc52533f5 ARM: bcm2835: DT changes for 3.15
A variety of features are added to the bcm2835 device trees:
 - ARM PMU, for perf_event
 - DMA controller
 - I2S controller
 
 A few cleanups are applied to the DTs too.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTGTGiAAoJEJuNpwkmVCGcRWQP/1oe3/PF6pEZgCy5887uCy9z
 RUj8eSLQk4QelyFSlDJ0ChvgCez6bb72Lw5Tm9gh2CNX3vMnTAWqLlLFuYlXgMjh
 agKthe1ZG2uHlRfVdVgQlRW1hivdCF+5DzvnAJ0pUkhaWzG9L9mtPVXozpFEsWur
 leu9E5JfWSnc6YW+iGtyxQ3l5SmWMFv6D+nChWlGx5jz40g/kieiI0toiiIIu/mb
 OtIzucUtQqmINPzVIktpe2m8qwdXPL6W4ktH9Y5/Cg8AGI/WCHWRCS1VZZ8uzkHs
 /yZbs5cK0pnJKbXnJqUrTe+zuaxW7xyp3WonZrIRN72cz5qvi7LAneEOZcYJ3cqz
 r19yEahzmZrhTdQZKC1CuaEDk9e6GckP6FUbUv3eGcwGoQU0I942JpVgGEVQ5P1Y
 NGTDQU9OawkHuxlZl9hOLZkunAzY0GHbR73AZ2SqYXyzN5t4kCURF0RyOq8J9nL0
 A58XpmuWOpeOuBuqCKxgVEd+5c3BYDE1oiSWwSHCcGotWb7zvyIgqGp+JbEE+KFf
 PHqUhv8g1FIGpwYK/M4dP8oqClaFKXzo44QbrojlLOHCu/zaEXnNu4fDX02hfit/
 W0d6YymesUQGBk0cxmxC/3CfJN/Vpc8BtIhW0Yxdhi3U9sLDyWgl0TZEETD1ARk6
 m6BIR2gbuqINemEGy+0V
 =pjrN
 -----END PGP SIGNATURE-----

Merge tag 'bcm2835-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt

Merge "ARM: bcm2835: DT changes for 3.15" from Stephen Warren:

A variety of features are added to the bcm2835 device trees:
- ARM PMU, for perf_event
- DMA controller
- I2S controller

A few cleanups are applied to the DTs too.

* tag 'bcm2835-for-3.15-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi:
  ARM: bcm2835: fix clock DT node names
  ARM: bcm2835: node name unit address cleanup
  ARM: bcm2835: fix DT node sort order
  ARM: bcm2835: add I2S driver to device tree
  ARM: bcm2835: add dmaengine driver to device tree
  ARM: bcm2835: perf_event support for Raspberry-Pi

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11 13:30:49 -07:00
Olof Johansson 59bb376f0e ARM: mach-bcm dt updates for 3.15
- add BCM4708 dt support
 - remove bcm11351-brt
 - bcm281xx common clock support
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTGBS6AAoJEOfTILNwq7R4aqYQAJmjqh2AcBHintlNEO+D1yCg
 r7rUJQnmNoSysC15AUk0r1plxYsOzFy6A7NCP+v1cm83rSNgDJN847h84dLX4CnL
 dJNDKNfWNiAin65uvY2X8LPUsuBTz0jaXtlMibhZ+n+7UQHkLtvhTsGZQ5QnhL6D
 8q/tSNRmVTDqnGnndqK4bOcajxwKyRr5Gadgi4gY1b8hCrkIQF7PK/D21Arrq0DE
 7iIQS2jzPBXUBAOCz0/QG6KLRzVamGL4wv7jzNUuxAPDZOF2W3dB2oh+fscwZyaK
 09Q20Sg6lLzeRsm8Oz7Y7oiG8a8Sx0Kr6Ot1A6D16e/wtvz4a88pasZz2SQhLUDQ
 5eDLNaaLtwOtY2s9GaZxs66TRE/6lFUBfgC4ep2rpQBDbbWAxxTQo8V0nYwq2a43
 Nfnr72C+l2P9VD7mPZeeJf/YiqORjGnsqg3xK8s1u+8T9jCME+rUEdzPi/Amz1Vc
 65ws3O8oZT6sy6f9tHhqKTlgFOL1aFxKmffXH6rdu8vUqzksRYeNy/+71uZ/Ljjw
 +FQ4xpKbeigOER/T+4sn3ikIJkZlq4Z6iX2LyqoQ+ekVqFaM/oYK2+W9vK019nI4
 WRzavecZUnVAEAOcW9xsCV1Ek/TgVmryyIVRSJeLhoS1aNpBLji3jMuV2M40UIUO
 tmhlBskWVb3BXCLDYGUA
 =waJa
 -----END PGP SIGNATURE-----

Merge tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm into next/dt

Merge "ARM: mach-bcm dt updates for 3.15" from Matt Porter:

- add BCM4708 dt support
- remove bcm11351-brt
- bcm281xx common clock support

* tag 'armsoc/for-3.15/dt' of git://github.com/broadcom/mach-bcm:
  ARM: dts: remove bcm11351-brt.dts
  ARM: dts: Leave sdio1 as disabled on bcm28155-ap
  ARM: dts: bcm281xx: define real clocks
  ARM: BCM5301X: add dts files for BCM4708 SoC

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11 13:23:18 -07:00
Olof Johansson 6e4b9bfd62 Keystone DTS updates for 3.15
- Add watchdog timer, timer64 and gpio device nodes
 - Add LED device nodes
 - Fixes for debugss, msmc clock nodes
 - Add support for Keystone Lamarr and Edision SOC/EVM support
 - Add NAND and AEMIF device nodes
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFtD1AAoJEHJsHOdBp5c/WTsP/36FISirYDIhQcemxZlRw5U1
 o5CVZBy+aZyFrSY03gcQtw8MUHVCrJVJIepI37wlpyYlWoSMMfBKmAGMu1c9W0DT
 35FDygHuc34H+RRGO0eLu+NFoVfUCzp3ijo7IMMvbjdyQCA/8wtrBh61U8RtkN+2
 Teu/NAM5hHP01rpr38z0MgffK0TFRh/zjJiTDI9+UOeD0COK3+XpWrEhvB8fuYkE
 aFpc5/wKRVX/oUpcGYx85g/4WxCuga5jXXlb5r8fIXHxxp4Qyeo2wV1qon6ncKtj
 yV0EYDMSv32ksYOboOZfsqQJML4bD3eNSTHv7fkqvvePYcLzulG2DhqGNqA47fTR
 uDi/48CdLn7bmT+Ms5ikzAfQtDouZg8g1vMN9GxReFrer3BZBurPUbQhOQju58dp
 M3xVvbPb2vVKo0iLuYvZdwIae5mxhqB0ig2jzchbqPTM+MS6LpYmiBb5hr/ZO7J7
 9lWr5SLE9SjsGyCOTAB/V3fSSuBk/AOvmNwMV6B0RLChHDVjCag4olMmYuQMglOn
 3X87LVk8jdQU7zA89chVp0h/rKl/4G4HKoDxmYoijBRRJPhuBvuymSz9sOO3urHM
 Wey7GQ/FtRKQ3LbxLjxNvfdlU6fPlR/ag3YfZ9NszuCaru4p6iAg4+1J2Llz4CUT
 G0QbZRON71R6BR/czk6o
 =sp/v
 -----END PGP SIGNATURE-----

Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Keystone DTS updates for 3.15 from Santosh Shilimkar:

- Add watchdog timer, timer64 and gpio device nodes
- Add LED device nodes
- Fixes for debugss, msmc clock nodes
- Add support for Keystone Lamarr and Edision SOC/EVM support
- Add NAND and AEMIF device nodes

* tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: add AEMIF/NAND device entry
  ARM: dts: keystone: add support for k2 Edison SoC and EVM
  ARM: dts: keystone: add support for K2 Lamarr SoC and EVM
  ARM: dts: keystone: preparatory patch to support K2L and K2E SOCs
  ARM: dts: keystone: update for supporting K2L/K2E EVMs
  ARM: dts: keystone: fix domain id for clkdebugsstrc
  ARM: dts: keystone: drop msmcsram clock node
  ARM: dts: k2hk-evm: rename clock node to clocks
  ARM: dts: k2hk-evm: add leds supports
  ARM: dts: keystone: add gpio device entry
  ARM: dts: keystone: add keystone timer entry
  ARM: dts: keystone: add watchdog entry

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11 13:00:21 -07:00
Boris BREZILLON f656d46bbb ARM: at91: fix network interface ordering for sama5d36
On the newly introduced sama5d36, Gigabit and 10/100 Ethernet network
interfaces are probed in a different order than for the sama5d35.
Moreover, users are accustomed to this order in bootloaders and backports
for older kernel revisions.
So this patch switches DT node order as it is done for the other dual-Ethernet
sama5d3 SoC.
Better interface numbering which does not depend on DT node order is being
developed for stronger interface identification.

Signed-off-by: Boris BREZILLON <b.brezillon.dev@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-11 12:49:10 -07:00
Srinivas Kandagatla e063735f91 ARM: STi: STIH416: Add IR support.
This patch adds IRB support to STiH416 platforms.

Tested on B2000 and B2020 development board

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:04:38 +00:00
Srinivas Kandagatla 8ccd3f3acf ARM: STi: STIH415: Add IR support.
This patch adds IRB support to STiH415 platforms.

Tested on B2000 and B2020 development boards.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:04:27 +00:00
Srinivas Kandagatla d25ea58453 ARM: STi: STiH416: Add ethernet support.
This patch adds support to STiH416 SOC, which has two ethernet
snps,dwmac controllers version 3.710. With this patch B2000 and B2020
boards can boot with ethernet in MII and RGMII modes.

Tested on both B2020 and B2000.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:04:13 +00:00
Srinivas Kandagatla c80fe3357f ARM: STi: STiH415: Add ethernet support.
This patch adds support to STiH415 SOC, which has two ethernet
snps,dwmac controllers version 3.610. With this patch B2000 and B2020
boards can boot with ethernet in MII and RGMII modes.

Tested on both B2020 and B2000.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:04:00 +00:00
Srinivas Kandagatla bef40df89f ARM: STi: STiH416: Add soft reset controller support.
This patch adds soft reset controller support for STiH415 and adds new
softreset lines required for other device tree nodes in the header file.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:03:47 +00:00
Srinivas Kandagatla da3e02a236 ARM: STi: STiH416: Add reset controller support.
This patch adds a reset controller node to the SOC device tree and also
adds new header files with reset lines required for other device tree
nodes.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:03:27 +00:00
Srinivas Kandagatla fc58fcf6da ARM: STi: STiH415: Add soft reset controller support.
This patch adds soft reset controller support for STiH415 and adds new
softreset lines required for other device tree nodes in the header file.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:03:10 +00:00
Srinivas Kandagatla 6b7f06cc80 ARM: STi: STiH415: Add reset controller support.
This patch adds a reset controller node to the SOC device tree and also
adds new header files with reset lines required for other device tree
nodes.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:02:51 +00:00
Srinivas Kandagatla 7ec5183a0a ARM: STi: STiH415: Add interrupt support for pin controller
This patch adds interrupt support for STiH415 pin controllers.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:02:45 +00:00
Srinivas Kandagatla bdda8b0527 ARM: STi: STiH416: Add interrupt support for pin controller
This patch adds interrupt support for STiH416 pin controllers.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
2014-03-11 10:02:33 +00:00
Nicolas Ferre e8b2da6e41 ARM: at91/DT: add NAND + DMA property
Add the "atmel,nand-has-dma" property to NAND node for SoC that
can use the DMA to perform NAND accesses.
Use of this property was added in 1b7192658a
(mtd: atmel_nand: add a new dt binding item for nand dma support).

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
2014-03-10 16:53:50 +01:00
Dinh Nguyen a5d6ac2a84 dts: socfpga: Add sysmgr node so the gmac can use to reference
commit[7e0b4cd dts: socfpga: Add DTS entry for adding the stmmac glue
layer for stmmac.] references the sysmgr through its phandle. This patch
adds the appropriate sysmgr node for the gmac to use.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
2014-03-09 23:21:52 -05:00
Dinh Nguyen 9b931361ff dts: socfpga: Add support for SD/MMC on the SOCFPGA platform
Introduce "altr,socfpga-dw-mshc" to enable Altera's SOCFPGA platform
specific implementation of the dw_mmc driver.

Also add the "syscon" binding to the "altr,sys-mgr" node. The clock
driver can use the syscon driver to toggle the register for the SD/MMC
clock phase shift settings.

Finally, fix an indentation error for the sysmgr node.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Acked-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Tested-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Chris Ball <chris@printf.net>
2014-03-09 23:11:35 -05:00
Linus Torvalds 79e615420c ARM: SoC fixes for 3.14-rc
A collection of fixes for ARM platforms. A little large due to us missing to
 do one last week, but there's nothing in particular here that is in itself
 large and scary.
 
 Mostly a handful of smaller fixes all over the place. The majority is made
 up of fixes for OMAP, but there are a few for others as well. In particular,
 there was a decision to rename a binding for the Broadcom pinctrl block that
 we need to go in before the final release since we then treat it as ABI.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTHKFOAAoJEIwa5zzehBx36EoP/0K7ts9qrShYUD2ASy9HuFKj
 cUcIHF+c0203bavIZzP5EQW/m7TGSybjO8UwkOaLv5SL6E9fn8rR01mmKpONeZbN
 E40ANvOxP3FdWWUFzZSh4oyaX0abaPUtPaYBavakHQI2Ej2m4UmpXAWUkCUGt9Om
 sXSAYuOi6tmpy40aimpaI1QBtx/eyxxJgEBKcbFBvhp1P3d56LTtoqmzACxBFU/8
 4NJIXuZlXTmXV9qIX+y4yXDhmVb6c/gEbNeLJ2F3yWzEeTgnMeycDb8o27Jl6Ii4
 rjsT25qplW5zvUODuhU6QUjuipPh8+WtyF8ruKMakxMNkVoGAC2flWw2TBR09tVj
 zIqYP7/vDhCEYcw4g/BqR8tEvojWt2m7Hm5y+oQY3qmCtLewL6TYeXZcXWFLCwSk
 m4zSvzZOsRsZWsZcflJKZr3g5vsjbg3vtoc3pOZaN4UcqEhU1HCtMfN3znnXIhtj
 xGWqN22S3OpGM0lzLY95lnVeLdrs6eX/ZY23BG1OV4OcDWM4nYwAxEq94QgPvSxR
 9E/fFhU2DZIulEA5Z+/PIReUCLuNL709zqnyAG9VTvbeC24sdr0W6bEM08O85xan
 kb7sbYRnt4qr4uOhPCi7wIENY4rrS91dcE3XZUhJtLWi/0jj+pHT9VoggyS4QdtS
 aWRhg70S5M6quMEoIOzg
 =YBim
 -----END PGP SIGNATURE-----

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC fixes from from Olof Johansson:
 "A collection of fixes for ARM platforms.  A little large due to us
  missing to do one last week, but there's nothing in particular here
  that is in itself large and scary.

  Mostly a handful of smaller fixes all over the place.  The majority is
  made up of fixes for OMAP, but there are a few for others as well.  In
  particular, there was a decision to rename a binding for the Broadcom
  pinctrl block that we need to go in before the final release since we
  then treat it as ABI"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting
  ARM: tegra: add LED options back into tegra_defconfig
  ARM: dts: omap3-igep: fix boot fail due wrong compatible match
  ARM: OMAP3: Fix pinctrl interrupts for core2
  pinctrl: Rename Broadcom Capri pinctrl binding
  pinctrl: refer to updated dt binding string.
  Update dtsi with new pinctrl compatible string
  ARM: OMAP: Kill warning in CPUIDLE code with !CONFIG_SMP
  ARM: OMAP2+: Add support for thumb mode on DT booted N900
  ARM: OMAP2+: clock: fix clkoutx2 with CLK_SET_RATE_PARENT
  ARM: OMAP4: hwmod: Fix SOFTRESET logic for OMAP4
  ARM: DRA7: hwmod data: correct the sysc data for spinlock
  ARM: OMAP5: PRM: Fix reboot handling
  ARM: sunxi: dt: Change the touchscreen compatibles
  ARM: sun7i: dt: Fix interrupt trigger types
2014-03-09 19:27:31 -07:00
Olof Johansson 1760e4f855 i.MX SoC changes for 3.15:
- Support suspend from ocram (DDR IO floating) for imx6 platforms
  - Add cpuidle support for imx6sl
  - Sparse warning fixes for imx6sl and vf610 clock code
  - Remove PWM platform code
  - Support ptp and rmii clock from pad
  - Support WEIM CS GPR configuration
  - Random cleanups and defconfig updates
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTFq0LAAoJEFBXWFqHsHzOqk4IAKO5D6WPahaDhQohpNUToD/O
 bF0Jqt8+hNpDSH5OSQMCi2M/T8OQIlYRJ6nlL5snZs7GVLXm32O9Rb3B5cSQ/Dts
 erCByWZwMPnmhuKwMh59CPIJI3qxsKQ1G8qTLecu2q4RagCmxiTNzzlS7pkaCqFN
 SMc+4uP12/TSvfGXNcs9XydI/dB3AI7KgnOAZSAT/ljguHyqSM/N1s3q2dFQ9+Zf
 +IOZKxLadOzVe4ucc/lUvPogXi7aOSptD52AnZLzoxIqOxUMt8o7KX8bT0UT/688
 QgtwiE7CwTS2czXmp9C8bQ5q8SgaLzJv4LjoHXuq8oqyWQ2jMPJkhjq2ZqCB2KM=
 =kCKC
 -----END PGP SIGNATURE-----

Merge tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc

i.MX SoC changes for 3.15 from Shawn Guo:
 - Support suspend from ocram (DDR IO floating) for imx6 platforms
 - Add cpuidle support for imx6sl
 - Sparse warning fixes for imx6sl and vf610 clock code
 - Remove PWM platform code
 - Support ptp and rmii clock from pad
 - Support WEIM CS GPR configuration
 - Random cleanups and defconfig updates

* tag 'imx-soc-3.15' of git://git.linaro.org/people/shawnguo/linux-2.6: (373 commits)
  ARM: imx6: drop .text.head section annotation from headsmp.S
  ARM: imx6: build suspend-imx6.o with CONFIG_SOC_IMX6
  ARM: imx6: rename pm-imx6q.c to pm-imx6.c
  ARM: imx6: introduce CONFIG_SOC_IMX6 for i.MX6 common stuff
  ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND
  ARM: imx6: call suspend_set_ops() from suspend routine
  ARM: imx6: build headsmp.o only on CONFIG_SMP
  ARM: imx6: move v7_cpu_resume() into suspend-imx6.S
  ARM i.MX6q: Mark VPU and IPU AXI transfers as cacheable, increase IPU priority
  ARM: imx6q: Add GPR6 and GPR7 register definitions for iomuxc gpr
  bus: imx-weim: support CS GPR configuration
  ARM: mach-imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX2_WDT from SOC_IMX53
  ARM: imx_v6_v7_defconfig: Select CONFIG_DEBUG_FS
  ARM: mach-imx: Select CONFIG_SRAM at ARCH_MXC level
  ARM: imx: add speed grading check for i.mx6 soc
  ARM: imx: avoid calling clk APIs in idle thread which may cause schedule
  ARM: imx6q: support ptp and rmii clock from pad
  ARM: imx6q: remove unneeded clk lookups
  ARM: imx_v6_v7_defconfig: Select CONFIG_MMC_UNSAFE_RESUME
  ARM: imx_v4_v5_defconfig: Select CONFIG_MMC_UNSAFE_RESUME
  ...
2014-03-09 12:03:18 -07:00
Olof Johansson c972aed767 i.MX device tree changes for 3.15, take 2:
- Cleanup and device additions for imx27-phytec-phycard boards
  - eDMA and audio support for vf610-twr board
  - Minor updates and fixes for a couple of imx28 and imx5 boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTFoZgAAoJEFBXWFqHsHzOP0gIAJa3SFdriHnBQBhk2f+eUamB
 ehH5orU8TCE0hJgxBSQoDwOiKqlRx3cXCWv8TAjxqIqLKzhSuu9g4d8j3HGBA9CX
 blFKItWABf3ARIOI3mCsZvGmnRX71Lu564QaUZCrCiN8Zi/LEEzZh1nyh9wWdLzN
 YbBSMxp5goy4gZ5+hwfsiglPtArhhBjtFkzWyaChLe7hQdhy3/Vc7z5UIu+S0f07
 CrEJdh74UXhAccXMETsNBnZ6Uf127fZCR3/TOxqZy9h8u1abR8w2/UG0QyeVNZcx
 QKPn1G0216eZue47TX7n/9PQ9hmZG5f7yamU1s02Jn4L+OdCVQDKdqciTZsyctM=
 =nT42
 -----END PGP SIGNATURE-----

Merge tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

i.MX device tree changes for 3.15, take 2 from Shawn Guo:
 - Cleanup and device additions for imx27-phytec-phycard boards
 - eDMA and audio support for vf610-twr board
 - Minor updates and fixes for a couple of imx28 and imx5 boards

* tag 'imx-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: vf610: i2c: Add eDMA support
  ARM: dts: imx27-phytec-phycore-som: Add USBOTG node
  ARM: dts: imx27-phytec-phycore-rdk: Add USBH2 node
  ARM: dts: i.MX27: Add USB nodes
  ARM: dts: vf610-twr: Add ADC support
  ARM: dts: mxs: Fix the RTC compatible prop on M28EVK
  ARM: dts: vf610-twr: Add simple-card support.
  ARM: dts: vf610-twr: Enable SGTL5000 codec.
  ARM: dts: vf610-twr: Enable SAI ALSA SoC DAI device
  ARM: dts: vf610: Add edma mux Tx and Rx support for SAI node.
  ARM: dts: vf610: lpuart: Add eDMA support
  ARM: dts: vf610: Add eDMA node
  ARM: dts: imx27-phytec-phycore: Add diagnostic PMIC LEDs
  ARM: dts: imx27-phytec-phycard-s-som: Rename file to .dtsi
  ARM: dts: i.MX51 babbage: Support diagnostic LED
  ARM: dts: imx28-tx28: Remove 'enable-active-low' property
  ARM: dts: mx53: Remove 'enable-active-low' property
  ARM: dts: imx27-phytec-phycard-s-rdk: Add pinctrl definitions for SDHC2
  ARM: dts: imx27-phytec-phycard-s-som: Add NFC node
  ARM: dts: imx27-phytec-phycard-s-som: Sort entries

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09 12:02:01 -07:00
Olof Johansson 09be3f5ee0 i.MX6 device tree changes for 3.15, take 2:
- Add USB, GPMI and SATA support for imx6q-phytec board
  - Update imx6sl-evk board support regarding PFUZE100, audio and
    LED etc.
  - Minor updates on a few imx6qdl boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJTFojxAAoJEFBXWFqHsHzOYxQH/AxyYbMJbxYT9ml0cu4Y6Ond
 wXlEkzTIzKQQWEH3ikfDvY4oD2DjLo4S884rXXOaGTXTLoc3uwp2x4Uav2PGCI8h
 zMmCjTV8rPMAEtwLOADCN/Ku9MQgyW0/4rR2ZCm8ZGsYkyXcZueAkpK3EwrpPRJw
 oJk+SUEWCE4Hbw26p2scTzw0Bn3AL/MEjdZ061qi5Tv0AJF7TCRv9OvRUNePqdgA
 LKtlFGHPDAVNLXSy/ChR8PXcBI5h+zF+ZwiQupen29RQ67BvUKEXtBdnM/SNTp2z
 yqqsurAnypAUs7yOkhAqHsu+EPOuOmhuepgU6tmOhY791Z5xA+no4h6e7inEUsw=
 =6Hku
 -----END PGP SIGNATURE-----

Merge tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

i.MX6 device tree changes for 3.15, take 2 from Shawn Guo:
 - Add USB, GPMI and SATA support for imx6q-phytec board
 - Update imx6sl-evk board support regarding PFUZE100, audio and
   LED etc.
 - Minor updates on a few imx6qdl boards

* tag 'imx6-dt-3.15-2' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx6q-phytec: Added SATA Support
  ARM: dts: imx6q-phytec: Added GPMI-NAND Support
  ARM: dts: imx6q-phytec: Added USB_HOST Support
  ARM: dts: imx6q-phytec: Added USB_OTG Support
  ARM: dts: imx6sl-evk: Keep VGEN1 regulator always enabled
  ARM: dts: imx6qdl-sabreauto: Support debug LED
  ARM: dts: imx6q: add 852MHz setpoint for CPU freq
  ARM: dts: imx6qdl-wandboard: use GPIO_6 for FEC interrupt
  ARM: dts: imx6sl-evk: Add debug LED support
  ARM: dts: imx6qdl-sabreauto: Add PFUZE100 support
  ARM: dts: imx6sl-evk: Add audio support
  ARM: dts: imx6sl-evk: Add PFUZE100 support
  ARM: dts: imx6qdl-sabresd: correct gpio key's active state

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09 11:59:28 -07:00
Olof Johansson 555e2a5cf2 ARM: sirf: machine update for 3.15
Among them:
   ARM: prima2: l2x0: fix checkpatch issues
   ARM: prima2: platsmp: fix checkpatch issues
   ARM: prima2: common: fix checkpatch issues
   ARM: prima2: rtciobrg: fix the typo about license
   ARM: prima2: staticize sirfsoc_init_late function
   ARM: prima2: move to generic reset controller driver framework
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFo93AAoJEDIv4aC191RhPJQQAIu3536YApJyih24fJYrJk96
 Fcx816YTEfv+SP0iJlerkRoXF7YKr7arKBptKquQNht8f/v5x4pKAjL6qYGoCURp
 fA2REcUtRS8vukbgfwhepWYYhO9wAxR7u00fataLXMvTpX7YL+TGIWXQG7wgcKKX
 6x9ASKhhYmF5+Ho6aXEvgq4uEUN2SGchUeCeRFnbQZXlcy0wjfp2J4REY2fRwfNs
 kPNnwmkxfFEdsiyS49S2a1obSx/Waa70GI1Is7gEk84pFqTSkSDMiaYRJ+mTbsWL
 sCqEbnZo78nLbleyMuwlGnKyu2jrv0UhULxk4FACfKSceAioymBIhyvYmaSDCtuv
 xrQbBHOWqGj3ywWslGUKzG5nXJooj+IOvxdhzYQleAQucg7T6uXr6OTZYPJPSNqi
 uBSxk9bJ4JG940yZXNBcz+kadWy17JhS9YjvnGR7qxYpCiISr8MW8BEWLId3QA3P
 ddFkLnAN4iqi45XFYvSWuod0IwlzswjKEOH638rNOFp0w1RS6VW9/fbq8bCSB1mm
 sTGz95LQjWCVsfw6D6XBHBK2s1dkqteTBoc4L0XovMIeug+8etcxJXopbN9X6Zsk
 GVcUXVZ09WztDgAFqFTa3LQC6PAJxUT/TqDUI26rz755tmKw0PzJ/Hgd13D606MT
 1uniCCF+MYbxBrr2U9al
 =aN9r
 -----END PGP SIGNATURE-----

Merge tag 'sirf-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/cleanup

ARM: sirf: machine update for 3.15 from Barry Song:

Most of the below are some minor fixes for coding style. "ARM: prima2:
move to generic reset controller driver framework" has been ready near
3.14 merge window, but it was late to merge in 3.14, so move this one
to 3.15.

* tag 'sirf-soc-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: prima2: move to generic reset controller driver framework
  ARM: prima2: staticize sirfsoc_init_late function
  ARM: prima2: rtciobrg: fix the typo about license
  ARM: prima2: common: fix checkpatch issues
  ARM: prima2: platsmp: fix checkpatch issues
  ARM: prima2: l2x0: fix checkpatch issues

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09 11:51:29 -07:00
Olof Johansson 6e77adb23f A set of device tree-related cleanups for the ux500 platform:
- Rename SSP/SPI clocks to the name found in the hardware
   reference manual. (Also includes a rename in the U300
   device tree file.)
 
 - Delete dead non-DT code.
 
 - Drop now completely unused GPIO definition header file.
 
 - Delete all hardcoded IRQ number assignments. This hits
   MFD a bit so the patch has been ACKed by Lee Jones from
   the MFD side.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTFSanAAoJEEEQszewGV1zGzUP/0Llq11lEo4wCaBKnRQL2EvE
 bE3oiRKq0qfQko0m1iui1jUO/sGHeaxUuNcF6rXo/sD6Zcd16mLs8ENW5BWmo4AV
 wb61RycBspM1bJHVXSWu07MPNpcvRdYAquvQkrWBAD4MIbYX4RY6lE/lIXjP8v4x
 l1g92MOCiIcOxwc1E7SeXk4H5/wI3DEzdCiOwyxueQlXUEc+OiKN4A3IDCRDA0/S
 yqN/Gjsj8rc8RG7YPIqBm4E4Msju7Jy9WE+hebrOZZ9rWfHpw7WMTdHfRR1KhzRm
 tM8Hm5I/doFCqQ7RcczueIogk9ogkQKuvg0vSdmXKcnfBuOkXjowedEIVz+gmTGn
 jd0TbaY3z5pzGMYMTFmOfRuSeq2O/K6CsXaPvfs0ugiFDKU2lWzF3tv/1boO/GYc
 tIzVB93l5HRIQlfQWFHDavXakxVuRVvv3yfQD+q1F7QP/CbNYQ1scEZio5XfQtDs
 YVFSqazzgISDgUaVVukzoWb8lPTI65/F/Rn5kLTEoPMEVSe0yGGoxTPK/TYfUdOn
 XCytmyTBMlaDvyn+GQrM6FZXXdCiTs2GJrstkcR7tioPWC+gyvIOXWu212MbLod2
 bjc/l/IK4KmtwYvMChk2j313mFiDqTwi1DTwhejgGP4DT/nC/cwqKyvG3YW2nq0G
 rFDyua9CmtRCuAgxBBIU
 =pCAM
 -----END PGP SIGNATURE-----

Merge tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

A set of device tree-related cleanups for the ux500 platform from Linus
Walleij:

- Rename SSP/SPI clocks to the name found in the hardware
  reference manual. (Also includes a rename in the U300
  device tree file.)
- Delete dead non-DT code.
- Drop now completely unused GPIO definition header file.
- Delete all hardcoded IRQ number assignments. This hits
  MFD a bit so the patch has been ACKed by Lee Jones from
  the MFD side.

* tag 'ux500-dt-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  mfd: dbx500/abx500: root out hardcoded IRQ assignments
  ARM: ux500: drop a chunk of GPIO definitions
  ARM: ux500: skip GIC CPU and dist address checks
  ARM: ux500: delete pointless DT config option
  ARM: u300: switch SSP/SPI clock name to "SSPCLK"
  ARM: ux500: switch SSP/SPI clock name to "SSPCLK"

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09 11:44:33 -07:00
Olof Johansson 1809136044 Allwinner DT patches for 3.15, take 1:
- Add SPI controllers for all the SoCs
   - Add various missing aliases
   - Add USB clocks nodes
   - Addition of the GMAC support
   - Introduction of the pcDuino board
   - A few DT cleanup patches: change of compatibles,
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFFhJAAoJEBx+YmzsjxAgFfsQALAcX5Vyw6Qi7vOQEipsY/Cv
 spaokviWKhanViYNDxMt0Q03rHUNIYbGD9bQA6V+dw5k4LFX1ww3BPQhlQm4kAw/
 MjGTdD+Mgg2cwdGw3YvT3hot2iYgy3HOxEdA9UPX1SKPAVmyoKk5SasZr7Lb+6zk
 N2Ezpz8+erE8WVrg/2SoP91LoU13vJX0Z9hsiBUCjRtYS75Zs7qF6hf03oqYg+EK
 j0vp3f1NdVIMItS/4UlBz4lqwNWJRQb2Q1JX0BKI9ITBGv7RlNcJoe3A/qKpqtAf
 jb1cvld2orj9a677PDvQbYfarUcWpJEckp5ypTl33i4amzQbCYhZRY+kmltKQmsY
 iaJa+OYHCRgZgzE7kBll3WG/69BoV+9g56bqRD0+kudXZoD2JIEb6sDYjBiGqNh/
 vwSvdDR1Pblw9Af9fGe8OK5E0/RJQWzT0PQLZnPDfPDLk5LxuQsytYhujrHZExte
 eYIUm9M8g9f5UAA70bSO2HjNmVUdS2kmFp09GaObOfqLZBp5vHCxQpAeY20tyQ1z
 0bcrqK+RTN8EvyjWuGyr8sMReZclKsOi/KrO6kgvVtTUMH1tt7v4OxxrZv99sdQv
 tA4wk9R4gs+owKh/DTkSMj91vLgzk/e+DoNhLp1oAHlU/qX2/AOSfzKTnhUh4cML
 zFsZzST0/kSXs3lU2UPN
 =mXsD
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux into next/dt

Allwinner DT patches for 3.15, take 1 from Maxime Ripard:
  - Add SPI controllers for all the SoCs
  - Add various missing aliases
  - Add USB clocks nodes
  - Addition of the GMAC support
  - Introduction of the pcDuino board
  - A few DT cleanup patches: change of compatibles,

* tag 'sunxi-dt-for-3.15' of https://github.com/mripard/linux: (33 commits)
  ARM: sun6i: dt: Fix mod0 compatible
  ARM: dts: sun7i: Enable the SPI controllers of the A20-olinuxino-micro
  ARM: dt: sun7i: Add SPI muxing options
  ARM: dt: sun5i: Add A13 SPI controller nodes
  ARM: dt: sun5i: Add A10s SPI controller nodes
  ARM: dt: sun4i: Add A10 SPI controller nodes
  ARM: dt: sun7i: Add A20 SPI controller nodes
  ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators
  ARM: sunxi: dt: Convert to the new clock compatibles
  ARM: sun7i: add arch timer node
  ARM: sun7i: dt: Add bindings for USB clocks
  ARM: sun5i: dt: Add bindings for USB clocks
  ARM: sun4i: dt: Add bindings for USB clocks
  ARM: dts: sun7i: Add ethernet alias for GMAC
  ARM: dts: sun7i: a20-olinuxino-micro: Enable GMAC instead of EMAC
  ARM: dts: sun7i: cubieboard2: Enable GMAC instead of EMAC
  ARM: dts: sun7i: cubietruck: Enable the GMAC
  ARM: dts: sun7i: Add pin muxing options for the GMAC
  ARM: dts: sun7i: Add GMAC controller node to sun7i DTSI
  ARM: dts: sun7i: Add GMAC clock node to sun7i DTSI
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09 11:40:26 -07:00
Olof Johansson b989e36aaa Samsung exynos clock related DT updates for v3.15
- use macros instead of hard coded numbers for clock bindings
 
 NOTE: this is based on v3.15-next/dt-samsung
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTE9QWAAoJEA0Cl+kVi2xqDBAQAJORPoEBQOs+Y2vHughs16jg
 48uG6ttIFcjo9HRe0DVpEBE4gyQzIUGOgU/8ebU29kA2Ce0calTQZDZZ4YQZ1LXL
 zc1MACqS2LBKoeFFCpyq61ghtNWjTyoQCgkQi6C/GNUv36uEuIAUPD5Cj+j5eUfS
 M6bHImxE0sHFxYzZPQ3BGO0gN7IoPEGYrXJmgD5LbswBgYP3qbFckr/spGzKb0Yt
 LyLTiZzb03l9C8lpaRkzA6AzAUJSqH2ialD7cEIVgxG1/Zmx0p2fW0ORpXWoU4Tp
 vM7akP4ZkdDdW5fUZOVklzjxnBG3pKOXivOeZ28K66vS3u5RRJYHd7gq4/d77JUe
 Jzz6s3jmr5Rk5UVtqrPNqu7SRz8RR9j5MBJ2gKDJK4GVelGqk8KgWdfAF/BGzGdj
 FbZMh3TzPMJxrcLTNDDaBrawg/mxQifV2ixV3hHFUtjw6Bbocxo5NDmG2sol8zQU
 XI7IlFzTQzqkb5KLYfPS3OGfBAvLUXfe9XT/XJkrSVYHXj7DJEonbZlTrxp35HYA
 0bFacDXMMqwqqaGjMsAbIslq0QUNBU97ztmmwInYfrBwah1nO3QxDhfATRF3VrHa
 264vnh1l97uWjN/iwTXMeZC6+ng2KqmQvrIbXc4d02buVRcnDIY+v5M11CY1AUFt
 Sz112ddWErQHi2MQoEJ0
 =4qfh
 -----END PGP SIGNATURE-----

Merge tag 'exynos-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Samsung exynos clock related DT updates for v3.15 from Kukjim Kim:

- use macros instead of hard coded numbers for clock bindings

NOTE: this is based on v3.15-next/dt-samsung

* tag 'exynos-clk' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: use macros in clock bindings for exynos5440
  ARM: dts: use macros in clock bindings for exynos5420
  ARM: dts: use macros in clock bindings for exynos5250
  ARM: dts: use macros in clock bindings for exynos4
2014-03-09 11:33:01 -07:00
Olof Johansson 516561a5ea Samsung DT updates for v3.15
For exynos4412
 - update vdd_arm voltage range for odroidx board
 
 For exynos5250
 - add PMU sysreg node and update watchdog node
 - re-organize RTC status
 - add max77686 pmic node for smdk5250
 
 For exynos5420
 - add PMU sysreg, i2s, adma and watchdog nodes
 - re-organize RTC status
 - add fixed voltage regulators and regulator nodes
   for smdk5420
 - add PMIC, GPIO based wake up key and vmmc-supply
   support for arndale-octa board
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTE9IiAAoJEA0Cl+kVi2xqOooQAIzTTXaGBpwM65jyEHL2/lgL
 AL9F/Q1FN8oeBTwomnfDOqbiNQh4bufXm7suCbp/whugnL2BzXghDT9wij0vcpH4
 DjXtbQRa7/dKcnncFHWUAaKnMGQZCJi0Wk1TRNbeJPDmOt12hghp73uAvUtrCxlF
 K5s3fCRc7ZapmHztgbu2vPvPzXGjLT68l4ccS1whqZIgsFZHQZDcUVRnugbc43yf
 JzrANbONbFROiuUFVWNx6nJ/n0AscMxpisQg66ngdlmi0q1CWqNK78kKwc56sw2L
 XN7m92im6D2HOhIsGULZQqy82EWtpsdW1z7zuuau9YMiG5qMVfZtPaHeMGwEg1W6
 /Zxd0NdcIopS73hC+zf75girzGmR7gIorlAOEVNM6DZcXtrCNkiEYx3/E+XgIP7r
 Vmebgm9KvQaYEqmfFvK1PKN/T1ySeCBkNiqrvjWaMEOtF9pL6WqE1aEBD78dPg/C
 Gjt9tYpiDtvxNzqwg7YQyYYmaGbKwMRR3ARd5qd3oFubu8pJLLNZvbQUCJzy0buD
 bgfofA/4c/p2QNLluPdM51XuiXMXG/4ienKbPjKEE5XWmXeZY8OdtWvNXw+rAVXX
 2Xa7KPclIOvKxsa/DPb2n0FJg8izx/Ns5l3ANqzrXv2q+ckldy7wZ4Sxu1L+qYWM
 l+XIdU4I8c/K3QDDPsND
 =eUF9
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt

Samsung DT updates for v3.15 from Kukjin Kim:

For exynos4412
- update vdd_arm voltage range for odroidx board

For exynos5250
- add PMU sysreg node and update watchdog node
- re-organize RTC status
- add max77686 pmic node for smdk5250

For exynos5420
- add PMU sysreg, i2s, adma and watchdog nodes
- re-organize RTC status
- add fixed voltage regulators and regulator nodes
  for smdk5420
- add PMIC, GPIO based wake up key and vmmc-supply
  support for arndale-octa board

* tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Add vmmc-supply to MMC on arndale-octa board
  ARM: dts: Add wake up key to arndale-octa board
  ARM: dts: Add PMIC support to arndale-octa board
  ARM: dts: Add fixed voltage regulators to smdk5420
  ARM: dts: Add I2S nodes to exynos5420
  ARM: dts: Add ADMA node to exynos5420
  ARM: dts: Re-organize RTC status for exynos5250
  ARM: dts: Re-organize RTC status for exynos5420
  ARM: dts: Add regulator entries to smdk5420
  ARM: dts: add max77686 pmic node for smdk5250
  ARM: dts: update vdd_arm voltage range for exynos4412 based boards
  ARM: dts: update watchdog device nodes for exynos5250 and exynos5420
  ARM: dts: Add pmu sysreg node to exynos5250 and exynos5420

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-09 11:31:00 -07:00
Olof Johansson 20bb468598 Device tree related changes for omaps with minor code
changes also to platform data quirks that are still needed
 for some features.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTE7rMAAoJEBvUPslcq6Vz1yEP/ifsxXX+bjeQH2AUHXXsxkpO
 sXZsdnW0+vAP75ZaOcH/51gOV9a69vMeq/cKrnnj7v651s1a6JCc08M4UtScsUsu
 v6vD7rq8TnlaTYU0HKPfzzFcnq2wdCNGRRWXzfqJwdObteg6bzVJZkYFH6HLdsdH
 oCzGFzoKAT8m3ZbT6x0xbyBASp5liz0MF9r97ReX1ttq3bPRbCC48N2AwqEmT0sA
 gHKij5+V6B6hw9bs8HXT2ZkXNPni77u1+IvPGQHYJTfTEQnJjP6KNf+zkbtrBTrD
 f2BvLCtxcnLLSGEQcEpmPGzR5L2NukUOrreeNJg3j0ePguL4VI7QF5Skoxha5E6j
 tvnWT1NjZH4hMwLP1E7ACJVlr73iSdJ4dmT7GRmrNFlgYpV2cXqL7lEjgZOkXmJK
 81SlQ0d/px1LQ0Cbp9A321NS7mp8tCZPKSDuRzWwnwhRX9y48tKOMDhhjKyNxIvI
 xs9iMKAHYdh1NVsvqhlCoTTDXctwDQPl8FZrAa7LdDcNSUoMASEbO/xaQBOzAnvx
 eIjBrQFbICj0FJtlpeV9AzGpSBCSRGR91g2+tPF69lpJRD0/0jU6LG92Lmid2Ybr
 lZPkvUq1ZXuUWD5DUiPzhTJP3jYJmThpbpj9pGZkHHUqGQDa7aQxNeE4YdvU2Wli
 B9LnMic89jNW9q2tSL+9
 =a/5V
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

OMAP device tree changes from Tony Lindgren:

Device tree related changes for omaps with minor code
changes also to platform data quirks that are still needed
for some features.

* tag 'omap-for-v3.15/dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (60 commits)
  ARM: dts: omap4+: Add DMM bindings
  ARM: dts: am43x-gp-evm: Add matrix gpio keys.
  ARM: dts: am43xx: add support for parallel NAND flash
  ARM: dts: AM33xx: updated default ECC scheme in nand-ecc-opt
  ARM: dts: am335x-evm: NAND: update MTD partition table
  ARM: OMAP2+: gpmc: update gpmc_hwecc_bch_capable() for new platforms and ECC schemes
  ARM: dts: omap3-gta04: Add bma180 accelerometer
  ARM: dts: omap3-gta04: Enable mmc2 for wifi
  ARM: dts: omap3-gta04: Add basic sound support
  ARM: dts: omap3-gta04: Add twl4030 charger
  ARM: dts: omap3-gta04: Add touchscreen properties
  ARM: dts: omap3-gta04: Add support for magnetometer
  ARM: dts: am437x-gp-evm: Enable gpio.
  ARM: dts: am437x-gp-evm: Add pwm backlight support.
  ARM: dts: am437x-gp-evm: Add gp dts.
  ARM: dts: am43x-epos-evm: Add SPI data.
  ARM: dts: am43x-epos-evm: Add I2C2 data.
  pinctrl: am43xx: dt-bindings: add MUX_MODE8
  ARM: dts: am43x-epos-evm: Add pwm backlight support.
  ARM: dts: am4372: Add pwm-cells property for ecap device.
  ...
2014-03-08 23:19:21 -08:00
Olof Johansson 10554647b4 Two omap3430 vs 3630 device tree regression fixes for
issues booting 3430 based boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.15 (GNU/Linux)
 
 iQIcBAABAgAGBQJTE7TIAAoJEBvUPslcq6VzHvEP/RxCNr6O1sRneB4r+kLScgX1
 ccvJtPAN5s4/MmUZnfoW2REzC8SXc6NxqfnaYaTSSMgn+C+xU98tkI8BGz8IiSA6
 e3LXSQYu1tTht1pL68OFOI0x0mhAhGTFKUFsoAPVWUlyJegckxAg9XKK/SRq52Ea
 ko02mJgdZY6mLaJowsIl940MqW4yGKr3g/z+CDDhYh9E2I0O5hGNjWhhtqcgsjit
 C/HlL7MHf186NEURpd9PAh+6H0bJHHWA0p2Ir825sfJgBFG44pJvnTz7YIpBOQeb
 twlULgFsSPc5osBzxvMBi4xu0Th6h9rydp1QP0tgoS1eEh1ekcf0/gb7wXHYw6g4
 8oKB+K1CJy35UAKgIyObh8VKqNpzQOkQZ6enSBAuS0I944XcNcSxcSUhiY9wo9q4
 96j0cvGIAC8nNIfLXKISnhJuzW4Xa20cIZwjDx9zCHgUGxgx1x2I8g/qVu2pHtwv
 TEZrK94LhlEHNO2By3/4s647YX0r6PpDaGo1rG2z11sRWu3C/G+/KASADW2VNwyC
 bY1HupfLZ6U/zmYu2Y250CyNU+0yTragDKdR8SboT9BQTJ/wWZQckerE/R8y2hN7
 lg67ah0jounBm902bW8JxcUYCuSdku4rtIn7EoDRWRQhnXVYEbmnecM8wltomak5
 vcCiCZkhqQ/O9j0dFLh9
 =J6Y0
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

Two omap3430 vs 3630 device tree regression fixes for
issues booting 3430 based boards.

* tag 'omap-for-v3.14/fixes-dt-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: omap3-gta04: Add ti,omap36xx to compatible property to avoid problems with booting
  ARM: dts: omap3-igep: fix boot fail due wrong compatible match

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08 22:56:31 -08:00
Olof Johansson c381585fcc SMP-support for RK3066 and RK3188 SoCs from Rockchip.
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJTEh/AAAoJEPOmecmc0R2Bnr0H/2K+XzzOwKWXeQbclpaVzSk3
 XAWh05b11ROOuq/7afsHl16j5lissJhQd3MgpnpFLqIW3i1/MqJzFRTyvRMPqkO6
 CSqslWdfp1dkAQrTHBSoSpYyijOBcpI1SVCmJhP/02EtrcyxpUi11Adlw6xuS+hN
 pOpEGmzxvtnA4q0o++apNCbfhXAEGonzLC+O4nXa9H2luSSUQKKAsr5uGgsb3voF
 fvpX/DVVzCPoF8Pd3fRA8sZcykviaYhFtprmJ7rzGaPnD7nzwF82ve0Y56uSI4kV
 W5y9MvKId7utDisw5+JIA9m0p2vDXZxVailaOaIQ2CCKKyhhDJ4HdyA/rvBR+uc=
 =kJnD
 -----END PGP SIGNATURE-----

Merge tag 'v3.15-rockchip-smp' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc

Merge Rockchip SMP support from Heiko Stübner:

SMP-support for RK3066 and RK3188 SoCs from Rockchip.

* tag 'v3.15-rockchip-smp' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: rockchip: add smp bringup code
  ARM: rockchip: add power-management-unit
  ARM: rockchip: add sram dt nodes and documentation
  ARM: rockchip: add snoop-control-unit

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08 22:55:31 -08:00
Olof Johansson ba0e1fa928 Merge branch 'integrator/multiplatform-base' into next/cleanup2
* integrator/multiplatform-base:
  ARM: integrator: select GPIO block
  ARM: integrator: register the IM-PD1 VIC
  ARM: integrator: use managed resources for the IM-PD1
  irqchip: support cascaded VICs
  irqchip: vic: update the base IRQ member correctly
  clk: versatile: respect parent rate in ICST clock
  clk: versatile: pass a parent to the ICST clock
  ARM: integrator: switch to fetch clocks from device tree
  ARM: SP804: make Integrator/CP timer pick clock from DT
  ARM: integrator: define clocks in the device trees
2014-03-08 22:53:27 -08:00
Olof Johansson 4058f76247 Rename pinctrl dt binding to restore consistency with
other bcm mobile bindings.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTDB0VAAoJEPYb7NoJr+nLwGkQALuroLtwGGq0/6Jw4dr9n5UO
 tclAvSbuvUoqwu58cD3grWhkavFKQqR4fJdWcrmczROD9r6rX48QDFe2jNlRjgj/
 yNKkTsd+Ay9I0tPeyx3Buf+tVeQgqsSuG7FJPKgAxMf3HT+tmaWpdIMsjcLOwzdi
 ZMTpIw0cLGMdtr8OSHW/nJuaQV3b+DhnjSLC8QIRg3XgJGjNzJxiKu2Flp0w261P
 Ubzs/PDv83Xl5d972e6JoYR5gGzMwIskm64LmEbHiigLJsvo71oHW57Q2g9asx7h
 stiBzAWF7/Q1xDQ0hTukIOIbX94juR9zSaje66qZ578CFiRAYefginCfyIak9R6R
 Jk0X3krsc0bU9hi4maiYEMVXO3R7K7Rv4BcdoXkg38BXNyINfpdUZlb/5ds6o2FJ
 AZaBgt+/3dl649YaX+ft9VW+1oeV4Hj89sn2pH56NV/rC+dzmh3EHExyHFPJ+sO+
 KKaoXVPf7+TyStrwSxXPSdpUlmGWRWEn9NF1JIGtGNBU+hbiXw7TEOD6DaC8TAN0
 kqAC3ba1YwJalR5rr6UC8ZG2dIZMv3BF7efrM+ewcV7w7F5KF/suJmYIGF+hAFfJ
 Ki7YRRUMS2bVroFjQ7haFGkcwS4JzQnR0hO4O4rNu9JbgBWs0Zv5idj1G/EFpT7a
 hM4ZETYQQb27LVicK/dN
 =2dxs
 -----END PGP SIGNATURE-----

Merge tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/broadcom/bcm11351 into fixes

Merge 'bcm pinctrl rename' From Christin Daudt:

Rename pinctrl dt binding to restore consistency with other bcm mobile
bindings.

* tag 'bcm-for-3.14-pinctrl-reduced-rename' of git://github.com/broadcom/bcm11351:
  pinctrl: Rename Broadcom Capri pinctrl binding
  pinctrl: refer to updated dt binding string.
  Update dtsi with new pinctrl compatible string
  + Linux 3.14-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08 22:11:16 -08:00
Olof Johansson 614cd4a4ac Two fixes for device trees additions that got added in 3.14. One fixes the
interrupt types of some IPs, the other fixes up a compatible that got
 introduced during 3.14
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTFFXwAAoJEBx+YmzsjxAgXR4P/3Oa9crjF3IFZq4ugO+cJsbg
 F3xjKMfuyCjfAYwtzexivRl7PjuGShdevYvNRbY1sqNTAIQbJRWAQC+ZXolXPp/W
 gE6z8mAIlLG0OmE8t1glGLhXVyXiRTlm2s96su2q73MWqYMNXE+yr8K+qt+5gA7r
 M34lYAGqKyQEgs8TKSGSvqa7yZLWZlii6FKwtOCU6HlFm3Rz9Glj8MyTixQDMY0H
 LCONp9csbEgPfrLh+FfJitK2H5kRAU0xJAmP/k+rZtzSKy0kPuCTsKO/ZeUnKhQy
 Rq1Li60Ho3nzmVNljtFVPoDZluxlrZwXA8xLzE88CiwjlYx3TauFFxIIbyGwPamX
 hBEWDqL0x9Y7FQD4Ft4s8mnCE1bD+7eKnqCyCDVGD5je+1qu70vFQZa7ZR2eM9kg
 FS/GSWuG54nIBRwIn7tcdK6iKxkvOIq9ZyQIYw5Uk0d2ZYeiyWNnHl9KtfjwKkXN
 Yh2N6yd4tH6gUhH9niHyczumTuya4+QUbd8DxZrbkD9G3XnmQdLbjTifAjvZTzk/
 zRF/nx399aEYd2LHoBpozuhF9k8otrleC8sWqIjkwVRVX9KYsgNC2CuIgUQCgSpX
 hFcx1xtdNwFyq3AdZmrSV1ORBumEb3lhNAtXWwtFfioamDWDIb2m39wgxiNhZrN7
 hdpJ2Rt48dI8iTRKRxQ9
 =uxIH
 -----END PGP SIGNATURE-----

Merge tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux into fixes

Allwinner fixes from Maxime Ripard:

Two fixes for device trees additions that got added in 3.14. One fixes the
interrupt types of some IPs, the other fixes up a compatible that got
introduced during 3.14

* tag 'sunxi-fixes-for-3.14' of https://github.com/mripard/linux:
  ARM: sunxi: dt: Change the touchscreen compatibles
  ARM: sun7i: dt: Fix interrupt trigger types

Signed-off-by: Olof Johansson <olof@lixom.net>
2014-03-08 22:09:23 -08:00
Linus Torvalds 4d7eaa12f3 Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
 "A number of ARM updates for -rc, covering mostly ARM specific code,
  but with one change to modpost.c to allow Thumb section mismatches to
  be detected.

  ARM changes include reporting when an attempt is made to boot a LPAE
  kernel on hardware which does not support LPAE, rather than just being
  silent about it.

  A number of other minor fixes are included too"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 7992/1: boot: compressed: ignore bswapsdi2.S
  ARM: 7991/1: sa1100: fix compile problem on Collie
  ARM: fix noMMU kallsyms symbol filtering
  ARM: 7980/1: kernel: improve error message when LPAE config doesn't match CPU
  ARM: 7964/1: Detect section mismatches in thumb relocations
  ARM: 7963/1: mm: report both sections from PMD
2014-03-07 17:39:32 -08:00
Mark Rutland 38e0b088d3 ARM: 7992/1: boot: compressed: ignore bswapsdi2.S
Commit 017f161a55 (ARM: 7877/1: use built-in byte swap function) added
bswapsdi2.{o,S} to arch/arm/boot/compressed/Makefile, but didn't update
the .gitignore. Thus after a a build git status shows bswapsdi2.S as a
new file, which is a little annoying.

This patch updates arch/arm/boot/compressed/.gitignore to ignore
bswapsdi2.S, as we already do for ashldi3.S and others.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Kim Phillips <kim.phillips@freescale.com>
Cc: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-07 22:04:10 +00:00
Philipp Zabel 4520e69238 ARM: dts: imx6qdl: Add IPU DI ports and endpoints, move imx-drm node to dtsi
This patch connects IPU and display encoder (HDMI, LVDS, MIPI)
device tree nodes, as well as parallel displays on the DISP0
and DISP1 outputs, using the OF graph bindings described in
Documentation/devicetree/bindings/media/video-interfaces.txt

The IPU ports correspond to the two display interfaces. The
order of endpoints in the ports is arbitrary.

Each encoder with an associated input multiplexer has multiple
input ports in the device tree. The order and reg property of
the ports must correspond to the multiplexer input order.

Since the imx-drm node now only needs to contain links to the
display interfaces, it can be moved to the SoC dtsi level. At
the board level, only connections between the display interface
ports and encoders or panels have to be added.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-07 16:17:59 +00:00
Philipp Zabel e05c8c9a79 ARM: dts: imx53: Add IPU DI ports and endpoints, move imx-drm node to dtsi
This patch connects IPU and display encoder (VGA, LVDS)
device tree nodes, as well as parallel displays on the DISP0
and DISP1 outputs, using the OF graph bindings described in
Documentation/devicetree/bindings/media/video-interfaces.txt

The IPU ports correspond to the two display interfaces. The
order of endpoints in the ports is arbitrary.

Since the imx-drm node now only needs to contain links to the
display interfaces, it can be moved to the SoC dtsi level. At
the board level, only connections between the display interface
ports and encoders or panels have to be added.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-07 16:17:58 +00:00
Philipp Zabel de10e04e8c ARM: dts: imx51: Add IPU ports and endpoints, move imx-drm node to dtsi
This patch connects IPU and and parallel display device tree
nodes using the OF graph bindings described in
Documentation/devicetree/bindings/media/video-interfaces.txt

The IPU ports correspond to the two display interfaces. The
order of endpoints in the ports is arbitrary.

Since the imx-drm node now only needs to contain links to the
display interfaces, it can be moved to the SoC dtsi level. At
the board level, only connections between the display interface
ports and panels have to be added.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-07 16:17:57 +00:00
Philipp Zabel 49ba179086 ARM: dts: imx53-mba53: Fix TVE DDC I2C bus property
This patch fixes the Television Encoder node's DDC I2C bus property to
use the common property name of 'ddc-i2c-bus' instead of just 'ddc'.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2014-03-07 16:17:55 +00:00
Maxime Ripard 1cff74027c ARM: sun6i: colombus: Enable the I2C controllers
The A31 Colombus board has 3 I2C controllers that should be usable. However,
the first one is not working for some reason on the hardware I have been able
to test it on, while it should really be the same controller. Enable the i2c1
and i2c2 busses, and mark i2c0 as in failure in the DT.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-07 15:28:09 +01:00
Maxime Ripard 8be188b84b ARM: sun6i: Enable the I2C muxing options
The i2c controllers have a few muxing options on the A31. Enable the
ones found in the A31 Colombus board.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-07 15:28:06 +01:00
Maxime Ripard 96c7cc9b1a ARM: sun6i: Enable the I2C controllers
The A31 has 4 I2C controllers that are the same than the one in the
other Allwinner SoCs, except for the fact that they are asserted in
reset by the reset unit.

Add these i2c controllers to the DTSI.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-07 15:28:03 +01:00
Sebastian Hesselbarth df76299fec ARM: dove: drop pinctrl PMU reg property
Marvell Dove's pinctrl does require some PMU regs for muxing PMU
functions to MPP pins. Recently, a discussion started about consolidating
Power Management Unit (PMU) into a single DT node. As we don't want
anymore DT ABI in the way, drop the corresponding reg property from
pinctrl node now. The driver will derive the registers from existing
reg properties.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 20:20:33 +00:00
Gregory CLEMENT a8a921dd22 ARM: mvebu: add Device Tree for the Armada 385 RD board
The Armada 385 RD board is the reference design board from Marvell
for the Armada 385 SoC. This commit adds a Device Tree description for
this board, which enables the following features:

 * Network interfaces
 * I2C bus
 * Serial port
 * SPI bus, with a SPI flash
 * PCIe interface

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 20:10:12 +00:00
Thomas Petazzoni 0d2e63782c ARM: mvebu: use the correct phy connection mode on Armada 385 DB
On Armada 385 DB, while the "rgmii" PHY connection mode works fine
with the generic PHY driver, it fails to work when the Marvell PHY
driver is enabled in the kernel configuration, due to a finer handling
of the PHY configuration. This is due to the fact that the phy
connection mode should instead be "rgmii-id", i.e with the TX/RX delay
mechanisms enabled.

This fixes the network operation on Armada 385 DB with
CONFIG_MARVELL_PHY=y. Without this patch and this option enabled, one
would only get messages such as:

  mvneta f1070000.ethernet eth1: bad rx status 0cc10000 (crc error), size=70

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 20:08:05 +00:00
Thomas Petazzoni ebe021e268 ARM: mvebu: the Armada XP Matrix board has 4 GB
Since the Armada XP Matrix board has 4 GB of RAM and not 2 GB, we
update the Device Tree to take into account the correct amount of
memory. As noted in the new comment, the last 256 MB of RAM are in
fact not usable, due to the overlap with the MBus Window address
range.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 19:59:38 +00:00
Thomas Petazzoni 91ed32200e ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
Marvell has now provided bootloaders that are Device Tree capable for
the Armada XP GP board, and that also remap the internal register base
address to 0xf1000000. In addition, the bootloader now sets the MBus
Window base address to 0xf0000000, which allows to use much more RAM
in the last GB of RAM before the 4 GB limit (the entire space from
0xC0000000 to 0xFFFFFFFF was not usable due to being used for I/O, not
only the space from 0xF0000000 to 0xFFFFFFFF is used for I/O).

Therefore this commit:

 * Updates the memory->reg Device Tree property with the fact that in
   the first bank of RAM, memory up to 0xf0000000 can be used.

 * Updates the soc->ranges Device Tree property with the fact that the
   internal registers are now mapped at 0xf1000000.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 19:59:37 +00:00
Thomas Petazzoni 82066bdb5a ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
Marvell has now provided bootloaders that are Device Tree capable for
the Armada XP DB board, and that also remap the internal register base
address to 0xf1000000. In addition, the bootloader now sets the MBus
Window base address to 0xf0000000, but on this board, this change
doesn't make much difference since the board is by default equipped
with 2 GB of RAM.

Therefore this commit updates the soc->ranges Device Tree property
with the fact that the internal registers are now mapped at
0xf1000000.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 19:59:37 +00:00
Thomas Petazzoni 46febc6366 ARM: mvebu: change the default PCIe apertures for Armada 370/XP
The latest Marvell bootloaders for various boards change the MBus
Window base address from 0xC0000000 to 0xF0000000, in order to make
more RAM in the first 4 GB actually usable by the kernel (RAM that is
covered by the MBus window is "shadowed" and therefore not usable).

However, our default PCIe memory and I/O apertures where sitting at
0xe0000000 (for memory) and 0xe8000000 (for I/O), which will now be
outside of the MBus Window range on those platforms. To make things
work, we have to ensure those apertures use addresses in the
0xF0000000 -> 0xFFFFFFFF range.

Of course this change of the MBus Window base address from 0xC0000000
to 0xF0000000 also comes with a change of the internal register base
address from 0xD0000000 to 0xF1000000.

We have therefore designed the following memory map:

 * 0xF0000000 -> 0xF1000000: 16 MB, used for NOR flashes on Armada XP
   GP and Armada XP DB.

 * 0xF1000000 -> 0xF1100000: 1 MB, used for internal registers.

 * 0xF8000000 -> 0xFFE00000: 126 MB, used for PCIe memory.

 * 0xFFE00000 -> 0xFFF00000: 1 MB, used for PCIe I/O.

 * 0xFFF00000 -> 0xFFFFFFFF: 1 MB, used for the BootROM mapping

There is one exception to this layout: the Armada XP OpenBlocks, which
has a 128 MB NOR flash, mapped from 0xF0000000 to 0xF8000000. This
does not conflict with the current change for the PCIe I/O and memory
apertures, and continues to work because on Armada XP OpenBlocks, the
bootloader is an old one, and continues to have internal registers
mapped at 0xD0000000.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
2014-03-06 19:59:37 +00:00
Lucas Stach 97070bd44b ARM: dts: tegra: add PCIe interrupt mapping properties
Those are defined by the common PCI binding.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-03-06 10:37:24 -07:00
Stephen Warren e30cb2388a ARM: tegra: use 2 address cells for Tegra124 DT
Tegra124 can support 4GB of RAM. With that much RAM (plus some memory-
mapped IO peripherals), more than 32-bits of physical address space is
required. Hence, convert all Tegra124 DTs to use 2 DT cells for address
space.

(I think this was suggested by Olof Johansson, but I'm not 100% sure)

Signed-off-by: Stephen Warren <swarren@nvidia.com>
2014-03-05 13:29:13 -07:00
Yegor Yefremov 18c49af3ee ARM: dts: am335x-evmsk: enable dual_emac mode
EVM board provides two Ethernet ports, this patch sets them into
dual_emac mode to provide two independent network interfaces.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Nishanth Menon a1b8ee1058 ARM: dts: DRA7: Add device nodes for ABB
Add ABB device nodes for DRA7 family of devices. Data is based on
DRA7 Technical Reference Manual revision I (Sept 2013)

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Andrii.Tseglytskyi e12c77371e ARM: dts: OMAP4: Add device nodes for ABB
Add ABB device nodes for OMAP443x family of devices. abb_iva is
populated, but disabled as it is not used on current OMAP443x family,
but the node is used on OMAP446x family. Data is based on OMAP443x
Technical Reference Manual revision AN (April 2013).

ABB device nodes for OMAP4460 device Data is based on OMAP4460
Technical Reference Manual revision Z (April 2013)

[nm@ti.com: co-developer]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Andrii.Tseglytskyi b391d3875e ARM: dts: OMAP36xx: Add device node for ABB
Add ABB device node for OMAP36xx family of devices. Data is based on
OMAP36XX Technical Reference Manual revision AB (Dec 2012).

[nm@ti.com: co-developer]
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Andrii.Tseglytskyi <andrii.tseglytskyi@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Balaji T K d2885dbb7a ARM: dts: am43x-epos-evm: add SD card hotplug support
Add card detect gpio for SD card slot and include dt gpio header.

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Balaji T K b6586cd7b7 ARM: dts: am335x-evm: add SD card hotplug support
Add card detect gpio for SD card slot

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Balaji T K 506be3fba6 ARM: dts: am437x gp-evm: add sd card dt nodes
enable sd card slot on am437x-gp-evm

Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:53:36 -08:00
Kishon Vijay Abraham I 073addc865 ARM: dts: omap5: added dt properties to adapt to the new phy framwork
Added device tree bindings for dwc3, usb2 and usb3 PHYs. The documentation
of these can be found at Documentation/devicetree/bindings/phy/phy-bindings.txt
and Documentation/devicetree/bindings/phy/ti-phy.txt.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-05 11:40:04 -08:00
Matt Porter a33705ee8a ARM: dts: remove bcm11351-brt.dts
The BCM11351 BRT board will never see the light of day. Remove the BRT
dts since it is not maintainable.

Reviewed-by: Alex Elder <elder@linaro.org>
Reviewed-by: Christian Daudt <bcm@fixthebug.org>
Reviewed-by: Markus Mayer <markus.mayer@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>
2014-03-05 01:28:56 -05:00
Barry Song e7eda91f63 ARM: prima2: move to generic reset controller driver framework
this moves to generic IP module reset framework, and make other drivers
use common device_reset() API.

Cc: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Bin Shi <Bin.Shi@csr.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
2014-03-05 10:33:47 +08:00
Imre Kaloz 90f4f01ba5 ARM: OMAP2+: Use pdata quirks for wl12xx on the AM335x EV-MSK
Enable the WiLink6 connected to mmc2.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-04 10:46:33 -08:00
Roger Quadros a2525e5404 ARM: dts: Get rid of incompatible ids for hci-omap USB host nodes
The OMAP EHCI and OHCI controllers are not compatible with drivers
other than "ti,ehci-omap" and "ti,ohci-omap3" respectively, so get
rid of the incompatible ids.

CC: Alan Stern <stern@rowland.harvard.edu>
CC: Nishant Menon <nm@ti.com>
CC: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-04 10:20:56 -08:00
Roger Quadros 2ecf8aa112 ARM: OMAP2+: Remove legacy_init_ehci_clk()
The necessary clock phandle for the EHCI clock is now provided
via device tree so we no longer need this legacy method.

Update the omap4-panda and omap5-uevm board DTS to provide the
necessary EHCI PHY clock information.

Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-04 10:20:22 -08:00
Florian Vaussard 5eb9b5e565 ARM: dts: Add support for OMAP4 Gumstix DuoVero/Parlor
Gumstix DuoVero is an OMAP4430-based Computer On Module.
Parlor is one of the available expansion board.

Tested features:
- GPMC ethernet
- HSUSB2 and OTG
- Audio out
- WiFi and Bluetooth (w2cbw0015 SDIO module)
- LED and button

Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-04 10:16:06 -08:00
David Lanzendörfer e2315012c6 ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
This patch adds basic support for the INet-97F_Rev_02 board found in various
low cost consumer tablet devices (http://linux-sunxi.org/INet-97F_Rev_02)

Signed-off-by: David Lanzendörfer <david.lanzendoerfer@o2s.ch>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:47:03 +01:00
Hans de Goede dcadf59e15 ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
This add support for the A10-OLinuXino-LIME:
https://www.olimex.com/Products/OLinuXino/A10/A10-OLinuXino-LIME

A low cost Allwinner A10 based dev-board, with sata, ethernet, hdmi and 2x USB.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:46:35 +01:00
Zalan Blenessy e2f02651ba ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:46:05 +01:00
Roman Byshko 52305e24ac ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Roman Byshko <rbyshko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:58 +01:00
Hans de Goede a415eef218 ARM: sun7i: dt: Add USB host nodes to cubietruck dts
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:54 +01:00
Hans de Goede a83447f5c6 ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:47 +01:00
Hans de Goede 72f4e49830 ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:38 +01:00
Roman Byshko 4703bc83fa ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Roman Byshko <rbyshko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:32 +01:00
Hans de Goede 77978a3728 ARM: sun4i: dt: Add USB host nodes to pcduino.dts
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:23 +01:00
Hans de Goede b7b8ce3c07 ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:14 +01:00
Hans de Goede ca78c26c0b ARM: sun4i: dt: Add USB host nodes to hackberry dts
Add nodes for the usb-phy and ehci- and ohci-usb-host controllers.

Based on fex file settings, the fex file also contains a mysterious line:
usb_hub_vcc_en_gpio = port:PB09<1><0><default><0>

Which also clashes with usbc0, which has:
usb_drv_vbus_gpio = port:PB09<1><0><default><0>

So if usb does not work properly we need someone with a hackberry to look
closer into this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
2014-03-04 17:45:07 +01:00