rockchip: rk3288-firefly: Drop unused SPL_LED related code

The firefly-rk3288_defconfig build target does not enable the SPL_LED
Kconfig option.

Drop the unused SPL_LED related code and replace it with a default-state
prop to ensure the LED driver enable the LED at U-Boot proper phase.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3288-firefly-u-boot.dtsi b/arch/arm/dts/rk3288-firefly-u-boot.dtsi
index 644198a..30b4719 100644 (file)
--- a/arch/arm/dts/rk3288-firefly-u-boot.dtsi
+++ b/arch/arm/dts/rk3288-firefly-u-boot.dtsi
@@ -6,20 +6,9 @@
 #include "rk3288-u-boot.dtsi"
 
 / {
-       config {
-               bootph-all;
-               u-boot,boot-led = "firefly:green:power";
-       };
-
        leds {
-               bootph-all;
-
-               work {
-                       bootph-all;
-               };
-
                power {
-                       bootph-all;
+                       default-state = "on";
                };
        };
 };
@@ -56,10 +45,6 @@
        bootph-all;
 };
 
-&gpio8 {
-       bootph-all;
-};
-
 &pcfg_pull_up_drv_12ma {
        bootph-pre-ram;
 };

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index ff16d25..9cc97ba 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -75,7 +75,6 @@ config TARGET_FENNEC_RK3288
 config TARGET_FIREFLY_RK3288
        bool "Firefly-RK3288"
        select BOARD_LATE_INIT
-       select SPL_BOARD_INIT if SPL
        select TPL
        help
          Firefly is a RK3288-based development board with 2 USB ports,

diff --git a/board/firefly/firefly-rk3288/Makefile b/board/firefly/firefly-rk3288/Makefile
deleted file mode 100644 (file)
index 6716845..0000000
--- a/board/firefly/firefly-rk3288/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# (C) Copyright 2015 Google, Inc
-#
-# SPDX-License-Identifier:     GPL-2.0+
-#
-
-obj-y  += firefly-rk3288.o

diff --git a/board/firefly/firefly-rk3288/firefly-rk3288.c b/board/firefly/firefly-rk3288/firefly-rk3288.c
deleted file mode 100644 (file)
index c65ce58..0000000
--- a/board/firefly/firefly-rk3288/firefly-rk3288.c
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * (C) Copyright 2015 Google, Inc
- */
-
-#include <hang.h>
-#include <led.h>
-#include <log.h>
-#include <asm/global_data.h>
-#include <dm/ofnode.h>
-
-#ifdef CONFIG_XPL_BUILD
-static int setup_led(void)
-{
-#ifdef CONFIG_SPL_LED
-       struct udevice *dev;
-       char *led_name;
-       int ret;
-
-       led_name = ofnode_conf_read_str("u-boot,boot-led");
-       if (!led_name)
-               return 0;
-       ret = led_get_by_label(led_name, &dev);
-       if (ret) {
-               debug("%s: get=%d\n", __func__, ret);
-               return ret;
-       }
-       ret = led_set_state(dev, LEDST_ON);
-       if (ret)
-               return ret;
-#endif
-
-       return 0;
-}
-
-void spl_board_init(void)
-{
-       int ret;
-
-       ret = setup_led();
-       if (ret) {
-               debug("LED ret=%d\n", ret);
-               hang();
-       }
-}
-#endif