Use common function to set GPIOs for MX3 and MX5
Subsystems (5)
PATCH 1/10 Use common function to set GPIOs for MX3 and MX5
The patch adds support for setting gpios to the MX51 processor and change name to the corresponding functions for MX31. In this way, it is possible to get rid of nasty #ifdef switches related to the processor type.
--- arch/arm/include/asm/arch-mx31/mx31-regs.h | 14 +++- arch/arm/include/asm/arch-mx31/mx31.h | 25 ------- arch/arm/include/asm/arch-mx51/imx-regs.h | 6 ++ board/davedenx/qong/qong.c | 29 ++++---- drivers/gpio/Makefile | 2 +- drivers/gpio/mx31_gpio.c | 88 ----------------------- drivers/gpio/mxc_gpio.c | 107 ++++++++++++++++++++++++++++ drivers/spi/mxc_spi.c | 15 ++-- include/configs/imx31_phycore.h | 2 +- include/configs/qong.h | 2 +- include/mxc_gpio.h | 52 +++++++++++++ 11 files changed, 201 insertions(+), 141 deletions(-) delete mode 100644 drivers/gpio/mx31_gpio.c create mode 100644 drivers/gpio/mxc_gpio.c create mode 100644 include/mxc_gpio.h
arch/arm/include/asm/arch-mx31/mx31-regs.h +11 -3
@@ -57,6 +57,14 @@ struct clock_control_regs {u32 pdr2; }; +/* GPIO Registers */ +struct gpio_regs { +u32 gpio_dr; +u32 gpio_dir; +u32 gpio_psr; +}; + +/* Bit definitions for RCSR register in CCM */ #define CCM_RCSR_NF16B (1 << 31)#define CCM_RCSR_NFMS (1 << 30)
@@ -153,9 +161,9 @@ struct clock_control_regs {/* * GPIO */ -#define GPIO1_BASE 0x53FCC000 -#define GPIO2_BASE 0x53FD0000 -#define GPIO3_BASE 0x53FA4000 +#define GPIO1_BASE_ADDR 0x53FCC000 +#define GPIO2_BASE_ADDR 0x53FD0000 +#define GPIO3_BASE_ADDR 0x53FA4000#define GPIO_DR 0x00000000/* data register */ #define GPIO_GDIR 0x00000004/* direction register */ #define GPIO_PSR 0x00000008/* pad status register */
arch/arm/include/asm/arch-mx31/mx31.h +0 -25
@@ -28,31 +28,6 @@ extern u32 mx31_get_ipg_clk(void);#define imx_get_uartclk mx31_get_ipg_clkextern void mx31_gpio_mux (unsigned long mode); -enum mx31_gpio_direction { -MX31_GPIO_DIRECTION_IN , -MX31_GPIO_DIRECTION_OUT , -}; - -#ifdef CONFIG_MX31_GPIO -extern int mx31_gpio_direction (unsigned int gpio, -enum mx31_gpio_direction direction); -extern void mx31_gpio_set (unsigned int gpio,unsigned int value); -extern int mx31_gpio_get (unsigned int gpio); -#else -static inline int mx31_gpio_direction (unsigned int gpio, -enum mx31_gpio_direction direction) -{ -return 1 ; -} -static inline int mx31_gpio_get (unsigned int gpio) -{ -return 1 ; -} -static inline void mx31_gpio_set (unsigned int gpio,unsigned int value) -{ -} -#endif -void mx31_uart1_hw_init (void );void mx31_spi2_hw_init (void );
arch/arm/include/asm/arch-mx51/imx-regs.h +6 -0
@@ -256,6 +256,12 @@ struct weim {u32 cswcr2; }; +/* GPIO Registers */ +struct gpio_regs { +u32 gpio_dr; +u32 gpio_dir; +u32 gpio_psr; +};#endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MXC_MX51_H__ */
board/davedenx/qong/qong.c +15 -14
@@ -27,6 +27,7 @@#include <asm/arch/mx31-regs.h> #include <nand.h> #include <fsl_pmic.h> +#include <mxc_gpio.h> #include "qong_fpga.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -41,9 +42,9 @@ int dram_init (void)static void qong_fpga_reset (void ) { -mx31_gpio_set (QONG_FPGA_RST_PIN ,0 ); +mxc_gpio_set (QONG_FPGA_RST_PIN ,0 );udelay (30 ); -mx31_gpio_set (QONG_FPGA_RST_PIN ,1 ); +mxc_gpio_set (QONG_FPGA_RST_PIN ,1 );udelay (300 ); }
@@ -66,11 +67,11 @@ int board_early_init_f (void)/* FPGA reset Pin */ /* rstn = 0 */ -mx31_gpio_set (QONG_FPGA_RST_PIN ,0 ); -mx31_gpio_direction (QONG_FPGA_RST_PIN ,MX31_GPIO_DIRECTION_OUT ); +mxc_gpio_set (QONG_FPGA_RST_PIN ,0 ); +mxc_gpio_direction (QONG_FPGA_RST_PIN ,MXC_GPIO_DIRECTION_OUT );/* set interrupt pin as input */ -mx31_gpio_direction (QONG_FPGA_IRQ_PIN ,MX31_GPIO_DIRECTION_IN ); +mxc_gpio_direction (QONG_FPGA_IRQ_PIN ,MXC_GPIO_DIRECTION_IN );#endif
@@ -206,27 +207,27 @@ static void board_nand_setup(void)qong_fpga_reset ();/* Enable NAND flash */ -mx31_gpio_set (15 ,1 ); -mx31_gpio_set (14 ,1 ); -mx31_gpio_direction (15 ,MX31_GPIO_DIRECTION_OUT ); -mx31_gpio_direction (16 ,MX31_GPIO_DIRECTION_IN ); -mx31_gpio_direction (14 ,MX31_GPIO_DIRECTION_IN ); -mx31_gpio_set (15 ,0 ); +mxc_gpio_set (15 ,1 ); +mxc_gpio_set (14 ,1 ); +mxc_gpio_direction (15 ,MXC_GPIO_DIRECTION_OUT ); +mxc_gpio_direction (16 ,MXC_GPIO_DIRECTION_IN ); +mxc_gpio_direction (14 ,MXC_GPIO_DIRECTION_IN ); +mxc_gpio_set (15 ,0 ); }int qong_nand_rdy (void *chip) {udelay (1 ); -return mx31_gpio_get (16 ); +return mxc_gpio_get (16 ); }void qong_nand_select_chip (struct mtd_info *mtd,int chip) {if (chip >=0 ) -mx31_gpio_set (15 ,0 ); +mxc_gpio_set (15 ,0 );else -mx31_gpio_set (15 ,1 ); +mxc_gpio_set (15 ,1 ); }
drivers/gpio/Makefile +1 -1
@@ -27,7 +27,7 @@ LIB := $(obj)libgpio.a COBJS-$(CONFIG_AT91_GPIO) += at91_gpio.o COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o -COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o +COBJS-$(CONFIG_MXC_GPIO) += mxc_gpio.o COBJS-$(CONFIG_PCA953X) += pca953x.o COBJS-$(CONFIG_S5P) += s5p_gpio.o
drivers/gpio/mx31_gpio.c deleted +0 -88
88 lines not on this page · raw message
drivers/gpio/mxc_gpio.c new file +107 -0
107 lines not on this page · raw message
drivers/spi/mxc_spi.c +7 -8
@@ -23,6 +23,7 @@#include <spi.h> #include <asm/errno.h> #include <asm/io.h> +#include <mxc_gpio.h> #ifdef CONFIG_MX27 /* i.MX27 has a completely wrong register layout and register definitions in the
@@ -68,9 +69,6 @@ static unsigned long spi_bases[] = { 0x53f84000, }; -#define OUT MX31_GPIO_DIRECTION_OUT -#define mxc_gpio_direction mx31_gpio_direction -#define mxc_gpio_set mx31_gpio_set#elif defined(CONFIG_MX51 )#include <asm/arch/imx-regs.h> #include <asm/arch/clock.h>
@@ -111,13 +109,12 @@ static unsigned long spi_bases[] = {CSPI2_BASE_ADDR , CSPI3_BASE_ADDR, }; -#define mxc_gpio_direction (gpio, dir) (0) -#define mxc_gpio_set (gpio, value) {} -#define OUT 1#else #error "Unsupported architecture"#endif +#define OUT MXC_GPIO_DIRECTION_OUT +struct mxc_spi_slave {struct spi_slave slave;unsigned long base;
@@ -126,6 +123,7 @@ struct mxc_spi_slave {u32 cfg_reg;#endif int gpio; +int ss_pol; };static inline struct mxc_spi_slave *to_mxc_spi_slave (struct spi_slave *slave)
@@ -147,7 +145,7 @@ void spi_cs_activate(struct spi_slave *slave) {struct mxc_spi_slave *mxcs =to_mxc_spi_slave (slave);if (mxcs->gpio >0 ) -mxc_gpio_set (mxcs->gpio, mxcs->ctrl_reg &MXC_CSPICTRL_SSPOL ); +mxc_gpio_set (mxcs->gpio, mxcs->ss_pol); }void spi_cs_deactivate (struct spi_slave *slave)
@@ -155,7 +153,7 @@ void spi_cs_deactivate(struct spi_slave *slave)struct mxc_spi_slave *mxcs =to_mxc_spi_slave (slave);if (mxcs->gpio >0 )mxc_gpio_set (mxcs->gpio, - !(mxcs->ctrl_reg &MXC_CSPICTRL_SSPOL )); + !(mxcs->ss_pol)); }#ifdef CONFIG_MX51
@@ -394,6 +392,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, mxcs->slave.bus = bus; mxcs->slave.cs = cs; mxcs->base = spi_bases[bus]; + mxcs->ss_pol = (mode &SPI_CS_HIGH ) ?1 :0 ;#ifdef CONFIG_MX51 /* Can be used for i.MX31 too ? */
include/configs/imx31_phycore.h +1 -1
@@ -183,7 +183,7 @@#ifdef CONFIG_IMX31_PHYCORE_EET #define BOARD_LATE_INIT -#define CONFIG_MX31_GPIO 1 +#define CONFIG_MXC_GPIO #define CONFIG_HARD_SPI 1#define CONFIG_MXC_SPI 1
include/configs/qong.h +1 -1
@@ -52,7 +52,7 @@#define CONFIG_MXC_UART 1#define CONFIG_SYS_MX31_UART1 1 -#define CONFIG_MX31_GPIO +#define CONFIG_MXC_GPIO #define CONFIG_MXC_SPI #define CONFIG_DEFAULT_SPI_BUS 1
include/mxc_gpio.h new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 2/10 ARM: Use syslib functions for all CORTEXA8
The OMAP3 cpu directory contains a syslib file with some utilities that can be shared by all targets using arm cortexa8 processors, not only OMAP.
--- arch/arm/cpu/armv7/Makefile | 3 +- arch/arm/cpu/armv7/omap-common/Makefile | 1 - arch/arm/cpu/armv7/omap-common/syslib.c | 70 ---------------------------- arch/arm/cpu/armv7/syslib.c | 70 ++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx51/sys_proto.h | 1 + 5 files changed, 73 insertions(+), 72 deletions(-) delete mode 100644 arch/arm/cpu/armv7/omap-common/syslib.c create mode 100644 arch/arm/cpu/armv7/syslib.c
arch/arm/cpu/armv7/Makefile +2 -1
@@ -27,6 +27,7 @@ LIB = $(obj)lib$(CPU).a START := start.o COBJS := cpu.o +COBJS += syslib.o SRCS := $(START:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
@@ -44,4 +45,4 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend -######################################################################### +#########################################################################
arch/arm/cpu/armv7/omap-common/Makefile +0 -1
@@ -28,7 +28,6 @@ LIB = $(obj)libomap-common.a SOBJS := reset.o COBJS := timer.o -COBJS += syslib.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
arch/arm/cpu/armv7/omap-common/syslib.c deleted +0 -70
70 lines not on this page · raw message
arch/arm/cpu/armv7/syslib.c new file +70 -0
70 lines not on this page · raw message
arch/arm/include/asm/arch-mx51/sys_proto.h +1 -0
@@ -26,5 +26,6 @@u32 get_cpu_rev (void );#define is_soc_rev (rev) ((get_cpu_rev() & 0xFF) - rev) +void sdelay (unsigned long );#endif
Signature · 1 line
1.6.3.3
PATCH 3/10 MX51: Added pins definition to set up pads
Add pins definitions to set up RAM pads. Pins have only a pad, there is no entry in the multiplexer.
--- arch/arm/include/asm/arch-mx51/mx51_pins.h | 44 ++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-mx51/mx51_pins.h +44 -0
@@ -368,6 +368,50 @@ enum iomux_pins {MX51_PIN_GPIO1_7 =_MXC_BUILD_GPIO_PIN (0 ,7 ,0 ,0x3E4 ,0x810 ),MX51_PIN_GPIO1_8 =_MXC_BUILD_GPIO_PIN (0 ,8 ,0 ,0x3E8 ,0x814 ),MX51_PIN_GPIO1_9 =_MXC_BUILD_GPIO_PIN (0 ,9 ,0 ,0x3EC ,0x818 ), + +/* The following are PADS used for drive strength */ + +MX51_PIN_CTL_GRP_DDRPKS =_MXC_BUILD_NON_GPIO_PIN (0 ,0x820 ), +MX51_PIN_CTL_GRP_PKEDDR =_MXC_BUILD_NON_GPIO_PIN (0 ,0x838 ), +MX51_PIN_CTL_GRP_PKEADDR =_MXC_BUILD_NON_GPIO_PIN (0 ,0x890 ), +MX51_PIN_CTL_GRP_DDRAPKS =_MXC_BUILD_NON_GPIO_PIN (0 ,0x87C ), +MX51_PIN_CTL_GRP_DDRAPUS =_MXC_BUILD_NON_GPIO_PIN (0 ,0x84C ), +MX51_PIN_CTL_GRP_DDRPUS =_MXC_BUILD_NON_GPIO_PIN (0 ,0x884 ), +MX51_PIN_CTL_GRP_HYSDDR0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x85C ), +MX51_PIN_CTL_GRP_HYSDDR1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x864 ), +MX51_PIN_CTL_GRP_HYSDDR2 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x86C ), +MX51_PIN_CTL_GRP_HYSDDR3 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x874 ), +MX51_PIN_CTL_GRP_DDR_SR_B0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x878 ), +MX51_PIN_CTL_GRP_DDR_SR_B1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x880 ), +MX51_PIN_CTL_GRP_DDR_SR_B2 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x88C ), +MX51_PIN_CTL_GRP_DDR_SR_B4 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x89C ), +MX51_PIN_CTL_GRP_DRAM_B0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8A4 ), +MX51_PIN_CTL_GRP_DRAM_B1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8AC ), +MX51_PIN_CTL_GRP_DRAM_B2 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8B8 ), +MX51_PIN_CTL_GRP_DRAM_B4 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x82C ), +MX51_PIN_CTL_GRP_INMODE1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8A0 ), +MX51_PIN_CTL_GRP_DDR_SR_A0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8B0 ), +MX51_PIN_CTL_GRP_EMI_DS5 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8B4 ), +MX51_PIN_CTL_GRP_DDR_SR_A1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x8BC ), +MX51_PIN_CTL_GRP_DDR_A0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x83C ), +MX51_PIN_CTL_GRP_DDR_A1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x848 ), +MX51_PIN_CTL_GRP_DISP_PKE0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x868 ), +MX51_PIN_CTL_DRAM_RAS =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4A4 ), +MX51_PIN_CTL_DRAM_CAS =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4A8 ), +MX51_PIN_CTL_DRAM_SDWE =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4Ac ), +MX51_PIN_CTL_DRAM_SDCKE0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4B0 ), +MX51_PIN_CTL_DRAM_SDCKE1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4B4 ), +MX51_PIN_CTL_DRAM_SDCLK =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4B8 ), +MX51_PIN_CTL_DRAM_SDQS0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4BC ), +MX51_PIN_CTL_DRAM_SDQS1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4C0 ), +MX51_PIN_CTL_DRAM_SDQS2 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4C4 ), +MX51_PIN_CTL_DRAM_SDQS3 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4C8 ), +MX51_PIN_CTL_DRAM_CS0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4CC ), +MX51_PIN_CTL_DRAM_CS1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4D0 ), +MX51_PIN_CTL_DRAM_DQM0 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4D4 ), +MX51_PIN_CTL_DRAM_DQM1 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4D8 ), +MX51_PIN_CTL_DRAM_DQM2 =_MXC_BUILD_NON_GPIO_PIN (0 ,0x4DC ), + MX51_PIN_CTL_DRAM_DQM3 = _MXC_BUILD_NON_GPIO_PIN(0, 0x4E0), };#endif /* __ASSEMBLY__ */
Signature · 1 line
1.6.3.3
PATCH 4/10 MX51: add structure to access System Reset Controller
--- arch/arm/include/asm/arch-mx51/imx-regs.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/include/asm/arch-mx51/imx-regs.h +10 -0
@@ -262,6 +262,16 @@ struct gpio_regs {u32 gpio_dir;u32 gpio_psr; }; + +/* System Reset Controller (SRC) */ +struct src { +u32 scr; +u32 sbmr; +u32 srsr; +u32 reserved1[2 ]; +u32 sisr; +u32 simr; +};#endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MXC_MX51_H__ */
Signature · 1 line
1.6.3.3
PATCH 5/10 MXC: Add watchdog support to serial driver
Calls WATCHDOG_RESET() inside serial driver
for boards enabling watchdog.
--- drivers/serial/serial_mxc.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
drivers/serial/serial_mxc.c +5 -2
@@ -18,6 +18,7 @@*/ #include <common.h> +#include <watchdog.h> #ifdef CONFIG_MX31 #include <asm/arch/mx31.h> #else
@@ -189,7 +190,8 @@ void serial_setbrg (void)int serial_getc (void ) { -while (__REG (UART_PHYS +UTS ) &UTS_RXEMPTY ); +while (__REG (UART_PHYS +UTS ) &UTS_RXEMPTY ) +WATCHDOG_RESET ();return (__REG (UART_PHYS +URXD ) &URXD_RX_DATA );/* mask out status from upper word */ }
@@ -198,7 +200,8 @@ void serial_putc (const char c)__REG (UART_PHYS +UTXD ) = c;/* wait for transmitter to be ready */ -while (!(__REG (UART_PHYS +UTS ) &UTS_TXEMPTY )); +while (!(__REG (UART_PHYS +UTS ) &UTS_TXEMPTY )) +WATCHDOG_RESET ();/* If \n, also do \r */ if (c =='\n' )
Signature · 1 line
1.6.3.3
PATCH 6/10 MX51: Drop unused header file for mx51evk
As stated in 272017853339f5b9685f9488bdaf5405812d12a4, the mx51evk has not CPLD and all references must be removed. This patch drop a .h file that still remains in board directory.
--- board/freescale/mx51evk/mx51evk.c | 2 - board/freescale/mx51evk/mx51evk.h | 50 ------------------------------------- 2 files changed, 0 insertions(+), 52 deletions(-) delete mode 100644 board/freescale/mx51evk/mx51evk.h
board/freescale/mx51evk/mx51evk.c +0 -2
@@ -33,12 +33,10 @@#include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h> -#include "mx51evk.h" DECLARE_GLOBAL_DATA_PTR ;static u32 system_rev; -struct io_board_ctrl *mx51_io_board;#ifdef CONFIG_FSL_ESDHC struct fsl_esdhc_cfg esdhc_cfg[2] = {
board/freescale/mx51evk/mx51evk.h deleted +0 -50
50 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 7/10 MXC: Correct SPI_CPOL setting in SPI driver
The handling of the SPI_CPOL bit inside the SPI
driver was wrong. As reported by the manual,
the meaning of the SSPOL inside the
configuration register is the same as reported
by SPI specification (0 if low in idle, 1 is high
on idle). The driver inverts this logic.
Because this patch sets the logic as specified, it is required to clear the CPOL bit in the configuration file to adapt to the correct logic.
--- drivers/spi/mxc_spi.c | 4 ++-- include/configs/imx31_litekit.h | 4 ++-- include/configs/mx31ads.h | 4 ++-- include/configs/mx31pdk.h | 4 ++-- include/configs/mx51evk.h | 2 +- include/configs/qong.h | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-)
drivers/spi/mxc_spi.c +2 -2
@@ -215,7 +215,7 @@ static s32 spi_cfg(struct mxc_spi_slave *mxcs, unsigned int cs,if (mode &SPI_CS_HIGH ) ss_pol =1 ; -if (!(mode &SPI_CPOL )) +if (mode &SPI_CPOL ) sclkpol =1 ;if (mode &SPI_CPHA )
@@ -412,7 +412,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,if (mode &SPI_CPHA ) ctrl_reg |=MXC_CSPICTRL_PHA ; -if (!(mode &SPI_CPOL )) +if (mode &SPI_CPOL ) ctrl_reg |=MXC_CSPICTRL_POL ;if (mode &SPI_CS_HIGH ) ctrl_reg |=MXC_CSPICTRL_SSPOL ;
include/configs/imx31_litekit.h +2 -2
@@ -66,13 +66,13 @@#define CONFIG_HARD_SPI 1#define CONFIG_MXC_SPI 1#define CONFIG_DEFAULT_SPI_BUS 1 -#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_FSL_PMIC #define CONFIG_FSL_PMIC_BUS 1#define CONFIG_FSL_PMIC_CS 0#define CONFIG_FSL_PMIC_CLK 1000000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_RTC_MC13783 1
include/configs/mx31ads.h +2 -2
@@ -63,13 +63,13 @@#define CONFIG_HARD_SPI 1#define CONFIG_MXC_SPI 1#define CONFIG_DEFAULT_SPI_BUS 1 -#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_FSL_PMIC #define CONFIG_FSL_PMIC_BUS 1#define CONFIG_FSL_PMIC_CS 0#define CONFIG_FSL_PMIC_CLK 1000000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_RTC_MC13783 1/* allow to overwrite serial and ethaddr */
include/configs/mx31pdk.h +2 -2
@@ -67,13 +67,13 @@#define CONFIG_HARD_SPI 1#define CONFIG_MXC_SPI 1#define CONFIG_DEFAULT_SPI_BUS 1 -#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_FSL_PMIC #define CONFIG_FSL_PMIC_BUS 1#define CONFIG_FSL_PMIC_CS 2#define CONFIG_FSL_PMIC_CLK 1000000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_RTC_MC13783 1/* allow to overwrite serial and ethaddr */
include/configs/mx51evk.h +1 -1
@@ -73,7 +73,7 @@#define CONFIG_FSL_PMIC_BUS 0#define CONFIG_FSL_PMIC_CS 0#define CONFIG_FSL_PMIC_CLK 2500000 -#define CONFIG_FSL_PMIC_MODE (SPI_CPOL | SPI_CS_HIGH) +#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)/* * MMC Configs
include/configs/qong.h +2 -2
@@ -56,14 +56,14 @@#define CONFIG_MXC_SPI #define CONFIG_DEFAULT_SPI_BUS 1 -#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_DEFAULT_SPI_MODE (SPI_MODE_0 | SPI_CS_HIGH)#define CONFIG_RTC_MC13783 #define CONFIG_FSL_PMIC #define CONFIG_FSL_PMIC_BUS 1#define CONFIG_FSL_PMIC_CS 0#define CONFIG_FSL_PMIC_CLK 100000 -#define CONFIG_FSL_PMIC_MODE (SPI_MODE_2 | SPI_CS_HIGH) +#define CONFIG_FSL_PMIC_MODE (SPI_MODE_0 | SPI_CS_HIGH)/* FPGA */ #define CONFIG_QONG_FPGA 1
Signature · 1 line
1.6.3.3
PATCH 8/10 MXC: Fix byte-ordering in SPI driver for i.MX31/i.MX51
The actual SPI driver for i.MX31 and i.MX51 controller use a wrong byte ordering, because it is supposed to work only with Freescale's devices, as the Power Controllers (PMIC). The driver is not suitable for general purposes, because the buffers passed to spi_xfer must be 32-bit aligned, as it is used mainly to send integer to PMIC devices.
The patch drops any kind of limitation and makes the driver useful with devices controlled sending commands composed by single bytes (or by a odd number of bytes), such as spi flash, sensor, etc.
Because the byte ordering is changed,
any current driver using this controller must be adapted, too.
--- drivers/misc/fsl_pmic.c | 10 ++- drivers/spi/mxc_spi.c | 149 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 118 insertions(+), 41 deletions(-)
drivers/misc/fsl_pmic.c +7 -3
@@ -46,6 +46,7 @@ void pmic_spi_free(struct spi_slave *slave)u32 pmic_reg (u32 reg,u32 val,u32 write) {u32 pmic_tx, pmic_rx; +u32 tmp;if (!slave) { slave =pmic_spi_probe ();
@@ -65,7 +66,9 @@ u32 pmic_reg(u32 reg, u32 val, u32 write) pmic_tx = (write <<31 ) | (reg <<25 ) | (val &0x00FFFFFF ); -if (spi_xfer (slave,4 <<3 , &pmic_tx, &pmic_rx, + tmp =cpu_to_be32 (pmic_tx); + +if (spi_xfer (slave,4 <<3 , &tmp, &pmic_rx,SPI_XFER_BEGIN |SPI_XFER_END )) {spi_release_bus (slave);return -1 ;
@@ -73,7 +76,8 @@ u32 pmic_reg(u32 reg, u32 val, u32 write)if (write) { pmic_tx &= ~(1 <<31 ); -if (spi_xfer (slave,4 <<3 , &pmic_tx, &pmic_rx, + tmp =cpu_to_be32 (pmic_tx); +if (spi_xfer (slave,4 <<3 , &tmp, &pmic_rx,SPI_XFER_BEGIN |SPI_XFER_END )) {spi_release_bus (slave);return -1 ;
@@ -81,7 +85,7 @@ u32 pmic_reg(u32 reg, u32 val, u32 write) }spi_release_bus (slave); -return pmic_rx; +return cpu_to_be32 (pmic_rx); }void pmic_reg_write (u32 reg,u32 value)
drivers/spi/mxc_spi.c +111 -38
201 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 9/10 MX51: Register definitions cannot be included in board config file
Due to wrong dependencies, it is not possible to include imx_regs.h inside the board configuration file.
--- arch/arm/include/asm/arch-mx51/imx-regs.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/include/asm/arch-mx51/imx-regs.h +6 -4
@@ -23,9 +23,6 @@#ifndef __ASM_ARCH_MXC_MX51_H__#define __ASM_ARCH_MXC_MX51_H__ -#define __REG (x) (*((volatile u32 *)(x))) -#define __REG16 (x) (*((volatile u16 *)(x))) -#define __REG8 (x) (*((volatile u8 *)(x)))/* * IRAM */
@@ -207,7 +204,12 @@#define BOARD_REV_1_0 0x0#define BOARD_REV_2_0 0x1 -#ifndef __ASSEMBLY__ +#if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__)) +#include <asm/types.h> + +#define __REG(x) (*((volatile u32 *)(x))) +#define __REG16(x) (*((volatile u16 *)(x))) +#define __REG8(x) (*((volatile u8 *)(x))) struct clkctl { u32 ccr;
Signature · 1 line
1.6.3.3
PATCH 10/10 MX51: Support for TTECH vision2 board
The patch adds support for TTECH vision2 board.
The board has 512MB RAM, SDHC slot and 4MB SPI
device from StMicron.
--- MAINTAINERS | 1 + board/ttcontrol/vision2/Makefile | 48 ++ board/ttcontrol/vision2/config.mk | 25 + board/ttcontrol/vision2/imximage_hynix.cfg | 209 ++++++++ board/ttcontrol/vision2/vision2.c | 712 ++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/vision2.h | 214 +++++++++ include/mc13892.h | 3 + 8 files changed, 1213 insertions(+), 0 deletions(-) create mode 100644 board/ttcontrol/vision2/Makefile create mode 100644 board/ttcontrol/vision2/config.mk create mode 100644 board/ttcontrol/vision2/imximage_hynix.cfg create mode 100644 board/ttcontrol/vision2/vision2.c create mode 100644 include/configs/vision2.h
MAINTAINERS +1 -0
@@ -547,6 +547,7 @@ Stefano Babic <[email protected]> polaris xscale trizepsiv xscale mx51evk i.MX51 + vision2 i.MX51 Dirk Behme <[email protected]>
board/ttcontrol/vision2/Makefile new file +48 -0
48 lines not on this page · raw message
board/ttcontrol/vision2/config.mk new file +25 -0
@@ -0,0 +1,25 @@ +# +# Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved. +# +# 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 +# + +LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds +TEXT_BASE = 0x97800000 +IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage_hynix.cfg
board/ttcontrol/vision2/imximage_hynix.cfg new file +209 -0
209 lines not on this page · raw message
board/ttcontrol/vision2/vision2.c new file +712 -0
712 lines not on this page · raw message
boards.cfg +1 -0
@@ -47,6 +47,7 @@ jadecpu arm arm926ejs jadecpu syteco mb86r0x suen3 arm arm926ejs km_arm keymile kirkwood rd6281a arm arm926ejs - Marvell kirkwood mx51evk arm armv7 mx51evk freescale mx51 +vision2 arm armv7 vision2 ttcontrol mx51 actux1 arm ixp actux2 arm ixp actux3 arm ixp
include/configs/vision2.h new file +214 -0
214 lines not on this page · raw message
include/mc13892.h +3 -0
@@ -157,4 +157,7 @@#define VSDSTBY (1 << 19)#define VSDMODE (1 << 20) +/* Reg Power Control 2*/ +#define WDIRESET (1 << 12) +#endif
Signature · 1 line
1.6.3.3