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>
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>
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>
- 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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
This corrects the example by adding #address-cells, #size-cells and a reg for
each trigger to comply to the ePAPR, as suggested by Mark Rutland in
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/234184.html
Also, it removes the properties that are not used anymore, to stop propagating
them.
Also fixes atmel,adc-use-external-triggers property name.
Finally, fixes a few typos.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
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>
atmel,at91sam9rl-udc is a USB gadget, it has no means to control vbus.
atmel,vbus-gpio is in fact used to detect the presence of vbus.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
[nicolas.ferre@atmel.com: modify the commit message]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
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>
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>
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>
- 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>
- 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>
- 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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Arnd Bergmann