Fixes for rv1108 and rv1108-elgin-r1
cover Fixes for rv1108 and rv1108-elgin-r1
Those are fixes we've been using and we'd like to upstream.
They are fixes and would be great to have them included on 2020.04 release.
Otavio Salvador (4):
ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1
elgin-rv1108: Use rk_board_late_init() for GPIO settings
elgin-rv1108: Avoid adc_channel_single_shot error
rv1108: Fix boot regression
arch/arm/dts/rv1108-elgin-r1.dts | 11 +++++++++++ arch/arm/dts/rv1108-u-boot.dtsi | 6 ++++++ board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- configs/elgin-rv1108_defconfig | 2 ++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/rv1108-u-boot.dtsi
Signature · 1 line
2.25.1
PATCH 1/4 ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1
In order to make the console pins more robust to noise, activate the pullups and increase its drive strength.
---
arch/arm/dts/rv1108-elgin-r1.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/dts/rv1108-elgin-r1.dts +11 -0
@@ -40,9 +40,20 @@ }; &uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2m0_xfer_pullup>; status = "okay"; }; &usb20_otg { status = "okay"; }; + +&pinctrl { + uart2m0 { + uart2m0_xfer_pullup: uart2m0-xfer-pullup { + rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, + <2 RK_PD1 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; + }; + }; +};
Signature · 1 line
2.25.1
Re: [PATCH 1/4] ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1【请注意,邮件由[email protected]代发】
Hi Otavio,
Quoted 4 lines · Otavio Salvador
In order to make the console pins more robust to noise, activate the pullups and increase its drive strength.
Signed-off-by Otavio Salvador <[email protected]>
Thanks,
- Kever
Quoted 30 lines
---
arch/arm/dts/rv1108-elgin-r1.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/arm/dts/rv1108-elgin-r1.dts +11
-0@@ -40,9 +40,20 @@ }; &uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2m0_xfer_pullup>; status = "okay"; }; &usb20_otg { status = "okay"; }; + +&pinctrl { + uart2m0 { + uart2m0_xfer_pullup: uart2m0-xfer-pullup { + rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, + <2 RK_PD1 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; + }; + }; +};
Re: [PATCH 1/4] ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1【请注意,邮件由[email protected]代发】
Ping?
Quoted 47 lines · Kever Yang
Hi Otavio,
Quoted 4 lines · Otavio Salvador
In order to make the console pins more robust to noise, activate the pullups and increase its drive strength.
Signed-off-by Otavio Salvador <[email protected]>Reviewed-by Kever Yang <[email protected]>Thanks,
- KeverQuoted 30 lines
---
arch/arm/dts/rv1108-elgin-r1.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)arch/arm/dts/rv1108-elgin-r1.dts +11
-0@@ -40,9 +40,20 @@ }; &uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2m0_xfer_pullup>; status = "okay"; }; &usb20_otg { status = "okay"; }; + +&pinctrl { + uart2m0 { + uart2m0_xfer_pullup: uart2m0-xfer-pullup { + rockchip,pins = <2 RK_PD2 RK_FUNC_1 &pcfg_pull_up_drv_8ma>, + <2 RK_PD1 RK_FUNC_1 &pcfg_pull_up_drv_8ma>; + }; + }; +};
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH 2/4 elgin-rv1108: Use rk_board_late_init() for GPIO settings
In reply to Otavio SalvadorSince commit 8e9a8d0d0c8c ("rockchip: elgin-rv1108: use board_early_init_f for per-boar init") the function that configure the board GPIOs is no longer called since CONFIG_BOARD_EARLY_INIT_F=y is not selected.
These GPIOs do not need to be configured in such early stagem, so change it to rk_board_late_init() and also select CONFIG_BOARD_LATE_INIT=y to fix the regression.
---
board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- configs/elgin-rv1108_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
board/elgin/elgin_rv1108/elgin_rv1108.c +1 -1
@@ -50,7 +50,7 @@ int mach_cpu_init(void)#define MODEM_ENABLE_GPIO 111 -int board_early_init_f (void ) +int rk_board_late_init (void ) {gpio_request (MODEM_ENABLE_GPIO ,"modem_enable" );gpio_direction_output (MODEM_ENABLE_GPIO ,0 );
configs/elgin-rv1108_defconfig +1 -0
@@ -10,6 +10,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb" +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GPIO=y
Signature · 1 line
2.25.1
Re: [PATCH 2/4] elgin-rv1108: Use rk_board_late_init() for GPIO settings【请注意,邮件由[email protected]代发】
Quoted 10 lines · Otavio Salvador
Since commit
8e9a8d0d0c8c("rockchip: elgin-rv1108: useboard_early_init_ffor per-boar init") the function that configure the board GPIOs is no longer called sinceCONFIG_BOARD_EARLY_INIT_F=yis not selected.These GPIOs do not need to be configured in such early stagem, so change it to
rk_board_late_init()and also selectCONFIG_BOARD_LATE_INIT=yto fix the regression.Signed-off-by Otavio Salvador <[email protected]>Signed-off-by Fabio Berton <[email protected]>
Thanks,
- Kever
Quoted 31 lines
---
board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- configs/elgin-rv1108_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)board/elgin/elgin_rv1108/elgin_rv1108.c +1
-1@@ -50,7 +50,7 @@ int mach_cpu_init(void)#define MODEM_ENABLE_GPIO 111 -int board_early_init_f (void ) +int rk_board_late_init (void ) {gpio_request (MODEM_ENABLE_GPIO ,"modem_enable" );gpio_direction_output (MODEM_ENABLE_GPIO ,0 );configs/elgin-rv1108_defconfig +1
-0@@ -10,6 +10,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb" +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GPIO=y
Re: [PATCH 2/4] elgin-rv1108: Use rk_board_late_init() for GPIO settings【请注意,邮件由[email protected]代发】
Ping?
Quoted 52 lines · Kever Yang
Quoted 10 lines · Otavio Salvador
Since commit
8e9a8d0d0c8c("rockchip: elgin-rv1108: useboard_early_init_ffor per-boar init") the function that configure the board GPIOs is no longer called sinceCONFIG_BOARD_EARLY_INIT_F=yis not selected.These GPIOs do not need to be configured in such early stagem, so change it to
rk_board_late_init()and also selectCONFIG_BOARD_LATE_INIT=yto fix the regression.Signed-off-by Otavio Salvador <[email protected]>Signed-off-by Fabio Berton <[email protected]>Reviewed-by Kever Yang <[email protected]>Thanks,
- KeverQuoted 31 lines
---
board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- configs/elgin-rv1108_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)board/elgin/elgin_rv1108/elgin_rv1108.c +1
-1@@ -50,7 +50,7 @@ int mach_cpu_init(void)#define MODEM_ENABLE_GPIO 111 -int board_early_init_f (void ) +int rk_board_late_init (void ) {gpio_request (MODEM_ENABLE_GPIO ,"modem_enable" );gpio_direction_output (MODEM_ENABLE_GPIO ,0 );configs/elgin-rv1108_defconfig +1
-0@@ -10,6 +10,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_USE_BOOTCOMMAND is not set CONFIG_DEFAULT_FDT_FILE="rv1108-elgin-r1.dtb" +CONFIG_BOARD_LATE_INIT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_CMD_GPIO=y
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH 3/4 elgin-rv1108: Avoid adc_channel_single_shot error
In reply to Otavio SalvadorCurrently the following error message is seen during boot:
U-Boot 2020.01-08751-g55759ae141 (Mar 09 2020 - 14:44:52 -0300)
Model: Elgin RV1108 R1 board DRAM: 128 MiB APLL: 600000000 DPLL:1200000000 GPLL:1188000000 ACLK_BUS: 148500000 ACLK_PERI:148500000 HCLK_PERI:148500000 PCLK_PERI:74250000 MMC: dwmmc at 30110000: 0 Loading Environment from MMC... OK In: serial at 10210000 Out: serial at 10210000 Err: serial at 10210000 Model: Elgin RV1108 R1 board rockchip_dnl_key_pressed: adc_channel_single_shot fail!
....
Since the elgin-rv1108 does not use ADC to read the download key status, select CONFIG_ROCKCHIP_BOOT_MODE_REG=0 to avoid such error.
---
configs/elgin-rv1108_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/elgin-rv1108_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ROCKCHIP_RV1108=y CONFIG_TARGET_ELGIN_RV1108=y +CONFIG_ROCKCHIP_BOOT_MODE_REG=0 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0x10210000 CONFIG_DEBUG_UART_CLOCK=24000000
Signature · 1 line
2.25.1
Re: [PATCH 3/4] elgin-rv1108: Avoid adc_channel_single_shot error【请注意,邮件由[email protected]代发】
Quoted 15 lines · Otavio Salvador
Currently the following error message is seen during boot:
U-Boot 2020.01-08751-g55759ae141 (Mar 09 2020 - 14:44:52 -0300)
Model: Elgin RV1108 R1 board DRAM: 128 MiB APLL: 600000000 DPLL:1200000000 GPLL:1188000000 ACLK_BUS: 148500000 ACLK_PERI:148500000 HCLK_PERI:148500000 PCLK_PERI:74250000 MMC: dwmmc at 30110000: 0 Loading Environment from MMC... OK In: serial at 10210000 Out: serial at 10210000 Err: serial at 10210000 Model: Elgin RV1108 R1 board rockchip_dnl_key_pressed: adc_channel_single_shot fail!
Quoted 7 lines
....
Since the elgin-rv1108 does not use ADC to read the download key status, select
CONFIG_ROCKCHIP_BOOT_MODE_REG=0to avoid such error.Signed-off-by Otavio Salvador <[email protected]>
Thanks,
- Kever
Quoted 17 lines
---
configs/elgin-rv1108_defconfig | 1 + 1 file changed, 1 insertion(+)configs/elgin-rv1108_defconfig +1
-0@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ROCKCHIP_RV1108=y CONFIG_TARGET_ELGIN_RV1108=y +CONFIG_ROCKCHIP_BOOT_MODE_REG=0 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0x10210000 CONFIG_DEBUG_UART_CLOCK=24000000
Re: [PATCH 3/4] elgin-rv1108: Avoid adc_channel_single_shot error【请注意,邮件由[email protected]代发】
Ping?
Quoted 50 lines · Kever Yang
Quoted 15 lines · Otavio Salvador
Currently the following error message is seen during boot:
U-Boot 2020.01-08751-g55759ae141 (Mar 09 2020 - 14:44:52 -0300)
Model: Elgin RV1108 R1 board DRAM: 128 MiB APLL: 600000000 DPLL:1200000000 GPLL:1188000000 ACLK_BUS: 148500000 ACLK_PERI:148500000 HCLK_PERI:148500000 PCLK_PERI:74250000 MMC: dwmmc at 30110000: 0 Loading Environment from MMC... OK In: serial at 10210000 Out: serial at 10210000 Err: serial at 10210000 Model: Elgin RV1108 R1 board rockchip_dnl_key_pressed: adc_channel_single_shot fail!Quoted 7 lines
....
Since the elgin-rv1108 does not use ADC to read the download key status, select
CONFIG_ROCKCHIP_BOOT_MODE_REG=0to avoid such error.Signed-off-by Otavio Salvador <[email protected]>Reviewed-by Kever Yang <[email protected]>Thanks,
- KeverQuoted 17 lines
---
configs/elgin-rv1108_defconfig | 1 + 1 file changed, 1 insertion(+)configs/elgin-rv1108_defconfig +1
-0@@ -4,6 +4,7 @@ CONFIG_SYS_TEXT_BASE=0x60000000 CONFIG_ENV_OFFSET=0x3F8000 CONFIG_ROCKCHIP_RV1108=y CONFIG_TARGET_ELGIN_RV1108=y +CONFIG_ROCKCHIP_BOOT_MODE_REG=0 CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0x10210000 CONFIG_DEBUG_UART_CLOCK=24000000
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
PATCH 4/4 rv1108: Fix boot regression
In reply to Otavio SalvadorSince commit 79030a486128 ("rockchip: Add Single boot image (with binman, pad_cat)") the following boot regression is seen:
U-Boot 2020.04-rc3-00050-gd16e18ca6c-dirty (Mar 09 2020 - 11:40:07 -0300)
Model: Elgin RV1108 R1 board DRAM: 128 MiB
initcall sequence 67fd12a0 failed at call 6000b927 (err=-22)
This happens because the above commit missed to include the "rockchip-u-boot.dtsi" for rv1108, so include this file like it done for other Rockchip SoC dtsi's.
---
arch/arm/dts/rv1108-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 arch/arm/dts/rv1108-u-boot.dtsi
arch/arm/dts/rv1108-u-boot.dtsi new file +6 -0
@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +#include "rockchip-u-boot.dtsi"
Signature · 1 line
2.25.1
PATCH 4/4 rv1108: Fix boot regression
Quoted 7 lines · Otavio Salvador
Since commit
79030a486128("rockchip: Add Single boot image (with binman,pad_cat)") the following boot regression is seen:U-Boot 2020.04-rc3-00050-gd16e18ca6c-dirty (Mar 09 2020 - 11:40:07 -0300)
Model: Elgin RV1108 R1 board DRAM: 128 MiB
Quoted 8 lines
initcall sequence
67fd12a0failed at call6000b927(err=-22)This happens because the above commit missed to include the "
rockchip-u-boot.dtsi" for rv1108, so include this file like it done for other Rockchip SoC dtsi's.Fixes 79030a486128 ("rockchip: Add Single boot image (with binman, pad_cat)")Signed-off-by Otavio Salvador <[email protected]>
Thanks,
- Kever
Quoted 18 lines
---
arch/arm/dts/rv1108-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)create mode 100644
arch/arm/dts/rv1108-u-boot.dtsiarch/arm/dts/rv1108-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +#include "rockchip-u-boot.dtsi"
PATCH 4/4 rv1108: Fix boot regression
Ping?
Quoted 44 lines · Kever Yang
Quoted 7 lines · Otavio Salvador
Since commit
79030a486128("rockchip: Add Single boot image (with binman,pad_cat)") the following boot regression is seen:U-Boot 2020.04-rc3-00050-gd16e18ca6c-dirty (Mar 09 2020 - 11:40:07 -0300)
Model: Elgin RV1108 R1 board DRAM: 128 MiBQuoted 8 lines
initcall sequence
67fd12a0failed at call6000b927(err=-22)This happens because the above commit missed to include the "
rockchip-u-boot.dtsi" for rv1108, so include this file like it done for other Rockchip SoC dtsi's.Fixes 79030a486128 ("rockchip: Add Single boot image (with binman, pad_cat)")Signed-off-by Otavio Salvador <[email protected]>Reviewed-by Kever Yang <[email protected]>Thanks,
- KeverQuoted 18 lines
---
arch/arm/dts/rv1108-u-boot.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)create mode 100644
arch/arm/dts/rv1108-u-boot.dtsiarch/arm/dts/rv1108-u-boot.dtsi new file +6
-0@@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki <[email protected]> + */ + +#include "rockchip-u-boot.dtsi"
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
cover Fixes for rv1108 and rv1108-elgin-r1
In reply to Otavio SalvadorHello,
Quoted 11 lines · Otavio Salvador
Those are fixes we've been using and we'd like to upstream.
They are fixes and would be great to have them included on 2020.04 release.
Otavio Salvador (4):
ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1
elgin-rv1108: Userk_board_late_init()for GPIO settings
elgin-rv1108: Avoidadc_channel_single_shoterror
rv1108: Fix boot regression
The patches on this serie are all bug fixes so please make sure they go on 2020.04. Maybe Tom may apply them directly?
Signature · 3 lines
Otavio Salvador O.S. Systems http://www.ossystems.com.br http://code.ossystems.com.br Mobile: +55 (53) 9 9981-7854 Mobile: +1 (347) 903-9750
cover Fixes for rv1108 and rv1108-elgin-r1
hI Otavio,
Quoted 9 lines · Otavio Salvador
Hello,
Quoted 6 lines · Otavio Salvador
Those are fixes we've been using and we'd like to upstream.
They are fixes and would be great to have them included on 2020.04 release.
Quoted 7 lines
Quoted 5 lines
Otavio Salvador (4):
ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1
elgin-rv1108: Userk_board_late_init()for GPIO settings
elgin-rv1108: Avoidadc_channel_single_shoterror
rv1108: Fix boot regressionThe patches on this serie are all bug fixes so please make sure they go on 2020.04. Maybe Tom may apply them directly?
I have merge these patches, and under verify, will send out once it pass travics build.
Thanks,
- Kever
Quoted 1 line
cover Fixes for rv1108 and rv1108-elgin-r1
In reply to Otavio SalvadorQuoted 14 lines · Otavio Salvador
Hello,
Quoted 11 lines · Otavio Salvador
Those are fixes we've been using and we'd like to upstream.
They are fixes and would be great to have them included on 2020.04 release.
Otavio Salvador (4):
ARM: dts: Activate pullups in the console pins on rv1108-elgin-r1
elgin-rv1108: Userk_board_late_init()for GPIO settings
elgin-rv1108: Avoidadc_channel_single_shoterror
rv1108: Fix boot regression
Applied to u-boot-rockchip master.
Thanks,
- Kever
Quoted 3 lines
The patches on this serie are all bug fixes so please make sure they go on 2020.04. Maybe Tom may apply them directly?