sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/mxs'

This commit is contained in:
Sascha Hauer 2015-02-04 19:09:15 +01:00
parent ce961e3412 99dc500593
commit 7b0f932bcd
36 changed files with 1020 additions and 303 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -120,6 +120,7 @@ config ARCH_MVEBU
config ARCH_MXS
bool "Freescale i.MX23/28 (mxs) based"
select GPIOLIB
select GENERIC_GPIO
select COMMON_CLK
select CLKDEV_LOOKUP

1
arch/arm/boards/Makefile
View File

@ -20,6 +20,7 @@ obj-$(CONFIG_MACH_CFA10036) += crystalfontz-cfa10036/
obj-$(CONFIG_MACH_CHUMBY) += chumby_falconwing/
obj-$(CONFIG_MACH_CLEP7212) += clep7212/
obj-$(CONFIG_MACH_DFI_FS700_M60) += dfi-fs700-m60/
obj-$(CONFIG_MACH_DUCKBILL) += duckbill/
obj-$(CONFIG_MACH_DSS11) += dss11/
obj-$(CONFIG_MACH_EDB93012) += edb93xx/
obj-$(CONFIG_MACH_EDB9301) += edb93xx/

3
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
View File

@ -127,9 +127,6 @@ static int cfa10036_devices_init(void)
add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, SZ_8K,
IORESOURCE_MEM, &mci_pdata);
add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, SZ_8K,
IORESOURCE_MEM, NULL);
i2c_register_board_info(0, cfa10036_i2c_devices, ARRAY_SIZE(cfa10036_i2c_devices));
add_generic_device_res("i2c-gpio", 0, NULL, 0, &i2c_gpio_pdata);

2
arch/arm/boards/duckbill/Makefile Normal file
View File

@ -0,0 +1,2 @@
obj-y += board.o
lwl-y += lowlevel.o

82
arch/arm/boards/duckbill/board.c Normal file
View File

@ -0,0 +1,82 @@
/*
* Copyright (C) 2010 Juergen Beisert, Pengutronix <kernel@pengutronix.de>
* Copyright (C) 2011 Marc Kleine-Budde, Pengutronix <mkl@pengutronix.de>
* Copyright (C) 2011 Wolfram Sang, Pengutronix <w.sang@pengutronix.de>
*
* 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 <environment.h>
#include <errno.h>
#include <gpio.h>
#include <init.h>
#include <io.h>
#include <net.h>
#include <mach/clock.h>
#include <mach/imx-regs.h>
#include <mach/iomux-imx28.h>
#include <mach/iomux.h>
#include <mach/ocotp.h>
#include <mach/devices.h>
#include <mach/usb.h>
#include <usb/fsl_usb2.h>
#include <asm/armlinux.h>
#include <asm/mmu.h>
static void duckbill_get_ethaddr(void)
{
u8 mac_ocotp[3], mac[6];
int ret;
ret = mxs_ocotp_read(mac_ocotp, 3, 0);
if (ret != 3) {
pr_err("Reading MAC from OCOTP failed!\n");
return;
}
mac[0] = 0x00;
mac[1] = 0x04;
mac[2] = 0x9f;
mac[3] = mac_ocotp[2];
mac[4] = mac_ocotp[1];
mac[5] = mac_ocotp[0];
eth_register_ethaddr(0, mac);
}
static struct fsl_usb2_platform_data usb_pdata = {
.operating_mode = FSL_USB2_DR_DEVICE,
.phy_mode = FSL_USB2_PHY_UTMI,
};
static int duckbill_devices_init(void)
{
duckbill_get_ethaddr(); /* must be after registering ocotp */
imx28_usb_phy0_enable();
add_generic_device("fsl-udc", DEVICE_ID_DYNAMIC, NULL, IMX_USB0_BASE,
0x200, IORESOURCE_MEM, &usb_pdata);
return 0;
}
fs_initcall(duckbill_devices_init);
static int duckbill_console_init(void)
{
barebox_set_model("I2SE Duckbill");
barebox_set_hostname("duckbill");
return 0;
}
console_initcall(duckbill_console_init);

73
arch/arm/boards/duckbill/lowlevel.c Normal file
View File

@ -0,0 +1,73 @@
#define pr_fmt(fmt) "Freescale MX28evk: " fmt
#define DEBUG
#include <common.h>
#include <linux/sizes.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/imx28-regs.h>
#include <mach/init.h>
#include <io.h>
#include <debug_ll.h>
#include <mach/iomux.h>
#include <stmp-device.h>
extern char __dtb_imx28_duckbill_start[];
ENTRY_FUNCTION(start_barebox_duckbill, r0, r1, r2)
{
void *fdt;
pr_debug("here we are!\n");
fdt = __dtb_imx28_duckbill_start - get_runtime_offset();
barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, fdt);
}
static const uint32_t iomux_pads[] = {
/* EMI */
EMI_DATA0, EMI_DATA1, EMI_DATA2, EMI_DATA3, EMI_DATA4, EMI_DATA5,
EMI_DATA6, EMI_DATA7, EMI_DATA8, EMI_DATA9, EMI_DATA10, EMI_DATA11,
EMI_DATA12, EMI_DATA13, EMI_DATA14, EMI_DATA15, EMI_ODT0, EMI_DQM0,
EMI_ODT1, EMI_DQM1, EMI_DDR_OPEN_FB, EMI_CLK, EMI_DSQ0, EMI_DSQ1,
EMI_DDR_OPEN, EMI_A0, EMI_A1, EMI_A2, EMI_A3, EMI_A4, EMI_A5,
EMI_A6, EMI_A7, EMI_A8, EMI_A9, EMI_A10, EMI_A11, EMI_A12, EMI_A13,
EMI_A14, EMI_BA0, EMI_BA1, EMI_BA2, EMI_CASN, EMI_RASN, EMI_WEN,
EMI_CE0N, EMI_CE1N, EMI_CKE,
/* Debug UART */
PWM0_DUART_RX | VE_3_3V,
PWM1_DUART_TX | VE_3_3V,
};
static noinline void duckbill_init(void)
{
int i;
/* initialize muxing */
for (i = 0; i < ARRAY_SIZE(iomux_pads); i++)
imx_gpio_mode(iomux_pads[i]);
pr_debug("initializing power...\n");
mx28_power_init(0, 0, 1);
pr_debug("initializing SDRAM...\n");
mx28_mem_init();
pr_debug("DONE\n");
}
ENTRY_FUNCTION(prep_start_barebox_duckbill, r0, r1, r2)
{
void (*back)(unsigned long) = (void *)get_lr();
relocate_to_current_adr();
setup_c();
duckbill_init();
back(0);
}

50
arch/arm/boards/freescale-mx28-evk/env/config vendored
View File

@ -1,50 +0,0 @@
#!/bin/sh
#user=
# use 'dhcp' to do dhcp in barebox and in kernel
# use 'none' if you want to skip kernel ip autoconfiguration
ip=dhcp
# or set your networking parameters here
#eth0.ipaddr=a.b.c.d
#eth0.netmask=a.b.c.d
#eth0.serverip=a.b.c.d
#eth0.gateway=a.b.c.d
#eth0.ethaddr=de:ad:be:ef:00:00
# can be either 'tftp', 'nfs', 'nand', 'nor' or 'disk'
kernel_loc=tftp
# can be either 'net', 'nand', 'nor', 'disk' or 'initrd'
rootfs_loc=net
# for flash based rootfs: 'jffs2' or 'ubifs'
# in case of disk any regular filesystem like 'ext2', 'ext3', 'reiserfs'
rootfs_type=ext2
# where is the rootfs in case of 'rootfs_loc=disk' (linux name)
rootfs_part_linux_dev=mmcblk0p4
rootfsimage=rootfs-${global.hostname}.$rootfs_type
# where is the kernel image in case of 'kernel_loc=disk'
kernel_part=disk0.2
kernelimage=zImage-${global.hostname}
bareboximage=barebox-${global.hostname}.bin
bareboxenvimage=barebox-${global.hostname}.bin
if [ -n $user ]; then
bareboximage="$user"-"$bareboximage"
bareboxenvimage="$user"-"$bareboxenvimage"
kernelimage="$user"-"$kernelimage"
rootfsimage="$user"-"$rootfsimage"
nfsroot="/home/$user/nfsroot/${global.hostname}"
else
nfsroot="/path/to/nfs/root"
fi
autoboot_timeout=3
bootargs="console=ttyAMA0,115200"
# set a fancy prompt (if support is compiled in)
PS1="\e[1;32mbarebox@\e[1;31m\h:\w\e[0m "

58
arch/arm/boards/freescale-mx28-evk/lowlevel.c
View File

@ -1,11 +1,65 @@
#define pr_fmt(fmt) "Freescale MX28evk: " fmt
#define DEBUG
#include <common.h>
#include <linux/sizes.h>
#include <asm/barebox-arm-head.h>
#include <asm/barebox-arm.h>
#include <mach/imx28-regs.h>
#include <mach/init.h>
#include <io.h>
#include <debug_ll.h>
#include <mach/iomux.h>
#include <stmp-device.h>
void __naked barebox_arm_reset_vector(void)
ENTRY_FUNCTION(start_barebox_freescale_mx28evk, r0, r1, r2)
{
arm_cpu_lowlevel_init();
barebox_arm_entry(IMX_MEMORY_BASE, SZ_128M, NULL);
}
static const uint32_t iomux_pads[] = {
/* EMI */
EMI_DATA0, EMI_DATA1, EMI_DATA2, EMI_DATA3, EMI_DATA4, EMI_DATA5,
EMI_DATA6, EMI_DATA7, EMI_DATA8, EMI_DATA9, EMI_DATA10, EMI_DATA11,
EMI_DATA12, EMI_DATA13, EMI_DATA14, EMI_DATA15, EMI_ODT0, EMI_DQM0,
EMI_ODT1, EMI_DQM1, EMI_DDR_OPEN_FB, EMI_CLK, EMI_DSQ0, EMI_DSQ1,
EMI_DDR_OPEN, EMI_A0, EMI_A1, EMI_A2, EMI_A3, EMI_A4, EMI_A5,
EMI_A6, EMI_A7, EMI_A8, EMI_A9, EMI_A10, EMI_A11, EMI_A12, EMI_A13,
EMI_A14, EMI_BA0, EMI_BA1, EMI_BA2, EMI_CASN, EMI_RASN, EMI_WEN,
EMI_CE0N, EMI_CE1N, EMI_CKE,
/* Debug UART */
PWM0_DUART_RX | VE_3_3V,
PWM1_DUART_TX | VE_3_3V,
};
static noinline void freescale_mx28evk_init(void)
{
int i;
/* initialize muxing */
for (i = 0; i < ARRAY_SIZE(iomux_pads); i++)
imx_gpio_mode(iomux_pads[i]);
pr_debug("initializing power...\n");
mx28_power_init(0, 1, 0);
pr_debug("initializing SDRAM...\n");
mx28_mem_init();
pr_debug("DONE\n");
}
ENTRY_FUNCTION(prep_start_barebox_freescale_mx28evk, r0, r1, r2)
{
void (*back)(unsigned long) = (void *)get_lr();
relocate_to_current_adr();
setup_c();
freescale_mx28evk_init();
back(0);
}

2
arch/arm/boards/freescale-mx28-evk/mx28-evk.c
View File

@ -275,8 +275,6 @@ static int mx28_evk_devices_init(void)
add_generic_device("stmfb", 0, NULL, IMX_FB_BASE, 0x2000,
IORESOURCE_MEM, &mx28_evk_fb_pdata);
add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0x2000,
IORESOURCE_MEM, NULL);
mx28_evk_get_ethaddr(); /* must be after registering ocotp */
mx28_evk_fec_reset();

2
arch/arm/boards/imx233-olinuxino/lowlevel.c
View File

@ -154,7 +154,7 @@ static noinline void imx23_olinuxino_init(void)
pr_debug("initializing power...\n");
mx23_power_init();
mx23_power_init(0, 1, 0);
pr_debug("initializing SDRAM...\n");

2
arch/arm/boards/karo-tx28/lowlevel.c
View File

@ -43,7 +43,7 @@ static noinline void karo_tx28_init(void)
pr_debug("initializing power...\n");
mx28_power_init_battery_input();
mx28_power_init(0, 1, 0);
pr_debug("initializing SDRAM...\n");

3
arch/arm/boards/karo-tx28/tx28-stk5.c
View File

@ -382,9 +382,6 @@ void base_board_init(void)
add_generic_device("stmfb", 0, NULL, IMX_FB_BASE, 0x2000,
IORESOURCE_MEM, &tx28_fb_pdata);
add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0x2000,
IORESOURCE_MEM, NULL);
tx28_get_ethaddr();
add_generic_device("imx28-fec", 0, NULL, IMX_FEC0_BASE, 0x4000,

100
arch/arm/configs/duckbill_defconfig Normal file
View File

@ -0,0 +1,100 @@
CONFIG_ARCH_MXS=y
CONFIG_ARCH_IMX28=y
CONFIG_MACH_DUCKBILL=y
CONFIG_ARCH_MXS_USBLOADER=y
CONFIG_AEABI=y
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_ARM_UNWIND=y
CONFIG_MMU=y
CONFIG_TEXT_BASE=0x0
CONFIG_MALLOC_SIZE=0x0
CONFIG_MALLOC_TLSF=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
CONFIG_BLSPEC=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_RESET_SOURCE=y
CONFIG_DEBUG_INFO=y
CONFIG_CMD_DMESG=y
CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_BOOTM_SHOW_TYPE=y
CONFIG_CMD_BOOTM_VERBOSE=y
CONFIG_CMD_BOOTM_INITRD=y
CONFIG_CMD_GO=y
CONFIG_CMD_RESET=y
CONFIG_CMD_UIMAGE=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_LOADENV=y
CONFIG_CMD_PRINTENV=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_SAVEENV=y
CONFIG_CMD_CMP=y
CONFIG_CMD_FILETYPE=y
CONFIG_CMD_LN=y
CONFIG_CMD_MD5SUM=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_LET=y
CONFIG_CMD_MSLEEP=y
CONFIG_CMD_READF=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_HOST=y
CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_ECHO_E=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_MENUTREE=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_CRC=y
CONFIG_CMD_CRC_CMP=y
CONFIG_CMD_MM=y
CONFIG_CMD_CLK=y
CONFIG_CMD_DETECT=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_LED=y
CONFIG_CMD_NANDTEST=y
CONFIG_CMD_SPI=y
CONFIG_CMD_LED_TRIGGER=y
CONFIG_CMD_USBGADGET=y
CONFIG_CMD_OF_NODE=y
CONFIG_CMD_OF_PROPERTY=y
CONFIG_CMD_OFTREE=y
CONFIG_NET=y
CONFIG_OFDEVICE=y
CONFIG_OF_BAREBOX_DRIVERS=y
CONFIG_DRIVER_SERIAL_AUART=y
CONFIG_DRIVER_NET_FEC_IMX=y
CONFIG_DRIVER_SPI_MXS=y
CONFIG_MTD=y
CONFIG_NAND=y
CONFIG_NAND_MXS=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DFU=y
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
CONFIG_VIDEO=y
CONFIG_DRIVER_VIDEO_STM=y
CONFIG_MCI=y
CONFIG_MCI_STARTUP=y
CONFIG_MCI_MXS=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_LED_GPIO_OF=y
CONFIG_LED_TRIGGERS=y
CONFIG_MXS_APBH_DMA=y
CONFIG_FS_TFTP=y
CONFIG_FS_FAT=y
CONFIG_FS_FAT_WRITE=y
CONFIG_FS_FAT_LFN=y

71
arch/arm/configs/freescale-mx28-evk_defconfig
View File

@ -3,37 +3,71 @@ CONFIG_ARCH_IMX28=y
CONFIG_MACH_MX28EVK=y
CONFIG_AEABI=y
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
CONFIG_ARM_UNWIND=y
CONFIG_MMU=y
CONFIG_TEXT_BASE=0x43000000
CONFIG_MALLOC_SIZE=0x800000
CONFIG_BROKEN=y
CONFIG_LONGHELP=y
CONFIG_GLOB=y
CONFIG_TEXT_BASE=0x0
CONFIG_MALLOC_SIZE=0x0
CONFIG_MALLOC_TLSF=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/freescale-mx28-evk/env"
CONFIG_MENU=y
CONFIG_BLSPEC=y
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_RESET_SOURCE=y
CONFIG_DEBUG_INFO=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_SAVEENV=y
CONFIG_CMD_DMESG=y
CONFIG_LONGHELP=y
CONFIG_CMD_IOMEM=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_BOOTM_SHOW_TYPE=y
CONFIG_CMD_BOOTM_VERBOSE=y
CONFIG_CMD_BOOTM_INITRD=y
CONFIG_CMD_GO=y
CONFIG_CMD_RESET=y
CONFIG_CMD_UIMAGE=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_LOADENV=y
CONFIG_CMD_PRINTENV=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_MAGICVAR=y
CONFIG_CMD_MAGICVAR_HELP=y
CONFIG_CMD_SAVEENV=y
CONFIG_CMD_CMP=y
CONFIG_CMD_FILETYPE=y
CONFIG_CMD_LN=y
CONFIG_CMD_MD5SUM=y
CONFIG_CMD_UNCOMPRESS=y
CONFIG_CMD_LET=y
CONFIG_CMD_MSLEEP=y
CONFIG_CMD_READF=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_HOST=y
CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
CONFIG_CMD_ECHO_E=y
CONFIG_CMD_BOOTM_SHOW_TYPE=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_MENUTREE=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_READLINE=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_CRC=y
CONFIG_CMD_CRC_CMP=y
CONFIG_CMD_MM=y
CONFIG_CMD_CLK=y
CONFIG_CMD_DETECT=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_NANDTEST=y
CONFIG_CMD_SPI=y
CONFIG_CMD_OF_NODE=y
CONFIG_CMD_OF_PROPERTY=y
CONFIG_CMD_OFTREE=y
CONFIG_NET=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
CONFIG_NET_RESOLV=y
CONFIG_DRIVER_SERIAL_AUART=y
CONFIG_DRIVER_NET_FEC_IMX=y
CONFIG_DRIVER_SPI_MXS=y
@ -48,4 +82,5 @@ CONFIG_MCI_MXS=y
CONFIG_MXS_APBH_DMA=y
CONFIG_FS_TFTP=y
CONFIG_FS_FAT=y
CONFIG_FS_FAT_WRITE=y
CONFIG_FS_FAT_LFN=y

1
arch/arm/dts/Makefile
View File

@ -10,6 +10,7 @@ obj- += dummy.o
pbl-dtb-$(CONFIG_MACH_AFI_GF) += am335x-afi-gf.dtb.o
pbl-dtb-$(CONFIG_MACH_BEAGLEBONE) += am335x-bone.dtb.o am335x-boneblack.dtb.o am335x-bone-common.dtb.o
pbl-dtb-$(CONFIG_MACH_DFI_FS700_M60) += imx6q-dfi-fs700-m60-6q.dtb.o imx6dl-dfi-fs700-m60-6s.dtb.o
pbl-dtb-$(CONFIG_MACH_DUCKBILL) += imx28-duckbill.dtb.o
pbl-dtb-$(CONFIG_MACH_EFIKA_MX_SMARTBOOK) += imx51-genesi-efika-sb.dtb.o
pbl-dtb-$(CONFIG_MACH_EMBEST_RIOTBOARD) += imx6s-riotboard.dtb.o
pbl-dtb-$(CONFIG_MACH_EMBEDSKY_E9) += imx6q-embedsky-e9.dtb.o

15
arch/arm/dts/imx28-duckbill.dts Normal file
View File

@ -0,0 +1,15 @@
#include <arm/imx28-duckbill.dts>
/ {
chosen {
stdout-path = &duart;
};
};
&duart {
arm,primecell-periphid = <0x00041011>;
};
&ocotp {
status = "okay";
};

10
arch/arm/mach-mxs/Kconfig
View File

@ -68,10 +68,20 @@ config MACH_TX28
config MACH_MX28EVK
bool "mx28-evk"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select MXS_OCOTP
select HAVE_PBL_MULTI_IMAGES
help
Say Y here if you are using the Freescale i.MX28-EVK board
config MACH_DUCKBILL
bool "Duckbill"
select HAVE_DEFAULT_ENVIRONMENT_NEW
select MXS_OCOTP
select HAVE_PBL_MULTI_IMAGES
help
Say Y here if you are using the I2SE Duckbill board
config MACH_CFA10036
bool "cfa-10036"
select HAVE_DEFAULT_ENVIRONMENT_NEW

8
arch/arm/mach-mxs/include/mach/init.h
View File

@ -12,10 +12,10 @@
void mxs_early_delay(int delay);
void mx23_power_init(void);
void mx23_power_init_battery_input(void);
void mx28_power_init(void);
void mx28_power_init_battery_input(void);
void mx23_power_init(int __has_battery, int __use_battery_input,
int __use_5v_input);
void mx28_power_init(int __has_battery, int __use_battery_input,
int __use_5v_input);
void mxs_power_wait_pswitch(void);
extern uint32_t mx28_dram_vals[];

60
arch/arm/mach-mxs/iomux-imx.c
View File

@ -75,12 +75,6 @@ static unsigned calc_output_reg(unsigned no)
return ((no >> 5) << 4) + HW_PINCTRL_DOUT0;
}
static unsigned calc_input_reg(unsigned no)
{
/* each register controls 32 pads */
return ((no >> 5) << 4) + HW_PINCTRL_DIN0;
}
/**
* @param[in] m One pin define per call from iomux-mx23.h/iomux-mx28.h
*/
@ -168,57 +162,3 @@ void imx_gpio_mode(uint32_t m)
}
}
}
int gpio_direction_input(unsigned gpio)
{
unsigned reg_offset;
if (gpio > MAX_GPIO_NO)
return -EINVAL;
reg_offset = calc_output_enable_reg(gpio);
writel(0x1 << (gpio % 32), IMX_IOMUXC_BASE + reg_offset + STMP_OFFSET_REG_CLR);
return 0;
}
int gpio_direction_output(unsigned gpio, int val)
{
unsigned reg_offset;
if (gpio > MAX_GPIO_NO)
return -EINVAL;
/* first set the output value... */
reg_offset = calc_output_reg(gpio);
writel(0x1 << (gpio % 32), IMX_IOMUXC_BASE +
reg_offset + (val != 0 ? STMP_OFFSET_REG_SET : STMP_OFFSET_REG_CLR));
/* ...then the direction */
reg_offset = calc_output_enable_reg(gpio);
writel(0x1 << (gpio % 32), IMX_IOMUXC_BASE + reg_offset + STMP_OFFSET_REG_SET);
return 0;
}
void gpio_set_value(unsigned gpio, int val)
{
unsigned reg_offset;
reg_offset = calc_output_reg(gpio);
writel(0x1 << (gpio % 32), IMX_IOMUXC_BASE +
reg_offset + (val != 0 ?
STMP_OFFSET_REG_SET : STMP_OFFSET_REG_CLR));
}
int gpio_get_value(unsigned gpio)
{
uint32_t reg;
unsigned reg_offset;
reg_offset = calc_input_reg(gpio);
reg = readl(IMX_IOMUXC_BASE + reg_offset);
if (reg & (0x1 << (gpio % 32)))
return 1;
return 0;
}

15
arch/arm/mach-mxs/mem-init.c
View File

@ -255,17 +255,6 @@ void mxs_mem_setup_cpu_and_hbus(void)
mxs_early_delay(15000);
}
void mxs_mem_setup_vdda(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
writel((0xc << POWER_VDDACTRL_TRG_OFFSET) |
(0x7 << POWER_VDDACTRL_BO_OFFSET_OFFSET) |
POWER_VDDACTRL_LINREG_OFFSET_1STEPS_BELOW,
&power_regs->hw_power_vddactrl);
}
static void mx23_mem_setup_vddmem(void)
{
struct mxs_power_regs *power_regs =
@ -287,8 +276,6 @@ void mx23_mem_init(void)
/* Fractional divider for ref_emi is 33 ; 480 * 18 / 33 = 266MHz */
mxs_mem_init_clock(33);
mxs_mem_setup_vdda();
/*
* Reset/ungate the EMI block. This is essential, otherwise the system
* suffers from memory instability. This thing is mx23 specific and is
@ -340,8 +327,6 @@ void mx28_mem_init(void)
/* Fractional divider for ref_emi is 21 ; 480 * 18 / 21 = 411MHz */
mxs_mem_init_clock(21);
mxs_mem_setup_vdda();
/* Set DDR2 mode */
writel(PINCTRL_EMI_DS_CTRL_DDR_MODE_DDR2,
IMX_IOMUXC_BASE + 0x1b80);

9
arch/arm/mach-mxs/ocotp.c
View File

@ -207,9 +207,18 @@ static int mxs_ocotp_probe(struct device_d *dev)
return 0;
}
static __maybe_unused struct of_device_id mxs_ocotp_compatible[] = {
{
.compatible = "fsl,ocotp",
}, {
/* sentinel */
}
};
static struct driver_d mxs_ocotp_driver = {
.name = DRIVERNAME,
.probe = mxs_ocotp_probe,
.of_compatible = DRV_OF_COMPAT(mxs_ocotp_compatible),
};
static int mxs_ocotp_init(void)

277
arch/arm/mach-mxs/power-init.c
View File

@ -24,6 +24,56 @@
#include <mach/regs-rtc.h>
#include <mach/regs-lradc.h>
/*
* has_battery - true when this board has a battery.
*/
static int has_battery;
/*
* use_battery_input - true when this board is supplied from the
* battery input, but has a DC source instead of a real battery
*/
static int use_battery_input;
/*
* use_5v_input - true when this board can use the 5V input
*/
static int use_5v_input;
static void mxs_power_status(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
static int linregofs[] = { 0, 1, -1, -2 };
uint32_t vddio = readl(&power_regs->hw_power_vddioctrl);
uint32_t vdda = readl(&power_regs->hw_power_vddactrl);
uint32_t vddd = readl(&power_regs->hw_power_vdddctrl);
uint32_t vddmem = readl(&power_regs->hw_power_vddmemctrl);
printf("vddio: %dmV (BO -%dmV), Linreg enabled, Linreg offset: %d, FET %sabled\n",
(vddio & 0x1f) * 50 + 2800,
((vddio >> 8) & 0x7) * 50,
linregofs[((vdda >> 12) & 0x3)],
(vddio & (1 << 16)) ? "dis" : "en");
printf("vdda: %dmV (BO -%dmV), Linreg %sabled, Linreg offset: %d, FET %sabled\n",
(vdda & 0x1f) * 25 + 1500,
((vdda >> 8) & 0x7) * 25,
(vdda & (1 << 17)) ? "en" : "dis",
linregofs[((vdda >> 12) & 0x3)],
(vdda & (1 << 16)) ? "dis" : "en");
printf("vddd: %dmV (BO -%dmV), Linreg %sabled, Linreg offset: %d, FET %sabled\n",
(vddd & 0x1f) * 25 + 800,
((vddd >> 8) & 0x7) * 25,
(vddd & (1 << 21)) ? "en" : "dis",
linregofs[((vdda >> 16) & 0x3)],
(vdda & (1 << 20)) ? "dis" : "en");
printf("vddmem: %dmV (BO -%dmV), Linreg %sabled\n",
(vddmem & 0x1f) * 25 + 1100,
((vddmem >> 5) & 0x7) * 25,
(vddmem & (1 << 8)) ? "en" : "dis");
}
/*
* This delay function is intended to be used only in early stage of boot, where
* clock are not set up yet. The timer used here is reset on every boot and
@ -298,36 +348,6 @@ static void mxs_src_power_init(void)
clrbits_le32(&power_regs->hw_power_5vctrl, POWER_5VCTRL_DCDC_XFER);
}
/**
* mxs_power_init_4p2_params() - Configure the parameters of the 4P2 regulator
*
* This function configures the necessary parameters for the 4P2 linear
* regulator to supply the DC-DC converter from 5V input.
*/
static void mxs_power_init_4p2_params(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
/* Setup 4P2 parameters */
clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
POWER_DCDC4P2_CMPTRIP_MASK | POWER_DCDC4P2_TRG_MASK,
POWER_DCDC4P2_TRG_4V2 | (31 << POWER_DCDC4P2_CMPTRIP_OFFSET));
clrsetbits_le32(&power_regs->hw_power_5vctrl,
POWER_5VCTRL_HEADROOM_ADJ_MASK,
0x4 << POWER_5VCTRL_HEADROOM_ADJ_OFFSET);
clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
POWER_DCDC4P2_DROPOUT_CTRL_MASK,
POWER_DCDC4P2_DROPOUT_CTRL_100MV |
POWER_DCDC4P2_DROPOUT_CTRL_SRC_SEL);
clrsetbits_le32(&power_regs->hw_power_5vctrl,
POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK,
0x3f << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
}
/**
* mxs_enable_4p2_dcdc_input() - Enable or disable the DCDC input from 4P2
* @xfer: Select if the input shall be enabled or disabled
@ -431,16 +451,82 @@ static void mxs_enable_4p2_dcdc_input(int xfer)
}
/**
* mxs_power_init_4p2_regulator() - Start the 4P2 regulator
* mxs_power_init_dcdc_4p2_source() - Switch DC-DC converter to 4P2 source
*
* This function enables the 4P2 regulator and switches the DC-DC converter
* to use the 4P2 input.
* This function configures the DC-DC converter to be supplied from the 4P2
* linear regulator.
*/
static void mxs_power_init_4p2_regulator(void)
static void mxs_power_init_dcdc_4p2_source(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
uint32_t tmp, tmp2;
if (!(readl(&power_regs->hw_power_dcdc4p2) &
POWER_DCDC4P2_ENABLE_DCDC)) {
hang();
}
mxs_enable_4p2_dcdc_input(1);
if (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ) {
clrbits_le32(&power_regs->hw_power_dcdc4p2,
POWER_DCDC4P2_ENABLE_DCDC);
writel(POWER_5VCTRL_ENABLE_DCDC,
&power_regs->hw_power_5vctrl_clr);
charger_4p2_disable();
}
}
/**
* mxs_power_enable_4p2() - Power up the 4P2 regulator
*
* This function drives the process of powering up the 4P2 linear regulator
* and switching the DC-DC converter input over to the 4P2 linear regulator.
*/
static void mxs_power_enable_4p2(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
uint32_t vdddctrl, vddactrl, vddioctrl;
uint32_t tmp, tmp2, dropout_ctrl;
vdddctrl = readl(&power_regs->hw_power_vdddctrl);
vddactrl = readl(&power_regs->hw_power_vddactrl);
vddioctrl = readl(&power_regs->hw_power_vddioctrl);
setbits_le32(&power_regs->hw_power_vdddctrl,
POWER_VDDDCTRL_DISABLE_FET | POWER_VDDDCTRL_ENABLE_LINREG |
POWER_VDDDCTRL_PWDN_BRNOUT);
setbits_le32(&power_regs->hw_power_vddactrl,
POWER_VDDACTRL_DISABLE_FET | POWER_VDDACTRL_ENABLE_LINREG |
POWER_VDDACTRL_PWDN_BRNOUT);
setbits_le32(&power_regs->hw_power_vddioctrl,
POWER_VDDIOCTRL_DISABLE_FET | POWER_VDDIOCTRL_PWDN_BRNOUT);
/* Setup 4P2 parameters */
clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
POWER_DCDC4P2_CMPTRIP_MASK | POWER_DCDC4P2_TRG_MASK,
POWER_DCDC4P2_TRG_4V2 | (31 << POWER_DCDC4P2_CMPTRIP_OFFSET));
clrsetbits_le32(&power_regs->hw_power_5vctrl,
POWER_5VCTRL_HEADROOM_ADJ_MASK,
0x4 << POWER_5VCTRL_HEADROOM_ADJ_OFFSET);
if (has_battery || use_battery_input)
dropout_ctrl = POWER_DCDC4P2_DROPOUT_CTRL_SRC_SEL;
else
dropout_ctrl = POWER_DCDC4P2_DROPOUT_CTRL_SRC_4P2;
clrsetbits_le32(&power_regs->hw_power_dcdc4p2,
POWER_DCDC4P2_DROPOUT_CTRL_MASK,
POWER_DCDC4P2_DROPOUT_CTRL_100MV |
dropout_ctrl);
clrsetbits_le32(&power_regs->hw_power_5vctrl,
POWER_5VCTRL_CHARGE_4P2_ILIMIT_MASK,
0x3f << POWER_5VCTRL_CHARGE_4P2_ILIMIT_OFFSET);
setbits_le32(&power_regs->hw_power_dcdc4p2, POWER_DCDC4P2_ENABLE_4P2);
@ -516,65 +602,6 @@ static void mxs_power_init_4p2_regulator(void)
clrbits_le32(&power_regs->hw_power_dcdc4p2, POWER_DCDC4P2_BO_MASK);
writel(POWER_CTRL_DCDC4P2_BO_IRQ, &power_regs->hw_power_ctrl_clr);
}
/**
* mxs_power_init_dcdc_4p2_source() - Switch DC-DC converter to 4P2 source
*
* This function configures the DC-DC converter to be supplied from the 4P2
* linear regulator.
*/
static void mxs_power_init_dcdc_4p2_source(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
if (!(readl(&power_regs->hw_power_dcdc4p2) &
POWER_DCDC4P2_ENABLE_DCDC)) {
hang();
}
mxs_enable_4p2_dcdc_input(1);
if (readl(&power_regs->hw_power_ctrl) & POWER_CTRL_VBUS_VALID_IRQ) {
clrbits_le32(&power_regs->hw_power_dcdc4p2,
POWER_DCDC4P2_ENABLE_DCDC);
writel(POWER_5VCTRL_ENABLE_DCDC,
&power_regs->hw_power_5vctrl_clr);
charger_4p2_disable();
}
}
/**
* mxs_power_enable_4p2() - Power up the 4P2 regulator
*
* This function drives the process of powering up the 4P2 linear regulator
* and switching the DC-DC converter input over to the 4P2 linear regulator.
*/
static void mxs_power_enable_4p2(void)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
uint32_t vdddctrl, vddactrl, vddioctrl;
uint32_t tmp;
vdddctrl = readl(&power_regs->hw_power_vdddctrl);
vddactrl = readl(&power_regs->hw_power_vddactrl);
vddioctrl = readl(&power_regs->hw_power_vddioctrl);
setbits_le32(&power_regs->hw_power_vdddctrl,
POWER_VDDDCTRL_DISABLE_FET | POWER_VDDDCTRL_ENABLE_LINREG |
POWER_VDDDCTRL_PWDN_BRNOUT);
setbits_le32(&power_regs->hw_power_vddactrl,
POWER_VDDACTRL_DISABLE_FET | POWER_VDDACTRL_ENABLE_LINREG |
POWER_VDDACTRL_PWDN_BRNOUT);
setbits_le32(&power_regs->hw_power_vddioctrl,
POWER_VDDIOCTRL_DISABLE_FET | POWER_VDDIOCTRL_PWDN_BRNOUT);
mxs_power_init_4p2_params();
mxs_power_init_4p2_regulator();
/* Shutdown battery (none present) */
if (!mxs_is_batt_ready()) {
@ -1021,6 +1048,19 @@ static const struct mxs_vddx_cfg mxs_vddmem_cfg = {
.bo_offset_offset = 0,
};
static const struct mxs_vddx_cfg mxs_vdda_cfg = {
.reg = &(((struct mxs_power_regs *)IMX_POWER_BASE)->
hw_power_vddactrl),
.step_mV = 25,
.lowest_mV = 1500,
.powered_by_linreg = NULL,
.trg_mask = POWER_VDDACTRL_TRG_MASK,
.bo_irq = POWER_CTRL_VDDA_BO_IRQ,
.bo_enirq = POWER_CTRL_ENIRQ_VDDA_BO,
.bo_offset_mask = POWER_VDDACTRL_BO_OFFSET_MASK,
.bo_offset_offset = POWER_VDDACTRL_BO_OFFSET_OFFSET,
};
/**
* mxs_power_set_vddx() - Configure voltage on DC-DC converter rail
* @cfg: Configuration data of the DC-DC converter rail
@ -1143,11 +1183,16 @@ static void mx23_ungate_power(void)
* This function calls all the power block initialization functions in
* proper sequence to start the power block.
*/
static void __mx23_power_init(int has_battery)
void mx23_power_init(int __has_battery, int __use_battery_input,
int __use_5v_input)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
has_battery = __has_battery;
use_battery_input = __use_battery_input;
use_5v_input = __use_5v_input;
mx23_ungate_power();
mxs_power_clock2xtal();
@ -1161,8 +1206,10 @@ static void __mx23_power_init(int has_battery)
if (has_battery)
mxs_power_configure_power_source();
else
else if (use_battery_input)
mxs_enable_battery_input();
else if (use_5v_input)
mxs_boot_valid_5v();
mxs_power_clock2pll();
@ -1177,8 +1224,9 @@ static void __mx23_power_init(int has_battery)
mxs_enable_output_rail_protection();
mxs_power_set_vddx(&mx23_vddio_cfg, 3300, 3150);
mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1000);
mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1325);
mxs_power_set_vddx(&mxs_vddmem_cfg, 2500, 1700);
mxs_power_set_vddx(&mxs_vdda_cfg, 1800, 1650);
writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
POWER_CTRL_VDDIO_BO_IRQ | POWER_CTRL_VDD5V_DROOP_IRQ |
@ -1190,27 +1238,23 @@ static void __mx23_power_init(int has_battery)
mxs_early_delay(1000);
}
void mx23_power_init(void)
{
__mx23_power_init(1);
}
void mx23_power_init_battery_input(void)
{
__mx23_power_init(0);
}
/**
* mx28_power_init() - The power block init main function
*
* This function calls all the power block initialization functions in
* proper sequence to start the power block.
*/
static void __mx28_power_init(int has_battery)
void mx28_power_init(int __has_battery, int __use_battery_input,
int __use_5v_input)
{
struct mxs_power_regs *power_regs =
(struct mxs_power_regs *)IMX_POWER_BASE;
has_battery = __has_battery;
use_battery_input = __use_battery_input;
use_5v_input = __use_5v_input;
mxs_power_status();
mxs_power_clock2xtal();
mxs_power_set_auto_restart();
mxs_power_set_linreg();
@ -1222,8 +1266,10 @@ static void __mx28_power_init(int has_battery)
if (has_battery)
mxs_power_configure_power_source();
else
else if (use_battery_input)
mxs_enable_battery_input();
else if (use_5v_input)
mxs_boot_valid_5v();
mxs_power_clock2pll();
@ -1234,7 +1280,8 @@ static void __mx28_power_init(int has_battery)
mxs_enable_output_rail_protection();
mxs_power_set_vddx(&mx28_vddio_cfg, 3300, 3150);
mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1000);
mxs_power_set_vddx(&mxs_vddd_cfg, 1500, 1325);
mxs_power_set_vddx(&mxs_vdda_cfg, 1800, 1650);
writel(POWER_CTRL_VDDD_BO_IRQ | POWER_CTRL_VDDA_BO_IRQ |
POWER_CTRL_VDDIO_BO_IRQ | POWER_CTRL_VDD5V_DROOP_IRQ |
@ -1244,16 +1291,8 @@ static void __mx28_power_init(int has_battery)
writel(POWER_5VCTRL_PWDN_5VBRNOUT, &power_regs->hw_power_5vctrl_set);
mxs_early_delay(1000);
}
void mx28_power_init(void)
{
__mx28_power_init(1);
}
void mx28_power_init_battery_input(void)
{
__mx28_power_init(0);
mxs_power_status();
}
/**

6
arch/arm/mach-mxs/soc-imx23.c
View File

@ -38,8 +38,14 @@ EXPORT_SYMBOL(reset_cpu);
static int imx23_devices_init(void)
{
if (of_get_root_node())
return 0;
add_generic_device("imx23-dma-apbh", 0, NULL, MXS_APBH_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx23-clkctrl", 0, NULL, IMX_CCM_BASE, 0x100, IORESOURCE_MEM, NULL);
add_generic_device("imx23-gpio", 0, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx23-gpio", 1, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx23-gpio", 2, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
return 0;
}

9
arch/arm/mach-mxs/soc-imx28.c
View File

@ -56,8 +56,17 @@ postcore_initcall(imx28_init);
static int imx28_devices_init(void)
{
if (of_get_root_node())
return 0;
add_generic_device("imx28-dma-apbh", 0, NULL, MXS_APBH_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx28-clkctrl", 0, NULL, IMX_CCM_BASE, 0x100, IORESOURCE_MEM, NULL);
add_generic_device("imx28-gpio", 0, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx28-gpio", 1, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx28-gpio", 2, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx28-gpio", 3, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("imx28-gpio", 4, NULL, IMX_IOMUXC_BASE, 0x2000, IORESOURCE_MEM, NULL);
add_generic_device("ocotp", 0, NULL, IMX_OCOTP_BASE, 0x2000, IORESOURCE_MEM, NULL);
return 0;
}

1
common/Makefile
View File

@ -1,5 +1,6 @@
obj-y += memory.o
obj-y += memory_display.o
pbl-$(CONFIG_PBL_CONSOLE) += memory_display.o
obj-y += clock.o
obj-y += console_common.o
obj-y += startup.o

3
drivers/gpio/Kconfig
View File

@ -41,6 +41,9 @@ config GPIO_GENERIC_PLATFORM
config GPIO_IMX
def_bool ARCH_IMX
config GPIO_MXS
def_bool ARCH_MXS
config GPIO_JZ4740
bool "GPIO support for Ingenic SoCs"
depends on MACH_MIPS_XBURST

1
drivers/gpio/Makefile
View File

@ -6,6 +6,7 @@ obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o
obj-$(CONFIG_GPIO_DIGIC) += gpio-digic.o
obj-$(CONFIG_GPIO_GENERIC) += gpio-generic.o
obj-$(CONFIG_GPIO_IMX) += gpio-imx.o
obj-$(CONFIG_GPIO_MXS) += gpio-mxs.o
obj-$(CONFIG_GPIO_JZ4740) += gpio-jz4740.o
obj-$(CONFIG_GPIO_MALTA_FPGA_I2C) += gpio-malta-fpga-i2c.o
obj-$(CONFIG_GPIO_ORION) += gpio-orion.o

186
drivers/gpio/gpio-mxs.c Normal file
View File

@ -0,0 +1,186 @@
/*
* Freescale MXS gpio support
*
* 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 <errno.h>
#include <io.h>
#include <of.h>
#include <gpio.h>
#include <init.h>
#include <stmp-device.h>
#include <linux/err.h>
struct mxs_gpio_chip {
void __iomem *base;
void __iomem *din;
void __iomem *doe;
void __iomem *dout;
struct gpio_chip chip;
struct mxs_gpio_regs *regs;
};
struct mxs_gpio_regs {
unsigned int din;
unsigned int doe;
unsigned int dout;
};
static struct mxs_gpio_regs regs_mxs23 = {
.din = 0x0600,
.dout = 0x0500,
.doe = 0x0700,
};
static struct mxs_gpio_regs regs_mxs28 = {
.din = 0x0900,
.dout = 0x0700,
.doe = 0x0b00,
};
static void mxs_gpio_set_value(struct gpio_chip *chip, unsigned gpio, int value)
{
struct mxs_gpio_chip *mxsgpio = container_of(chip, struct mxs_gpio_chip, chip);
if (value)
writel(0x1 << gpio, mxsgpio->dout + STMP_OFFSET_REG_SET);
else
writel(0x1 << gpio, mxsgpio->dout + STMP_OFFSET_REG_CLR);
}
static int mxs_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
{
struct mxs_gpio_chip *mxsgpio = container_of(chip, struct mxs_gpio_chip, chip);
writel(0x1 << gpio, mxsgpio->doe + STMP_OFFSET_REG_CLR);
return 0;
}
static int mxs_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, int value)
{
struct mxs_gpio_chip *mxsgpio = container_of(chip, struct mxs_gpio_chip, chip);
mxs_gpio_set_value(chip, gpio, value);
writel(0x1 << gpio, mxsgpio->doe + STMP_OFFSET_REG_SET);
return 0;
}
static int mxs_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
{
struct mxs_gpio_chip *mxsgpio = container_of(chip, struct mxs_gpio_chip, chip);
if (readl(mxsgpio->din) & (1 << gpio))
return 1;
else
return 0;
}
static int mxs_get_direction(struct gpio_chip *chip, unsigned gpio)
{
struct mxs_gpio_chip *mxsgpio = container_of(chip, struct mxs_gpio_chip, chip);
if (readl(mxsgpio->doe) & (1 << gpio))
return GPIOF_DIR_OUT;
else
return GPIOF_DIR_IN;
}
static struct gpio_ops mxs_gpio_ops = {
.direction_input = mxs_gpio_direction_input,
.direction_output = mxs_gpio_direction_output,
.get = mxs_gpio_get_value,
.set = mxs_gpio_set_value,
.get_direction = mxs_get_direction,
};
static int mxs_gpio_probe(struct device_d *dev)
{
struct mxs_gpio_chip *mxsgpio;
struct mxs_gpio_regs *regs;
int ret, id;
ret = dev_get_drvdata(dev, (unsigned long *)&regs);
if (ret)
return ret;
mxsgpio = xzalloc(sizeof(*mxsgpio));
mxsgpio->chip.ops = &mxs_gpio_ops;
if (dev->id < 0) {
id = of_alias_get_id(dev->device_node, "gpio");
if (id < 0)
return id;
mxsgpio->base = dev_get_mem_region(dev->parent, 0);
mxsgpio->chip.base = id * 32;
} else {
id = dev->id;
mxsgpio->base = dev_get_mem_region(dev, 0);
mxsgpio->chip.base = dev->id * 32;
}
if (IS_ERR(mxsgpio->base))
return PTR_ERR(mxsgpio->base);
mxsgpio->doe = mxsgpio->base + regs->doe + id * 0x10;
mxsgpio->dout = mxsgpio->base + regs->dout + id * 0x10;
mxsgpio->din = mxsgpio->base + regs->din + id * 0x10;
mxsgpio->chip.ngpio = 32;
mxsgpio->chip.dev = dev;
mxsgpio->regs = regs;
gpiochip_add(&mxsgpio->chip);
dev_dbg(dev, "probed gpiochip%d with base %d\n", dev->id, mxsgpio->chip.base);
return 0;
}
static __maybe_unused struct of_device_id mxs_gpio_dt_ids[] = {
{
.compatible = "fsl,imx23-gpio",
.data = (unsigned long)&regs_mxs23,
}, {
.compatible = "fsl,imx28-gpio",
.data = (unsigned long)&regs_mxs28,
}, {
/* sentinel */
}
};
static struct platform_device_id mxs_gpio_ids[] = {
{
.name = "imx23-gpio",
.driver_data = (unsigned long)&regs_mxs23,
}, {
.name = "imx28-gpio",
.driver_data = (unsigned long)&regs_mxs28,
}, {
/* sentinel */
},
};
static struct driver_d mxs_gpio_driver = {
.name = "gpio-mxs",
.probe = mxs_gpio_probe,
.of_compatible = DRV_OF_COMPAT(mxs_gpio_dt_ids),
.id_table = mxs_gpio_ids,
};
static int mxs_gpio_add(void)
{
platform_driver_register(&mxs_gpio_driver);
return 0;
}
core_initcall(mxs_gpio_add);

50
drivers/mci/mxs.c
View File

@ -549,11 +549,6 @@ static int mxs_mci_probe(struct device_d *hw_dev)
struct mci_host *host;
unsigned long rate;
if (hw_dev->platform_data == NULL) {
dev_err(hw_dev, "Missing platform data\n");
return -EINVAL;
}
mxs_mci = xzalloc(sizeof(*mxs_mci));
host = &mxs_mci->host;
@ -567,9 +562,16 @@ static int mxs_mci_probe(struct device_d *hw_dev)
return PTR_ERR(mxs_mci->regs);
/* feed forward the platform specific values */
host->voltages = pd->voltages;
host->host_caps = pd->caps;
host->devname = pd->devname;
if (pd) {
host->voltages = pd->voltages;
host->host_caps = pd->caps;
host->devname = pd->devname;
host->f_min = pd->f_min;
host->f_max = pd->f_max;
} else {
host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34, /* fixed to 3.3 V */
mci_of_parse(host);
}
mxs_mci->clk = clk_get(hw_dev, NULL);
if (IS_ERR(mxs_mci->clk))
@ -579,22 +581,13 @@ static int mxs_mci_probe(struct device_d *hw_dev)
rate = clk_get_rate(mxs_mci->clk);
if (pd->f_min == 0) {
host->f_min = rate / 254 / 256;
dev_dbg(hw_dev, "Min. frequency is %u Hz\n", host->f_min);
} else {
host->f_min = pd->f_min;
dev_dbg(hw_dev, "Min. frequency is %u Hz, could be %lu Hz\n",
host->f_min, rate / 254 / 256);
}
if (pd->f_max == 0) {
if (host->f_min < 400000)
host->f_min = 400000;
if (host->f_max == 0)
host->f_max = rate / 2 / 1;
dev_dbg(hw_dev, "Max. frequency is %u Hz\n", host->f_max);
} else {
host->f_max = pd->f_max;
dev_dbg(hw_dev, "Max. frequency is %u Hz, could be %lu Hz\n",
host->f_max, rate / 2 / 1);
}
dev_dbg(hw_dev, "Max. frequency is %u Hz\n", host->f_max);
dev_dbg(hw_dev, "Min. frequency is %u Hz\n", host->f_min);
if (IS_ENABLED(CONFIG_MCI_INFO)) {
mxs_mci->f_min = host->f_min;
@ -605,8 +598,19 @@ static int mxs_mci_probe(struct device_d *hw_dev)
return mci_register(host);
}
static __maybe_unused struct of_device_id mxs_mmc_compatible[] = {
{
.compatible = "fsl,imx23-mmc",
}, {
.compatible = "fsl,imx28-mmc",
}, {
/* sentinel */
}
};
static struct driver_d mxs_mci_driver = {
.name = "mxs_mci",
.probe = mxs_mci_probe,
.of_compatible = DRV_OF_COMPAT(mxs_mmc_compatible),
};
device_platform_driver(mxs_mci_driver);

4
drivers/of/platform.c
View File

@ -312,8 +312,8 @@ static int of_platform_bus_create(struct device_node *bus,
}
if (of_device_is_compatible(bus, "arm,primecell")) {
of_amba_device_create(bus);
return 0;
if (of_amba_device_create(bus))
return 0;
}
dev = of_platform_device_create(bus, parent);

7
drivers/pinctrl/Kconfig
View File

@ -37,6 +37,13 @@ comment "OFDEVICE is not enabled."
comment "Without device tree support PINCTRL won't do anything"
endif
config PINCTRL_MXS
bool "MXS pinctrl"
depends on ARCH_MXS
default ARCH_MXS
help
This pinmux controller is found on i.MX23,28
config PINCTRL_ROCKCHIP
select GPIO_GENERIC
select MFD_SYSCON

1
drivers/pinctrl/Makefile
View File

@ -3,6 +3,7 @@ obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o
obj-$(CONFIG_PINCTRL_IMX_IOMUX_V1) += imx-iomux-v1.o
obj-$(CONFIG_PINCTRL_IMX_IOMUX_V2) += imx-iomux-v2.o
obj-$(CONFIG_PINCTRL_IMX_IOMUX_V3) += imx-iomux-v3.o
obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o
obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
obj-$(CONFIG_PINCTRL_TEGRA20) += pinctrl-tegra20.o

171
drivers/pinctrl/pinctrl-mxs.c Normal file
View File

@ -0,0 +1,171 @@
/*
* pinctrl-mxs.c - MXS pinctrl support
*
* Copyright (c) 2015 Sascha Hauer <s.hauer@pengutronix.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 version 2
* as published by the Free Software Foundation.
*
* 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 <io.h>
#include <of.h>
#include <pinctrl.h>
#include <malloc.h>
#include <stmp-device.h>
struct mxs_pinctrl {
void __iomem *base;
struct pinctrl_device pinctrl;
};
#define PINID(bank, pin) ((bank) * 32 + (pin))
#define MUXID_TO_PINID(m) PINID((m) >> 12 & 0xf, (m) >> 4 & 0xff)
#define MUXID_TO_MUXSEL(m) ((m) & 0xf)
#define PINID_TO_BANK(p) ((p) >> 5)
#define PINID_TO_PIN(p) ((p) % 32)
static int mxs_pinctrl_set_state(struct pinctrl_device *pdev, struct device_node *np)
{
struct mxs_pinctrl *iomux = container_of(pdev, struct mxs_pinctrl, pinctrl);
const __be32 *list;
int npins, size, i;
u32 val, ma, vol, pull;
int ret;
int ma_present = 0, vol_present = 0, pull_present = 0;
dev_dbg(iomux->pinctrl.dev, "set state: %s\n", np->full_name);
list = of_get_property(np, "fsl,pinmux-ids", &size);
if (!list)
return -EINVAL;
if (!size || size % 4) {
dev_err(iomux->pinctrl.dev, "Invalid fsl,pins property in %s\n",
np->full_name);
return -EINVAL;
}
npins = size / 4;
ret = of_property_read_u32(np, "fsl,drive-strength", &ma);
if (!ret)
ma_present = 1;
ret = of_property_read_u32(np, "fsl,voltage", &vol);
if (!ret)
vol_present = 1;
ret = of_property_read_u32(np, "fsl,pull-up", &pull);
if (!ret)
pull_present = 1;
for (i = 0; i < npins; i++) {
int muxsel, pinid, bank, pin, shift;
void __iomem *reg;
val = be32_to_cpu(*list++);
muxsel = MUXID_TO_MUXSEL(val);
pinid = MUXID_TO_PINID(val);
bank = PINID_TO_BANK(pinid);
pin = PINID_TO_PIN(pinid);
reg = iomux->base + 0x100;
reg += bank * 0x20 + pin / 16 * 0x10;
shift = pin % 16 * 2;
writel(0x3 << shift, reg + STMP_OFFSET_REG_CLR);
writel(muxsel << shift, reg + STMP_OFFSET_REG_SET);
dev_dbg(iomux->pinctrl.dev, "pin %d, mux %d, ma: %d, vol: %d, pull: %d\n",
pinid, muxsel, ma, vol, pull);
/* drive */
reg = iomux->base + 0x300;
reg += bank * 0x40 + pin / 8 * 0x10;
/* mA */
if (ma_present) {
shift = pin % 8 * 4;
writel(0x3 << shift, reg + STMP_OFFSET_REG_CLR);
writel(ma << shift, reg + STMP_OFFSET_REG_SET);
}
/* vol */
if (vol_present) {
shift = pin % 8 * 4 + 2;
if (vol)
writel(1 << shift, reg + STMP_OFFSET_REG_SET);
else
writel(1 << shift, reg + STMP_OFFSET_REG_CLR);
}
/* pull */
if (pull_present) {
reg = iomux->base + 0x600;
reg += bank * 0x10;
shift = pin;
if (pull)
writel(1 << shift, reg + STMP_OFFSET_REG_SET);
else
writel(1 << shift, reg + STMP_OFFSET_REG_CLR);
}
}
return 0;
}
static struct pinctrl_ops mxs_pinctrl_ops = {
.set_state = mxs_pinctrl_set_state,
};
static int mxs_pinctrl_probe(struct device_d *dev)
{
struct mxs_pinctrl *iomux;
int ret = 0;
iomux = xzalloc(sizeof(*iomux));
iomux->base = dev_get_mem_region(dev, 0);
iomux->pinctrl.dev = dev;
iomux->pinctrl.ops = &mxs_pinctrl_ops;
ret = pinctrl_register(&iomux->pinctrl);
if (ret)
free(iomux);
return ret;
}
static __maybe_unused struct of_device_id mxs_pinctrl_dt_ids[] = {
{
.compatible = "fsl,imx28-pinctrl",
}, {
/* sentinel */
}
};
static struct driver_d mxs_pinctrl_driver = {
.name = "mxs-pinctrl",
.probe = mxs_pinctrl_probe,
.of_compatible = DRV_OF_COMPAT(mxs_pinctrl_dt_ids),
};
static int mxs_pinctrl_init(void)
{
return platform_driver_register(&mxs_pinctrl_driver);
}
postcore_initcall(mxs_pinctrl_init);

9
drivers/serial/stm-serial.c
View File

@ -189,9 +189,18 @@ static void stm_serial_remove(struct device_d *dev)
free(priv);
}
static __maybe_unused struct of_device_id stm_serial_dt_ids[] = {
{
.compatible = "arm,pl011",
}, {
/* sentinel */
}
};
static struct driver_d stm_serial_driver = {
.name = "stm_serial",
.probe = stm_serial_probe,
.remove = stm_serial_remove,
.of_compatible = DRV_OF_COMPAT(stm_serial_dt_ids),
};
console_platform_driver(stm_serial_driver);

20
images/Makefile.mxs
View File

@ -22,6 +22,16 @@ board = $(srctree)/arch/$(ARCH)/boards
mxs23cfg = $(srctree)/arch/arm/mach-mxs/mxs23img.cfg
mxs28cfg = $(srctree)/arch/arm/mach-mxs/mxs28img.cfg
pblx-$(CONFIG_MACH_DUCKBILL) += start_barebox_duckbill prep_start_barebox_duckbill
PREP_start_barebox_duckbill.pblx.mxsbs = start_barebox_duckbill_prep
CFG_start_barebox_duckbill.mxsbs = $(mxs28cfg)
FILE_barebox-duckbill-bootstream.img = start_barebox_duckbill.mxsbs
image-$(CONFIG_MACH_DUCKBILL) += barebox-duckbill-bootstream.img
FILE_barebox-duckbill-sd.img = start_barebox_duckbill.mxsbs.mxssd
image-$(CONFIG_MACH_DUCKBILL) += barebox-duckbill-sd.img
FILE_barebox-duckbill-2nd.img = start_barebox_duckbill.pblx
image-$(CONFIG_MACH_DUCKBILL) += barebox-duckbill-2nd.img
pblx-$(CONFIG_MACH_TX28) += start_barebox_karo_tx28 prep_start_barebox_karo_tx28
PREP_start_barebox_karo_tx28.pblx.mxsbs = start_barebox_karo_tx28_prep
CFG_start_barebox_karo_tx28.mxsbs = $(mxs28cfg)
@ -32,6 +42,16 @@ image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-sd.img
FILE_barebox-karo-tx28-2nd.img = start_barebox_karo_tx28.pblx
image-$(CONFIG_MACH_TX28) += barebox-karo-tx28-2nd.img
pblx-$(CONFIG_MACH_MX28EVK) += start_barebox_freescale_mx28evk prep_start_barebox_freescale_mx28evk
PREP_start_barebox_freescale_mx28evk.pblx.mxsbs = start_barebox_freescale_mx28evk_prep
CFG_start_barebox_freescale_mx28evk.mxsbs = $(mxs28cfg)
FILE_barebox-freescale-mx28evk-bootstream.img = start_barebox_freescale_mx28evk.mxsbs
image-$(CONFIG_MACH_MX28EVK) += barebox-freescale-mx28evk-bootstream.img
FILE_barebox-freescale-mx28evk-sd.img = start_barebox_freescale_mx28evk.mxsbs.mxssd
image-$(CONFIG_MACH_MX28EVK) += barebox-freescale-mx28evk-sd.img
FILE_barebox-freescale-mx28evk-2nd.img = start_barebox_freescale_mx28evk.pblx
image-$(CONFIG_MACH_MX28EVK) += barebox-freescale-mx28evk-2nd.img
pblx-$(CONFIG_MACH_IMX233_OLINUXINO) += start_barebox_olinuxino_imx23 prep_start_barebox_olinuxino_imx23
PREP_start_barebox_olinuxino_imx23.pblx.mxsbs = start_barebox_olinuxino_imx23_prep;
CFG_start_barebox_olinuxino_imx23.mxsbs = $(mxs23cfg)

10
pbl/console.c
View File

@ -30,3 +30,13 @@ int pr_print(int level, const char *fmt, ...)
return i;
}
int ctrlc(void)
{
return 0;
}
void console_putc(unsigned int ch, char c)
{
putc_ll(c);
}