linaro-dev

linaro-dev@lists.linaro.org

4332 discussions

[NOTES] 4/6 Linaro Developer Platform Weekly Status Meeting

by Tom Gall

Enclosed you'll find a link to the agenda, notes and actions from the Linaro Developer Platforms Weekly Status meeting held on April 6th in #linaro-meeting on irc.freenode.net at 15:00 UTC. https://wiki.linaro.org/Platform/DevPlatform/Meetings/2011-04-06 Actions from the meeting where as follows: * slangasek to handle merge of dpkg-cross (bug #736154) Regards, Tom (tgall_foo) Developer Platforms Team "We want great men who, when fortune frowns will not be discouraged." - Colonel Henry Knox w) tom.gall att linaro.org w) tom_gall att vnet.ibm.com h) tom_gall att mac.com

14 years, 1 month

[NOTES] Android Platform team meeting 2011-04-06

by Jamie Bennett

Hi, The notes and actions for this weeks Android Platform Team meeting along with team activity reports are now available at: https://wiki.linaro.org/Platform/Android/Meetings/2011-04-06 = Actions Recorded = * asac to invite TI to Android weekly meeting * asac to chase TI on the mm bits * jim to create a the panda-gfx-integration-initial blueprint * Team to review what they are working on and document what isn't approved/doesn't have a Blueprint/is not targeted to discuss in next weeks meeting * patrikryd to try to push generic hook patch to upstream and see what happens * jserv-- to send email to android-platform telling folks about our toolchain package!! (marketing) and pointing out the build failures we get in platform and asking whether they want contributions to fix them properly * patrikryd to fill out summary on https://blueprints.launchpad.net/linaro-android/+spec/linaro-android-platfo… * patrikryd to fix work item syntax on https://blueprints.launchpad.net/linaro-android/+spec/linaro-android-platfo… * asac and JamieBennett to talk to james_w about keeping android blueprints on android team radar * jeremy to add a more verbose summary to linaro-android-benchmark-suite-integration-into-lava and poke asac/jamie for approving * luse to fix work items and get linaro-android-toolchain-benchmark to approved state * luse/jserv-- to draft a new blueprint that is about integrating the google benchmarks itself .... this blueprint would come before linaro-android-toolchain-benchmark * asac to think about validation meta blueprint and what to do with that with jamie and jeremychang * jserv-- to fix linaro-android-toolchain-ndk WI syntax * patrik to add l-m-c update WI to boottarball spec and assgn that WI to jeremy; also add verification WI owned by him to test the complete "solution" * JamieBennett get the bug bot in here finally * JamieBennett to hunt down infrastructure projects and ensure they are properly covered by android team including bug driver powers etc. * patrikryd to sort out href8500 build situation Regards, Jamie. -- Linaro Release Manager | Platform Project Manager

14 years, 1 month

[PATCH] toolchain/build: Integrate Linaro-GDB in Android toolchain build system

by Luse Cheng

Integrate Linaro-GDB in Android toolchain build system --- linaro-build.sh | 126 ++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 79 insertions(+), 47 deletions(-) diff --git a/linaro-build.sh b/linaro-build.sh index 18d4c84..388ee7a 100755 --- a/linaro-build.sh +++ b/linaro-build.sh @@ -20,6 +20,7 @@ ARG_WGET_LINARO_GCC_SRC= ARG_BZR_LINARO_GCC_SRC= ARG_WITH_GCC= +ARG_WITH_GDB= ARG_WITH_SYSROOT= ARG_APPLY_PATCH=no @@ -54,72 +55,91 @@ usage() { echo " --prefix=<path> Specify installation path [/tmp/android-toolchain-eabi]" echo " --toolchain-src=<path> Toolchain source directory [`dirname $PWD`]" echo " --with-gcc=<path> Specify GCC source (support: directory, bzr, url)" + echo " --with-gdb=<path> Specify gdb source (support: directory, bzr, url)" echo " --with-sysroot=<path> Specify SYSROOT directory" echo " --apply-gcc-patch=<yes|no> Apply Linaro's extra gcc-patches [no]" echo " --help Print this help message" echo } -ARG_LINARO_GCC_SRC_DIR= - -downloadFormBZR() { - local MY_LP_LINARO_GCC=$1 - ARG_LINARO_GCC_SRC_DIR=${MY_LP_LINARO_GCC#*:} - - [ ! -d ${ARG_TOOLCHAIN_SRC_DIR}/gcc ] && mkdir -p "${ARG_TOOLCHAIN_SRC_DIR}/gcc" - if [ ! -d "${ARG_TOOLCHAIN_SRC_DIR}/gcc/${ARG_LINARO_GCC_SRC_DIR}" ]; then - info "Use bzr to clone ${MY_LP_LINARO_GCC}" - RUN=`bzr clone ${MY_LP_LINARO_GCC} ${ARG_TOOLCHAIN_SRC_DIR}/gcc/${ARG_LINARO_GCC_SRC_DIR}` - [ $? -ne 0 ] && error "bzr ${MY_LP_LINARO_GCC} fails." +# $1 - package name (gcc, gdb, etc) +# $2 - value of ARG_WITH_package (lp:*, http://*) +downloadFromBZR() { + local package=$1 + local MY_LP_LINARO_PKG=$2 + local src_dir=${MY_LP_LINARO_PKG#*:} + + local PACKAGE_NAME=`echo $package | tr "[:lower:]" "[:upper:]"` + eval "ARG_LINARO_${PACKAGE_NAME}_SRC_DIR=${src_dir}" + + [ ! -d ${ARG_TOOLCHAIN_SRC_DIR}/$package ] && mkdir -p "${ARG_TOOLCHAIN_SRC_DIR}/$package" + if [ ! -d "${ARG_TOOLCHAIN_SRC_DIR}/$package/${src_dir}" ]; then + info "Use bzr to clone ${MY_LP_LINARO_PKG}" + RUN=`bzr clone ${MY_LP_LINARO_PKG} ${ARG_TOOLCHAIN_SRC_DIR}/$package/${src_dir}` + [ $? -ne 0 ] && error "bzr ${MY_LP_LINARO_PKG} fails." else - info "${ARG_TOOLCHAIN_SRC_DIR}/gcc/${ARG_LINARO_GCC_SRC_DIR} already exists, skip bzr clone" + info "${ARG_TOOLCHAIN_SRC_DIR}/$package/${src_dir} already exists, skip bzr clone" fi } -downloadFormHTTP() { - info "Use wget to get $1" - local MY_LINARO_GCC_FILE=`basename $1` - if [ -f "${MY_LINARO_GCC_FILE}" ]; then +# $1 - package name (gcc, gdb, etc) +# $2 - arg (lp:*, http://*) +downloadFromHTTP() { + local package=$1 + local url=$2 + local file=`basename $url` + + local PACKAGE_NAME=`echo $package | tr "[:lower:]" "[:upper:]"` + + info "Use wget to get $file" + if [ -f "${ARG_TOOLCHAIN_SRC_DIR}/${file}" ] || [ -f "${ARG_TOOLCHAIN_SRC_DIR}/$package/${file}" ]; then #TODO: Add md5 check - info "${MY_LINARO_GCC_FILE} is already exist, skip download" + info "${file} is already exist, skip download" else - RUN=`wget $1` - [ $? -ne 0 ] && error "wget $1 error" + wget "$url" || error "wget $1 error" + mv "$file" "${ARG_TOOLCHAIN_SRC_DIR}/$package" || error "fail to move $file" #TODO: Add md5 check fi - ARG_LINARO_GCC_SRC_DIR=`basename ${MY_LINARO_GCC_FILE} .tar.bz2` - [ ! -d ${ARG_TOOLCHAIN_SRC_DIR}/gcc ] && mkdir -p "${ARG_TOOLCHAIN_SRC_DIR}/gcc" - if [ ! -d "${ARG_TOOLCHAIN_SRC_DIR}/gcc/${ARG_LINARO_GCC_SRC_DIR}" ]; then - info "untar ${MY_LINARO_GCC_FILE} to ${ARG_TOOLCHAIN_SRC_DIR}/gcc" - tar jxf ${MY_LINARO_GCC_FILE} -C ${ARG_TOOLCHAIN_SRC_DIR}/gcc - else - info "${ARG_TOOLCHAIN_SRC_DIR}/gcc/${ARG_LINARO_GCC_SRC_DIR} is already exist, skip untar" - fi + local src_dir=$(basename $file) + src_dir=$(echo $src_dir | sed "s/$\.tar\.bz2\|\.tar\.gz\|\.tgz\|\.tbz$//") + eval "ARG_LINARO_${PACKAGE_NAME}_SRC_DIR=${src_dir}" } -getGCCFrom() { - # set empty to detect error - ARG_LINARO_GCC_SRC_DIR= - ARG_LINARO_GCC_VER= +# $1 - value of ARG_WITH_package +getPackage() { + local package=$(basename $1) + local version=${package#*-} + version=$(echo $version | sed "s/$\.tar\.bz2\|\.tar\.gz\|\.tgz\|\.tbz$//") + package=${package%%-*} + + local PACKAGE_NAME=`echo $package | tr "[:lower:]" "[:upper:]"` case $1 in lp:*) # bzr clone lp:gcc-linaro - downloadFormBZR $1 + downloadFromBZR $package $1 ;; http://*) # snapshot URL: http://launchpad.net/gcc-linaro/4.5/4.5-2011.03-0/+download/gcc-linaro-4.5-… - downloadFormHTTP $1 + downloadFromHTTP $package $1 ;; *) # local directory - [ ! -d "${ARG_TOOLCHAIN_SRC_DIR}/gcc/$1" ] && error "$ARG_TOOLCHAIN_SRC_DIR/gcc/$ARG_LINARO_GCC_SRC_DIR not exist" - ARG_LINARO_GCC_SRC_DIR=$1 + [ ! -d "${ARG_TOOLCHAIN_SRC_DIR}/$package/$1" ] && error "$ARG_TOOLCHAIN_SRC_DIR/$package/$1 not exist" + eval "ARG_LINARO_${PACKAGE_NAME}_SRC_DIR=$1" esac - ARG_LINARO_GCC_VER=`echo ${ARG_LINARO_GCC_SRC_DIR} | grep -o "4\.[5-9]"` - if [ ${ARG_LINARO_GCC_VER} = "" ]; then - warn "Cannot detect version for ${ARG_LINARO_GCC_VER}, 4.5 is used" - ARG_LINARO_GCC_VER=4.5 - fi + # verify version + case $package in + gcc) + # make sure version is greater than 4.5 + ver=`echo $version | grep -o "^4\.$[5-9]\|[1-9][0-9]$"` + if [ x"$version" = x"" ]; then + warn "Cannot detect version for $package-$version, 4.5 is used" + version="4.5" + fi + ;; + esac + + eval "ARG_LINARO_${PACKAGE_NAME}_VER=$version" } while [ $# -gt 0 ]; do @@ -136,6 +156,9 @@ while [ $# -gt 0 ]; do --with-gcc=*) ARG_WITH_GCC="${ARG#*=}" ;; + --with-gdb=*) + ARG_WITH_GDB="${ARG#*=}" + ;; --with-sysroot=*) ARG_WITH_SYSROOT="${ARG#*=}" ;; @@ -160,7 +183,7 @@ if [ "${ARG_TOOLCHAIN_SRC_DIR}" = "" ] || [ ! -f "${ARG_TOOLCHAIN_SRC_DIR}/build error "--toolchain-src-dir is not set or ${ARG_TOOLCHAIN_SRC_DIR} is not ANDROID_TOOLCHAIN_ROOT" fi -if [ "${ARG_WITH_GCC}" = "" ]; then +if [ x"${ARG_WITH_GCC}" = x"" ]; then error "Must specify --with-gcc to build toolchain" fi @@ -171,7 +194,11 @@ if [ ! -z "${ARG_WITH_SYSROOT}" ]; then BUILD_SYSROOT="--with-sysroot=${ARG_WITH_SYSROOT}" fi -getGCCFrom $ARG_WITH_GCC +for package in ${!ARG_WITH*}; do + if [ x"${!package}" != "x" ]; then + getPackage ${!package} + fi +done if [ "x${ARG_APPLY_PATCH}" = "xyes" ]; then note "Will apply patches in toolchain/gcc-patches/${ARG_LINARO_GCC_VER}" @@ -186,8 +213,13 @@ if [ "x${ARG_APPLY_PATCH}" = "xyes" ]; then fi -GCC_VARIANT=`basename ${ARG_LINARO_GCC_SRC_DIR}` -GCC_VARIANT=${GCC_VARIANT#gcc-*} +if [ x"${ARG_WITH_GCC}" != x"" ]; then + BUILD_WITH_GCC="--with-gcc-version=${ARG_LINARO_GCC_VER}" +fi + +if [ x"${ARG_WITH_GDB}" != x"" ]; then + BUILD_WITH_GDB="--with-gdb-version=${ARG_LINARO_GDB_VER}" +fi if echo "$BUILD_ARCH" | grep -q '64' ; then info "Use 64-bit Build Enviorment" @@ -204,11 +236,11 @@ ${ARG_TOOLCHAIN_SRC_DIR}/build/configure \ --disable-docs --disable-nls \ --host=${BUILD_HOST} --build=${BUILD_HOST} \ ${BUILD_SYSROOT} \ - --with-gcc-version=${GCC_VARIANT} \ + ${BUILD_WITH_GCC} \ + ${BUILD_WITH_GDB} \ --with-binutils-version=2.20.1 \ --with-gmp-version=4.2.4 \ - --with-mpfr-version=2.4.1 \ - --with-gdb-version=7.1.x + --with-mpfr-version=2.4.1 make make install -- 1.7.0.4

14 years, 1 month

[NOTES] Minutes & Actions: Kernel Working Group meetings of April 04, 2011

by Mounir Bsaibes

Enclosed you'll find a link to the agenda, minutes, actions and IRC logs from the Linaro kernel working group weekly meetings of April 04, 2011. https://wiki.linaro.org/WorkingGroups/KernelConsolidation/Meetings/2011-04-… == Summary == * Starting up the planning for next cycle * Six high-level TRs: - (1) device tree, (2) Android, (3) kernel/uboot support for new SoCs/boards (including standard architecture), - (4) get to a monthly cadence for John Rigby, (5) improve performance of kernel/uboot for upcoming boards/SoCs, and (6) improve RAS for same. * For 4) we need to get a monthly cadence for John Rigby, we need to help John Rigby to put together a monthly image for testing/evaluation. * There are a lot of not upstream-headed patches, Andy will try to separate them out into a good bad and ugly pile. * Discussion whether networking should be a new focus area for the group. Paull will bring this topic to the TSC to see whether they will be in support of handling Network device Drivers fix-ups and improvement. * Device Tree * All of the u-boot patches are in jcrigby's tree that covers omap3/4, samsung, freescale * On the kernel side efika, panda, overo, samsung and beagle support has been patched in and jcrigby will be pulling them into his stable tree * For Android - After alarmtimers is finished, John thinks lowmemorykiller would be a good area to look into. * Some of the kconfig Work Items will be POSTPONED to next cycle, as Jason will test kexec and John has to concentrate on Android kernel tree. Regards, Mounir

14 years, 1 month

[powerdebug 01/35] change regulator init function

by Daniel Lezcano

Move the corresponding function to the right header file and rename the function with <subsystem>_function_name. Signed-off-by: Daniel Lezcano <daniel.lezcano(a)free.fr> --- powerdebug.c | 3 ++- powerdebug.h | 1 - regulator.c | 2 +- regulator.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/powerdebug.c b/powerdebug.c index 2f0992b..fa26e77 100644 --- a/powerdebug.c +++ b/powerdebug.c @@ -15,6 +15,7 @@ #include <getopt.h> #include <stdbool.h> +#include "regulator.h" #include "powerdebug.h" int highlighted_row; @@ -352,7 +353,7 @@ int main(int argc, char **argv) return 1; } - if (init_regulator_ds()) + if (regulator_init()) return 1; if (mainloop(options)) diff --git a/powerdebug.h b/powerdebug.h index cef5570..42add86 100644 --- a/powerdebug.h +++ b/powerdebug.h @@ -32,7 +32,6 @@ extern struct regulator_info *regulators_info; extern int numregulators; -extern int init_regulator_ds(void); extern void print_regulator_info(int verbose); extern void read_regulator_info(void); extern void print_regulator_info(int verbose); diff --git a/regulator.c b/regulator.c index 18c9777..395571b 100644 --- a/regulator.c +++ b/regulator.c @@ -15,7 +15,7 @@ #include "regulator.h" -int init_regulator_ds(void) +int regulator_init(void) { DIR *regdir; struct dirent *item; diff --git a/regulator.h b/regulator.h index 3ecf6b8..b6780ab 100644 --- a/regulator.h +++ b/regulator.h @@ -40,4 +40,4 @@ struct regulator_info { int num_users; } *regulators_info; -extern int numregulators; +extern int regulator_init(void); -- 1.7.1

14 years, 1 month

Pathes for "Produce boottarball that includes rootfs, kernel and bootloader" for Android

by Patrik Ryd

Hi, I will push some patches for review. They are all for Android. For the blueprint https://blueprints.launchpad.net/linaro-android/+spec/linaro-android-platfo… . I have had problems setting the subject correctly, but they are for the android manifest, linaro/device/common, linaro/device/beagleboard and build gits. BR, Patrik

14 years, 1 month

[PATCH] Added missing " in build-boottarball-target

by Patrik Ryd

--- core/Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Makefile b/core/Makefile index 8b7d6de..857dd20 100644 --- a/core/Makefile +++ b/core/Makefile @@ -794,7 +794,7 @@ stnod: systemtarball-nodeps ####### ## boot tarball define build-boottarball-target - $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET) + $(hide) echo "Target boot fs tarball: $(INSTALLED_BOOTTARBALL_TARGET)" $(hide) mkdir -p $(PRODUCT_OUT)/boot $(hide) cp -f $(INTERNAL_BOOTIMAGE_FILES) $(PRODUCT_OUT)/boot/. $(hide) echo $(BOARD_KERNEL_CMDLINE) > $(PRODUCT_OUT)/boot/cmdline @@ -809,7 +809,7 @@ endif boot_tar := $(PRODUCT_OUT)/boot.tar INSTALLED_BOOTTARBALL_TARGET := $(boot_tar).$(BOOT_TARBALL_FORMAT) -$(INSTALLED_BOOTTARBALL_TARGET): PRIVATE_BOOT_TAR := $(boot_tar) +PRIVATE_BOOT_TAR := $(boot_tar) $(INSTALLED_BOOTTARBALL_TARGET): $(FS_GET_STATS) $(INTERNAL_BOOTIMAGE_FILES) $(build-boottarball-target) -- 1.7.1

14 years, 1 month

[PATCH 1/2] Enable kernel

by Patrik Ryd

Set TARGET_NO_KERNEL to false in BoardConfig --- BoardConfig.mk | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index f0703c7..11b49a8 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -5,7 +5,8 @@ TARGET_BOARD_PLATFORM := omap3 TARGET_NO_BOOTLOADER := true -TARGET_NO_KERNEL := true +TARGET_NO_KERNEL := false +KERNEL_CONFIG := android_omap3_defconfig TARGET_NO_RADIOIMAGE := true TARGET_PROVIDES_INIT_RC := true BOARD_USES_GENERIC_AUDIO := false -- 1.7.1

14 years, 1 month

[PATCH V1] ARM: Samsung: Basic CPUIDLE Support

by Amit Daniel Kachhap

This patch supports cpuidle framework for EXYNOS4210. Currently, Only one idle state is possible to use, but more idle states can be added following by this patch. Signed-off-by: Jaecheol Lee <jc.lee(a)samsung.com> Signed-off-by: Amit Daniel Kachhap <amit.kachhap(a)linaro.org> --- FIX: Fixed the merging issue reported by Nicolas Pitre <nicolas.pitre(a)linaro.org> Sending the rebased patch for linaro 2.6.38 kernel. This patch adds basic cpuidle infrastructure and fixes the launchpad bug(bug id: 723543). This patch is under review in samsung mailing list. http://www.spinics.net/lists/linux-samsung-soc/msg04268.html arch/arm/mach-exynos4/Makefile | 1 + arch/arm/mach-exynos4/cpuidle.c | 87 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 0 deletions(-) create mode 100644 arch/arm/mach-exynos4/cpuidle.c diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index b8f0e7d..f8a3a74 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o gpiolib.o irq-eint.o dma.o obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_CPU_FREQ) += cpufreq.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_SMP) += platsmp.o headsmp.o diff --git a/arch/arm/mach-exynos4/cpuidle.c b/arch/arm/mach-exynos4/cpuidle.c new file mode 100644 index 0000000..a543a18 --- /dev/null +++ b/arch/arm/mach-exynos4/cpuidle.c @@ -0,0 +1,87 @@ +/* linux/arch/arm/mach-exynos4/cpuidle.c + * + * Copyright (c) 2011 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/cpuidle.h> +#include <linux/io.h> + +#include <asm/proc-fns.h> + +static int exynos4_enter_idle(struct cpuidle_device *dev, + struct cpuidle_state *state); + +static struct cpuidle_state exynos4_cpuidle_set[] = { + [0] = { + .enter = exynos4_enter_idle, + .exit_latency = 1, + .target_residency = 100000, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "IDLE", + .desc = "ARM clock gating(WFI)", + }, +}; + +static DEFINE_PER_CPU(struct cpuidle_device, exynos4_cpuidle_device); + +static struct cpuidle_driver exynos4_idle_driver = { + .name = "exynos4_idle", + .owner = THIS_MODULE, +}; + +static int exynos4_enter_idle(struct cpuidle_device *dev, + struct cpuidle_state *state) +{ + struct timeval before, after; + int idle_time; + + local_irq_disable(); + do_gettimeofday(&before); + + cpu_do_idle(); + + do_gettimeofday(&after); + local_irq_enable(); + idle_time = (after.tv_sec - before.tv_sec) * USEC_PER_SEC + + (after.tv_usec - before.tv_usec); + + return idle_time; +} + +static int __init exynos4_init_cpuidle(void) +{ + int i, max_cpuidle_state, cpu_id; + struct cpuidle_device *device; + + cpuidle_register_driver(&exynos4_idle_driver); + + for_each_cpu(cpu_id, cpu_online_mask) { + device = &per_cpu(exynos4_cpuidle_device, cpu_id); + device->cpu = cpu_id; + + device->state_count = (sizeof(exynos4_cpuidle_set) / + sizeof(struct cpuidle_state)); + + max_cpuidle_state = device->state_count; + + for (i = 0; i < max_cpuidle_state; i++) { + memcpy(&device->states[i], &exynos4_cpuidle_set[i], + sizeof(struct cpuidle_state)); + } + + if (cpuidle_register_device(device)) { + printk(KERN_ERR "CPUidle register device failed\n,"); + return -EIO; + } + } + return 0; +} + +device_initcall(exynos4_init_cpuidle); -- 1.7.1

14 years, 1 month

[PATCH] net/fec: fix compile error introduced by dt support

by Shawn Guo

After fec dt support is added, the following compile error will be seen when building a pure non-dt kernel. drivers/net/fec.c: In function ‘fec_probe’: drivers/net/fec.c:1383: error: implicit declaration of function ‘of_match_device’ drivers/net/fec.c:1383: warning: assignment makes pointer from integer without a cast This patch is to fix the error. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- drivers/net/fec.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/drivers/net/fec.c b/drivers/net/fec.c index b57f879..ffb1e75 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -85,8 +85,19 @@ static const struct of_device_id fec_dt_ids[] = { { .compatible = "fsl,imx51-fec", .data = &fec_devtype[0], }, {}, }; + +static const struct of_device_id * +fec_get_of_device_id(struct platform_device *pdev) +{ + return of_match_device(fec_dt_ids, &pdev->dev); +} #else #define fec_dt_ids NULL +static inline struct of_device_id * +fec_get_of_device_id(struct platform_device *pdev) +{ + return NULL; +} #endif static unsigned char macaddr[ETH_ALEN]; @@ -1380,7 +1391,7 @@ fec_probe(struct platform_device *pdev) struct resource *r; const struct of_device_id *of_id; - of_id = of_match_device(fec_dt_ids, &pdev->dev); + of_id = fec_get_of_device_id(pdev); if (of_id) pdev->id_entry = (struct platform_device_id *)of_id->data; -- 1.7.1

14 years, 1 month

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev