Enable Bootloader LEDs on W1850
This commit enables the LED controller on the W1850. The new version is
D.WAYNE v4.1.0, and also makes the factory reset pattern match the L950.
Finally, the default configuration is updated to respect the "silent"
environment variable.
Change-Id: I65d71d80dc441959294282e18b5c285ae65a0a22
diff --git a/arch/arm/dts/cp-ipq6018-robin.dts b/arch/arm/dts/cp-ipq6018-robin.dts
index a0b7f1f..77962c2 100644
--- a/arch/arm/dts/cp-ipq6018-robin.dts
+++ b/arch/arm/dts/cp-ipq6018-robin.dts
@@ -26,7 +26,7 @@
pci0 = "/pci@20000000";
usb0 = "/xhci@8a00000";
usb1 = "/xhci@7000000";
- i2c1 = "/i2c@78ba000";
+ i2c0 = "/i2c@78b8000";
};
ess-switch {
@@ -217,7 +217,7 @@
cp-leds {
led_bar1 {
- i2c_addr = <0x29>;
+ i2c_addr = <0x28>;
enable_gpio {
gpio = <23>;
func = <0>;
@@ -225,24 +225,32 @@
out = <GPIO_OUT_HIGH>;
};
leds {
- lightbar1: led@1 { led-idx = <1>; };
- lightbar2: led@2 { led-idx = <2>; };
- lightbar3: led@3 { led-idx = <3>; };
- lightbar4: led@4 { led-idx = <4>; };
- lightbar5: led@5 { led-idx = <5>; };
- lightbar6: led@6 { led-idx = <6>; };
- lightbar7: led@7 { led-idx = <7>; };
- lightbar8: led@8 { led-idx = <8>; };
- lightbar9: led@9 { led-idx = <9>; };
- lightbar10: led@10 { led-idx = <10>; };
- lightbar11: led@11 { led-idx = <11>; };
- lightbar12: led@12 { led-idx = <12>; };
- lightbar13: led@13 { led-idx = <13>; };
- lightbar14: led@14 { led-idx = <14>; };
- lightbar15: led@15 { led-idx = <15>; };
- lightbar16: led@16 { led-idx = <16>; };
- lightbar17: led@17 { led-idx = <17>; };
- lightbar18: led@18 { led-idx = <18>; };
+
+ LED2_G { led-idx = <1>; factory-reset-seq = <0x055>;};
+ LED2_R { led-idx = <3>; factory-reset-seq = <0x500>;};
+ LED2_B { led-idx = <2>; factory-reset-seq = <0x055>;};
+
+ LED3_G { led-idx = <4>; factory-reset-seq = <0x055>;};
+ LED3_B { led-idx = <5>; factory-reset-seq = <0x055>;};
+ LED3_R { led-idx = <6>; factory-reset-seq = <0x500>;};
+
+ LED4_G { led-idx = <7>; factory-reset-seq = <0x055>;};
+ LED4_B { led-idx = <8>; factory-reset-seq = <0x055>;};
+ LED4_R { led-idx = <9>; factory-reset-seq = <0x500>; };
+
+ LED5_G { led-idx = <10>; factory-reset-seq = <0x055>;};
+ LED5_B { led-idx = <11>; factory-reset-seq = <0x055>;};
+ LED5_R { led-idx = <12>;factory-reset-seq = <0x500>; };
+
+ LED6_G { led-idx = <13>; factory-reset-seq = <0x055>;} ;
+ LED6_B { led-idx = <14>; factory-reset-seq = <0x055>;} ;
+ LED6_R { led-idx = <15>; factory-reset-seq = <0x500>;} ;
+
+ LED7_G { led-idx = <16>; factory-reset-seq = <0x055>;} ;
+ LED7_B { led-idx = <17>; factory-reset-seq = <0x055>;} ;
+ LED7_R { led-idx = <18>; factory-reset-seq = <0x500>;} ;
+
+
};
};
};
diff --git a/configs/robin_defconfig b/configs/robin_defconfig
index da621dc..6970b74 100644
--- a/configs/robin_defconfig
+++ b/configs/robin_defconfig
@@ -6,8 +6,8 @@
CONFIG_SYS_MALLOC_F=y
CONFIG_DM_SERIAL=y
CONFIG_DEFAULT_DEVICE_TREE="cp-ipq6018-robin"
-CONFIG_LOCALVERSION=" D.WAYNE v4.0.0 "
-CONFIG_LOCALVERSION_AUTO=y
+CONFIG_LOCALVERSION=" D.WAYNE v4.1.0 "
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_EXPERT=y
@@ -15,7 +15,7 @@
CONFIG_DEBUG_ENABLE=y
CONFIG_CMD_DEBUG_ENABLE=y
CONFIG_ROBIN=y
-CONFIG_CRADLEPOINT_DEBUG=y
+# CONFIG_CRADLEPOINT_DEBUG is not set
CONFIG_SYS_MALLOC_CLEAR_ON_INIT=y
CONFIG_IMAGE_FORMAT_LEGACY=y
# CONFIG_IPQ_ELF_AUTH is not set
@@ -24,7 +24,11 @@
CONFIG_FIT_SIGNATURE=y
CONFIG_SYS_EXTRA_OPTIONS=""
CONFIG_SYS_PROMPT="D.WAYNE# "
-
+# CONFIG_CRADLEPOINT_DEBUG is not set
+CONFIG_SILENT_CONSOLE=y
+CONFIG_SILENT_U_BOOT_ONLY=y
+CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC=y
+CONFIG_SYS_DEVICE_NULLDEV=y
#
# Commands
#
@@ -49,11 +53,11 @@
#
# Environment commands
#
-CONFIG_CMD_EXPORTENV=y
-CONFIG_CMD_IMPORTENV=y
-CONFIG_CMD_EDITENV=y
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_EDITENV is not set
CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_ENV_EXISTS=y
+# CONFIG_CMD_ENV_EXISTS is not set
#
# Memory commands
@@ -78,7 +82,7 @@
# CONFIG_CMD_SPI is not set
# CONFIG_CMD_I2C is not set
# CONFIG_CMD_USB is not set
-CONFIG_CMD_FPGA=y
+# CONFIG_CMD_FPGA is not set
#
# Shell scripting commands
diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h
index 13b512b..ab51e46 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -49,7 +49,7 @@
* select serial console configuration
*/
#define CONFIG_CONS_INDEX 1
-#define CONFIG_SYS_DEVICE_NULLDEV
+#define CONFIG_SYS_DEVICE_NULLDEV 1
/* allow to overwrite serial and ethaddr */
#define CONFIG_BAUDRATE 115200
@@ -329,6 +329,16 @@
#define CONFIG_IPQ_MDIO 1
#define CONFIG_IPQ_ETH_INIT_DEFER
+/* #define CONFIG_CRADLEPOINT_DEBUG */
+
+/* Have a silent console by default, unless CONFIG_CRADLEPOINT_DEBUG is defined...*/
+#ifndef CONFIG_CRADLEPOINT_DEBUG
+ #define CONFIG_SILENT_CONSOLE 1
+ #define CONFIG_SILENT_U_BOOT_ONLY 1
+ #define CONFIG_SILENT_CONSOLE_UPDATE_ON_RELOC 1
+#endif
+
+
/*
* CRASH DUMP ENABLE
*/