Commit graph

123 commits

Author SHA1 Message Date
Sourav Poddar 741cac5f00 ARM: dts: am4372: Add hdq device tree data
Add device tree nodes and pinmux for hdq/1wire on
am43x epos evm.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-05-14 14:42:08 -07:00
David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
Tony Lindgren e610c9d3ae Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.16/fixes-not-urgent 2014-05-08 08:02:57 -07:00
Sourav Poddar 2a1a5043fd ARM: dts: am43x-epos: Add qspi device
This patch adds qspi nodes for am43xx SOC devices.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-05-06 10:19:49 -07:00
George Cherian a0ae47ea3e ARM: dts: AM4372: Add USB nodes
Add nodes for 2 instances each of
	- ocp2scp
	- USB PHY control module
	- USB PHY
	- dwc3_omap
	- USB

for AM43xx.

Signed-off-by: George Cherian <george.cherian@ti.com>
Acked-by: Roger Quadros <rogerq@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-05-06 10:19:49 -07:00
Afzal Mohammed 2eeddb8a53 ARM: dts: AM4372: add l3-noc information
AM4372 has two clk domains 100f and 200s. Provide register mapping,
interrupt information and compatibility flags associated with it.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
2014-05-05 14:35:29 -05:00
George Cherian de21b26e51 ARM: dts: am4372: Add clock names for cpsw and cpts
Add CPSW fck and CPTS clock and clock names for AM4372

Signed-off-by: George Cherian <george.cherian@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-05 13:18:50 -04:00
Geert Uytterhoeven ae107d0613 dt: Fix binding typos in clock-names and interrupt-names
s/interrupts-names/interrupt-names/g
s/clocks-names/clock-names/g

Some of the binding files and device tree files get this wrong and the
kernel won't be able to pick it up. Fix them up now so that they don't
get widely used.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by : Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
2014-04-23 13:03:57 +01: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
Tony Lindgren f777ba1780 Add craneboard devices
Add more N900 devices
 Add am43x-epos-evm and am437x-gp-evm devices
 Add OMAP4 DMM devices
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTE5Q8AAoJEK1b4JDGryJ1yDYQAKbaaCsxVHjOrxJFhNvPlJSh
 17YrJx47CzVRQU4WogeVCGyZtOtiHRHVFn+f3dqYS1a3f4cUngsPEvK9av3J8J30
 vM/sg0e/gEqsu/gnRn1uP0SZnLKAg6xY6WQfbOzgHghDHwtAXkxJrKiG/52K0oS+
 hq9zEdXXkbUqO9sU8uTuyESa2Pn+EJEBkbbC+lcLQ1bOa8YpkI/RquErlo2l3HwK
 gqOw3X+9vob3itMilAjcEyYsiR0/iCxYm8JUbGTTMshHPJJeO69YPOAgPll7LaQs
 uGshUpMv/HVm3laWUfPbvkfsFgBou1rbxl0NSHucsDyqRYk14E8LP7Jc8hmKb/8S
 zrD8y9b0Yh4s3guYHAshE9L/N4vQzTN2AH28ERJjOdDmI18+hOX10EvMGYfuOlt0
 Yar9oc8ZqOk6m3sRkHpoN4kBJwtig/VNz6R8aHnaMfakPix1rrthBW6NxY2FVM71
 mn4oncrjUrMjQutMku4/kmg6Lx40Cg026N7WOiXOLYSUJmi2TpPMuO2gcsHLOQlL
 LoQ5wJGRMlT7AkEL0s/w12TQBYeRboGrsiqxTYLtg2bYYen1ETEMHlz3ITR8MsGw
 D6ZXz6g8CpDuOHFGLj/etZ5OYb2BcKaO/V5iS2lsJEXkGKfpZW4UeCBusxG/8OCT
 WhHK2VHmPywqq8XnuhCK
 =jRur
 -----END PGP SIGNATURE-----

Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt

Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices

Conflicts:
	arch/arm/boot/dts/am43x-epos-evm.dts
	arch/arm/boot/dts/dra7.dtsi
2014-03-02 14:22:03 -08:00
Pekon Gupta f68e355c86 ARM: dts: am43xx: add support for parallel NAND flash
This patch:
 - enables GPMC h/w and ELM h/w engine for AM43xx devices (am4372.dtsi)
 - adds pinmux and DT node for Micron 4K-paged x8 NAND device (MT29F4G08AB)
   present on following boards:

   am43x-epos-evm:
	On this board, NAND Flash control lines are muxed with QSPI, Thus only
        one of the two can be used at a time. Selection is controlled by:
        (a) dynamically driving following GPIO pin from software
            GPMC_A0(GPIO) == 0 NAND is selected (default)
            GPMC_A0(GPIO) == 1 eMMC is selected

Signed-off-by: Pekon Gupta <pekon@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-03-02 10:15:54 -08:00
Sourav Poddar aa8423054a ARM: dts: am4372: Add pwm-cells property for ecap device.
Add "pwm-cells" node for all ecap, ehrpwm in am43x dtsi files.

Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2014-03-02 18:36:41 +01:00
Nishanth Menon 8d766fa29f ARM: dts: OMAP3+: add clock nodes for CPU
OMAP34xx, AM3517 and OMAP36xx platforms use dpll1 clock.

OMAP443x, OMAP446x, OMAP447x, OMAP5, DRA7, AM43xx platforms use
dpll_mpu clock.

Latency used is the generic latency defined in omap-cpufreq
driver.

Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-02-28 15:04:28 -08:00
Suman Anna fd4a8a685d ARM: dts: AM4372: Add hwspinlock node
Add the hwspinlock device tree node for AM43xx family
of SoCs.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
2014-02-28 14:14:10 -08:00
Tero Kristo 6a67920811 ARM: dts: am43xx clock data
This patch creates a unique node for each clock in the AM43xx power,
reset and clock manager (PRCM).

Signed-off-by: Tero Kristo <t-kristo@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
2014-01-17 12:36:52 -08:00
Nishanth Menon 6a96867844 ARM: dts: AM33xx+: Add i2c aliases
Provide alias to allow ordering the i2c devices correctly.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-22 11:05:42 +02:00
Peter Ujfalusi b9c95bf4e0 ARM: dts: AM4372: Add McASP nodes
Add nodes for McASP0 and McASP1 for AM43xx.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-22 10:37:05 +02:00
Lokesh Vutla 9e3269b8c6 ARM: dts: AM4372: Add L2, EDMA, mailbox, MMC and SHAM nodes
Populate nodes for l2-cache-controller, EDMA, mailbox,
mmc, sham.

Update as well DT properties for epwmss, aes, des.

Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-20 19:16:54 +02:00
Joel Fernandes 099f3a8548 ARM: dts: AM437X: Add DES node
AM437x SoC has a DES3DES module similar to the one on OMAP4.
Add DT node for the same.

Signed-off-by: Joel Fernandes <joelf@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-11 21:06:42 +02:00
Joel Fernandes 6e70a510b4 ARM: dts: AM437X: Add AES node
AM437x SoC has AES module similar to the one on OMAP4.
Add DT node for the same.

Signed-off-by: Joel Fernandes <joelf@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-11 21:06:41 +02:00
Afzal Mohammed 7345601273 ARM: dts: AM4372: add few nodes
Populate uarts, timers, rtc, wdt, gpio, i2c, spi, cpsw & pwm nodes.

Reason for adding these nodes early - hwmod code required address
space of peripherals corresponding to these nodes (as address space
details are removed from hwmod database).

uart0, timers - 1 & 2 and synctimer were already present, so here the
remaining uarts & timers are added.

All properties as per the existing binding has been added for uart,
timer, rtc, wdt & gpio. Even though that was not the current scope
of work, felt adding those would reduce or require no effort later
to get these peripherals working.

For i2c, spi, cpsw & pwm - only the properties that were sure to be
correct has been added (main intention is to make hwmod happy and
avoid any later modification to here added properties).

While at it add "ti,hwmod" property to already existing nodes.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-08 17:51:42 +02:00
Afzal Mohammed 738c74090e ARM: dts: AM4372: cpu(s) node per latest binding
Update AM4372 cpu node to the latest cpus/cpu bindings for ARM.

Signed-off-by: Afzal Mohammed <afzal@ti.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Benoit Cousson <bcousson@baylibre.com>
2013-10-08 17:51:41 +02:00
Afzal Mohammed 6cfd8117f5 ARM: dts: AM43x: Initial support
DT source (minimal) for AM4372 SoC to represent AM43x SoC's. Those
represented here are the minimal DT nodes necessary to get kernel
booting.

In DT nodes, "ti,hwmod" property has not been added, this would be
added along with PRCM support for AM43x.

Signed-off-by: Ankur Kishore <a-kishore@ti.com>
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
2013-06-18 18:53:41 -05:00