Compare commits
No commits in common. "2016.05-am335x-netmodule" and "develop-cpu-wdt-reset-reason" have entirely different histories.
2016.05-am
...
develop-cp
|
|
@ -57,7 +57,6 @@
|
|||
#define PMIC_LDOx_CONF_MASK 0x80
|
||||
|
||||
#define PMIC_REG_ID_4_3 0x84
|
||||
#define PMIC_REG_ID_6_5 0x85
|
||||
|
||||
#define PMIC_REG_BUCK_ILIM_A 0x9A
|
||||
#define PMIC_REG_BUCK_ILIM_B 0x9B
|
||||
|
|
|
|||
|
|
@ -1304,13 +1304,13 @@ static void ft_dio(void *blob)
|
|||
ft_enable_node(blob, "/netbox_dio_2in_1out");
|
||||
|
||||
/* OEM Linux gpios -> remove IOs not present */
|
||||
ft_set_gpio_name(blob, "gpio0", 27, ""); /* gpio0_27: IO_OUT1n */
|
||||
ft_set_gpio_name(blob, "gpio1", 14, ""); /* gpio1_14: IO_IN2 */
|
||||
ft_set_gpio_name(blob, "gpio1", 15, ""); /* gpio1_15: IO_IN3 */
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@44e07000", 27, ""); /* gpio0_27: IO_OUT1n */
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@4804c000", 14, ""); /* gpio1_14: IO_IN2 */
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@4804c000", 15, ""); /* gpio1_15: IO_IN3 */
|
||||
|
||||
/* pmic_gpios: 5: IO_IN2_WAKE3n, 6: IO_IN2_WAKE3n */
|
||||
ft_set_gpio_name(blob, "pmic_gpios", 5, "");
|
||||
ft_set_gpio_name(blob, "pmic_gpios", 6, "");
|
||||
ft_set_gpio_name(blob, "/ocp/i2c@44e0b000/da9063@58/gpio", 5, "");
|
||||
ft_set_gpio_name(blob, "/ocp/i2c@44e0b000/da9063@58/gpio", 6, "");
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -1321,12 +1321,13 @@ static void ft_dio(void *blob)
|
|||
static void ft_tty(void *blob)
|
||||
{
|
||||
if (hw_has_tty) {
|
||||
ft_enable_node(blob, "serial5");
|
||||
/* TODO: Should use alias uart5 */
|
||||
ft_enable_node(blob, "/ocp/serial@481aa000");
|
||||
}
|
||||
else {
|
||||
/* OEM Linux gpios -> remove IOs not present */
|
||||
ft_set_gpio_name(blob, "gpio0", 22, ""); /* gpio0_22: SEL_RS232_RS485n */
|
||||
ft_set_gpio_name(blob, "gpio0", 23, ""); /* gpio0_23: RS485_TERM_ENn */
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@44e07000", 22, ""); /* gpio0_22: SEL_RS232_RS485n */
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@44e07000", 23, ""); /* gpio0_23: RS485_TERM_ENn */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -48,13 +48,10 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
/*
|
||||
* CPU GPIOs
|
||||
*
|
||||
* (C15) GPIO0_6: MB_LED_PWM
|
||||
* (V2) GPIO0_8: RS232_485n_SEL (V3.2)
|
||||
* (V3) GPIO0_9: RS485_DE (V3.2)
|
||||
* (J18) GPIO0_16: ETH_SW_RST~ (V2.0)
|
||||
* (K15) GPIO0_17: CTRL.INT~
|
||||
* (T10) GPIO0_23: CAN_TERM1~ (V1.0)
|
||||
* (T17) GPIO0_30: LED0.GN (<V3.2 only)
|
||||
* (T17) GPIO0_30: LED0.RD
|
||||
*
|
||||
* (T12) GPIO1_12: SIM_SW
|
||||
* (V13) GPIO1_14: GNSS_RST~
|
||||
|
|
@ -62,12 +59,11 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
* (R14) GPIO1_20: BT_EN
|
||||
* (V15) GPIO1_21: GSM_PWR_EN
|
||||
* (U15) GPIO1_22: LED1.RD
|
||||
* (T15) GPIO1_23: LED0.GN (V3.2)
|
||||
* (V16) GPIO1_24: LED1.GN
|
||||
* (U16) GPIO1_25: RST_GSM
|
||||
* (T16) GPIO1_26: WLAN_EN
|
||||
* (V17) GPIO1_27: WLAN_IRQ
|
||||
* (U18) GPIO1_28: LED0.RD
|
||||
* (U18) GPIO1_28: LED0.GN
|
||||
*
|
||||
* (U3) GPIO2_16: TIMEPULSE~ (HW26)
|
||||
* (R6) GPIO2_25: RST_ETH~
|
||||
|
|
@ -81,9 +77,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
|
||||
#define GPIO_TO_PIN(bank, gpio) (32 * (bank) + (gpio))
|
||||
|
||||
#define GPIO_LED_PWM_V32 GPIO_TO_PIN(0, 6) /* V3.2 LED brightness */
|
||||
#define GPIO_LED0_GREEN GPIO_TO_PIN(0, 30) /* <V3.2 */
|
||||
#define GPIO_LED0_GREEN_V32 GPIO_TO_PIN(1, 23) /* V3.2 */
|
||||
#define GPIO_LED0_GREEN GPIO_TO_PIN(0, 30)
|
||||
#define GPIO_LED0_RED GPIO_TO_PIN(1, 28)
|
||||
#define GPIO_LED1_GREEN GPIO_TO_PIN(1, 24)
|
||||
#define GPIO_LED1_RED GPIO_TO_PIN(1, 22)
|
||||
|
|
@ -113,8 +107,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
|
||||
#define GPIO_UART2_RX GPIO_TO_PIN(0, 2) /* UART Rx Pin as GPIO */
|
||||
|
||||
#define GPIO_RS232_RS485n_SEL GPIO_TO_PIN(0, 8)
|
||||
#define GPIO_RS485_DE GPIO_TO_PIN(0, 9)
|
||||
|
||||
/*
|
||||
* PMIC GPIOs
|
||||
|
|
@ -150,13 +142,6 @@ DECLARE_GLOBAL_DATA_PTR;
|
|||
#error Recovery boot time must be larger than factory reset + 1 second
|
||||
#endif
|
||||
|
||||
/*
|
||||
* CPU Reset Reason
|
||||
*/
|
||||
|
||||
#define CPU_GLOBAL_COLD_RST 0x01
|
||||
#define CPU_GLOBAL_WARM_SW_RST 0x02
|
||||
#define CPU_WDT1_RESET 0x10
|
||||
|
||||
|
||||
#if !defined(CONFIG_SPL_BUILD)
|
||||
|
|
@ -168,8 +153,6 @@ static int hw_type = -1;
|
|||
static char hw_variant_name[64];
|
||||
#else
|
||||
static int hw_type = -1;
|
||||
static int hw_ver = -1;
|
||||
static int hw_rev = -1;
|
||||
static uint32_t sys_start_event = 0x0;
|
||||
#endif
|
||||
|
||||
|
|
@ -230,24 +213,10 @@ err_free_gpio:
|
|||
#define REQUEST_AND_CLEAR_GPIO(N) request_and_set_gpio(N, #N, 0);
|
||||
|
||||
|
||||
static bool is_v32_or_newer(void)
|
||||
{
|
||||
int full_ver = hw_ver*256 + hw_rev;
|
||||
bool res = full_ver >= 0x0302;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
static void init_leds(void)
|
||||
{
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED0_RED);
|
||||
if (is_v32_or_newer()) {
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED_PWM_V32);
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED0_GREEN_V32);
|
||||
}
|
||||
else {
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED0_GREEN);
|
||||
}
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED0_GREEN);
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED1_RED);
|
||||
REQUEST_AND_SET_GPIO(GPIO_LED1_GREEN);
|
||||
}
|
||||
|
|
@ -255,12 +224,7 @@ static void init_leds(void)
|
|||
static void set_status_led(int red, int green)
|
||||
{
|
||||
gpio_set_value(GPIO_LED0_RED, red);
|
||||
if (is_v32_or_newer()) {
|
||||
gpio_set_value(GPIO_LED0_GREEN_V32, green);
|
||||
}
|
||||
else {
|
||||
gpio_set_value(GPIO_LED0_GREEN, green);
|
||||
}
|
||||
gpio_set_value(GPIO_LED0_GREEN, green);
|
||||
}
|
||||
|
||||
static void set_indicator_led(int red, int green)
|
||||
|
|
@ -454,26 +418,6 @@ static void pmic_disable_auto_mode(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void pmic_gnss_pwr_sequence(void)
|
||||
{
|
||||
int rc;
|
||||
uint8_t val;
|
||||
|
||||
/*
|
||||
* GNSS 3.3V needs to start at same time as board 3.3V.
|
||||
* Modify LDO6 configuration accordingly if not already done.
|
||||
*/
|
||||
rc = da9063_get_reg(PMIC_REG_ID_6_5, &val);
|
||||
if (!rc && (val != 0x20)) {
|
||||
(void)da9063_set_reg(PMIC_REG_ID_6_5, 0x20); /* Add LDO6 to sequencer, slot 2 */
|
||||
(void)da9063_set_reg(PMIC_REG_CONFIG_G, 0x64); /* LDO6 automatic enable control by sequencer */
|
||||
}
|
||||
|
||||
/* Enable +3V3_GNSS (LDO6) */
|
||||
(void)da9063_set_reg(PMIC_REG_LDO6_CONT, PMIC_LDOx_EN_MASK);
|
||||
mdelay(2);
|
||||
}
|
||||
|
||||
static void init_pmic_spl(void)
|
||||
{
|
||||
int bus;
|
||||
|
|
@ -491,7 +435,9 @@ static void init_pmic_spl(void)
|
|||
pmic_disable_auto_mode();
|
||||
}
|
||||
|
||||
pmic_gnss_pwr_sequence();
|
||||
/* Enable +3V3_GNSS (LDO6) */
|
||||
(void)da9063_set_reg(PMIC_REG_LDO6_CONT, PMIC_LDOx_EN_MASK);
|
||||
mdelay(2);
|
||||
|
||||
/* Enable +5V_CAN (LDO11 Switch) */
|
||||
(void)da9063_set_reg(PMIC_REG_LDO11_CONT, PMIC_LDOx_EN_MASK);
|
||||
|
|
@ -523,7 +469,6 @@ static void check_reset_reason(unsigned int reset_reason_shm_location)
|
|||
volatile struct reset_registers* reset_regs = (struct reset_registers*)reset_reason_shm_location;
|
||||
uint32_t start_reason = 0;
|
||||
uint32_t reset_reason = 0;
|
||||
uint32_t cpu_reset_reason = 0;
|
||||
uint8_t state = 0x00;
|
||||
int bus;
|
||||
int ret;
|
||||
|
|
@ -562,18 +507,13 @@ static void check_reset_reason(unsigned int reset_reason_shm_location)
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Check CPU reset reason register as the device can be reset
|
||||
* by a CPU watchdog
|
||||
*/
|
||||
cpu_reset_reason = readl(PRM_RSTST);
|
||||
if (cpu_reset_reason & CPU_WDT1_RESET) {
|
||||
/* CPU reset reason -> PRM_RSTST ; watchdog reset = 0x00000010*/
|
||||
int cpu_reset_reason = readl(PRM_RSTST);
|
||||
if (cpu_reset_reason & 0x10) {
|
||||
start_reason |= SR_WATCHDOG;
|
||||
}
|
||||
|
||||
/* clear the CPU reset reason register */
|
||||
writel((CPU_WDT1_RESET | CPU_GLOBAL_COLD_RST | CPU_GLOBAL_WARM_SW_RST), PRM_RSTST);
|
||||
|
||||
/* reset the reset reason register */
|
||||
writel(0x13, PRM_RSTST);
|
||||
|
||||
/*
|
||||
* Check Wakeup Events
|
||||
|
|
@ -781,8 +721,6 @@ static void init_bd_spl(void)
|
|||
if (read_eeprom() >= 0) {
|
||||
int hw_type_from_bd = -1;
|
||||
|
||||
bd_get_hw_version(&hw_ver, &hw_rev);
|
||||
|
||||
/* If entry is found returns value, otherwise 0 */
|
||||
bd_get_hw_type(&hw_type_from_bd);
|
||||
if (hw_type_from_bd != 0) {
|
||||
|
|
@ -794,29 +732,6 @@ static void init_bd_spl(void)
|
|||
}
|
||||
}
|
||||
|
||||
static void power_um(void)
|
||||
{
|
||||
int bus;
|
||||
|
||||
da9063_init(CONFIG_PMIC_I2C_BUS);
|
||||
|
||||
bus = da9063_claim_i2c_bus();
|
||||
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_RST_UM_N); /* Assert reset (active low) */
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_CTRL_WDIS_N);
|
||||
|
||||
da9063_set_gpio(PMIC_UM_SUPPLY_EN_IO, 0); /* Switch Supply off */
|
||||
mdelay(30); /* Give time to discharge output */
|
||||
|
||||
da9063_set_gpio(PMIC_UM_SUPPLY_VSEL_IO, 0); /* Set voltage to 3.3V */
|
||||
mdelay(1);
|
||||
|
||||
da9063_set_gpio(PMIC_UM_SUPPLY_EN_IO, 1); /* Enable Supply */
|
||||
mdelay(10);
|
||||
|
||||
da9063_release_i2c_bus(bus);
|
||||
}
|
||||
|
||||
void am33xx_spl_board_init(void)
|
||||
{
|
||||
/* Set CPU speed to 600 MHz (fix) */
|
||||
|
|
@ -828,9 +743,6 @@ void am33xx_spl_board_init(void)
|
|||
/* Configure both I2C buses used */
|
||||
init_i2c();
|
||||
|
||||
/* Power on Extension/User module, so it doesn't block I2C bus */
|
||||
power_um();
|
||||
|
||||
/* Get board descriptor */
|
||||
init_bd_spl();
|
||||
|
||||
|
|
@ -851,17 +763,6 @@ void am33xx_spl_board_init(void)
|
|||
stop_if_ignition_is_off();
|
||||
}
|
||||
|
||||
if (is_v32_or_newer()) {
|
||||
enable_led_mux_v32();
|
||||
enable_uart4_pin_mux();
|
||||
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_RS485_DE);
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_RS232_RS485n_SEL);
|
||||
}
|
||||
else {
|
||||
enable_led_mux();
|
||||
}
|
||||
|
||||
init_leds();
|
||||
set_status_led(1, 0); /* Red */
|
||||
set_indicator_led(1, 0); /* Red */
|
||||
|
|
@ -1071,14 +972,30 @@ static void init_usb_hub(void)
|
|||
|
||||
static void init_user_module(void)
|
||||
{
|
||||
int bus;
|
||||
|
||||
bus = da9063_claim_i2c_bus();
|
||||
|
||||
puts("UM: ");
|
||||
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_RST_UM_N); /* Assert reset (active low) */
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_CTRL_WDIS_N);
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_CTRL_WDIS_N) /* TODO: CHECK */
|
||||
|
||||
/* TODO: Should this be done at first power up as well? */
|
||||
da9063_set_gpio(PMIC_UM_SUPPLY_EN_IO, 0); /* Switch Supply off */
|
||||
mdelay(30); /* Give time to discharge output */
|
||||
|
||||
da9063_set_gpio(PMIC_UM_SUPPLY_VSEL_IO, 0); /* Set voltage to 3.3V */
|
||||
mdelay(1);
|
||||
|
||||
da9063_set_gpio(PMIC_UM_SUPPLY_EN_IO, 1); /* Enable Supply */
|
||||
mdelay(10);
|
||||
|
||||
gpio_direction_input(GPIO_RST_UM_N); /* Release reset (open drain) */
|
||||
mdelay(10);
|
||||
|
||||
da9063_release_i2c_bus(bus);
|
||||
|
||||
mdelay(200); /* Give module some time to boot */
|
||||
um_init(CONFIG_UM_I2C_BUS); /* Try to detect user module */
|
||||
|
||||
|
|
@ -1176,33 +1093,12 @@ static void init_gsm(void)
|
|||
#endif
|
||||
}
|
||||
|
||||
static void init_gnss(uint32_t reset_reason_shm_location)
|
||||
static void init_gnss(void)
|
||||
{
|
||||
volatile struct reset_registers* reset_regs = (struct reset_registers*)reset_reason_shm_location;
|
||||
bool do_reset = false;
|
||||
|
||||
/*
|
||||
* Release GNSS reset line, so that module starts up early.
|
||||
* Excpetion: If this is an initial power up, we reset the module to ensure defined operation.
|
||||
* Reasoning: Some NEO-M9 modems start in Safe Boot mode, due to power sequencing.
|
||||
* Release GNSS reset line, so that module starts up early
|
||||
*/
|
||||
puts("GNSS: ");
|
||||
|
||||
if (rr_is_start_reason_valid(reset_regs)) {
|
||||
if ((reset_regs->sr_events & SR_POR) == SR_POR) {
|
||||
do_reset = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (do_reset) {
|
||||
puts("reset\n");
|
||||
REQUEST_AND_CLEAR_GPIO(GPIO_RST_GNSS);
|
||||
mdelay(110);
|
||||
gpio_set_value(GPIO_RST_GNSS, 1);
|
||||
} else {
|
||||
puts("init\n");
|
||||
REQUEST_AND_SET_GPIO(GPIO_RST_GNSS);
|
||||
}
|
||||
REQUEST_AND_SET_GPIO(GPIO_RST_GNSS);
|
||||
}
|
||||
|
||||
static void init_timepulse(void)
|
||||
|
|
@ -1246,6 +1142,16 @@ int board_init(void)
|
|||
ui_init(CONFIG_UI_I2C_BUS);
|
||||
#endif
|
||||
|
||||
/* Let user know we're starting */
|
||||
init_leds();
|
||||
set_status_led(1, 1); /* Orange */
|
||||
set_indicator_led(0, 0); /* Off */
|
||||
|
||||
#ifndef CONFIG_NRSW_BUILD
|
||||
ui_set_status_led(1, 1); /* Orange */
|
||||
ui_set_indicator_led(0, 0); /* Off */
|
||||
#endif
|
||||
|
||||
printf("OSC: %lu MHz\n", get_osclk()/1000000);
|
||||
|
||||
return 0;
|
||||
|
|
@ -1889,16 +1795,6 @@ int board_late_init(void)
|
|||
get_hw_version();
|
||||
get_pmic_version();
|
||||
|
||||
/* Let user know we're starting */
|
||||
init_leds();
|
||||
set_status_led(1, 1); /* Orange */
|
||||
set_indicator_led(0, 0); /* Off */
|
||||
|
||||
#ifndef CONFIG_NRSW_BUILD
|
||||
ui_set_status_led(1, 1); /* Orange */
|
||||
ui_set_indicator_led(0, 0); /* Off */
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_NRSW_BUILD
|
||||
set_root_partition();
|
||||
set_devicetree_name();
|
||||
|
|
@ -1958,7 +1854,7 @@ int board_late_init(void)
|
|||
#endif
|
||||
init_sim_mux();
|
||||
init_gsm();
|
||||
init_gnss(RESET_REASON_SHM_LOCATION);
|
||||
init_gnss();
|
||||
init_timepulse();
|
||||
|
||||
/*
|
||||
|
|
@ -2145,85 +2041,6 @@ int board_fit_config_name_match(const char *name)
|
|||
|
||||
#if defined(CONFIG_OF_BOARD_SETUP) && !defined(CONFIG_SPL_BUILD)
|
||||
|
||||
static void ft_enable_node(void* blob, const char* name)
|
||||
{
|
||||
int node_ofs = -1;
|
||||
|
||||
node_ofs = fdt_path_offset(blob, name);
|
||||
// printf("ft_enable_node %s -> %d\n", name, node_ofs);
|
||||
if (node_ofs >= 0) {
|
||||
fdt_setprop_string(blob, node_ofs, "status", "okay");
|
||||
}
|
||||
}
|
||||
|
||||
static void ft_disable_node(void* blob, const char* name)
|
||||
{
|
||||
int node_ofs = -1;
|
||||
|
||||
node_ofs = fdt_path_offset(blob, name);
|
||||
// printf("ft_disable_node %s -> %d\n", name, node_ofs);
|
||||
if (node_ofs >= 0) {
|
||||
fdt_setprop_string(blob, node_ofs, "status", "disabled");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Modify the name of a gpio in a gpio-line-names string list.
|
||||
*/
|
||||
static void ft_set_gpio_name(void *blob, const char* gpio, int pin, const char* name)
|
||||
{
|
||||
int node_ofs = fdt_path_offset(blob, gpio);
|
||||
int gpios = -1;
|
||||
const char* text;
|
||||
int pos = 0;
|
||||
int i;
|
||||
char buffer[512];
|
||||
|
||||
if (node_ofs < 0) {
|
||||
printf("Can't find node %s\n", gpio);
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* get number of IOs in node */
|
||||
gpios = fdt_getprop_u32_default_node(blob, node_ofs, 0, "ngpios", -1);
|
||||
if (gpios == -1 || gpios > 64) {
|
||||
printf("Illegal number of gpios %d\n", gpios);
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* get string array with names */
|
||||
const struct fdt_property* prop = fdt_get_property(blob, node_ofs, "gpio-line-names", NULL);
|
||||
if (prop == NULL) {
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* modify given name */
|
||||
for (i=0; i<gpios; i++) {
|
||||
if (i == pin) {
|
||||
/* Take provided name if GPIO pin is matched */
|
||||
text = name;
|
||||
}
|
||||
else {
|
||||
/* Take existing name from string list */
|
||||
(void)fdt_get_string_index(blob, node_ofs, "gpio-line-names", i, &text);
|
||||
}
|
||||
|
||||
/* Add name to new string list */
|
||||
if ((pos + strlen(text) + 1) < sizeof(buffer)) {
|
||||
strncpy(buffer+pos, text, sizeof(buffer)-pos);
|
||||
pos += strlen(text) + 1;
|
||||
}
|
||||
else {
|
||||
printf("ft_set_gpio_name() Buffer too small\n");
|
||||
goto end;
|
||||
}
|
||||
}
|
||||
|
||||
(void)fdt_setprop(blob, node_ofs, "gpio-line-names", buffer, pos);
|
||||
|
||||
end: ;
|
||||
}
|
||||
|
||||
static void ft_bootloader_version(void *blob)
|
||||
{
|
||||
int node_offset;
|
||||
|
|
@ -2293,7 +2110,7 @@ static void ft_user_interface(void *blob)
|
|||
if (ui_hw_version == 1) {
|
||||
int node_offset;
|
||||
|
||||
node_offset = fdt_path_offset(blob, "ui_v1");
|
||||
node_offset = fdt_path_offset(blob, "/ocp/i2c@4802a000/pca9539@74/");
|
||||
if (node_offset != -1) {
|
||||
fdt_setprop_string(blob, node_offset, "status", "okay");
|
||||
}
|
||||
|
|
@ -2318,7 +2135,7 @@ static void ft_user_interface(void *blob)
|
|||
else if (ui_hw_version == 2) {
|
||||
int node_offset;
|
||||
|
||||
node_offset = fdt_path_offset(blob, "ui_v2");
|
||||
node_offset = fdt_path_offset(blob, "/ocp/i2c@4802a000/pca9538@70/");
|
||||
if (node_offset != -1) {
|
||||
fdt_setprop_string(blob, node_offset, "status", "okay");
|
||||
}
|
||||
|
|
@ -2376,13 +2193,13 @@ static void ft_eth(void *blob)
|
|||
if (hw_ver == 1) {
|
||||
int node_offset;
|
||||
|
||||
node_offset = fdt_path_offset(blob, "broadr1");
|
||||
node_offset = fdt_path_offset(blob, "/ocp/ethernet@4a100000/mdio@4a101000/ethernet-phy@2/");
|
||||
if (node_offset != -1) {
|
||||
fdt_setprop_u32(blob, node_offset, "<reg>", 7);
|
||||
fdt_setprop_u32(blob, node_offset, "reg", 7);
|
||||
}
|
||||
|
||||
node_offset = fdt_path_offset(blob, "broadr0");
|
||||
node_offset = fdt_path_offset(blob, "/ocp/ethernet@4a100000/mdio@4a101000/ethernet-phy@3/");
|
||||
if (node_offset != -1) {
|
||||
fdt_setprop_u32(blob, node_offset, "<reg>", 6);
|
||||
fdt_setprop_u32(blob, node_offset, "reg", 6);
|
||||
|
|
@ -2390,35 +2207,6 @@ static void ft_eth(void *blob)
|
|||
}
|
||||
}
|
||||
|
||||
static void ft_uart4(void *blob)
|
||||
{
|
||||
/*
|
||||
* V3.2 HW can feature uart4 as RS232/485 interface.
|
||||
* TODO: Check product descriptor to see if interface is assembled?
|
||||
*/
|
||||
if (is_v32_or_newer()) {
|
||||
ft_enable_node(blob, "serial4");
|
||||
}
|
||||
else {
|
||||
/* If interface is not present, remove SEL_RS232_RS485n name from gpio0_8 */
|
||||
ft_set_gpio_name(blob, "gpio0", 8, "");
|
||||
}
|
||||
}
|
||||
|
||||
static void ft_led(void *blob)
|
||||
{
|
||||
/*
|
||||
* V3.2 HW has LED0 Green at GPIO1_23 instead of 0_30
|
||||
* Link from SysState-LED Driver also needs to be adapted
|
||||
*/
|
||||
if (is_v32_or_newer()) {
|
||||
ft_disable_node(blob, "status_led");
|
||||
ft_disable_node(blob, "/sysstate-led");
|
||||
ft_enable_node(blob, "status_led_v32");
|
||||
ft_enable_node(blob, "/sysstate-led-v32");
|
||||
}
|
||||
}
|
||||
|
||||
int ft_board_setup(void *blob, bd_t *bd)
|
||||
{
|
||||
ft_bootloader_version(blob);
|
||||
|
|
@ -2428,8 +2216,6 @@ int ft_board_setup(void *blob, bd_t *bd)
|
|||
ft_user_module(blob);
|
||||
#endif
|
||||
ft_eth(blob);
|
||||
ft_uart4(blob);
|
||||
ft_led(blob);
|
||||
ft_start_event(blob, RESET_REASON_SHM_LOCATION);
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -13,10 +13,8 @@
|
|||
|
||||
void enable_uart0_pin_mux(void);
|
||||
void enable_uart2_pin_mux(void);
|
||||
void enable_uart4_pin_mux(void);
|
||||
void enable_spi1_mux(void);
|
||||
void enable_led_mux(void);
|
||||
void enable_led_mux_v32(void);
|
||||
|
||||
void enable_board_pin_mux(void);
|
||||
|
||||
#define GPIO_TO_PIN(bank, gpio) (32 * (bank) + (gpio))
|
||||
|
|
|
|||
|
|
@ -23,22 +23,24 @@
|
|||
|
||||
static struct module_pin_mux gpio_pin_mux[] = {
|
||||
/*
|
||||
* (V2) GPIO0_8: RS232_485n_SEL (V3.2)
|
||||
* (V3) GPIO0_9: RS485_DE (V3.2)
|
||||
* (J18) GPIO0_16: ETH_SW_RST~ (V2.0)
|
||||
* (K15) GPIO0_17: CTRL.INT~
|
||||
* (T10) GPIO0_23: CAN_TERM1~ (V1.0)
|
||||
* (T17) GPIO0_30: LED0.GN
|
||||
*
|
||||
* (T12) GPIO1_12: SIM_SW
|
||||
* (V13) GPIO1_14: GNSS_RST~
|
||||
* (U13) GPIO1_15: CAN_TERM0~ (V1.0)
|
||||
* (R14) GPIO1_20: BT_EN
|
||||
* (V15) GPIO1_21: GSM_PWR_EN
|
||||
* (U15) GPIO1_22: LED1.RD
|
||||
* (V16) GPIO1_24: LED1.GN
|
||||
* (U16) GPIO1_25: RST_GSM
|
||||
* (T16) GPIO1_26: WLAN_EN
|
||||
* (V17) GPIO1_27: WLAN_IRQ
|
||||
* (U18) GPIO1_28: LED0.RD
|
||||
*
|
||||
* (U3) GPIO2_16: TIMEPULSE (HW26), see note [1]
|
||||
* (U3) GPIO2_16: TIMEPULSE (HW26)
|
||||
* (R6) GPIO2_25: RST_ETH~
|
||||
*
|
||||
* (J17) GPIO3_4: GNSS_EXTINT
|
||||
|
|
@ -46,15 +48,13 @@ static struct module_pin_mux gpio_pin_mux[] = {
|
|||
* (L18) GPIO3_10: CTRL.RST
|
||||
* (C12) GPIO3_17: UI_RST~
|
||||
* (A14) GPIO3_21: RST_HUB~ (USB)
|
||||
*
|
||||
* [1] No PU/PD allowed as TIMEPULSE is internally connected with SAFEBOOT_N.
|
||||
* SAFEBOOT_N must be left open/floating.
|
||||
*/
|
||||
|
||||
/* Bank 0 */
|
||||
{OFFSET(mii1_txd3), (MODE(7) | PULLUDDIS)}, /* (J18) GPIO0_16: ETH_SW_RST~ (V2.0) */
|
||||
{OFFSET(mii1_txd2), (MODE(7) | PULLUDEN | PULLUP_EN | RXACTIVE)}, /* (K15) GPIO0_17: CTRL.INT~ */
|
||||
{OFFSET(gpmc_ad9), (MODE(7) | PULLUDDIS)}, /* (T10) GPIO0_23: CAN_TERM1~ */
|
||||
{OFFSET(gpmc_wait0), (MODE(7) | PULLUDDIS)}, /* (T17) GPIO0_30: LED0.GN */
|
||||
|
||||
/* Bank 1 */
|
||||
{OFFSET(gpmc_ad12), (MODE(7) | PULLUDEN | PULLUP_EN)}, /* (T12) GPIO1_12: SIM_SW */
|
||||
|
|
@ -63,14 +63,32 @@ static struct module_pin_mux gpio_pin_mux[] = {
|
|||
|
||||
{OFFSET(gpmc_a4), (MODE(7) | PULLUDDIS)}, /* (R14) gpio1_20: BT_EN */
|
||||
{OFFSET(gpmc_a5), (MODE(7) | PULLUDDIS)}, /* (V15) gpio1_21: GSM_PWR_EN */
|
||||
{OFFSET(gpmc_a6), (MODE(7) | PULLUDDIS)}, /* (U15) GPIO1_22: LED1.RD */
|
||||
{OFFSET(gpmc_a8), (MODE(7) | PULLUDDIS)}, /* (V16) GPIO1_24: LED1.GN */
|
||||
{OFFSET(gpmc_a9), (MODE(7) | PULLUDDIS)}, /* (U16) gpio1_25: RST_GSM */
|
||||
{OFFSET(gpmc_a10), (MODE(7) | PULLUDDIS)}, /* (T16) gpio1_26: WLAN_EN */
|
||||
{OFFSET(gpmc_a11), (MODE(7) | PULLUDDIS | RXACTIVE)}, /* (V17) gpio1_27: WLAN_IRQ */
|
||||
{OFFSET(gpmc_be1n), (MODE(7) | PULLUDDIS)}, /* (U18) GPIO1_28: LED0.RD */
|
||||
|
||||
/* TODO: What about all the unused GPMC pins ? */
|
||||
|
||||
/* Bank 2 */
|
||||
{OFFSET(lcd_data10), (MODE(7) | PULLUDDIS | RXACTIVE)}, /* (U3) GPIO2_16: TIMEPULSE */
|
||||
{OFFSET(lcd_data10), (MODE(7) | PULLUDEN | PULLDOWN_EN | RXACTIVE)}, /* (U3) GPIO2_16: TIMEPULSE input */
|
||||
{OFFSET(lcd_ac_bias_en), (MODE(7) | PULLUDDIS)}, /* (R6) GPIO2_25: RST_ETH~ */
|
||||
|
||||
#if 0
|
||||
/* TODO: What is this meant for? */
|
||||
{OFFSET(lcd_data3), (MODE(7) | PULLUDEN | PULLUP_EN)}, /* (R4) gpio2[9] */ /* SYSBOOT_3 */
|
||||
{OFFSET(lcd_data4), (MODE(7) | PULLUDEN | PULLUP_EN)}, /* (T1) gpio2[10] */ /* SYSBOOT_4 */
|
||||
|
||||
/* TODO: Check other unued pins from sysboot block */
|
||||
/* Ensure PU/PD does not work against external signal */
|
||||
/*
|
||||
* SYSBOOT 0,1,5,12,13 = Low
|
||||
* SYSBOOT 2 = High
|
||||
*/
|
||||
#endif
|
||||
|
||||
/* Bank 3 */
|
||||
{OFFSET(mii1_rxdv), (MODE(7) | PULLUDDIS)}, /* (J17) GPIO3_4: GNSS_EXTINT */
|
||||
{OFFSET(mii1_txclk), (MODE(7) | PULLUDDIS)}, /* (K18) GPIO3_9: CTRL.W_DIS */
|
||||
|
|
@ -80,39 +98,6 @@ static struct module_pin_mux gpio_pin_mux[] = {
|
|||
{-1}
|
||||
};
|
||||
|
||||
static struct module_pin_mux led_pin_mux[] = {
|
||||
/*
|
||||
* (T17) GPIO0_30: LED0.GN
|
||||
* (U15) GPIO1_22: LED1.RD
|
||||
* (V16) GPIO1_24: LED1.GN
|
||||
* (U18) GPIO1_28: LED0.RD
|
||||
*/
|
||||
|
||||
{OFFSET(gpmc_wait0), (MODE(7) | PULLUDDIS)}, /* (T17) GPIO0_30: LED0.GN */
|
||||
{OFFSET(gpmc_a6), (MODE(7) | PULLUDDIS)}, /* (U15) GPIO1_22: LED1.RD */
|
||||
{OFFSET(gpmc_a8), (MODE(7) | PULLUDDIS)}, /* (V16) GPIO1_24: LED1.GN */
|
||||
{OFFSET(gpmc_be1n), (MODE(7) | PULLUDDIS)}, /* (U18) GPIO1_28: LED0.RD */
|
||||
{-1}
|
||||
};
|
||||
|
||||
static struct module_pin_mux led_pin_mux_v32[] = {
|
||||
/*
|
||||
* (C15) GPIO0_6: MB_LED_PWM
|
||||
* (U15) GPIO1_22: LED1.RD
|
||||
* (T15) GPIO1_23: LED0.GN (formerly: (T17) GPIO0_30)
|
||||
* (V16) GPIO1_24: LED1.GN
|
||||
* (U18) GPIO1_28: LED0.RD
|
||||
*/
|
||||
|
||||
{OFFSET(spi0_cs1), (MODE(7) | PULLUDDIS)}, /* (C15) GPIO0_6: MB_LED_PWM */
|
||||
{OFFSET(gpmc_a6), (MODE(7) | PULLUDDIS)}, /* (U15) GPIO1_22: LED1.RD */
|
||||
{OFFSET(gpmc_a7), (MODE(7) | PULLUDDIS)}, /* (T15) GPIO1_23: LED0.GN */
|
||||
{OFFSET(gpmc_a8), (MODE(7) | PULLUDDIS)}, /* (V16) GPIO1_24: LED1.GN */
|
||||
{OFFSET(gpmc_be1n), (MODE(7) | PULLUDDIS)}, /* (U18) GPIO1_28: LED0.RD */
|
||||
{-1}
|
||||
};
|
||||
|
||||
|
||||
/* I2C0 PMIC */
|
||||
static struct module_pin_mux i2c0_pin_mux[] = {
|
||||
{OFFSET(i2c0_sda), (MODE(0) | RXACTIVE | PULLUDEN | PULLUP_EN | SLEWCTRL)}, /* (C17) I2C0_SDA */
|
||||
|
|
@ -218,22 +203,8 @@ static struct module_pin_mux uart2_pin_mux[] = {
|
|||
|
||||
/* UART3: GNSS */
|
||||
static struct module_pin_mux uart3_pin_mux[] = {
|
||||
{OFFSET(mii1_rxd3), (MODE(1) | PULLUDDIS | RXACTIVE)}, /* (L17) UART3_RXD */
|
||||
{OFFSET(mii1_rxd2), (MODE(1) | PULLUDDIS | SLEWCTRL)}, /* (L16) UART3_TXD */
|
||||
{-1}
|
||||
};
|
||||
|
||||
/* UART4: User RS232/485 (V3.2 only) */
|
||||
static struct module_pin_mux uart4_pin_mux[] = {
|
||||
/*
|
||||
* CTSn = SEL_RS232/RS485~: Default = Low -> RS485 mode
|
||||
* RTSn = RS485_DE: Default = Low -> RS485 transmitter disabled
|
||||
* Configure as GPIO in U-Boot to keep disabled, Linux will change to RTSn
|
||||
*/
|
||||
{OFFSET(gpmc_wait0), (MODE(6) | PULLUDEN | PULLUP_EN | RXACTIVE)}, /* (T17) UART4_RXD */
|
||||
{OFFSET(gpmc_wpn), (MODE(6) | PULLUDEN | PULLUP_EN | SLEWCTRL)}, /* (U17) UART4_TXD */
|
||||
{OFFSET(lcd_data12), (MODE(7) | PULLUDEN | PULLDOWN_EN)}, /* (V2) uart4_ctsn */
|
||||
{OFFSET(lcd_data13), (MODE(7) | PULLUDEN | PULLDOWN_EN)}, /* (V3) uart4_rtsn */
|
||||
{OFFSET(mii1_rxd3), (MODE(1) | PULLUDEN | PULLUP_EN | RXACTIVE)}, /* (L17) UART3_RXD */
|
||||
{OFFSET(mii1_rxd2), (MODE(1) | PULLUDEN | PULLUP_EN | SLEWCTRL)}, /* (L16) UART3_TXD */
|
||||
{-1}
|
||||
};
|
||||
|
||||
|
|
@ -297,22 +268,7 @@ void enable_uart2_pin_mux(void)
|
|||
configure_module_pin_mux(uart2_pin_mux);
|
||||
}
|
||||
|
||||
void enable_uart4_pin_mux(void)
|
||||
{
|
||||
configure_module_pin_mux(uart4_pin_mux);
|
||||
}
|
||||
|
||||
void enable_spi1_mux(void)
|
||||
{
|
||||
configure_module_pin_mux(spi1_pin_mux);
|
||||
}
|
||||
|
||||
void enable_led_mux(void)
|
||||
{
|
||||
configure_module_pin_mux(led_pin_mux);
|
||||
}
|
||||
|
||||
void enable_led_mux_v32(void)
|
||||
{
|
||||
configure_module_pin_mux(led_pin_mux_v32);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1330,10 +1330,10 @@ end: ;
|
|||
static void ft_comio_gpios(void *blob)
|
||||
{
|
||||
/* gpio0_7: COM/IO relay output */
|
||||
ft_set_gpio_name(blob, "gpio0", 7, "COMIO_OUT0");
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@44e07000", 7, "COMIO_OUT0");
|
||||
|
||||
/* gpio1_8: COM/IO digital input */
|
||||
ft_set_gpio_name(blob, "gpio1", 8, "COMIO_IN0");
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@4804c000", 8, "COMIO_IN0");
|
||||
}
|
||||
|
||||
static void ft_shields(void* blob)
|
||||
|
|
@ -1345,13 +1345,15 @@ static void ft_shields(void* blob)
|
|||
case SHIELD_COM_IO:
|
||||
ft_comio_gpios(blob);
|
||||
ft_enable_node(blob, "/netbox_dio_comio");
|
||||
ft_enable_node(blob, "serial0");
|
||||
/* TODO: Should use alias serial0 */
|
||||
ft_enable_node(blob, "/ocp/serial@44e09000");
|
||||
break;
|
||||
|
||||
case SHIELD_DUALCAN:
|
||||
case SHIELD_DUALCAN_PASSIVE:
|
||||
ft_enable_node(blob, "d-can0");
|
||||
ft_enable_node(blob, "d-can1");
|
||||
/* TODO: Should use alias d_can0, d_can1 */
|
||||
ft_enable_node(blob, "/ocp/can@481cc000");
|
||||
ft_enable_node(blob, "/ocp/can@481d0000");
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -1242,10 +1242,10 @@ end: ;
|
|||
static void ft_comio_gpios(void *blob)
|
||||
{
|
||||
/* gpio0_7: COM/IO relay output */
|
||||
ft_set_gpio_name(blob, "gpio0", 7, "COMIO_OUT0");
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@44e07000", 7, "COMIO_OUT0");
|
||||
|
||||
/* gpio1_8: COM/IO digital input */
|
||||
ft_set_gpio_name(blob, "gpio1", 8, "COMIO_IN0");
|
||||
ft_set_gpio_name(blob, "/ocp/gpio@4804c000", 8, "COMIO_IN0");
|
||||
}
|
||||
|
||||
static void ft_shields(void* blob)
|
||||
|
|
@ -1257,13 +1257,15 @@ static void ft_shields(void* blob)
|
|||
case SHIELD_COM_IO:
|
||||
ft_comio_gpios(blob);
|
||||
ft_enable_node(blob, "/netbox_dio_comio");
|
||||
ft_enable_node(blob, "serial0");
|
||||
/* TODO: Should use alias serial0 */
|
||||
ft_enable_node(blob, "/ocp/serial@44e09000");
|
||||
break;
|
||||
|
||||
case SHIELD_DUALCAN:
|
||||
case SHIELD_DUALCAN_PASSIVE:
|
||||
ft_enable_node(blob, "d-can0");
|
||||
ft_enable_node(blob, "d-can1");
|
||||
/* TODO: Should use alias d_can0, d_can1 */
|
||||
ft_enable_node(blob, "/ocp/can@481cc000");
|
||||
ft_enable_node(blob, "/ocp/can@481d0000");
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -1271,7 +1273,7 @@ static void ft_shields(void* blob)
|
|||
* Enable uart1 (ttyS0) always as kernel needs it as fallback console,
|
||||
* if (ttyS1) is not available as console.
|
||||
*/
|
||||
ft_enable_node(blob, "serial0");
|
||||
ft_enable_node(blob, "/ocp/serial@44e09000");
|
||||
break;
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue