| Message ID | 1585828641-16429-1-git-send-email-sunil@amarulasolutions.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | Revert "board: roc-pc-rk3399: Add support for onboard LED's and push button to indicate power mode" | expand |
Hi Suniel, Please use a new patch instead of 'Revert'. BTW: please add 'rockchip:' at the beginning of the patch subject. Thanks, - Kever On 2020/4/2 下午7:57, sunil@amarulasolutions.com wrote: > From: Suniel Mahesh <sunil@amarulasolutions.com> > > In case of a power interruption, human intervention is required which > is not desirable if the device is installed at a remote location. Keep > red LED as it is to indicate board in full power mode. > > This reverts partially the commit 5a6d3d1fbca70d7f528c685292d64c4cd0106aa6. > > Signed-off-by: Suniel Mahesh <sunil@amarulasolutions.com> > --- > Note: > - patch tested on rk3399-roc-pc > - code related to button press is removed > --- > board/firefly/roc-pc-rk3399/roc-pc-rk3399.c | 16 +--------------- > 1 file changed, 1 insertion(+), 15 deletions(-) > > diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c > index de9185a..0fe1914 100644 > --- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c > +++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c > @@ -10,7 +10,6 @@ > #include <spl_gpio.h> > #include <asm/io.h> > #include <asm/arch-rockchip/gpio.h> > -#include <asm/arch-rockchip/grf_rk3399.h> > > #ifndef CONFIG_SPL_BUILD > int board_early_init_f(void) > @@ -34,26 +33,13 @@ out: > > #if defined(CONFIG_TPL_BUILD) > > -#define PMUGRF_BASE 0xff320000 > #define GPIO0_BASE 0xff720000 > > int board_early_init_f(void) > { > struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE; > - struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE; > > - /** > - * 1. Glow yellow LED, termed as low power > - * 2. Poll for on board power key press > - * 3. Once 2 done, off yellow and glow red LED, termed as full power > - * 4. Continue booting... > - */ > - spl_gpio_output(gpio0, GPIO(BANK_A, 2), 1); > - > - spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_A, 5), GPIO_PULL_NORMAL); > - while (readl(&gpio0->ext_port) & 0x20); > - > - spl_gpio_output(gpio0, GPIO(BANK_A, 2), 0); > + /* Turn on red LED, indicating full power mode */ > spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1); > > return 0;
diff --git a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c index de9185a..0fe1914 100644 --- a/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c +++ b/board/firefly/roc-pc-rk3399/roc-pc-rk3399.c @@ -10,7 +10,6 @@ #include <spl_gpio.h> #include <asm/io.h> #include <asm/arch-rockchip/gpio.h> -#include <asm/arch-rockchip/grf_rk3399.h> #ifndef CONFIG_SPL_BUILD int board_early_init_f(void) @@ -34,26 +33,13 @@ out: #if defined(CONFIG_TPL_BUILD) -#define PMUGRF_BASE 0xff320000 #define GPIO0_BASE 0xff720000 int board_early_init_f(void) { struct rockchip_gpio_regs * const gpio0 = (void *)GPIO0_BASE; - struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE; - /** - * 1. Glow yellow LED, termed as low power - * 2. Poll for on board power key press - * 3. Once 2 done, off yellow and glow red LED, termed as full power - * 4. Continue booting... - */ - spl_gpio_output(gpio0, GPIO(BANK_A, 2), 1); - - spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_A, 5), GPIO_PULL_NORMAL); - while (readl(&gpio0->ext_port) & 0x20); - - spl_gpio_output(gpio0, GPIO(BANK_A, 2), 0); + /* Turn on red LED, indicating full power mode */ spl_gpio_output(gpio0, GPIO(BANK_B, 5), 1); return 0;