Skip to contentSkip to conversation

PXA: pxa-regs.h cleanup

PATCH New Marek Vasut 1 participant 13 messages Sep 9, 2010

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/13 PXA: pxa-regs.h cleanup

---

Let's hope nothing got broken here. Please review thoroughly. pxa-regs.h was nearly replaced in order to make it a bit more readable.

 arch/arm/cpu/pxa/cpu.c                   |   28 +-
 arch/arm/cpu/pxa/i2c.c                   |   59 +-
 arch/arm/cpu/pxa/pxafb.c                 |   59 +-
 arch/arm/cpu/pxa/timer.c                 |    7 +-
 arch/arm/cpu/pxa/usb.c                   |   61 +-
 arch/arm/include/asm/arch-pxa/hardware.h |   61 +-
 arch/arm/include/asm/arch-pxa/pxa-regs.h | 2672 ++++++++++++++++--------------
 board/colibri_pxa270/colibri_pxa270.c    |   32 +-
 board/cradle/cradle.c                    |    5 +-
 board/cradle/lowlevel_init.S             |    4 +-
 board/csb226/csb226.c                    |   13 +-
 board/delta/delta.c                      |   37 +-
 board/delta/nand.c                       |  110 +-
 board/innokom/innokom.c                  |   14 +-
 board/pxa255_idp/pxa_idp.c               |   27 +-
 board/trizepsiv/conxs.c                  |   32 +-
 board/vpac270/vpac270.c                  |   35 +-
 board/wepep250/wepep250.c                |   11 +-
 board/zipitz2/zipitz2.c                  |   33 +-
 board/zylonite/nand.c                    |  110 +-
 drivers/mmc/pxa_mmc.c                    |   83 +-
 drivers/serial/serial_pxa.c              |   61 +-
 include/configs/cradle.h                 |    2 -
 include/configs/delta.h                  |    1 +
 include/configs/zylonite.h               |    1 +
 25 files changed, 1861 insertions(+), 1697 deletions(-)
arch/arm/cpu/pxa/cpu.c +17 -11
index 800d120..330d013 100644
@@ -30,10 +30,11 @@
  * CPU specific code
  */
 
-#include <common.h>
-#include <command.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/io.h>
 #include <asm/system.h>
+#include <command.h>
+#include <common.h>
 
 static void cache_flush(void);
 
@@ -71,17 +72,22 @@ void set_GPIO_mode(int gpio_mode)
 {
 	int gpio = gpio_mode & GPIO_MD_MASK_NR;
 	int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8;
-	int gafr;
+	int val;
+
+	/* This below changes direction setting of GPIO "gpio" */
+	val = readl(GPDR(gpio));
 
 	if (gpio_mode & GPIO_MD_MASK_DIR)
-	{
-		GPDR(gpio) |= GPIO_bit(gpio);
-	}
+		val |= GPIO_bit(gpio);
 	else
-	{
-		GPDR(gpio) &= ~GPIO_bit(gpio);
-	}
-	gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2));
-	GAFR(gpio) = gafr |  (fn  << (((gpio) & 0xf)*2));
+		val &= ~GPIO_bit(gpio);
+
+	writel(val, GPDR(gpio));
+
+	/* This below updates only AF of GPIO "gpio" */
+	val = readl(GAFR(gpio));
+	val &= ~(0x3 << (((gpio) & 0xf) * 2));
+	val |= fn << (((gpio) & 0xf) * 2);
+	writel(val, GAFR(gpio));
 }
 #endif /* CONFIG_CPU_MONAHANS */
arch/arm/cpu/pxa/i2c.c +30 -29

100 lines not on this page · raw message

arch/arm/cpu/pxa/pxafb.c +30 -29

100 lines not on this page · raw message

arch/arm/cpu/pxa/timer.c +4 -3
index 8d0f826..ec950c7 100644
@@ -26,8 +26,9 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/io.h>
+#include <common.h>
 #include <div64.h>
 
 #ifdef CONFIG_USE_IRQ
@@ -86,7 +87,7 @@ void __udelay (unsigned long usec)
 
 void reset_timer_masked (void)
 {
-	OSCR = 0;
+	writel(0, OSCR);
 }
 
 ulong get_timer_masked (void)
@@ -113,7 +114,7 @@ void udelay_masked (unsigned long usec)
  */
 unsigned long long get_ticks(void)
 {
-	return OSCR;
+	return readl(OSCR);
 }
 
 /*
arch/arm/cpu/pxa/usb.c +27 -34

113 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/hardware.h +13 -48

73 lines not on this page · raw message

arch/arm/include/asm/arch-pxa/pxa-regs.h +1422 -1250

2,544 lines not on this page · raw message

board/colibri_pxa270/colibri_pxa270.c +17 -15
index 84ec38e..ad83f66 100644

Lines of this file are not shown. View the raw message.

board/cradle/cradle.c +3 -2
index 21eb655..c4a93f9 100644

Lines of this file are not shown. View the raw message.

board/cradle/lowlevel_init.S +2 -2
index 6b5cfb9..39964b6 100644

Lines of this file are not shown. View the raw message.

board/csb226/csb226.c +7 -6
index 0a6c13d..6eed9ad 100644

Lines of this file are not shown. View the raw message.

board/delta/delta.c +19 -18
index 68c39d2..df23076 100644

Lines of this file are not shown. View the raw message.

board/delta/nand.c +57 -53

110 lines not on this page · raw message

board/innokom/innokom.c +8 -6
index 3412f10..2c51125 100644

Lines of this file are not shown. View the raw message.

board/pxa255_idp/pxa_idp.c +14 -13
index a54a95d..7e4e7df 100644

Lines of this file are not shown. View the raw message.

board/trizepsiv/conxs.c +17 -15
index 8c11456..b051e35 100644

Lines of this file are not shown. View the raw message.

board/vpac270/vpac270.c +19 -16
index 18e47e2..e203bfd 100644

Lines of this file are not shown. View the raw message.

board/wepep250/wepep250.c +6 -5
index fe4b6a9..6e41ea6 100644

Lines of this file are not shown. View the raw message.

board/zipitz2/zipitz2.c +17 -16
index 14d1d76..f7edc4c 100644

Lines of this file are not shown. View the raw message.

board/zylonite/nand.c +57 -53

110 lines not on this page · raw message

drivers/mmc/pxa_mmc.c +42 -41

83 lines not on this page · raw message

drivers/serial/serial_pxa.c +31 -30

61 lines not on this page · raw message

include/configs/cradle.h +0 -2
index 200b61e..998e179 100644

Lines of this file are not shown. View the raw message.

include/configs/delta.h +1 -0
index 9c46c5b..d930fb4 100644

Lines of this file are not shown. View the raw message.

include/configs/zylonite.h +1 -0
index d0fc138..c8aa046 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.1

Part of the diff is not shown here. View the raw message.

#1 lore raw

PATCH 2/13 PXA: pxafb: Add ACX517AKN support

ACX517AKN LCD panel is found in Palm Tungsten|C

---
 arch/arm/cpu/pxa/pxafb.c |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
arch/arm/cpu/pxa/pxafb.c +34 -0
index e03e724..bdc1446 100644
@@ -216,6 +216,40 @@ vidinfo_t panel_info = {
 
 /*----------------------------------------------------------------------*/
 
+#ifdef CONFIG_ACX517AKN
+
+# define LCD_BPP	LCD_COLOR8
+
+/* you have to set lccr0 and lccr3 (including pcd) */
+# define REG_LCCR0	0x003008f9
+# define REG_LCCR3	0x03700006
+
+vidinfo_t panel_info = {
+	vl_col:		320,
+	vl_row:		320,
+	vl_width:	320,
+	vl_height:	320,
+	vl_clkp:	CONFIG_SYS_HIGH,
+	vl_oep:		CONFIG_SYS_LOW,
+	vl_hsp:		CONFIG_SYS_LOW,
+	vl_vsp:		CONFIG_SYS_LOW,
+	vl_dp:		CONFIG_SYS_HIGH,
+	vl_bpix:	LCD_BPP,
+	vl_lbw:		0,
+	vl_splt:	1,
+	vl_clor:	1,
+	vl_tft:		1,
+	vl_hpw:		0x04,
+	vl_blw:		0x1c,
+	vl_elw:		0x08,
+	vl_vpw:		0x01,
+	vl_bfw:		0x07,
+	vl_efw:		0x08,
+};
+#endif /* CONFIG_ACX517AKN */
+
+/*----------------------------------------------------------------------*/
+
 #if LCD_BPP == LCD_COLOR8
 void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue);
 #endif
Signature · 1 line
1.7.1
#2 lore raw

PATCH 3/13 common: Enable serial for PXA250

In reply to Marek Vasut
---
 common/serial.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
common/serial.c +1 -1
index fceabfa..7148cb9 100644
@@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR;
 static struct serial_device *serial_devices = NULL;
 static struct serial_device *serial_current = NULL;
 
-#if !defined(CONFIG_LWMON) && !defined(CONFIG_PXA27X)
+#if !defined(CONFIG_LWMON) && !defined(CONFIG_PXA27X) && !defined(CONFIG_PXA250)
 struct serial_device *__default_serial_console (void)
 {
 #if defined(CONFIG_8xx_CONS_SMC1) || defined(CONFIG_8xx_CONS_SMC2)
Signature · 1 line
1.7.1
#3 lore raw

PATCH 4/13 PXA: Palm Tungsten|C Support

In reply to Marek Vasut

This patch adds support for the Palm Tungsten|C PXA255 board. The support includes:
- LCD
- MMC
- UART
- NOR

---
 MAINTAINERS                  |    4 +
 MAKEALL                      |    1 +
 board/palmtc/Makefile        |   49 +++++++++
 board/palmtc/config.mk       |    1 +
 board/palmtc/lowlevel_init.S |   39 +++++++
 board/palmtc/palmtc.c        |   59 ++++++++++
 board/palmtc/u-boot.lds      |   56 ++++++++++
 boards.cfg                   |    1 +
 include/configs/palmtc.h     |  247 ++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 457 insertions(+), 0 deletions(-)
 create mode 100644 board/palmtc/Makefile
 create mode 100644 board/palmtc/config.mk
 create mode 100644 board/palmtc/lowlevel_init.S
 create mode 100644 board/palmtc/palmtc.c
 create mode 100644 board/palmtc/u-boot.lds
 create mode 100644 include/configs/palmtc.h
MAINTAINERS +4 -0
index 4b91b0f..70f03fb 100644
@@ -796,6 +796,10 @@ Greg Ungerer <[email protected]>
 	cm4116		ks8695p
 	cm4148		ks8695p
 
+Marek Vasut <[email protected]>
+
+	palmtc		xscale
+
 Hugo Villeneuve <[email protected]>
 
 	SFFSDR		ARM926EJS
MAKEALL +1 -0
index b34ae33..b871976 100755
@@ -713,6 +713,7 @@ LIST_pxa="		\
 	delta		\
 	innokom		\
 	lubbock		\
+	palmtc		\
 	pleb2		\
 	polaris		\
 	pxa255_idp	\
board/palmtc/Makefile new file +49 -0

49 lines not on this page · raw message

board/palmtc/config.mk new file +1 -0
new file mode 100644
index 0000000..1d650ac
@@ -0,0 +1 @@
+TEXT_BASE = 0xa1000000
board/palmtc/lowlevel_init.S new file +39 -0
new file mode 100644
index 0000000..74050dc
@@ -0,0 +1,39 @@
+/*
+ * Palm Tungsten|C Lowlevel Hardware Initialization
+ *
+ * Copyright (C) 2010 Marek Vasut <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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
+ */
+
+#include <config.h>
+#include <version.h>
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/macro.h>
+
+.globl lowlevel_init
+lowlevel_init:
+	pxa_gpio_setup
+	pxa_wait_ticks	0x8000
+	pxa_mem_setup
+	pxa_wakeup
+	pxa_intr_setup
+	pxa_clock_setup
+
+	mov	pc, lr
board/palmtc/palmtc.c new file +59 -0

59 lines not on this page · raw message

board/palmtc/u-boot.lds new file +56 -0

56 lines not on this page · raw message

boards.cfg +1 -0
index 69c6897..c6263c9 100644
@@ -59,6 +59,7 @@ delta		arm	pxa
 innokom		arm	pxa
 logodl		arm	pxa
 lubbock		arm	pxa
+palmtc		arm	pxa
 pleb2		arm	pxa
 xaeniax		arm	pxa
 xm250		arm	pxa
include/configs/palmtc.h new file +247 -0

247 lines not on this page · raw message

Signature · 1 line
1.7.1
#4 lore raw

PATCH 5/13 PXA: pxafb: Add support for Sharp LQ038J7DH53

In reply to Marek Vasut

This LCD panel is found in Palm LifeDrive handheld

---
 arch/arm/cpu/pxa/pxafb.c |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)
arch/arm/cpu/pxa/pxafb.c +34 -0
index bdc1446..35b3b48 100644
@@ -250,6 +250,40 @@ vidinfo_t panel_info = {
 
 /*----------------------------------------------------------------------*/
 
+#ifdef CONFIG_LQ038J7DH53
+
+# define LCD_BPP	LCD_COLOR8
+
+/* you have to set lccr0 and lccr3 (including pcd) */
+# define REG_LCCR0	0x003008f9
+# define REG_LCCR3	0x03700004
+
+vidinfo_t panel_info = {
+	vl_col:		320,
+	vl_row:		480,
+	vl_width:	320,
+	vl_height:	480,
+	vl_clkp:	CONFIG_SYS_HIGH,
+	vl_oep:		CONFIG_SYS_LOW,
+	vl_hsp:		CONFIG_SYS_LOW,
+	vl_vsp:		CONFIG_SYS_LOW,
+	vl_dp:		CONFIG_SYS_HIGH,
+	vl_bpix:	LCD_BPP,
+	vl_lbw:		0,
+	vl_splt:	1,
+	vl_clor:	1,
+	vl_tft:		1,
+	vl_hpw:		0x04,
+	vl_blw:		0x20,
+	vl_elw:		0x01,
+	vl_vpw:		0x01,
+	vl_bfw:		0x04,
+	vl_efw:		0x01,
+};
+#endif /* CONFIG_ACX517AKN */
+
+/*----------------------------------------------------------------------*/
+
 #if LCD_BPP == LCD_COLOR8
 void lcd_setcolreg (ushort regno, ushort red, ushort green, ushort blue);
 #endif
Signature · 1 line
1.7.1
#5 lore raw

PATCH 6/13 PXA: Add initial Palm LifeDrive support

In reply to Marek Vasut
---
 MAINTAINERS                  |    1 +
 MAKEALL                      |    1 +
 board/palmld/Makefile        |   49 ++++++++
 board/palmld/config.mk       |    1 +
 board/palmld/lowlevel_init.S |   45 +++++++
 board/palmld/palmld.c        |   69 +++++++++++
 board/palmld/u-boot.lds      |   56 +++++++++
 boards.cfg                   |    1 +
 include/configs/palmld.h     |  273 ++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 496 insertions(+), 0 deletions(-)
 create mode 100644 board/palmld/Makefile
 create mode 100644 board/palmld/config.mk
 create mode 100644 board/palmld/lowlevel_init.S
 create mode 100644 board/palmld/palmld.c
 create mode 100644 board/palmld/u-boot.lds
 create mode 100644 include/configs/palmld.h
MAINTAINERS +1 -0
index 70f03fb..5d20dca 100644
@@ -798,6 +798,7 @@ Greg Ungerer <[email protected]>
 
 Marek Vasut <[email protected]>
 
+	palmld		xscale
 	palmtc		xscale
 
 Hugo Villeneuve <[email protected]>
MAKEALL +1 -0
index b871976..1642abe 100755
@@ -713,6 +713,7 @@ LIST_pxa="		\
 	delta		\
 	innokom		\
 	lubbock		\
+	palmld		\
 	palmtc		\
 	pleb2		\
 	polaris		\
board/palmld/Makefile new file +49 -0

49 lines not on this page · raw message

board/palmld/config.mk new file +1 -0
new file mode 100644
index 0000000..1d650ac
@@ -0,0 +1 @@
+TEXT_BASE = 0xa1000000
board/palmld/lowlevel_init.S new file +45 -0

45 lines not on this page · raw message

board/palmld/palmld.c new file +69 -0

69 lines not on this page · raw message

board/palmld/u-boot.lds new file +56 -0

56 lines not on this page · raw message

boards.cfg +1 -0
index c6263c9..b5ee531 100644
@@ -59,6 +59,7 @@ delta		arm	pxa
 innokom		arm	pxa
 logodl		arm	pxa
 lubbock		arm	pxa
+palmld		arm	pxa
 palmtc		arm	pxa
 pleb2		arm	pxa
 xaeniax		arm	pxa
include/configs/palmld.h new file +273 -0

273 lines not on this page · raw message

Signature · 1 line
1.7.1
#6 lore raw

PATCH 7/13 PXA: Voipac270 improvements

In reply to Marek Vasut

128MB NOR module support.
Define __io to get harddrive working. Fix saving of environment into OneNAND. Boot from harddrive when possible. Add missing MAINTAINERS entry.

---
 MAINTAINERS                   |    1 +
 MAKEALL                       |    3 +-
 Makefile                      |    7 ++-
 board/vpac270/Makefile        |    7 +--
 board/vpac270/lowlevel_init.S |    1 -
 board/vpac270/vpac270.c       |   40 +++++----------
 include/configs/vpac270.h     |  106 +++++++++++++++++++++++-----------------
 7 files changed, 86 insertions(+), 79 deletions(-)
MAINTAINERS +1 -0
index 5d20dca..c35a277 100644
@@ -800,6 +800,7 @@ Marek Vasut <[email protected]>
 
 	palmld		xscale
 	palmtc		xscale
+	vpac270		xscale
 
 Hugo Villeneuve <[email protected]>
 
MAKEALL +2 -1
index 1642abe..52472de 100755
@@ -719,7 +719,8 @@ LIST_pxa="		\
 	polaris		\
 	pxa255_idp	\
 	trizepsiv	\
-	vpac270_nor	\
+	vpac270_128M_nor\
+	vpac270_256M_nor\
 	vpac270_onenand	\
 	wepep250	\
 	xaeniax		\
Makefile +6 -1
index 4f1cb1b..3f2b304 100644
@@ -2180,13 +2180,18 @@ trizepsiv_config	:	unconfig
 	fi;
 	@$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
 
-vpac270_nor_config \
+vpac270_nor_256M_config \
+vpac270_nor_128M_config \
 vpac270_onenand_config	: unconfig
 	@mkdir -p $(obj)include
 	@if [ "$(findstring onenand,$@)" ] ; then \
 		echo "#define CONFIG_ONENAND_U_BOOT" \
 			>>$(obj)include/config.h ; \
 	fi;
+	@if [ "$(findstring 256M,$@)" ] ; then \
+		echo "#define CONFIG_256M_U_BOOT" \
+			>>$(obj)include/config.h ; \
+	fi;
 	@$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270
 
 #########################################################################
board/vpac270/Makefile +2 -5
index c6f4c7c..f5014fc 100644
@@ -1,10 +1,7 @@
-
 #
-# (C) Copyright 2000
-# Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+# Voipac PXA270 Support
 #
-# See file CREDITS for list of people who contributed to this
-# project.
+# Copyright (C) 2010 Marek Vasut <[email protected]>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
board/vpac270/lowlevel_init.S +0 -1
index ec0d12c..c40d12f 100644
@@ -3,7 +3,6 @@
  *
  * Copyright (C) 2010 Marek Vasut <[email protected]>
  *
- *
  * See file CREDITS for list of people who contributed to this
  * project.
  *
board/vpac270/vpac270.c +14 -26
index e203bfd..a15c5d2 100644
@@ -1,16 +1,7 @@
 /*
- * (C) Copyright 2004
- * Robert Whaley, Applied Data Systems, Inc. rwhaley at applieddata.net
+ * Voipac PXA270 Support
  *
- * (C) Copyright 2002
- * Kyle Harris, Nexus Technologies, Inc. kharris at nexus-tech.net
- *
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <[email protected]>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
+ * Copyright (C) 2010 Marek Vasut <[email protected]>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -36,26 +27,15 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* ------------------------------------------------------------------------- */
-
 /*
  * Miscelaneous platform dependent initialisations
  */
-extern struct serial_device serial_ffuart_device;
-extern struct serial_device serial_btuart_device;
-extern struct serial_device serial_stuart_device;
-
-struct serial_device *default_serial_console (void)
-{
-	return &serial_ffuart_device;
-}
-
 int board_init (void)
 {
 	/* memory and cpu-speed are setup before relocation */
 	/* so we do _nothing_ here */
 
-	/* arch number of vpac270 */
+	/* Arch number of vpac270 */
 	gd->bd->bi_arch_number = MACH_TYPE_VPAC270;
 
 	/* adress of boot parameters */
@@ -64,17 +44,24 @@ int board_init (void)
 	return 0;
 }
 
+struct serial_device *default_serial_console (void)
+{
+	return &serial_ffuart_device;
+}
+
 int dram_init (void)
 {
 	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-
 	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
 
+#ifdef	CONFIG_256M_U_BOOT
+	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
+	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
+#endif
 	return 0;
 }
 
+#ifdef	CONFIG_CMD_USB
 int usb_board_init(void)
 {
 	writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
@@ -122,6 +109,7 @@ void usb_board_stop(void)
 
 	return;
 }
+#endif
 
 #ifdef CONFIG_DRIVER_DM9000
 int board_eth_init(bd_t *bis)
include/configs/vpac270.h +61 -45

244 lines not on this page · raw message

Signature · 1 line
1.7.1
#7 lore raw

PATCH 8/13 PXA: Balloon3 board support

In reply to Marek Vasut

The following hardware is currently supported:
- UART
- USB Host
- FPGA

---
 MAINTAINERS                    |    1 +
 MAKEALL                        |    1 +
 board/balloon3/Makefile        |   49 +++++++
 board/balloon3/balloon3.c      |  225 +++++++++++++++++++++++++++++++++
 board/balloon3/config.mk       |    1 +
 board/balloon3/lowlevel_init.S |   36 ++++++
 board/balloon3/u-boot.lds      |   55 ++++++++
 boards.cfg                     |    1 +
 include/configs/balloon3.h     |  269 ++++++++++++++++++++++++++++++++++++++++
 9 files changed, 638 insertions(+), 0 deletions(-)
 create mode 100644 board/balloon3/Makefile
 create mode 100644 board/balloon3/balloon3.c
 create mode 100644 board/balloon3/config.mk
 create mode 100644 board/balloon3/lowlevel_init.S
 create mode 100644 board/balloon3/u-boot.lds
 create mode 100644 include/configs/balloon3.h
MAINTAINERS +1 -0
index c35a277..433eae4 100644
@@ -798,6 +798,7 @@ Greg Ungerer <[email protected]>
 
 Marek Vasut <[email protected]>
 
+	balloon3	xscale
 	palmld		xscale
 	palmtc		xscale
 	vpac270		xscale
MAKEALL +1 -0
index 52472de..9d149e2 100755
@@ -706,6 +706,7 @@ LIST_at91="			\
 #########################################################################
 
 LIST_pxa="		\
+	balloon3	\
 	cerf250		\
 	colibri_pxa270	\
 	cradle		\
board/balloon3/Makefile new file +49 -0

49 lines not on this page · raw message

board/balloon3/balloon3.c new file +225 -0

225 lines not on this page · raw message

board/balloon3/config.mk new file +1 -0
new file mode 100644
index 0000000..1d650ac
@@ -0,0 +1 @@
+TEXT_BASE = 0xa1000000
board/balloon3/lowlevel_init.S new file +36 -0
new file mode 100644
index 0000000..d7b5be6
@@ -0,0 +1,36 @@
+/*
+ * Balloon3 Lowlevel Hardware Initialization
+ *
+ * Copyright (C) 2010 Marek Vasut <[email protected]>
+ *
+ * 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
+ */
+
+#include <config.h>
+#include <version.h>
+#include <asm/arch/pxa-regs.h>
+#include <asm/arch/macro.h>
+
+.globl lowlevel_init
+lowlevel_init:
+	pxa_gpio_setup
+	pxa_wait_ticks	0x8000
+	pxa_mem_setup
+	pxa_wakeup
+	pxa_intr_setup
+	pxa_clock_setup
+
+	mov	pc, lr
board/balloon3/u-boot.lds new file +55 -0

55 lines not on this page · raw message

boards.cfg +1 -0
index b5ee531..04ca7de 100644
@@ -51,6 +51,7 @@ actux2		arm	ixp
 actux3		arm	ixp
 actux4		arm	ixp
 ixdp425		arm	ixp
+balloon3	arm	pxa
 cerf250		arm	pxa
 colibri_pxa270	arm	pxa
 cradle		arm	pxa
include/configs/balloon3.h new file +269 -0

269 lines not on this page · raw message

Signature · 1 line
1.7.1
#8 lore raw

PATCH 9/13 PXA: Add missing MAINTAINERS entries

In reply to Marek Vasut
---
 MAINTAINERS |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
MAINTAINERS +2 -0
index 433eae4..7d66f7d 100644
@@ -799,9 +799,11 @@ Greg Ungerer <[email protected]>
 Marek Vasut <[email protected]>
 
 	balloon3	xscale
+	colibri_pxa270	xscale
 	palmld		xscale
 	palmtc		xscale
 	vpac270		xscale
+	zipitz2		xscale
 
 Hugo Villeneuve <[email protected]>
 
Signature · 1 line
1.7.1
#9 lore raw

PATCH 10/13 PXA: remove unused u-boot.lds from board/vpac270

In reply to Marek Vasut

From: Mikhail Kshevetskiy <[email protected]>

This file is not used, automatically generated u-boot.lds is used instead

---
 board/vpac270/u-boot.lds |   55 ----------------------------------------------
 1 files changed, 0 insertions(+), 55 deletions(-)
 delete mode 100644 board/vpac270/u-boot.lds
board/vpac270/u-boot.lds deleted +0 -55
deleted file mode 100644
index 58c371d..0000000
@@ -1,55 +0,0 @@
-/*
- * (C) Copyright 2000
- * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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
- */
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
-	. = 0x00000000;
-
-	. = ALIGN(4);
-	.text      :
-	{
-	  cpu/pxa/start.o	(.text)
-	  *(.text)
-	}
-
-	. = ALIGN(4);
-	.rodata : { *(.rodata) }
-
-	. = ALIGN(4);
-	.data : { *(.data) }
-
-	. = ALIGN(4);
-	.got : { *(.got) }
-
-	__u_boot_cmd_start = .;
-	.u_boot_cmd : { *(.u_boot_cmd) }
-	__u_boot_cmd_end = .;
-
-	. = ALIGN(4);
-	__bss_start = .;
-	.bss : { *(.bss) }
-	_end = .;
-}
Signature · 1 line
1.7.1
#10 lore raw

PATCH 11/13 PXA: cleanup vpac270 config and set CONFIG_SYS_HZ to 1000

In reply to Marek Vasut

From: Mikhail Kshevetskiy <[email protected]>

* CONFIG_SYS_CLKS_IN_HZ is not used anywhere, so removing it
* CONFIG_SYS_HZ is set to 1000 on most architectures, so it seems to be the safe default

---
 include/configs/vpac270.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
include/configs/vpac270.h +1 -2
index 694a8f9..4c18d3a 100644
@@ -146,8 +146,7 @@
 /*
  * Clock Configuration
  */
-#undef	CONFIG_SYS_CLKS_IN_HZ
-#define	CONFIG_SYS_HZ			3250000		/* Timer @ 3250000 Hz */
+#define	CONFIG_SYS_HZ			1000		/* Timer @ 3250000 Hz */
 #define	CONFIG_SYS_CPUSPEED		0x190		/* 312MHz */
 
 /*
Signature · 1 line
1.7.1
#11 lore raw

PATCH 12/13 PXA: fix environment sector size, kernel and environment location for vpac270

In reply to Marek Vasut

From: Mikhail Kshevetskiy <[email protected]>

Define ENV_ADDR as MONITOR_BASE + MONITOR_LEN. Fix environment sector size (NOR: 32Kb for first four sectors and 128Kb for other; OneNAND: 128Kb).

Last but not least: we have MONITOR_LEN = 0x40000 and one sector for environment (size = 0x20000), so the kernel may start from 0x00060000 only.

---
 include/configs/vpac270.h |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)
include/configs/vpac270.h +17 -8
index 4c18d3a..b8440a1 100644
@@ -45,7 +45,7 @@
 	"if ide reset && fatload ide 0 0xa4000000 uImage; then "	\
 		"bootm 0xa4000000; "					\
 	"fi; "								\
-	"bootm 0x40000;"
+	"bootm 0x60000;"
 #define	CONFIG_BOOTARGS			"console=tty0 console=ttyS0,115200"
 #define	CONFIG_TIMESTAMP
 #define	CONFIG_BOOTDELAY		2	/* Autoboot delay */
@@ -185,6 +185,12 @@
 /*
  * NOR FLASH
  */
+#define	CONFIG_SYS_MONITOR_BASE		0x0
+#define	CONFIG_SYS_MONITOR_LEN		0x40000
+#define	CONFIG_ENV_ADDR			\
+			(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
+#define	CONFIG_ENV_SIZE			0x4000
+
 #if	defined(CONFIG_CMD_FLASH)	/* NOR */
 #define	PHYS_FLASH_1			0x00000000	/* Flash Bank #1 */
 
@@ -211,7 +217,16 @@
 #define	CONFIG_SYS_FLASH_PROTECTION		1
 
 #define	CONFIG_ENV_IS_IN_FLASH		1
-#define	CONFIG_ENV_SECT_SIZE		0x4000
+
+/*
+ * The first four sectors of the NOR flash are 0x8000 bytes big, the rest of the
+ * flash consists of 0x20000 bytes big sectors.
+ */
+#if	(CONFIG_ENV_ADDR <= 0x18000)
+#define	CONFIG_ENV_SECT_SIZE		0x8000
+#else
+#define	CONFIG_ENV_SECT_SIZE		0x20000
+#endif
 
 #elif	defined(CONFIG_CMD_ONENAND)	/* OneNAND */
 #define	CONFIG_SYS_NO_FLASH
@@ -225,12 +240,6 @@
 #define	CONFIG_SYS_ENV_IS_NOWHERE
 #endif
 
-#define	CONFIG_SYS_MONITOR_BASE		0x0
-#define	CONFIG_SYS_MONITOR_LEN		0x40000
-
-#define	CONFIG_ENV_ADDR			0x40000
-#define	CONFIG_ENV_SIZE			0x4000
-
 /*
  * IDE
  */
Signature · 1 line
1.7.1
#12 lore raw

PATCH 13/13 PXA: fix MDREFR[APD] bit setting

In reply to Marek Vasut

From: Mikhail Kshevetskiy <[email protected]>

pxa_mem_setup macro use r6 to store CONFIG_SYS_MDREFR_VAL during memory initialization. This reg is modified during execution of pxa_wait_ticks. Later we use r6 to setup MDREFR[APD] bit. As result MDREFR[APD] is always zero.

---
 arch/arm/include/asm/arch-pxa/macro.h |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/include/asm/arch-pxa/macro.h +12 -8
index 035a57e..85958dd 100644
@@ -102,7 +102,11 @@
 /*
  * This macro sets up the Memory controller of the PXA2xx CPU
  *
- * Clobbered regs: r3, r4, r5
+ * WARNING: This macro uses internally r3 and r7 regs for MEMC_BASE
+ *          and CONFIG_SYS_MDREFR_VAL correspondingly. Please do not
+ *          use this regs for other purpose inside this macro.
+ *
+ * Clobbered regs: r3, r4, r5, r6, r7
  */
 .macro	pxa_mem_setup
 	/* This comes handy when setting MDREFR */
@@ -157,7 +161,7 @@
 	bic	r5, r5, #0xf00	/* MDREFR user config with zeroed DRI */
 
 	ldr	r4, =CONFIG_SYS_MDREFR_VAL
-	mov	r6, r4
+	mov	r7, r4
 	lsl	r4, #20
 	lsr	r4, #20		/* Get a valid DRI field */
 
@@ -187,12 +191,12 @@
 	 * 6) Initialize SDRAM
 	 */
 
-	bic	r6, #MDREFR_SLFRSH
-	str	r6, [r3, #MDREFR_OFFSET]
+	bic	r7, #MDREFR_SLFRSH
+	str	r7, [r3, #MDREFR_OFFSET]
 	ldr	r4, [r3, #MDREFR_OFFSET]
 
-	orr	r6, #MDREFR_E1PIN
-	str	r6, [r3, #MDREFR_OFFSET]
+	orr	r7, #MDREFR_E1PIN
+	str	r7, [r3, #MDREFR_OFFSET]
 	ldr	r4, [r3, #MDREFR_OFFSET]
 
 	/*
@@ -250,8 +254,8 @@
 	 */
 
 	ldr	r4, [r3, #MDREFR_OFFSET]
-	and	r6, r6, #MDREFR_APD
-	orr	r4, r4, r6
+	and	r7, r7, #MDREFR_APD
+	orr	r4, r4, r7
 	str	r4, [r3, #MDREFR_OFFSET]
 	ldr	r4, [r3, #MDREFR_OFFSET]
 .endm
Signature · 1 line
1.7.1