diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-10 23:48:28 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-10 23:48:28 -0700 |
commit | 6ec4ed82e9cf2ee5c83fd529af69b2c63b004809 (patch) | |
tree | 437e1d7e42ed225862e50574a2f5a45ab38701d5 | |
parent | 70888a4b412abd55c1710e2d36a9a00f4d23f474 (diff) | |
parent | 40364b9f5a4d167d97bb6a76cd239ca8cfff056a (diff) | |
download | op-kernel-dev-6ec4ed82e9cf2ee5c83fd529af69b2c63b004809.zip op-kernel-dev-6ec4ed82e9cf2ee5c83fd529af69b2c63b004809.tar.gz |
Merge tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Minor DT updates based on the dt-missed-3.4 branch
By Benoit Cousson (3) and Peter Ujfalusi (2)
via Tony Lindgren
* tag 'omap-dt-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
arm/dts: omap4-panda: Add LEDs support
arm/dts: omap4-sdp: Add LEDs support
arm/dts: twl4030: Add twl4030-gpio node
OMAP4: devices: Do not create mcpdm device if the dtb has been provided
OMAP4: devices: Do not create dmic device if the dtb has been provided
-rw-r--r-- | arch/arm/boot/dts/omap4-panda.dts | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-sdp.dts | 43 | ||||
-rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 8 | ||||
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 7 |
4 files changed, 70 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index ea6f5bb..e671361 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 { diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts index 67b2e98..e5eeb6f 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 { diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index a94654c..22f4d13 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>; + }; }; diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 98cab3a..b61c365 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -701,13 +701,14 @@ 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_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_mcpdm(); omap_init_mcspi(); + } omap_init_pmu(); omap_hdq_init(); omap_init_sti(); |