From 259bd6ce0200c4b9692fcbfa9cbc29d818aa2116 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 2 May 2012 15:23:18 +0300 Subject: OMAP4: devices: Do not create dmic device if the dtb has been provided If dtb is provided the needed device will be created dynamically. Signed-off-by: Peter Ujfalusi Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/devices.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 8a489ba68714..addaa588c8e7 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -722,12 +722,13 @@ static int __init omap2_init_devices(void) */ omap_init_audio(); omap_init_mcpdm(); - omap_init_dmic(); omap_init_camera(); omap_init_mbox(); /* If dtb is there, the devices will be created dynamically */ - if (!of_have_populated_dt()) + if (!of_have_populated_dt()) { + omap_init_dmic(); omap_init_mcspi(); + } omap_init_pmu(); omap_hdq_init(); omap_init_sti(); -- cgit v1.2.1 From 4b21ffcf5d6f197b535593b732e0e4fd2cc11921 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 2 May 2012 15:23:19 +0300 Subject: OMAP4: devices: Do not create mcpdm device if the dtb has been provided If dtb is provided the needed device will be created dynamically. Signed-off-by: Peter Ujfalusi Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index addaa588c8e7..ddf304de473c 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -721,12 +721,12 @@ static int __init omap2_init_devices(void) * in alphabetical order so they're easier to sort through. */ omap_init_audio(); - omap_init_mcpdm(); omap_init_camera(); omap_init_mbox(); /* If dtb is there, the devices will be created dynamically */ if (!of_have_populated_dt()) { omap_init_dmic(); + omap_init_mcpdm(); omap_init_mcspi(); } omap_init_pmu(); -- cgit v1.2.1 From 61ff641307c5191f40a416df5bb19f6745af2f0b Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Tue, 8 May 2012 18:37:25 +0200 Subject: arm/dts: twl4030: Add twl4030-gpio node Add the twl-gpio node inside twl4030 definition. Cc: Felipe Balbi Signed-off-by: Benoit Cousson Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/twl4030.dtsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index a94654c9eb8d..22f4d1394ed3 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -36,4 +36,12 @@ regulator-min-microvolt = <1850000>; regulator-max-microvolt = <3150000>; }; + + twl_gpio: gpio { + compatible = "ti,twl4030-gpio"; + gpio-controller; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <1>; + }; }; -- cgit v1.2.1 From 83909c7352ecd437dfdeabf609048bcced175196 Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Tue, 8 May 2012 18:37:26 +0200 Subject: arm/dts: omap4-sdp: Add LEDs support Add the debug LEDs nodes for an OMAP4 SDP/Blaze. Signed-off-by: Benoit Cousson Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap4-sdp.dts | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 67b2e98074c6..e5eeb6f9c6e6 100644 --- a/arch/arm/boot/dts/omap4-sdp.dts +++ b/arch/arm/boot/dts/omap4-sdp.dts @@ -27,6 +27,49 @@ enable-active-high; regulator-boot-on; }; + + leds { + compatible = "gpio-leds"; + debug0 { + label = "omap4:green:debug0"; + gpios = <&gpio2 29 0>; /* 61 */ + }; + + debug1 { + label = "omap4:green:debug1"; + gpios = <&gpio1 30 0>; /* 30 */ + }; + + debug2 { + label = "omap4:green:debug2"; + gpios = <&gpio1 7 0>; /* 7 */ + }; + + debug3 { + label = "omap4:green:debug3"; + gpios = <&gpio1 8 0>; /* 8 */ + }; + + debug4 { + label = "omap4:green:debug4"; + gpios = <&gpio2 18 0>; /* 50 */ + }; + + user1 { + label = "omap4:blue:user"; + gpios = <&gpio6 9 0>; /* 169 */ + }; + + user2 { + label = "omap4:red:user"; + gpios = <&gpio6 10 0>; /* 170 */ + }; + + user3 { + label = "omap4:green:user"; + gpios = <&gpio5 11 0>; /* 139 */ + }; + }; }; &i2c1 { -- cgit v1.2.1 From 40364b9f5a4d167d97bb6a76cd239ca8cfff056a Mon Sep 17 00:00:00 2001 From: Benoit Cousson Date: Tue, 8 May 2012 18:37:27 +0200 Subject: arm/dts: omap4-panda: Add LEDs support Add the debug LEDs nodes for an OMAP4 PandaBoard. Signed-off-by: Benoit Cousson Signed-off-by: Tony Lindgren --- arch/arm/boot/dts/omap4-panda.dts | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index ea6f5bb8a120..e671361bc791 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts @@ -17,6 +17,21 @@ device_type = "memory"; reg = <0x80000000 0x40000000>; /* 1 GB */ }; + + leds { + compatible = "gpio-leds"; + heartbeat { + label = "pandaboard::status1"; + gpios = <&gpio1 7 0>; + linux,default-trigger = "heartbeat"; + }; + + mmc { + label = "pandaboard::status2"; + gpios = <&gpio1 8 0>; + linux,default-trigger = "mmc0"; + }; + }; }; &i2c1 { -- cgit v1.2.1