[oe-commits] org.oe.dev merge of '05fe85ad77e7aace526412ed46891996775f2107'
oe commit
openembedded-commits at lists.openembedded.org
Thu Feb 14 15:00:56 UTC 2008
merge of '05fe85ad77e7aace526412ed46891996775f2107'
and '9f227060931d6ef3c46ac867c9d5ab6f7ff4c7b8'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d625decf5e60fa8f122af65024dbcaad6a1f0b19
ViewMTN: http://monotone.openembedded.org/revision/info/d625decf5e60fa8f122af65024dbcaad6a1f0b19
Files:
1
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/angstrom-2008.1.conf
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch
packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch
Diffs:
#
# mt diff -r05fe85ad77e7aace526412ed46891996775f2107 -rd625decf5e60fa8f122af65024dbcaad6a1f0b19
#
#
#
# add_file "conf/distro/include/angstrom-2008-preferred-versions.inc"
# content [ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [7ea86daa05508d4bd45a3e6eeba28b45153de9fe]
# to [68d8c62fce1fc4da0724773e540d24dd355ccaeb]
#
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
+++ conf/distro/include/angstrom-2008-preferred-versions.inc ebf743b8e6427e99a80a69e6d3b9c91f88e89d8d
@@ -0,0 +1,8 @@
+PREFERRED_VERSION_dbus = "1.1.4"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_libtool = "1.2.14"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.10"
+
============================================================
--- conf/distro/angstrom-2008.1.conf 7ea86daa05508d4bd45a3e6eeba28b45153de9fe
+++ conf/distro/angstrom-2008.1.conf 68d8c62fce1fc4da0724773e540d24dd355ccaeb
@@ -22,6 +22,7 @@ require conf/distro/include/sane-srcrevs
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/angstrom-2008-preferred-versions.inc
#Images built can have to modes:
# 'debug': empty rootpassword, strace included
@@ -71,16 +72,10 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9
#Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+ = "2.12.3"
-PREFERRED_VERSION_glib-2.0 = "2.14.4"
-PREFERRED_VERSION_pango = "1.18.1"
+PREFERRED_VERSION_gtk+ ?= "2.12.3"
+PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
+PREFERRED_VERSION_pango ?= "1.18.1"
-# prefer newest for speed and fun
-PREFERRED_VERSION_udev = "115"
-
-# Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable
-PREFERRED_VERSION_busybox = "1.7.2"
-
PREFERRED_PROVIDER_avahi = "avahi"
#Small machines prefer kdrive, but we might ship full Xorg in other images
#
# mt diff -r9f227060931d6ef3c46ac867c9d5ab6f7ff4c7b8 -rd625decf5e60fa8f122af65024dbcaad6a1f0b19
#
#
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch"
# content [c051c656cccc3f7c4bb15b21010e3e198b2e651d]
#
# add_file "packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch"
# content [4978804f67a8e4bbe5d9320b58f68773a3788b4b]
#
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c051c656cccc3f7c4bb15b21010e3e198b2e651d
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-leds.patch c051c656cccc3f7c4bb15b21010e3e198b2e651d
@@ -0,0 +1,202 @@
+diff -urN linux-2.6.24.orig/drivers/leds/Kconfig linux-2.6.24/drivers/leds/Kconfig
+--- linux-2.6.24.orig/drivers/leds/Kconfig 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Kconfig 2008-02-08 08:12:01.000000000 +0100
+@@ -114,6 +114,12 @@
+ help
+ This option enables support for the CM-X270 LEDs.
+
++config LEDS_MPC8313E_RDB
++ tristate "LED Support for MPC8313E-RDB LEDs"
++ depends on LEDS_CLASS && PPC_83xx
++ help
++ This option enables support for the LEDs on MPC8313E-RDB board.
++
+ comment "LED Triggers"
+
+ config LEDS_TRIGGERS
+diff -urN linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c
+--- linux-2.6.24.orig/drivers/leds/leds-mpc8313e-rdb.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.24/drivers/leds/leds-mpc8313e-rdb.c 2008-02-08 08:12:01.000000000 +0100
+@@ -0,0 +1,171 @@
++/*
++ * drivers/leds/leds-mpc8313e-rdb.c
++ * Copyright (C) 2007 Leon Woestenberg <leon at sidebranch.com>
++ * Copyright (C) 2007 Jeremy Laine <jeremy.laine at bolloretelecom.eu>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ *
++ * MPC8313E-RDB LEDs driver
++ *
++ */
++
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/ioport.h>
++#include <linux/leds.h>
++#include <linux/err.h>
++#include <asm/io.h>
++
++#define LEDS_BASE 0xfa000000
++#define LEDS_SIZE 0x2
++
++static struct platform_device *leds_pdev = NULL;
++static struct resource *led_mem = NULL;
++static void *led_io = NULL;
++static u8 led_state = 0xff;
++
++struct mpc8313_led {
++ struct led_classdev cdev;
++ u8 bitmask;
++};
++
++static void mpc8313leds_set(struct led_classdev *led_cdev, enum led_brightness value)
++{
++ struct mpc8313_led *led_dev = container_of(led_cdev, struct mpc8313_led, cdev);
++ if (value)
++ led_state &= ~led_dev->bitmask;
++ else
++ led_state |= led_dev->bitmask;
++ iowrite8(led_state, led_io);
++}
++
++static struct mpc8313_led mpc8313_leds[] = {
++ {
++ .cdev = {
++ .name = "mpc8313:led0",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 1,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led1",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 2,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led2",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 4,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led3",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 8,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:led4",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 16,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:green",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 32,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:yellow",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 64,
++ },
++ {
++ .cdev = {
++ .name = "mpc8313:red",
++ .brightness_set = mpc8313leds_set,
++ },
++ .bitmask = 128,
++ },
++};
++
++static int mpc8313leds_probe(struct platform_device *pdev)
++{
++ int i;
++ int ret;
++
++ for (i = ret = 0; ret >= 0 && i < ARRAY_SIZE(mpc8313_leds); i++) {
++ ret = led_classdev_register(&pdev->dev,
++ &mpc8313_leds[i].cdev);
++ }
++
++ if (ret < 0 && i > 1) {
++ for (i = i - 2; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++ }
++
++ return ret;
++}
++
++static int mpc8313leds_remove(struct platform_device *pdev)
++{
++ int i;
++
++ for (i = ARRAY_SIZE(mpc8313_leds) - 1; i >= 0; i--)
++ led_classdev_unregister(&mpc8313_leds[i].cdev);
++
++ return 0;
++}
++
++static struct platform_driver mpc8313leds_driver = {
++ .driver = {
++ .name = "mpc8313-leds",
++ .owner = THIS_MODULE,
++ },
++ .probe = mpc8313leds_probe,
++ .remove = mpc8313leds_remove,
++};
++
++static int __init mpc8313leds_init(void)
++{
++ if (!(led_mem = request_mem_region(LEDS_BASE, LEDS_SIZE, "mpc8313-leds")))
++ return -ENOMEM;
++ if (!(led_io = ioremap(LEDS_BASE, LEDS_SIZE)))
++ {
++ release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ return -ENOMEM;
++ }
++ iowrite8(led_state, led_io);
++
++ leds_pdev = platform_device_register_simple("mpc8313-leds", -1, NULL, 0);
++
++ return platform_driver_register(&mpc8313leds_driver);
++}
++
++static void __exit mpc8313leds_exit(void)
++{
++ if (led_mem) release_mem_region(LEDS_BASE, LEDS_SIZE);
++ led_mem = NULL;
++ platform_driver_unregister(&mpc8313leds_driver);
++
++ platform_device_unregister(leds_pdev);
++}
++
++module_init(mpc8313leds_init);
++module_exit(mpc8313leds_exit);
++
++MODULE_AUTHOR("Leon Woestenberg <leon at sidebranch.com>");
++MODULE_DESCRIPTION("MPC8313E-RDB LED driver");
++MODULE_LICENSE("GPL");
+diff -urN linux-2.6.24.orig/drivers/leds/Makefile linux-2.6.24/drivers/leds/Makefile
+--- linux-2.6.24.orig/drivers/leds/Makefile 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/drivers/leds/Makefile 2008-02-08 08:12:38.000000000 +0100
+@@ -19,6 +19,7 @@
+ obj-$(CONFIG_LEDS_COBALT_RAQ) += leds-cobalt-raq.o
+ obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o
+ obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
++obj-$(CONFIG_LEDS_MPC8313E_RDB) += leds-mpc8313e-rdb.o
+
+ # LED Triggers
+ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
============================================================
--- packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 4978804f67a8e4bbe5d9320b58f68773a3788b4b
+++ packages/linux/linux-2.6.24/mpc8313e-rdb/mpc8313e-rdb-rtc.patch 4978804f67a8e4bbe5d9320b58f68773a3788b4b
@@ -0,0 +1,24 @@
+diff -urN linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts
+--- linux-2.6.24.orig/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-01-24 23:58:37.000000000 +0100
++++ linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-02-08 08:09:07.000000000 +0100
+@@ -52,12 +52,20 @@
+ };
+
+ i2c at 3000 {
++ #address-cells = <1>;
++ #size-cells = <0>;
+ device_type = "i2c";
+ compatible = "fsl-i2c";
+ reg = <3000 100>;
+ interrupts = <e 8>;
+ interrupt-parent = < &ipic >;
+ dfsrr;
++
++ rtc at 68 {
++ device_type = "rtc";
++ compatible = "dallas,ds1339";
++ reg = <68>;
++ };
+ };
+
+ i2c at 3100 {
More information about the Openembedded-commits
mailing list