9
0
Fork 0
Commit Graph

181 Commits

Author SHA1 Message Date
Sascha Hauer bc872dbe79 ARM omap: Add device register convenience functions
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:52:36 +01:00
Sascha Hauer 19b6121a56 ARM omap: include individual SoC files
- remove mach/silicon.h and include omap?-silicon.h directly
- include mach/omap?-clock.h directly where needed

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:49 +01:00
Sascha Hauer 37ad50049b ARM omap: Use SoC specific defines for gpmc and timer base
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:49 +01:00
Sascha Hauer fa96d920a5 ARM omap3: make PRM defines SoC specific
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:49 +01:00
Sascha Hauer a9fe13a08b ARM omap4: make PRM defines SoC specific
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:49 +01:00
Sascha Hauer b9fd320cb3 ARM omap: Make timer base runtime configurable
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:49 +01:00
Sascha Hauer e412cb7805 ARM omap: Make gpmc base runtime configurable
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:49 +01:00
Sascha Hauer f42ee5fd40 ARM omap4: Add missing double include protection
missing in omap4-clock.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:48 +01:00
Sascha Hauer 494aafc7e3 ARM omap4: Add missing assembly protection in header file
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:48 +01:00
Sascha Hauer 431489e795 ARM omap4: remove unused struct
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:48 +01:00
Sascha Hauer 91a13beea9 ARM omap: remove unused function
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:51:48 +01:00
Jan Luebbe 39287a0baa ARM OMAP: add help text for OMAP_BUILD_IFT
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-19 21:40:06 +01:00
Sascha Hauer 039a0e52f8 ARM omap3: Call common_reset
omap3 has a soc specific reset function, make sure it calls common_reset
so that the proper CPU flags are set.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-08 17:51:25 +01:00
Sascha Hauer 8030ab24fa Merge branch 'kconfig' 2012-12-08 12:22:21 +01:00
Alexander Shiyan 4c20f9af97 Cleanup Kconfig files
This patch provides a global cleanup barebox Kconfig files. This includes
replacing spaces to tabs, formatting in accordance format, removing
extraneous lines and spaces. No functional changes.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-08 12:22:12 +01:00
Sascha Hauer 759946809a Merge branch 'for-next/omap' 2012-12-07 16:43:16 +01:00
Sascha Hauer 86ee7f112f Merge branch 'for-next/misc' 2012-12-07 16:43:15 +01:00
Robert P. J. Day d90be4efeb Define and use OMAP4 GPIO macros rather than magic constants.
Add and use meaningful macro names for OMAP4 GPIO addresses, and add a
comment to explain the 0x100 offset for OMAP4.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-05 19:55:09 +01:00
Robert P. J. Day c385e034e5 mach-omap/Kconfig: Some spelling fixes and indentation.
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-05 19:52:42 +01:00
Robert P. J. Day c7f45d762d Remove old, inaccurate "FileName:" cruft from ARM files
In addition, collapse adjacent comment blocks into one and remove
extraneous blank lines.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-05 19:51:14 +01:00
Sascha Hauer 9fe8679d3b debug_ll: Let architectures define PUTC_LL directly
putc already is a regular barebox function. To avoid conflicts and
confusions just let architectures define PUTC_LL directly instead
of going through this addiotional redirection.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-05 19:48:50 +01:00
Robert P. J. Day b11f70db16 OMAP3: Replace magic GPIO numbers in omap3_generic.c with macros.
Based on following lines in omap3-silicon.h:

#define OMAP_L4_WKUP_BASE       0x48300000
#define OMAP_L4_PER_BASE        0x49000000
... snip ...
#define OMAP_GPIO1_BASE         (OMAP_L4_WKUP_BASE + 0x10000)
#define OMAP_GPIO2_BASE         (OMAP_L4_PER_BASE + 0x50000)
#define OMAP_GPIO3_BASE         (OMAP_L4_PER_BASE + 0x52000)
#define OMAP_GPIO4_BASE         (OMAP_L4_PER_BASE + 0x54000)
#define OMAP_GPIO5_BASE         (OMAP_L4_PER_BASE + 0x56000)
#define OMAP_GPIO6_BASE         (OMAP_L4_PER_BASE + 0x58000)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-05 10:37:35 +01:00
Enrico Scholz 96116435e7 OMAP4: removed __packed__ annotation from pad_conf_entry
structure is used within barebox only and there is no need to pack it.
As this option has a negative performance impact, remove it.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-05 08:38:55 +01:00
Jan Luebbe cf425e1615 omap: gpmc: mark hex debug values as such
Also use %p for pointers.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-12-03 09:41:49 +01:00
Vicente aac938482f Add support for Archos G9 tablet
Signed-off-by: Vicente <vicencb@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-16 15:32:31 +01:00
Vicente 1dc9cbade4 omap4: add support for loading second stage from usb
Signed-off-by: Vicente <vicencb@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-16 15:32:31 +01:00
Vicente 6b4dc4d4f1 omap4: add support for booting cpu from usb
Signed-off-by: Vicente <vicencb@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-16 15:32:31 +01:00
Vicente beff13a41c omap4: add rename definitions to match datasheet
Signed-off-by: Vicente <vicencb@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-16 15:31:51 +01:00
Vicente 9a6fd89480 omap4: add usb boot source
Signed-off-by: Vicente <vicencb@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-16 15:31:32 +01:00
Sascha Hauer 154496f736 Merge branch 'for-next/omap' 2012-11-16 14:02:49 +01:00
Sascha Hauer daac8bf5d3 Merge branch 'for-next/bcm2835'
Conflicts:
	arch/arm/configs/versatilepb_defconfig
2012-11-16 14:00:34 +01:00
Sascha Hauer 5f2074bdd1 ARM OMAP3 beagle: switch to new environment
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-02 22:15:15 +01:00
Sascha Hauer 663c466794 ARM OMAP4 panda: switch to new environment
Switch to new environment and add the bootscripts needed for mmc. Also,
update defconfig for new environment.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-02 22:15:15 +01:00
Sascha Hauer fe93cc5827 ARM OMAP3: Put reset() into its own section
Needed so that the linker can throw it away when unused. This is needed
at least on current master for being able to enable pbl support for omap3
boards.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-02 22:15:15 +01:00
Sascha Hauer ba9b8d07ec ARM OMAP4: Turn puts into debug
When compiled with pbl support puts is not available, so turn it
into debug.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-11-02 20:36:36 +01:00
Sascha Hauer 89d6164660 ARM omap: pbl fixes
Omap3 pbl build may need omap3_clock.c. Also, do not use add_generic_device
in pbl

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-26 08:56:12 +02:00
Sascha Hauer 6f13282949 Merge branch 'for-next/gpio' into for-next/bcm2835 2012-10-21 10:48:14 +02:00
Teresa Gámez f1ea7465b2 ARM OMAP: Enable gpio output
Enable output instead of disabling it.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-21 10:39:43 +02:00
Teresa Gámez 7764b1faca ARM OMAP: change region size for gpio banks
- increased the region size for OMAP3, as it was not correct
- decrease region size for OMAP4 to prevent overlapping.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-09 20:36:21 +02:00
Teresa Gámez f4226a9ed4 ARM OMAP: Remove usage of gpio lib calls in lowlevel code
As the gpio functions are not available at this point, set the gpio manually.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-09 20:36:21 +02:00
Teresa Gámez 6bb2ad1323 ARM OMAP: gpiolib fix chip.base
Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-09 20:36:21 +02:00
Jean-Christophe PLAGNIOL-VILLARD 695b8b49f5 gpio: provide generic gpio header
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-10-05 15:04:54 +08:00
Jean-Christophe PLAGNIOL-VILLARD 3c5327e660 switch all platform_bus device/driver registering to platform_driver/device_register
now register_driver and register_device are for bus only usage.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
2012-10-04 15:19:12 +02:00
Sascha Hauer 638e059aba Merge branch 'for-next/arm-board-reset'
Conflicts:
	arch/arm/cpu/start-reset.c
	arch/arm/include/asm/barebox-arm.h
	arch/arm/mach-omap/Kconfig
	arch/arm/mach-omap/omap3_core.S
2012-10-03 21:19:30 +02:00
Sascha Hauer 6021818e3d Merge branch 'for-next/arm-remove-arch-init-ll'
Conflicts:
	arch/arm/include/asm/barebox-arm.h
2012-10-03 21:13:31 +02:00
Sascha Hauer 0ed19adde8 Merge branch 'for-next/spi' 2012-10-03 21:13:05 +02:00
Sascha Hauer d1e65d2a7b Merge branch 'for-next/remove-fsf-address'
Conflicts:
	drivers/net/miidev.c
	include/miidev.h
2012-10-03 21:12:48 +02:00
Sascha Hauer bee8dddbfc Merge branch 'for-next/omap'
Conflicts:
	Makefile
2012-10-03 21:11:48 +02:00
Jan Luebbe 93ca711e64 scripts: add tool to create image for SPI boot on AM35xx
Booting from SPI on an AM35xx (and possibly other TI SOCs) requires
a special format:

- 32 bit image size in big-endian
- 32 bit load address in big-endian
- binary image converted from little- to big-endian

The mk-am35xx-spi-image tool converts barebox.bin to
this format.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-10-02 08:22:30 +02:00
Jan Luebbe 3fc5a75457 gpio: reduce verbosity while probing
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-09-28 16:35:10 +02:00