summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-08-07 06:14:59 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-08-07 06:14:59 +0200
commitc138893990013fa9f3008325fdf4fd8ac0628ba2 (patch)
tree89749ef4673c0b22aa1c332d81e5bbb543efdf80 /arch
parent7e094e336c312178c898f19fcd4c7af6a992c038 (diff)
parentc36d1431b2ebe2a567556f6d21eb1078284030fd (diff)
downloadbarebox-c138893990013fa9f3008325fdf4fd8ac0628ba2.tar.gz
barebox-c138893990013fa9f3008325fdf4fd8ac0628ba2.tar.xz
Merge branch 'for-next/led'
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/configs/ritmix-rzx50_defconfig6
-rw-r--r--arch/mips/dts/rzx50.dts10
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/mips/configs/ritmix-rzx50_defconfig b/arch/mips/configs/ritmix-rzx50_defconfig
index e6f10fb938..232faa2659 100644
--- a/arch/mips/configs/ritmix-rzx50_defconfig
+++ b/arch/mips/configs/ritmix-rzx50_defconfig
@@ -29,12 +29,18 @@ CONFIG_CMD_GETOPT=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_GPIO=y
+CONFIG_CMD_LED=y
CONFIG_CMD_POWEROFF=y
+CONFIG_CMD_LED_TRIGGER=y
CONFIG_CMD_OF_NODE=y
CONFIG_CMD_OF_PROPERTY=y
CONFIG_CMD_OFTREE=y
CONFIG_OFDEVICE=y
# CONFIG_SPI is not set
+CONFIG_LED=y
+CONFIG_LED_GPIO=y
+CONFIG_LED_GPIO_OF=y
+CONFIG_LED_TRIGGERS=y
CONFIG_GPIO_JZ4740=y
CONFIG_SHA1=y
CONFIG_SHA224=y
diff --git a/arch/mips/dts/rzx50.dts b/arch/mips/dts/rzx50.dts
index 360c1bf5de..7ec3352666 100644
--- a/arch/mips/dts/rzx50.dts
+++ b/arch/mips/dts/rzx50.dts
@@ -9,6 +9,16 @@
memory {
reg = <0x00000000 0x4000000>;
};
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ lcd-backlight-enable {
+ label = "lcd backlight";
+ gpios = <&gpio4 22 0>;
+ linux,default-trigger = "default-on";
+ };
+ };
};
&serial1 {