mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCHv2 0/6] Add PCM051 support
@ 2012-12-20 14:22 Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 1/6] ARM AM33XX: Add mmc0 pin mux function Teresa Gámez
                   ` (6 more replies)
  0 siblings, 7 replies; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox

This is rebased on the new AM33XX patch stack of Jan Luebbe.
It adds phyCORE-AM335x (pcm051) support.
Added also device register functions for SRAM, RAM and EHCI.

Teresa Gámez (6):
  ARM AM33XX: Add mmc0 pin mux function
  ARM OMAP: Add SRAM and DRAM to device register functions
  ARM OMAP: Apply RAM device register functions to boards
  ARM OMAP: Add EHCI to device register functions
  ARM OMAP: Apply EHCI device register functions
  pcm051: Add inital support

 arch/arm/Makefile                               |    1 +
 arch/arm/boards/archosg9/board.c                |    2 +-
 arch/arm/boards/beagle/board.c                  |    5 +-
 arch/arm/boards/beaglebone/board.c              |    2 +-
 arch/arm/boards/omap343xdsp/board.c             |    2 +-
 arch/arm/boards/omap3evm/board.c                |    2 +-
 arch/arm/boards/panda/board.c                   |    5 +-
 arch/arm/boards/pcm049/board.c                  |    5 +-
 arch/arm/boards/pcm051/Makefile                 |    1 +
 arch/arm/boards/pcm051/board.c                  |   64 +++++++++++++++++++++++
 arch/arm/boards/pcm051/config.h                 |   21 +++++++
 arch/arm/boards/pcm051/env/boot/sd              |   10 ++++
 arch/arm/boards/pcm051/env/config               |   22 ++++++++
 arch/arm/boards/phycard-a-l1/pca-a-l1.c         |    5 +-
 arch/arm/boards/phycard-a-xl2/pca-a-xl2.c       |    6 +-
 arch/arm/configs/pcm051_defconfig               |   56 ++++++++++++++++++++
 arch/arm/mach-omap/Kconfig                      |   10 ++++
 arch/arm/mach-omap/am33xx_mux.c                 |    5 ++
 arch/arm/mach-omap/include/mach/am33xx-mux.h    |    1 +
 arch/arm/mach-omap/include/mach/devices.h       |    4 ++
 arch/arm/mach-omap/include/mach/omap3-devices.h |   12 ++++
 arch/arm/mach-omap/include/mach/omap4-devices.h |   11 ++++
 arch/arm/mach-omap/include/mach/omap4-silicon.h |    5 ++
 arch/arm/mach-omap/omap_devices.c               |   12 ++++
 24 files changed, 250 insertions(+), 19 deletions(-)
 create mode 100644 arch/arm/boards/pcm051/Makefile
 create mode 100644 arch/arm/boards/pcm051/board.c
 create mode 100644 arch/arm/boards/pcm051/config.h
 create mode 100644 arch/arm/boards/pcm051/env/boot/sd
 create mode 100644 arch/arm/boards/pcm051/env/config
 create mode 100644 arch/arm/configs/pcm051_defconfig


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCHv2 1/6] ARM AM33XX: Add mmc0 pin mux function
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
@ 2012-12-20 14:22 ` Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 2/6] ARM OMAP: Add SRAM and DRAM to device register functions Teresa Gámez
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox


Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/mach-omap/am33xx_mux.c              |    5 +++++
 arch/arm/mach-omap/include/mach/am33xx-mux.h |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap/am33xx_mux.c b/arch/arm/mach-omap/am33xx_mux.c
index 22bf317..3d7f245 100644
--- a/arch/arm/mach-omap/am33xx_mux.c
+++ b/arch/arm/mach-omap/am33xx_mux.c
@@ -504,3 +504,8 @@ void enable_uart0_pin_mux(void)
 {
 	configure_module_pin_mux(uart0_pin_mux);
 }
+
+void enable_mmc0_pin_mux(void)
+{
+	configure_module_pin_mux(mmc0_pin_mux);
+}
diff --git a/arch/arm/mach-omap/include/mach/am33xx-mux.h b/arch/arm/mach-omap/include/mach/am33xx-mux.h
index ed328f5..6078b3a 100644
--- a/arch/arm/mach-omap/include/mach/am33xx-mux.h
+++ b/arch/arm/mach-omap/include/mach/am33xx-mux.h
@@ -18,5 +18,6 @@ extern void enable_i2c0_pin_mux(void);
 extern void enable_i2c1_pin_mux(void);
 extern void enable_i2c2_pin_mux(void);
 extern void enable_uart0_pin_mux(void);
+extern void enable_mmc0_pin_mux(void);
 
 #endif /*__AM33XX_MUX_H__ */
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCHv2 2/6] ARM OMAP: Add SRAM and DRAM to device register functions
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 1/6] ARM AM33XX: Add mmc0 pin mux function Teresa Gámez
@ 2012-12-20 14:22 ` Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 3/6] ARM OMAP: Apply RAM device register functions to boards Teresa Gámez
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox


Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/mach-omap/include/mach/devices.h       |    4 ++++
 arch/arm/mach-omap/include/mach/omap3-devices.h |    6 ++++++
 arch/arm/mach-omap/include/mach/omap4-devices.h |    5 +++++
 arch/arm/mach-omap/include/mach/omap4-silicon.h |    2 ++
 arch/arm/mach-omap/omap_devices.c               |   12 ++++++++++++
 5 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap/include/mach/devices.h b/arch/arm/mach-omap/include/mach/devices.h
index 9881604..6cbb25e 100644
--- a/arch/arm/mach-omap/include/mach/devices.h
+++ b/arch/arm/mach-omap/include/mach/devices.h
@@ -3,6 +3,10 @@
 
 #include <mach/omap_hsmmc.h>
 
+void omap_add_ram0(resource_size_t size);
+
+void omap_add_sram0(resource_size_t base, resource_size_t size);
+
 struct device_d *omap_add_uart(int id, unsigned long base);
 
 struct device_d *omap_add_mmc(int id, unsigned long base,
diff --git a/arch/arm/mach-omap/include/mach/omap3-devices.h b/arch/arm/mach-omap/include/mach/omap3-devices.h
index 6617430..9d682cf 100644
--- a/arch/arm/mach-omap/include/mach/omap3-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap3-devices.h
@@ -8,6 +8,12 @@
 #include <mach/mcspi.h>
 #include <mach/omap_hsmmc.h>
 
+
+static inline void omap3_add_sram0(void)
+{
+	return omap_add_sram0(OMAP3_SRAM_BASE, 64 * SZ_1K);
+}
+
 /* the device numbering is the same as in the device tree */
 
 static inline struct device_d *omap3_add_spi(int id, resource_size_t start)
diff --git a/arch/arm/mach-omap/include/mach/omap4-devices.h b/arch/arm/mach-omap/include/mach/omap4-devices.h
index 448de68..df0694f 100644
--- a/arch/arm/mach-omap/include/mach/omap4-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap4-devices.h
@@ -8,6 +8,11 @@
 #include <mach/mcspi.h>
 #include <mach/omap_hsmmc.h>
 
+static inline void omap44xx_add_sram0(void)
+{
+	return omap_add_sram0(OMAP44XX_SRAM_BASE, 48 * SZ_1K);
+}
+
 static inline struct device_d *omap44xx_add_uart1(void)
 {
 	return omap_add_uart(0, OMAP44XX_UART1_BASE);
diff --git a/arch/arm/mach-omap/include/mach/omap4-silicon.h b/arch/arm/mach-omap/include/mach/omap4-silicon.h
index b5d1eb9..379588d 100644
--- a/arch/arm/mach-omap/include/mach/omap4-silicon.h
+++ b/arch/arm/mach-omap/include/mach/omap4-silicon.h
@@ -39,6 +39,8 @@
 #define OMAP44XX_L4_WKUP_BASE		0x4A300000
 #define OMAP44XX_L4_PER_BASE		0x48000000
 
+#define OMAP44XX_SRAM_BASE		0x40300000
+
 /* EMIF and DMM registers */
 #define OMAP44XX_EMIF1_BASE		0x4c000000
 #define OMAP44XX_EMIF2_BASE		0x4d000000
diff --git a/arch/arm/mach-omap/omap_devices.c b/arch/arm/mach-omap/omap_devices.c
index acf029d..e83ac85 100644
--- a/arch/arm/mach-omap/omap_devices.c
+++ b/arch/arm/mach-omap/omap_devices.c
@@ -1,7 +1,19 @@
 #include <driver.h>
 #include <ns16550.h>
+#include <asm/armlinux.h>
+
 #include <mach/omap3-devices.h>
 
+void omap_add_ram0(resource_size_t size)
+{
+	arm_add_mem_device("ram0", 0x80000000, size);
+}
+
+void omap_add_sram0(resource_size_t base, resource_size_t size)
+{
+	add_mem_device("sram0", base, size, IORESOURCE_MEM_WRITEABLE);
+}
+
 static struct NS16550_plat serial_plat = {
 	.clock = 48000000,      /* 48MHz (APLL96/2) */
 	.shift = 2,
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCHv2 3/6] ARM OMAP: Apply RAM device register functions to boards
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 1/6] ARM AM33XX: Add mmc0 pin mux function Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 2/6] ARM OMAP: Add SRAM and DRAM to device register functions Teresa Gámez
@ 2012-12-20 14:22 ` Teresa Gámez
  2012-12-20 14:25   ` Jean-Christophe PLAGNIOL-VILLARD
  2012-12-20 14:22 ` [PATCHv2 4/6] ARM OMAP: Add EHCI to device register functions Teresa Gámez
                   ` (3 subsequent siblings)
  6 siblings, 1 reply; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox

Apply RAM and SRAM register functions to all OMAP boards.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/boards/archosg9/board.c          |    2 +-
 arch/arm/boards/beagle/board.c            |    2 +-
 arch/arm/boards/beaglebone/board.c        |    2 +-
 arch/arm/boards/omap343xdsp/board.c       |    2 +-
 arch/arm/boards/omap3evm/board.c          |    2 +-
 arch/arm/boards/panda/board.c             |    2 +-
 arch/arm/boards/pcm049/board.c            |    5 ++---
 arch/arm/boards/phycard-a-l1/pca-a-l1.c   |    5 ++---
 arch/arm/boards/phycard-a-xl2/pca-a-xl2.c |    6 +++---
 9 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c
index 5f62748..1911c62 100644
--- a/arch/arm/boards/archosg9/board.c
+++ b/arch/arm/boards/archosg9/board.c
@@ -35,7 +35,7 @@ static int archosg9_console_init(void){
 console_initcall(archosg9_console_init);
 
 static int archosg9_mem_init(void){
-	arm_add_mem_device("ram0", 0x80000000, SZ_1G);
+	omap_add_ram0(SZ_1G);
 	return 0;
 }
 mem_initcall(archosg9_mem_init);
diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index 04c4d32..e0e1da6 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -280,7 +280,7 @@ static struct gpmc_nand_platform_data nand_plat = {
 
 static int beagle_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, 128 * 1024 * 1024);
+	omap_add_ram0(SZ_128M);
 
 	return 0;
 }
diff --git a/arch/arm/boards/beaglebone/board.c b/arch/arm/boards/beaglebone/board.c
index a7e3e74..f9ac7a4 100644
--- a/arch/arm/boards/beaglebone/board.c
+++ b/arch/arm/boards/beaglebone/board.c
@@ -307,7 +307,7 @@ console_initcall(beaglebone_console_init);
 
 static int beaglebone_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, 256 * 1024 * 1024);
+	omap_add_ram0(256 * 1024 * 1024);
 
 	return 0;
 }
diff --git a/arch/arm/boards/omap343xdsp/board.c b/arch/arm/boards/omap343xdsp/board.c
index eb752ff..6dbbc4c 100644
--- a/arch/arm/boards/omap343xdsp/board.c
+++ b/arch/arm/boards/omap343xdsp/board.c
@@ -620,7 +620,7 @@ console_initcall(sdp3430_console_init);
 
 static int sdp3430_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, 128 * 1024 * 1024);
+	omap_add_ram0(128 * 1024 * 1024);
 
 	return 0;
 }
diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c
index 03d3ab8..f636fe3 100644
--- a/arch/arm/boards/omap3evm/board.c
+++ b/arch/arm/boards/omap3evm/board.c
@@ -232,7 +232,7 @@ console_initcall(omap3evm_init_console);
 
 static int omap3evm_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, 128 * 1024 * 1024);
+	omap_add_ram0(SZ_128M);
 
 	return 0;
 }
diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c
index 5b27f46..8054a6a 100644
--- a/arch/arm/boards/panda/board.c
+++ b/arch/arm/boards/panda/board.c
@@ -44,7 +44,7 @@ console_initcall(panda_console_init);
 
 static int panda_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, SZ_1G);
+	omap_add_ram0(SZ_1G);
 
 	return 0;
 }
diff --git a/arch/arm/boards/pcm049/board.c b/arch/arm/boards/pcm049/board.c
index ca3f906..680539a 100644
--- a/arch/arm/boards/pcm049/board.c
+++ b/arch/arm/boards/pcm049/board.c
@@ -49,10 +49,9 @@ console_initcall(pcm049_console_init);
 
 static int pcm049_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, SZ_512M);
+	omap_add_ram0(SZ_512M);
 
-	add_mem_device("sram0", 0x40300000, 48 * 1024,
-				   IORESOURCE_MEM_WRITEABLE);
+	omap44xx_add_sram0();
 	return 0;
 }
 mem_initcall(pcm049_mem_init);
diff --git a/arch/arm/boards/phycard-a-l1/pca-a-l1.c b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
index b582d71..4b307a6 100644
--- a/arch/arm/boards/phycard-a-l1/pca-a-l1.c
+++ b/arch/arm/boards/phycard-a-l1/pca-a-l1.c
@@ -358,10 +358,9 @@ static int pcaal1_mem_init(void)
 	 */
 	gpmc_generic_init(0x10);
 #endif
-	add_mem_device("sram0", OMAP_SRAM_BASE, 60 * SZ_1K,
-				   IORESOURCE_MEM_WRITEABLE);
+	omap3_add_sram0();
 
-	arm_add_mem_device("ram0", OMAP_SDRC_CS0, get_sdr_cs_size(SDRC_CS0_OSET));
+	omap_add_ram0(get_sdr_cs_size(SDRC_CS0_OSET));
 	printf("found %s at SDCS0\n", size_human_readable(get_sdr_cs_size(SDRC_CS0_OSET)));
 
 	if ((get_sdr_cs_size(SDRC_CS1_OSET) != 0) && (get_sdr_cs1_base() != OMAP_SDRC_CS0)) {
diff --git a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c
index 3931f57..be7060f 100644
--- a/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c
+++ b/arch/arm/boards/phycard-a-xl2/pca-a-xl2.c
@@ -50,10 +50,10 @@ console_initcall(pcaaxl2_console_init);
 
 static int pcaaxl2_mem_init(void)
 {
-	arm_add_mem_device("ram0", 0x80000000, SZ_512M);
+	omap_add_ram0(SZ_512M);
+
+	omap44xx_add_sram0();
 
-	add_mem_device("sram0", 0x40300000, 48 * 1024,
-				   IORESOURCE_MEM_WRITEABLE);
 	return 0;
 }
 mem_initcall(pcaaxl2_mem_init);
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCHv2 4/6] ARM OMAP: Add EHCI to device register functions
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
                   ` (2 preceding siblings ...)
  2012-12-20 14:22 ` [PATCHv2 3/6] ARM OMAP: Apply RAM device register functions to boards Teresa Gámez
@ 2012-12-20 14:22 ` Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 5/6] ARM OMAP: Apply EHCI " Teresa Gámez
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox


Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/mach-omap/include/mach/omap3-devices.h |    6 ++++++
 arch/arm/mach-omap/include/mach/omap4-devices.h |    6 ++++++
 arch/arm/mach-omap/include/mach/omap4-silicon.h |    3 +++
 3 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap/include/mach/omap3-devices.h b/arch/arm/mach-omap/include/mach/omap3-devices.h
index 9d682cf..2e8e06f 100644
--- a/arch/arm/mach-omap/include/mach/omap3-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap3-devices.h
@@ -87,4 +87,10 @@ static inline struct device_d *omap3_add_i2c3(void *pdata)
 	return omap_add_i2c(2, OMAP3_I2C3_BASE, pdata);
 }
 
+static inline struct device_d *omap3_add_ehci(void *pdata)
+{
+	return add_usb_ehci_device(DEVICE_ID_DYNAMIC, OMAP3_EHCI_BASE,
+					OMAP3_EHCI_BASE + 0x10, pdata);
+}
+
 #endif /* __MACH_OMAP3_DEVICES_H */
diff --git a/arch/arm/mach-omap/include/mach/omap4-devices.h b/arch/arm/mach-omap/include/mach/omap4-devices.h
index df0694f..5aba72d 100644
--- a/arch/arm/mach-omap/include/mach/omap4-devices.h
+++ b/arch/arm/mach-omap/include/mach/omap4-devices.h
@@ -73,4 +73,10 @@ static inline struct device_d *omap44xx_add_i2c4(void *pdata)
 	return omap_add_i2c(3, OMAP44XX_I2C4_BASE, pdata);
 }
 
+static inline struct device_d *omap44xx_add_ehci(void *pdata)
+{
+	return add_usb_ehci_device(DEVICE_ID_DYNAMIC, OMAP44XX_EHCI_BASE,
+				OMAP44XX_EHCI_BASE + 0x10, pdata);
+}
+
 #endif /* __MACH_OMAP4_DEVICES_H */
diff --git a/arch/arm/mach-omap/include/mach/omap4-silicon.h b/arch/arm/mach-omap/include/mach/omap4-silicon.h
index 379588d..0e8abda 100644
--- a/arch/arm/mach-omap/include/mach/omap4-silicon.h
+++ b/arch/arm/mach-omap/include/mach/omap4-silicon.h
@@ -121,6 +121,9 @@
 /* GPMC */
 #define OMAP44XX_GPMC_BASE		0x50000000
 
+/* EHCI */
+#define OMAP44XX_EHCI_BASE		(OMAP44XX_L4_CORE_BASE + 0x64C00)
+
 /* DMM */
 #define OMAP44XX_DMM_BASE		0x4E000000
 #define DMM_LISA_MAP_BASE		(OMAP44XX_DMM_BASE + 0x40)
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCHv2 5/6] ARM OMAP: Apply EHCI device register functions
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
                   ` (3 preceding siblings ...)
  2012-12-20 14:22 ` [PATCHv2 4/6] ARM OMAP: Add EHCI to device register functions Teresa Gámez
@ 2012-12-20 14:22 ` Teresa Gámez
  2012-12-20 14:22 ` [PATCHv2 6/6] pcm051: Add inital support Teresa Gámez
  2012-12-21 11:22 ` [PATCHv2 0/6] Add PCM051 support Sascha Hauer
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox


Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/boards/beagle/board.c |    3 +--
 arch/arm/boards/panda/board.c  |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index e0e1da6..88096bb 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -293,8 +293,7 @@ static int beagle_devices_init(void)
 
 #ifdef CONFIG_USB_EHCI_OMAP
 	if (ehci_omap_init(&omap_ehci_pdata) >= 0)
-		add_usb_ehci_device(DEVICE_ID_DYNAMIC, OMAP3_EHCI_BASE,
-				    OMAP3_EHCI_BASE + 0x10, &ehci_pdata);
+		omap3_add_ehci(&ehci_pdata);
 #endif /* CONFIG_USB_EHCI_OMAP */
 #ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c
index 8054a6a..4ca2a81 100644
--- a/arch/arm/boards/panda/board.c
+++ b/arch/arm/boards/panda/board.c
@@ -86,8 +86,7 @@ static void panda_ehci_init(void)
 	/* enable power to hub */
 	gpio_set_value(GPIO_HUB_POWER, 1);
 
-	add_usb_ehci_device(DEVICE_ID_DYNAMIC, 0x4a064c00,
-			    0x4a064c00 + 0x10, &ehci_pdata);
+	omap44xx_add_ehci(&ehci_pdata);
 }
 #else
 static void panda_ehci_init(void)
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCHv2 6/6] pcm051: Add inital support
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
                   ` (4 preceding siblings ...)
  2012-12-20 14:22 ` [PATCHv2 5/6] ARM OMAP: Apply EHCI " Teresa Gámez
@ 2012-12-20 14:22 ` Teresa Gámez
  2012-12-21 11:22 ` [PATCHv2 0/6] Add PCM051 support Sascha Hauer
  6 siblings, 0 replies; 9+ messages in thread
From: Teresa Gámez @ 2012-12-20 14:22 UTC (permalink / raw)
  To: barebox

Added initial support for Phytec phyCORE-AM335x.

Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
---
 arch/arm/Makefile                  |    1 +
 arch/arm/boards/pcm051/Makefile    |    1 +
 arch/arm/boards/pcm051/board.c     |   64 ++++++++++++++++++++++++++++++++++++
 arch/arm/boards/pcm051/config.h    |   21 ++++++++++++
 arch/arm/boards/pcm051/env/boot/sd |   10 ++++++
 arch/arm/boards/pcm051/env/config  |   22 ++++++++++++
 arch/arm/configs/pcm051_defconfig  |   56 +++++++++++++++++++++++++++++++
 arch/arm/mach-omap/Kconfig         |   10 ++++++
 8 files changed, 185 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boards/pcm051/Makefile
 create mode 100644 arch/arm/boards/pcm051/board.c
 create mode 100644 arch/arm/boards/pcm051/config.h
 create mode 100644 arch/arm/boards/pcm051/env/boot/sd
 create mode 100644 arch/arm/boards/pcm051/env/config
 create mode 100644 arch/arm/configs/pcm051_defconfig

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5082a13..487cc64 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -115,6 +115,7 @@ board-$(CONFIG_MACH_PCM027)			:= pcm027
 board-$(CONFIG_MACH_PCM037)			:= pcm037
 board-$(CONFIG_MACH_PCM038)			:= pcm038
 board-$(CONFIG_MACH_PCM043)			:= pcm043
+board-$(CONFIG_MACH_PCM051)			:= pcm051
 board-$(CONFIG_MACH_PM9261)			:= pm9261
 board-$(CONFIG_MACH_PM9263)			:= pm9263
 board-$(CONFIG_MACH_PM9G45)			:= pm9g45
diff --git a/arch/arm/boards/pcm051/Makefile b/arch/arm/boards/pcm051/Makefile
new file mode 100644
index 0000000..dcfc293
--- /dev/null
+++ b/arch/arm/boards/pcm051/Makefile
@@ -0,0 +1 @@
+obj-y += board.o
diff --git a/arch/arm/boards/pcm051/board.c b/arch/arm/boards/pcm051/board.c
new file mode 100644
index 0000000..9739a2c
--- /dev/null
+++ b/arch/arm/boards/pcm051/board.c
@@ -0,0 +1,64 @@
+/*
+ * pcm051 - phyCORE-AM335x Board Initalization Code
+ *
+ * Copyright (C) 2012 Teresa Gámez, Phytec Messtechnik GmbH
+ *
+ * Based on arch/arm/boards/omap/board-beagle.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <common.h>
+#include <init.h>
+#include <sizes.h>
+#include <ns16550.h>
+#include <asm/armlinux.h>
+#include <generated/mach-types.h>
+#include <mach/am33xx-devices.h>
+#include <mach/am33xx-mux.h>
+#include <mach/am33xx-silicon.h>
+
+/**
+ * @brief UART serial port initialization
+ * arch
+ *
+ * @return result of device registration
+ */
+static int pcm051_console_init(void)
+{
+	/* Register the serial port */
+	am33xx_add_uart0();
+
+	return 0;
+}
+console_initcall(pcm051_console_init);
+
+static int pcm051_mem_init(void)
+{
+	omap_add_ram0(SZ_512M);
+
+	return 0;
+}
+mem_initcall(pcm051_mem_init);
+
+static int pcm051_devices_init(void)
+{
+	enable_mmc0_pin_mux();
+
+	am33xx_add_mmc0(NULL);
+
+	armlinux_set_bootparams((void *)(AM33XX_DRAM_ADDR_SPACE_START + 0x100));
+	armlinux_set_architecture(MACH_TYPE_PCM051);
+
+	return 0;
+}
+device_initcall(pcm051_devices_init);
diff --git a/arch/arm/boards/pcm051/config.h b/arch/arm/boards/pcm051/config.h
new file mode 100644
index 0000000..8b2b876
--- /dev/null
+++ b/arch/arm/boards/pcm051/config.h
@@ -0,0 +1,21 @@
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#endif	/* __CONFIG_H */
diff --git a/arch/arm/boards/pcm051/env/boot/sd b/arch/arm/boards/pcm051/env/boot/sd
new file mode 100644
index 0000000..f303c10
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/sd
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+	boot-menu-add-entry "$0" "kernel & rootfs on SD card"
+	exit
+fi
+
+global.bootm.image=/boot/uImage
+global.bootm.oftree=/boot/oftree
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/pcm051/env/config b/arch/arm/boards/pcm051/env/config
new file mode 100644
index 0000000..dd35ff4
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/config
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# change network settings in /env/network/eth0
+# change mtd partition settings and automountpoints in /env/init/*
+
+global.hostname=pcm051
+
+# set to false if you do not want to have colors
+global.allow_color=true
+
+# user (used for network filenames)
+global.user=none
+
+# timeout in seconds before the default boot entry is started
+global.autoboot_timeout=3
+
+# default boot entry (one of /env/boot/*)
+global.boot.default=sd
+
+# base bootargs
+global.linux.bootargs.base="console=ttyO0,115200n8"
+
diff --git a/arch/arm/configs/pcm051_defconfig b/arch/arm/configs/pcm051_defconfig
new file mode 100644
index 0000000..4da0ed4
--- /dev/null
+++ b/arch/arm/configs/pcm051_defconfig
@@ -0,0 +1,56 @@
+CONFIG_ARCH_OMAP=y
+CONFIG_ARCH_AM33XX=y
+CONFIG_OMAP_BUILD_IFT=y
+CONFIG_MACH_PCM051=y
+CONFIG_AEABI=y
+CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
+CONFIG_ARM_UNWIND=y
+CONFIG_TEXT_BASE=0x81000000
+CONFIG_PROMPT="barebox@pcm051>"
+CONFIG_LONGHELP=y
+CONFIG_HUSH_FANCY_PROMPT=y
+CONFIG_CMDLINE_EDITING=y
+CONFIG_AUTO_COMPLETE=y
+CONFIG_MENU=y
+# CONFIG_TIMESTAMP is not set
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/pcm051/env"
+CONFIG_DEBUG_INFO=y
+CONFIG_ENABLE_FLASH_NOISE=y
+CONFIG_ENABLE_PARTITION_NOISE=y
+CONFIG_ENABLE_DEVICE_NOISE=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_MENU=y
+CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_LOADB=y
+CONFIG_CMD_CRC=y
+CONFIG_CMD_CRC_CMP=y
+CONFIG_CMD_MD5SUM=y
+CONFIG_CMD_FLASH=y
+CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_UIMAGE=y
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_RESET=y
+CONFIG_CMD_GO=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_PARTITION=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_UNCOMPRESS=y
+CONFIG_DRIVER_SERIAL_NS16550=y
+CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y
+# CONFIG_SPI is not set
+CONFIG_MTD=y
+CONFIG_NAND=y
+CONFIG_USB=y
+CONFIG_MCI=y
+CONFIG_MCI_STARTUP=y
+CONFIG_MCI_OMAP_HSMMC=y
+CONFIG_FS_FAT=y
+CONFIG_FS_FAT_WRITE=y
+CONFIG_FS_FAT_LFN=y
diff --git a/arch/arm/mach-omap/Kconfig b/arch/arm/mach-omap/Kconfig
index ae1e07e..c5bb3a3 100644
--- a/arch/arm/mach-omap/Kconfig
+++ b/arch/arm/mach-omap/Kconfig
@@ -112,6 +112,7 @@ config BOARDINFO
 	default "Phytec phyCORE pcm049" if MACH_PCM049
 	default "Phytec phyCARD-A-L1" if MACH_PCAAL1
 	default "Phytec phyCARD-A-XL2" if MACH_PCAAXL2
+	default "Phytec phyCORE-AM335x" if MACH_PCM051
 
 choice
 	prompt "Select OMAP board"
@@ -186,6 +187,15 @@ config MACH_PCAAXL2
 	help
 	  Say Y here if you are using a phyCARD-A-XL1 PCA-A-XL1
 
+config MACH_PCM051
+	bool "Phytec phyCORE pcm051"
+	select OMAP_CLOCK_ALL
+	select HAVE_NOSHELL
+	select HAVE_DEFAULT_ENVIRONMENT_NEW
+	depends on ARCH_AM33XX
+	help
+	  Say Y here if you are using Phytecs phyCORE pcm051 board
+
 endchoice
 
 if MACH_OMAP3EVM
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCHv2 3/6] ARM OMAP: Apply RAM device register functions to boards
  2012-12-20 14:22 ` [PATCHv2 3/6] ARM OMAP: Apply RAM device register functions to boards Teresa Gámez
@ 2012-12-20 14:25   ` Jean-Christophe PLAGNIOL-VILLARD
  0 siblings, 0 replies; 9+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-12-20 14:25 UTC (permalink / raw)
  To: Teresa Gámez; +Cc: barebox

On 15:22 Thu 20 Dec     , Teresa Gámez wrote:
> Apply RAM and SRAM register functions to all OMAP boards.
> 
> Signed-off-by: Teresa Gámez <t.gamez@phytec.de>
> ---
>  arch/arm/boards/archosg9/board.c          |    2 +-
>  arch/arm/boards/beagle/board.c            |    2 +-
>  arch/arm/boards/beaglebone/board.c        |    2 +-
>  arch/arm/boards/omap343xdsp/board.c       |    2 +-
>  arch/arm/boards/omap3evm/board.c          |    2 +-
>  arch/arm/boards/panda/board.c             |    2 +-
>  arch/arm/boards/pcm049/board.c            |    5 ++---
>  arch/arm/boards/phycard-a-l1/pca-a-l1.c   |    5 ++---
>  arch/arm/boards/phycard-a-xl2/pca-a-xl2.c |    6 +++---
>  9 files changed, 13 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c
> index 5f62748..1911c62 100644
> --- a/arch/arm/boards/archosg9/board.c
> +++ b/arch/arm/boards/archosg9/board.c
> @@ -35,7 +35,7 @@ static int archosg9_console_init(void){
>  console_initcall(archosg9_console_init);
>  
>  static int archosg9_mem_init(void){
> -	arm_add_mem_device("ram0", 0x80000000, SZ_1G);
> +	omap_add_ram0(SZ_1G);
can you detect it

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCHv2 0/6] Add PCM051 support
  2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
                   ` (5 preceding siblings ...)
  2012-12-20 14:22 ` [PATCHv2 6/6] pcm051: Add inital support Teresa Gámez
@ 2012-12-21 11:22 ` Sascha Hauer
  6 siblings, 0 replies; 9+ messages in thread
From: Sascha Hauer @ 2012-12-21 11:22 UTC (permalink / raw)
  To: Teresa Gámez; +Cc: barebox

On Thu, Dec 20, 2012 at 03:22:28PM +0100, Teresa Gámez wrote:
> This is rebased on the new AM33XX patch stack of Jan Luebbe.
> It adds phyCORE-AM335x (pcm051) support.
> Added also device register functions for SRAM, RAM and EHCI.
> 
> Teresa Gámez (6):
>   ARM AM33XX: Add mmc0 pin mux function
>   ARM OMAP: Add SRAM and DRAM to device register functions
>   ARM OMAP: Apply RAM device register functions to boards
>   ARM OMAP: Add EHCI to device register functions
>   ARM OMAP: Apply EHCI device register functions
>   pcm051: Add inital support

Applied, thanks. The autodetection of the SDRAM indeed would be nice,
but not necessary now. This could be added later.

Jan, Teresa, please check if the result is ok.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-12-21 11:22 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-20 14:22 [PATCHv2 0/6] Add PCM051 support Teresa Gámez
2012-12-20 14:22 ` [PATCHv2 1/6] ARM AM33XX: Add mmc0 pin mux function Teresa Gámez
2012-12-20 14:22 ` [PATCHv2 2/6] ARM OMAP: Add SRAM and DRAM to device register functions Teresa Gámez
2012-12-20 14:22 ` [PATCHv2 3/6] ARM OMAP: Apply RAM device register functions to boards Teresa Gámez
2012-12-20 14:25   ` Jean-Christophe PLAGNIOL-VILLARD
2012-12-20 14:22 ` [PATCHv2 4/6] ARM OMAP: Add EHCI to device register functions Teresa Gámez
2012-12-20 14:22 ` [PATCHv2 5/6] ARM OMAP: Apply EHCI " Teresa Gámez
2012-12-20 14:22 ` [PATCHv2 6/6] pcm051: Add inital support Teresa Gámez
2012-12-21 11:22 ` [PATCHv2 0/6] Add PCM051 support Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox