linaro-kernel March 2012

linaro-kernel@lists.linaro.org

38 participants
53 discussions

[ACTIVITY] (Deepak Saxena) Feb 26 - Mar 3

by Deepak Saxena

== Deepak Saxena <dsaxena> == === Highlights === * Lots of catching up on emails from pre-ELC * 1-on-1's * Discussions on kernel upstreaming and roadmap process * Review of big.LITTLE Task Migration test plan === Plans === * Work on kernel wiki page updates * 1-on-1's, sub-team meetings * Working on roadmap cards * Start outline of porting guide that was discussed @ Connect * Continue looking at kernel upstreaming and roadmap process * Start outline of member's update on how kernel development process differs from traditional software development. * Dive deeper into big.LITTLE switcher project === Issues === *** I have lost all wiki access permissions (can't edit or create pages, *** *** can't acces /Internal). RT ticket filed last week but no progress. *** === Travel/Time Off === * Taking Monday March 12th mostly off, might be online parts of the day * Possible off May 4-10th. * Connect Q2

12 years, 1 month

re: What is bug of OMAP4460 that make oprofile can not run normally

by David Long

>Hi all, >We are know that the OMAP4460's PMU is buggy, which loses PMU interrupt always. >But I do not know what the real bug is, the HW bug or Software bug? >What the bug is? Kyler, This is a hardware problem in the ARM core. It is not specific to the 4460, for instance it also occurs in the 4430 (and presumably non-TI SoCs). The result of this bug is that PMU counter overflow interrupts are sometimes lost. The affect can be reduced by paralleling PMU counters, but this only reduces the problem statistically somewhat. There is no complete workaround. The problem is described in ARM errata, but I do not believe that information is generally available. I think it can be found on a Freescale site though. I suggest googling for ARM errata 628216. I believe this will be fixed in a future iteration of the design, but I do not know when this will be released. -dl David Long Linaro

12 years, 2 months

[ACTIVITY] (Shawn Guo) Week of Feb 27

by Shawn Guo

=== Device Tree === * Sent the full series (20 patches) adding DT support for IMX audio. - Covert audmux driver to a platform driver and move it into ASoC - Consolidate PowerPC SSI driver and make it work for IMX - Add imx-sgtl5000 machine driver (DT only) === Misc === * Reviewed ANATOP MFD and Regulator series (v7) from Paul Liu -- Regards, Shawn

12 years, 2 months

[Activity] (Niklas Hernaeus) 2012-02-27 - 2012-03-02

by Niklas Hernaeus

== Niklas Hernaeus <nhe> == === General activity === * Made the initial DT system to build and boot reliably. * Sent out a patch for this initial DT system. /nhe

12 years, 2 months

[PATCH 3/3] vmevent: Should not grab mutex in the atomic context

by Anton Vorontsov

There is not need to grab mutex in the atomic context, moreover this is wrong and causes the following bug: BUG: sleeping function called from invalid context at kernel/mutex.c:271 in_atomic(): 1, irqs_disabled(): 1, pid: 1056, name: m no locks held by m/1056. irq event stamp: 58768 hardirqs last enabled at (58767): [<ffffffff8101ca35>] do_page_fault+0x275/0x450 hardirqs last disabled at (58768): [<ffffffff81325a2b>] apic_timer_interrupt+0x6b/0x80 softirqs last enabled at (58676): [<ffffffff81038def>] __do_softirq+0x10f/0x160 softirqs last disabled at (58671): [<ffffffff813262ac>] call_softirq+0x1c/0x26 Pid: 1056, comm: m Not tainted 3.2.0+ #3 Call Trace: <IRQ> [<ffffffff81062530>] ? print_irqtrace_events+0xd0/0xe0 [<ffffffff8102f5da>] __might_sleep+0x12a/0x1e0 [<ffffffff81321dbc>] mutex_lock_nested+0x3c/0x340 [<ffffffff81053a8c>] ? __run_hrtimer+0x4c/0x100 [<ffffffff810bd920>] ? vmevent_read+0x100/0x100 [<ffffffff810bd79e>] vmevent_sample+0x6e/0xf0 [<ffffffff810bd946>] vmevent_timer_fn+0x26/0x60 [<ffffffff81053a92>] __run_hrtimer+0x52/0x100 [<ffffffff81054463>] hrtimer_interrupt+0xf3/0x220 [<ffffffff810166d4>] smp_apic_timer_interrupt+0x64/0xa0 [<ffffffff81325a30>] apic_timer_interrupt+0x70/0x80 <EOI> [<ffffffff8101ca3a>] ? do_page_fault+0x27a/0x450 [<ffffffff8101ca35>] ? do_page_fault+0x275/0x450 [<ffffffff810036bf>] ? do_softirq+0x6f/0xc0 [<ffffffff8132485d>] ? retint_restore_args+0xe/0xe [<ffffffff8132484a>] ? retint_swapgs+0xe/0x13 [<ffffffff8116b31d>] ? trace_hardirqs_off_thunk+0x3a/0x3c [<ffffffff81324a3f>] page_fault+0x1f/0x30 Signed-off-by: Anton Vorontsov <anton.vorontsov(a)linaro.org> --- The patch is for git://github.com/penberg/linux.git vmevent/core. mm/vmevent.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/mm/vmevent.c b/mm/vmevent.c index 1375f9d..1dbefb5 100644 --- a/mm/vmevent.c +++ b/mm/vmevent.c @@ -71,8 +71,6 @@ static void vmevent_sample(struct vmevent_watch *watch) if (!vmevent_match(watch, &event)) return; - mutex_lock(&watch->mutex); - watch->pending = true; if (watch->config.event_attrs & VMEVENT_EATTR_NR_AVAIL_PAGES) @@ -85,8 +83,6 @@ static void vmevent_sample(struct vmevent_watch *watch) watch->attr_values[n++] = event.nr_swap_pages; watch->nr_attrs = n; - - mutex_unlock(&watch->mutex); } static enum hrtimer_restart vmevent_timer_fn(struct hrtimer *hrtimer) -- 1.7.7.6

12 years, 2 months

[PATCH 2/3] vmevent: Fix deadlock when using si_meminfo()

by Anton Vorontsov

si_meminfo() calls nr_blockdev_pages() that grabs bdev_lock, but it is not safe to grab the lock from the hardirq context (the lock is never taken with an _irqsave variant in block_dev.c). When taken from an inappropriate context it easily causes the following deadlock: - - - - ================================= [ INFO: inconsistent lock state ] 3.2.0+ #1 --------------------------------- inconsistent {HARDIRQ-ON-W} -> {IN-HARDIRQ-W} usage. swapper/0/0 [HC1[1]:SC0[0]:HE0:SE1] takes: (bdev_lock){?.+...}, at: [<ffffffff810f1017>] nr_blockdev_pages+0x17/0x70 {HARDIRQ-ON-W} state was registered at: [<ffffffff81061b20>] mark_irqflags+0x140/0x1b0 [<ffffffff81062f03>] __lock_acquire+0x4c3/0x9c0 [<ffffffff810639c6>] lock_acquire+0x96/0xc0 [<ffffffff8131c58c>] _raw_spin_lock+0x2c/0x40 [<ffffffff810f1017>] nr_blockdev_pages+0x17/0x70 [<ffffffff81089ba8>] si_meminfo+0x38/0x60 [<ffffffff81675493>] eventpoll_init+0x11/0xa1 [<ffffffff8165eb40>] do_one_initcall+0x7a/0x12e [<ffffffff8165ec8e>] kernel_init+0x9a/0x114 [<ffffffff8131e934>] kernel_thread_helper+0x4/0x10 irq event stamp: 135250 hardirqs last enabled at (135247): [<ffffffff81009897>] default_idle+0x27/0x50 hardirqs last disabled at (135248): [<ffffffff8131e1ab>] apic_timer_interrupt+0x6b/0x80 softirqs last enabled at (135250): [<ffffffff8103814e>] _local_bh_enable+0xe/0x10 softirqs last disabled at (135249): [<ffffffff81038665>] irq_enter+0x65/0x80 other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(bdev_lock); <Interrupt> lock(bdev_lock); *** DEADLOCK *** no locks held by swapper/0/0. - - - - The patch fixes the issue by using totalram_pages instead of si_meminfo(). p.s. Note that VMEVENT_EATTR_NR_SWAP_PAGES type calls si_swapinfo(), which has a very similar problem. But there is no easy way to fix it. Do we have any use case for the VMEVENT_EATTR_NR_SWAP_PAGES event? If not, I'd vote for removing it and thus keeping things simple. Otherwise we would have two options: 1. Modify swap accounting for vmevent (either start grabbing _irqsave variant of swapfile.c's swap_lock, or try to make the accounting atomic); 2. Start using kthreads for vmevent_sample(). Signed-off-by: Anton Vorontsov <anton.vorontsov(a)linaro.org> --- The patch is for git://github.com/penberg/linux.git vmevent/core. mm/vmevent.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/vmevent.c b/mm/vmevent.c index 2342752..1375f9d 100644 --- a/mm/vmevent.c +++ b/mm/vmevent.c @@ -51,18 +51,18 @@ static bool vmevent_match(struct vmevent_watch *watch, static void vmevent_sample(struct vmevent_watch *watch) { struct vmevent_watch_event event; - struct sysinfo si; int n = 0; memset(&event, 0, sizeof(event)); event.nr_free_pages = global_page_state(NR_FREE_PAGES); - si_meminfo(&si); - event.nr_avail_pages = si.totalram; + event.nr_avail_pages = totalram_pages; #ifdef CONFIG_SWAP if (watch->config.event_attrs & VMEVENT_EATTR_NR_SWAP_PAGES) { + struct sysinfo si; + si_swapinfo(&si); event.nr_swap_pages = si.totalswap; } -- 1.7.7.6

12 years, 2 months

[PATCH 1/3] vmevent: Fix build for SWAP=n case

by Anton Vorontsov

Caught this build failure: CC mm/vmevent.o mm/vmevent.c:17:6: error: expected identifier or '(' before numeric constant mm/vmevent.c:18:1: warning: no semicolon at end of struct or union [enabled by default] mm/vmevent.c: In function 'vmevent_sample': mm/vmevent.c:84:36: error: expected identifier before numeric constant make[1]: *** [mm/vmevent.o] Error 1 make: *** [mm/] Error 2 This is because linux/swap.h defines nr_swap_pages to 0L, and so things break. Fix this by undefinding it back, as we don't use it anyway. Signed-off-by: Anton Vorontsov <anton.vorontsov(a)linaro.org> --- The patch is for git://github.com/penberg/linux.git vmevent/core. mm/vmevent.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/mm/vmevent.c b/mm/vmevent.c index 37d2c5f..2342752 100644 --- a/mm/vmevent.c +++ b/mm/vmevent.c @@ -6,6 +6,7 @@ #include <linux/poll.h> #include <linux/slab.h> #include <linux/swap.h> +#undef nr_swap_pages /* This is defined to a constant for SWAP=n case */ #define VMEVENT_MAX_FREE_THRESHOD 100 -- 1.7.7.6

12 years, 2 months

[PATCH] Initial Device Tree system for Snowball

by Niklas Hernaeus

From: Niklas Hernaeus <niklas.hernaeus(a)linaro.org> This is the base system for using Device Tree for Snowball. The new boardfile is a slightly modified copy of the original board file, so new Device Tree stuff can simply be added and code removed, while functionality stays the same. Signed-off-by: Niklas Hernaeus <niklas.hernaeus(a)linaro.org> --- arch/arm/boot/dts/snowball.dts | 32 ++ arch/arm/mach-ux500/Kconfig | 17 +- arch/arm/mach-ux500/Makefile | 5 +- arch/arm/mach-ux500/board-mop500-dt.c | 729 +++++++++++++++++++++++++++++++ arch/arm/mach-ux500/include/mach/irqs.h | 2 +- 5 files changed, 779 insertions(+), 6 deletions(-) create mode 100644 arch/arm/boot/dts/snowball.dts create mode 100644 arch/arm/mach-ux500/board-mop500-dt.c diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts new file mode 100644 index 0000000..02305fb --- /dev/null +++ b/arch/arm/boot/dts/snowball.dts @@ -0,0 +1,32 @@ +/* + * Copyright 2011 ST-Ericsson AB + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +/dts-v1/; + +/ { + model = "Calao Systems Snowball platform with device tree"; + compatible = "calaosystems,snowball-a9500"; + + #address-cells = <1>; + #size-cells = <1>; + + memory { + device_type = "memory"; + reg = <0x00000000 0x20000000>; + }; + + soc-u9500 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges; + }; +}; diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 52af004..be7e4fe 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -27,19 +27,22 @@ menu "Ux500 target platform (boards)" config MACH_U8500 bool "U8500 Development platform" depends on UX500_SOC_DB8500 + depends on !USE_OF select TPS6105X help Include support for the mop500 development platform. config MACH_HREFV60 - bool "U85000 Development platform, HREFv60 version" - depends on UX500_SOC_DB8500 - help - Include support for the HREFv60 new development platform. + bool "U85000 Development platform, HREFv60 version" + depends on UX500_SOC_DB8500 + depends on !USE_OF + help + Include support for the HREFv60 new development platform. config MACH_SNOWBALL bool "U8500 Snowball platform" depends on UX500_SOC_DB8500 + depends on !USE_OF select MACH_U8500 help Include support for the snowball development platform. @@ -49,6 +52,12 @@ config MACH_U5500 depends on UX500_SOC_DB5500 help Include support for the U5500 development platform. +config MACH_UX500_DT + def_bool y if USE_OF + depends on UX500_SOC_DB8500 || UX500_SOC_DB5500 + +config MACH_MOP500 + def_bool y if MACH_U8500 || MACH_UX500_DT endmenu config UX500_DEBUG_UART diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile index 6bd2f45..05bee25 100644 --- a/arch/arm/mach-ux500/Makefile +++ b/arch/arm/mach-ux500/Makefile @@ -7,7 +7,10 @@ obj-y := clock.o cpu.o devices.o devices-common.o \ obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o obj-$(CONFIG_UX500_SOC_DB5500) += cpu-db5500.o dma-db5500.o obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o -obj-$(CONFIG_MACH_U8500) += board-mop500.o board-mop500-sdi.o \ + +obj-$(CONFIG_MACH_UX500_DT) += board-mop500-dt.o +obj-$(CONFIG_MACH_U8500) += board-mop500.o +obj-$(CONFIG_MACH_MOP500) += board-mop500-sdi.o \ board-mop500-regulators.o \ board-mop500-uib.o board-mop500-stuib.o \ board-mop500-u8500uib.o \ diff --git a/arch/arm/mach-ux500/board-mop500-dt.c b/arch/arm/mach-ux500/board-mop500-dt.c new file mode 100644 index 0000000..33f4a83 --- /dev/null +++ b/arch/arm/mach-ux500/board-mop500-dt.c @@ -0,0 +1,729 @@ +/* + * Copyright (C) 2008-2009 ST-Ericsson + * + * Author: Srinidhi KASAGAR <srinidhi.kasagar(a)stericsson.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/interrupt.h> +#include <linux/platform_device.h> +#include <linux/io.h> +#include <linux/i2c.h> +#include <linux/gpio.h> +#include <linux/amba/bus.h> +#include <linux/amba/pl022.h> +#include <linux/amba/serial.h> +#include <linux/spi/spi.h> +#include <linux/mfd/abx500/ab8500.h> +#include <linux/regulator/ab8500.h> +#include <linux/mfd/tc3589x.h> +#include <linux/mfd/tps6105x.h> +#include <linux/mfd/abx500/ab8500-gpio.h> +#include <linux/leds-lp5521.h> +#include <linux/input.h> +#include <linux/smsc911x.h> +#include <linux/gpio_keys.h> +#include <linux/delay.h> + +#include <linux/of.h> +#include <linux/of_platform.h> + +#include <linux/leds.h> +#include <asm/mach-types.h> +#include <asm/mach/arch.h> +#include <asm/hardware/gic.h> + +#include <plat/i2c.h> +#include <plat/ste_dma40.h> +#include <plat/pincfg.h> +#include <plat/gpio-nomadik.h> + +#include <mach/hardware.h> +#include <mach/setup.h> +#include <mach/devices.h> +#include <mach/irqs.h> + +#include "pins-db8500.h" +#include "ste-dma40-db8500.h" +#include "devices-db8500.h" +#include "board-mop500.h" +#include "board-mop500-regulators.h" + +static struct gpio_led snowball_led_array[] = { + { + .name = "user_led", + .default_trigger = "none", + .gpio = 142, + }, +}; + +static struct gpio_led_platform_data snowball_led_data = { + .leds = snowball_led_array, + .num_leds = ARRAY_SIZE(snowball_led_array), +}; + +static struct platform_device snowball_led_dev = { + .name = "leds-gpio", + .dev = { + .platform_data = &snowball_led_data, + }, +}; + +static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { + .gpio_base = MOP500_AB8500_GPIO(0), + .irq_base = MOP500_AB8500_VIR_GPIO_IRQ_BASE, + /* config_reg is the initial configuration of ab8500 pins. + * The pins can be configured as GPIO or alt functions based + * on value present in GpioSel1 to GpioSel6 and AlternatFunction + * register. This is the array of 7 configuration settings. + * One has to compile time decide these settings. Below is the + * explanation of these setting + * GpioSel1 = 0x00 => Pins GPIO1 to GPIO8 are not used as GPIO + * GpioSel2 = 0x1E => Pins GPIO10 to GPIO13 are configured as GPIO + * GpioSel3 = 0x80 => Pin GPIO24 is configured as GPIO + * GpioSel4 = 0x01 => Pin GPIo25 is configured as GPIO + * GpioSel5 = 0x7A => Pins GPIO34, GPIO36 to GPIO39 are conf as GPIO + * GpioSel6 = 0x00 => Pins GPIO41 & GPIo42 are not configured as GPIO + * AlternaFunction = 0x00 => If Pins GPIO10 to 13 are not configured + * as GPIO then this register selectes the alternate fucntions + */ + .config_reg = {0x00, 0x1E, 0x80, 0x01, + 0x7A, 0x00, 0x00}, +}; + +static struct gpio_keys_button snowball_key_array[] = { + { + .gpio = 32, + .type = EV_KEY, + .code = KEY_1, + .desc = "userpb", + .active_low = 1, + .debounce_interval = 50, + .wakeup = 1, + }, + { + .gpio = 151, + .type = EV_KEY, + .code = KEY_2, + .desc = "extkb1", + .active_low = 1, + .debounce_interval = 50, + .wakeup = 1, + }, + { + .gpio = 152, + .type = EV_KEY, + .code = KEY_3, + .desc = "extkb2", + .active_low = 1, + .debounce_interval = 50, + .wakeup = 1, + }, + { + .gpio = 161, + .type = EV_KEY, + .code = KEY_4, + .desc = "extkb3", + .active_low = 1, + .debounce_interval = 50, + .wakeup = 1, + }, + { + .gpio = 162, + .type = EV_KEY, + .code = KEY_5, + .desc = "extkb4", + .active_low = 1, + .debounce_interval = 50, + .wakeup = 1, + }, +}; + +static struct gpio_keys_platform_data snowball_key_data = { + .buttons = snowball_key_array, + .nbuttons = ARRAY_SIZE(snowball_key_array), +}; + +static struct platform_device snowball_key_dev = { + .name = "gpio-keys", + .id = -1, + .dev = { + .platform_data = &snowball_key_data, + } +}; + +static struct smsc911x_platform_config snowball_sbnet_cfg = { + .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH, + .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL, + .flags = SMSC911X_USE_16BIT | SMSC911X_FORCE_INTERNAL_PHY, + .shift = 1, +}; + +static struct resource sbnet_res[] = { + { + .name = "smsc911x-memory", + .start = (0x5000 << 16), + .end = (0x5000 << 16) + 0xffff, + .flags = IORESOURCE_MEM, + }, + { + .start = NOMADIK_GPIO_TO_IRQ(140), + .end = NOMADIK_GPIO_TO_IRQ(140), + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE, + }, +}; + +static struct platform_device snowball_sbnet_dev = { + .name = "smsc911x", + .num_resources = ARRAY_SIZE(sbnet_res), + .resource = sbnet_res, + .dev = { + .platform_data = &snowball_sbnet_cfg, + }, +}; + +static struct ab8500_platform_data ab8500_platdata = { + .irq_base = MOP500_AB8500_IRQ_BASE, + .regulator_reg_init = ab8500_regulator_reg_init, + .num_regulator_reg_init = ARRAY_SIZE(ab8500_regulator_reg_init), + .regulator = ab8500_regulators, + .num_regulator = ARRAY_SIZE(ab8500_regulators), + .gpio = &ab8500_gpio_pdata, +}; + +static struct resource ab8500_resources[] = { + [0] = { + .start = IRQ_DB8500_AB8500, + .end = IRQ_DB8500_AB8500, + .flags = IORESOURCE_IRQ + } +}; + +struct platform_device ab8500_device = { + .name = "ab8500-i2c", + .id = 0, + .dev = { + .platform_data = &ab8500_platdata, + }, + .num_resources = 1, + .resource = ab8500_resources, +}; + +/* + * TPS61052 + */ + +static struct tps6105x_platform_data mop500_tps61052_data = { + .mode = TPS6105X_MODE_VOLTAGE, + .regulator_data = &tps61052_regulator, +}; + +/* + * TC35892 + */ + +static void mop500_tc35892_init(struct tc3589x *tc3589x, unsigned int base) +{ + mop500_sdi_tc35892_init(); +} + +static struct tc3589x_gpio_platform_data mop500_tc35892_gpio_data = { + .gpio_base = MOP500_EGPIO(0), + .setup = mop500_tc35892_init, +}; + +static struct tc3589x_platform_data mop500_tc35892_data = { + .block = TC3589x_BLOCK_GPIO, + .gpio = &mop500_tc35892_gpio_data, + .irq_base = MOP500_EGPIO_IRQ_BASE, +}; + +static struct lp5521_led_config lp5521_pri_led[] = { + [0] = { + .chan_nr = 0, + .led_current = 0x2f, + .max_current = 0x5f, + }, + [1] = { + .chan_nr = 1, + .led_current = 0x2f, + .max_current = 0x5f, + }, + [2] = { + .chan_nr = 2, + .led_current = 0x2f, + .max_current = 0x5f, + }, +}; + +static struct lp5521_platform_data __initdata lp5521_pri_data = { + .label = "lp5521_pri", + .led_config = &lp5521_pri_led[0], + .num_channels = 3, + .clock_mode = LP5521_CLOCK_EXT, +}; + +static struct lp5521_led_config lp5521_sec_led[] = { + [0] = { + .chan_nr = 0, + .led_current = 0x2f, + .max_current = 0x5f, + }, + [1] = { + .chan_nr = 1, + .led_current = 0x2f, + .max_current = 0x5f, + }, + [2] = { + .chan_nr = 2, + .led_current = 0x2f, + .max_current = 0x5f, + }, +}; + +static struct lp5521_platform_data __initdata lp5521_sec_data = { + .label = "lp5521_sec", + .led_config = &lp5521_sec_led[0], + .num_channels = 3, + .clock_mode = LP5521_CLOCK_EXT, +}; + +static struct i2c_board_info __initdata mop500_i2c0_devices[] = { + { + I2C_BOARD_INFO("tc3589x", 0x42), + .irq = NOMADIK_GPIO_TO_IRQ(217), + .platform_data = &mop500_tc35892_data, + }, + /* I2C0 devices only available prior to HREFv60 */ + { + I2C_BOARD_INFO("tps61052", 0x33), + .platform_data = &mop500_tps61052_data, + }, +}; + +#define NUM_PRE_V60_I2C0_DEVICES 1 + +static struct i2c_board_info __initdata mop500_i2c2_devices[] = { + { + /* lp5521 LED driver, 1st device */ + I2C_BOARD_INFO("lp5521", 0x33), + .platform_data = &lp5521_pri_data, + }, + { + /* lp5521 LED driver, 2st device */ + I2C_BOARD_INFO("lp5521", 0x34), + .platform_data = &lp5521_sec_data, + }, + { + /* Light sensor Rohm BH1780GLI */ + I2C_BOARD_INFO("bh1780", 0x29), + }, +}; + +#define U8500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, t_out, _sm) \ +static struct nmk_i2c_controller u8500_i2c##id##_data = { \ + /* \ + * slave data setup time, which is \ + * 250 ns,100ns,10ns which is 14,6,2 \ + * respectively for a 48 Mhz \ + * i2c clock \ + */ \ + .slsu = _slsu, \ + /* Tx FIFO threshold */ \ + .tft = _tft, \ + /* Rx FIFO threshold */ \ + .rft = _rft, \ + /* std. mode operation */ \ + .clk_freq = clk, \ + /* Slave response timeout(ms) */\ + .timeout = t_out, \ + .sm = _sm, \ +} + +/* + * The board uses 4 i2c controllers, initialize all of + * them with slave data setup time of 250 ns, + * Tx & Rx FIFO threshold values as 8 and standard + * mode of operation + */ +U8500_I2C_CONTROLLER(0, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); +U8500_I2C_CONTROLLER(1, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); +U8500_I2C_CONTROLLER(2, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); +U8500_I2C_CONTROLLER(3, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); + +static void __init mop500_i2c_init(void) +{ + db8500_add_i2c0(&u8500_i2c0_data); + db8500_add_i2c1(&u8500_i2c1_data); + db8500_add_i2c2(&u8500_i2c2_data); + db8500_add_i2c3(&u8500_i2c3_data); +} + +static struct gpio_keys_button mop500_gpio_keys[] = { + { + .desc = "SFH7741 Proximity Sensor", + .type = EV_SW, + .code = SW_FRONT_PROXIMITY, + .active_low = 0, + .can_disable = 1, + } +}; + +static struct regulator *prox_regulator; +static int mop500_prox_activate(struct device *dev); +static void mop500_prox_deactivate(struct device *dev); + +static struct gpio_keys_platform_data mop500_gpio_keys_data = { + .buttons = mop500_gpio_keys, + .nbuttons = ARRAY_SIZE(mop500_gpio_keys), + .enable = mop500_prox_activate, + .disable = mop500_prox_deactivate, +}; + +static struct platform_device mop500_gpio_keys_device = { + .name = "gpio-keys", + .id = 0, + .dev = { + .platform_data = &mop500_gpio_keys_data, + }, +}; + +static int mop500_prox_activate(struct device *dev) +{ + prox_regulator = regulator_get(&mop500_gpio_keys_device.dev, + "vcc"); + if (IS_ERR(prox_regulator)) { + dev_err(&mop500_gpio_keys_device.dev, + "no regulator\n"); + return PTR_ERR(prox_regulator); + } + regulator_enable(prox_regulator); + return 0; +} + +static void mop500_prox_deactivate(struct device *dev) +{ + regulator_disable(prox_regulator); + regulator_put(prox_regulator); +} + +/* add any platform devices here - TODO */ +static struct platform_device *mop500_platform_devs[] __initdata = { + &mop500_gpio_keys_device, + &ab8500_device, +}; + +#ifdef CONFIG_STE_DMA40 +static struct stedma40_chan_cfg ssp0_dma_cfg_rx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_PERIPH_TO_MEM, + .src_dev_type = DB8500_DMA_DEV8_SSP0_RX, + .dst_dev_type = STEDMA40_DEV_DST_MEMORY, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; + +static struct stedma40_chan_cfg ssp0_dma_cfg_tx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_MEM_TO_PERIPH, + .src_dev_type = STEDMA40_DEV_SRC_MEMORY, + .dst_dev_type = DB8500_DMA_DEV8_SSP0_TX, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; +#endif + +static struct pl022_ssp_controller ssp0_platform_data = { + .bus_id = 0, +#ifdef CONFIG_STE_DMA40 + .enable_dma = 1, + .dma_filter = stedma40_filter, + .dma_rx_param = &ssp0_dma_cfg_rx, + .dma_tx_param = &ssp0_dma_cfg_tx, +#else + .enable_dma = 0, +#endif + /* on this platform, gpio 31,142,144,214 & + * 224 are connected as chip selects + */ + .num_chipselect = 5, +}; + +static void __init mop500_spi_init(void) +{ + db8500_add_ssp0(&ssp0_platform_data); +} + +#ifdef CONFIG_STE_DMA40 +static struct stedma40_chan_cfg uart0_dma_cfg_rx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_PERIPH_TO_MEM, + .src_dev_type = DB8500_DMA_DEV13_UART0_RX, + .dst_dev_type = STEDMA40_DEV_DST_MEMORY, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; + +static struct stedma40_chan_cfg uart0_dma_cfg_tx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_MEM_TO_PERIPH, + .src_dev_type = STEDMA40_DEV_SRC_MEMORY, + .dst_dev_type = DB8500_DMA_DEV13_UART0_TX, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; + +static struct stedma40_chan_cfg uart1_dma_cfg_rx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_PERIPH_TO_MEM, + .src_dev_type = DB8500_DMA_DEV12_UART1_RX, + .dst_dev_type = STEDMA40_DEV_DST_MEMORY, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; + +static struct stedma40_chan_cfg uart1_dma_cfg_tx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_MEM_TO_PERIPH, + .src_dev_type = STEDMA40_DEV_SRC_MEMORY, + .dst_dev_type = DB8500_DMA_DEV12_UART1_TX, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; + +static struct stedma40_chan_cfg uart2_dma_cfg_rx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_PERIPH_TO_MEM, + .src_dev_type = DB8500_DMA_DEV11_UART2_RX, + .dst_dev_type = STEDMA40_DEV_DST_MEMORY, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; + +static struct stedma40_chan_cfg uart2_dma_cfg_tx = { + .mode = STEDMA40_MODE_LOGICAL, + .dir = STEDMA40_MEM_TO_PERIPH, + .src_dev_type = STEDMA40_DEV_SRC_MEMORY, + .dst_dev_type = DB8500_DMA_DEV11_UART2_TX, + .src_info.data_width = STEDMA40_BYTE_WIDTH, + .dst_info.data_width = STEDMA40_BYTE_WIDTH, +}; +#endif + + +static pin_cfg_t mop500_pins_uart0[] = { + GPIO0_U0_CTSn | PIN_INPUT_PULLUP, + GPIO1_U0_RTSn | PIN_OUTPUT_HIGH, + GPIO2_U0_RXD | PIN_INPUT_PULLUP, + GPIO3_U0_TXD | PIN_OUTPUT_HIGH, +}; + +#define PRCC_K_SOFTRST_SET 0x18 +#define PRCC_K_SOFTRST_CLEAR 0x1C +static void ux500_uart0_reset(void) +{ + void __iomem *prcc_rst_set, *prcc_rst_clr; + + prcc_rst_set = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE + + PRCC_K_SOFTRST_SET); + prcc_rst_clr = (void __iomem *)IO_ADDRESS(U8500_CLKRST1_BASE + + PRCC_K_SOFTRST_CLEAR); + + /* Activate soft reset PRCC_K_SOFTRST_CLEAR */ + writel((readl(prcc_rst_clr) | 0x1), prcc_rst_clr); + udelay(1); + + /* Release soft reset PRCC_K_SOFTRST_SET */ + writel((readl(prcc_rst_set) | 0x1), prcc_rst_set); + udelay(1); +} + +static void ux500_uart0_init(void) +{ + int ret; + + ret = nmk_config_pins(mop500_pins_uart0, + ARRAY_SIZE(mop500_pins_uart0)); + if (ret < 0) + pr_err("pl011: uart pins_enable failed\n"); +} + +static void ux500_uart0_exit(void) +{ + int ret; + + ret = nmk_config_pins_sleep(mop500_pins_uart0, + ARRAY_SIZE(mop500_pins_uart0)); + if (ret < 0) + pr_err("pl011: uart pins_disable failed\n"); +} + +static struct amba_pl011_data uart0_plat = { +#ifdef CONFIG_STE_DMA40 + .dma_filter = stedma40_filter, + .dma_rx_param = &uart0_dma_cfg_rx, + .dma_tx_param = &uart0_dma_cfg_tx, +#endif + .init = ux500_uart0_init, + .exit = ux500_uart0_exit, + .reset = ux500_uart0_reset, +}; + +static struct amba_pl011_data uart1_plat = { +#ifdef CONFIG_STE_DMA40 + .dma_filter = stedma40_filter, + .dma_rx_param = &uart1_dma_cfg_rx, + .dma_tx_param = &uart1_dma_cfg_tx, +#endif +}; + +static struct amba_pl011_data uart2_plat = { +#ifdef CONFIG_STE_DMA40 + .dma_filter = stedma40_filter, + .dma_rx_param = &uart2_dma_cfg_rx, + .dma_tx_param = &uart2_dma_cfg_tx, +#endif +}; + +static void __init mop500_uart_init(void) +{ + db8500_add_uart0(&uart0_plat); + db8500_add_uart1(&uart1_plat); + db8500_add_uart2(&uart2_plat); +} + +static struct platform_device *snowball_platform_devs[] __initdata = { + &snowball_led_dev, + &snowball_key_dev, + &snowball_sbnet_dev, + &ab8500_device, +}; + +static void __init mop500_init_machine(void) +{ + int i2c0_devs; + + mop500_gpio_keys[0].gpio = GPIO_PROX_SENSOR; + + u8500_init_devices(); + + mop500_pins_init(); + + platform_add_devices(mop500_platform_devs, + ARRAY_SIZE(mop500_platform_devs)); + + mop500_i2c_init(); + mop500_sdi_init(); + mop500_spi_init(); + mop500_uart_init(); + + i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); + + i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); + i2c_register_board_info(2, mop500_i2c2_devices, + ARRAY_SIZE(mop500_i2c2_devices)); + + /* This board has full regulator constraints */ + regulator_has_full_constraints(); +} + +static void __init snowball_init_machine(void) +{ + int i2c0_devs; + + u8500_init_devices(); + + snowball_pins_init(); + + platform_add_devices(snowball_platform_devs, + ARRAY_SIZE(snowball_platform_devs)); + + mop500_i2c_init(); + snowball_sdi_init(); + mop500_spi_init(); + mop500_uart_init(); + + i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); + i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); + i2c_register_board_info(2, mop500_i2c2_devices, + ARRAY_SIZE(mop500_i2c2_devices)); + + /* This board has full regulator constraints */ + regulator_has_full_constraints(); +} + +static void __init hrefv60_init_machine(void) +{ + int i2c0_devs; + + /* + * The HREFv60 board removed a GPIO expander and routed + * all these GPIO pins to the internal GPIO controller + * instead. + */ + mop500_gpio_keys[0].gpio = HREFV60_PROX_SENSE_GPIO; + + u8500_init_devices(); + + hrefv60_pins_init(); + + platform_add_devices(mop500_platform_devs, + ARRAY_SIZE(mop500_platform_devs)); + + mop500_i2c_init(); + hrefv60_sdi_init(); + mop500_spi_init(); + mop500_uart_init(); + + i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); + + i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES; + + i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); + i2c_register_board_info(2, mop500_i2c2_devices, + ARRAY_SIZE(mop500_i2c2_devices)); + + /* This board has full regulator constraints */ + regulator_has_full_constraints(); +} + +static const char * snowball_dt_board_compat[] = { + "calaosystems,snowball-a9500", + NULL +}; + +MACHINE_START(U8500, "ST-Ericsson MOP500 platform") + /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar(a)stericsson.com> */ + .atag_offset = 0x100, + .map_io = u8500_map_io, + .init_irq = ux500_init_irq, + /* we re-use nomadik timer here */ + .timer = &ux500_timer, + .handle_irq = gic_handle_irq, + .init_machine = mop500_init_machine, +MACHINE_END + +MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+") + .atag_offset = 0x100, + .map_io = u8500_map_io, + .init_irq = ux500_init_irq, + .timer = &ux500_timer, + .handle_irq = gic_handle_irq, + .init_machine = hrefv60_init_machine, +MACHINE_END + +DT_MACHINE_START(SNOWBALL, "Calao Systems Snowball platform") + .atag_offset = 0x100, + .map_io = u8500_map_io, + .init_irq = ux500_init_irq, + /* we re-use nomadik timer here */ + .timer = &ux500_timer, + .handle_irq = gic_handle_irq, + .init_machine = snowball_init_machine, + .dt_compat = snowball_dt_board_compat, +MACHINE_END diff --git a/arch/arm/mach-ux500/include/mach/irqs.h b/arch/arm/mach-ux500/include/mach/irqs.h index 9db68d2..11e15d4 100644 --- a/arch/arm/mach-ux500/include/mach/irqs.h +++ b/arch/arm/mach-ux500/include/mach/irqs.h @@ -43,7 +43,7 @@ /* This will be overridden by board-specific irq headers */ #define IRQ_BOARD_END IRQ_BOARD_START -#ifdef CONFIG_MACH_U8500 +#if defined(CONFIG_MACH_U8500) || defined(CONFIG_MACH_MOP500) #include <mach/irqs-board-mop500.h> #endif -- 1.7.5.4

12 years, 2 months

[ACTIVITY] (John Stultz) Feb 27-Mar 2

by John Stultz

=== Highlights === * My LWN summary of the Android upstreaming interest group meeting from Linaro Connect was published: https://lwn.net/Articles/484196/ * Chased down an issue w/ serial triggered resume from suspend on Pandaboard. Working with PaulW & KevinH to narrow down the issue, as it seems to depend on a combination of uboot, kernel config, and boot options. * Did some initial testing w/ Rafael's wakelock patches using Android. Behavior is not totally what I expect, but some of the Android wakelock code is shifting (early suspend is being dropped) so I'm not sure if I have a ideal match between userland and kernel with which to compare. * Sent out patches to reduce timekeeping lock hold times. Got a bit of feedback from Ingo, which I integrated in. Also did some increased testing which found a few bugs in my new code. Also in testing my work, found and chased down some older timekeeping bugs that had been introduced upstream over the last few years. This took a good chunk of time this week. * Meetings: Ran Android-subteam meeting over email, Phone call with Zach, Lunch with Deepak. * Managed to reproduce an issue I saw earlier in the month with the lowmemory killer in staging. * Some internal items ate most of a day. === Plans === * Continue working with PaulW and KevinH to sort out alarmtiemr work * Need to really get focused on fadvise volatile work === Issues === * NA

12 years, 2 months

[ACTIVITY] (Linus Walleij) 2012-01-28 - 2012-03-02

by Linus Walleij

== Linus Walleij linusw == === Highlights === * Presented the pin control subsystem at the Embedded Linux Conference in San Francisco. * Discussed pin control at Linaro Connect, discussed pin control at Embedded Linux Conference. Wrote a bunch of patches refactoring the subsystem to be closer to what we agreed, Stephen will do the heavy lifting though. * Wrote and finalized a presentation for the Embedded Systems Conference pertaining to the platform perimeter including GPIO, pin control, device tree ... etc. * Reviewed and merged a whole bunch of patches from Stephen Warren @nVidia who gladly stepped in and offered to write the code we needed to get pin control to where we want it for v3.4. Dong Aishen is doing a great job in helping out with code review here. * Dummy pin controls implemented as default fallback for devices not provided with any controllers. * Sent pinctrl fixes to Torvalds for v3.3-rc4. * Collected a number of ux500 fixes and requested the ARM SoC maintainers to pull them in. Had to back off U9540 support but will reiterate. * Samuel Ortiz merged the DB8500 PRCMU update to the MFD tree. * Wrote mail to Greg & LKML about system controllers after discussion at ARM SoC maintainers summit. Seems the need may be there and we could create drivers/scm the day we have something that would live there. === Plans === * Accumulate pinctrl patches for kernel v3.4 merge window. * Drive generalization of Nomadik GPIO by using the pinctrl framework. drivers/gpio/gpio-nomadik.c * Test the PL08x patches on the Ericsson Research PB11MPCore and submit platform data for using pl08x DMA on that platform. * Look into other Ux500 stuff in need of mainlining... like - Ux500 clocks - the HWMON stuff. === Issues === * Ux500 mainlining or improvements (such as device tree) having second priority. * Sorry for long report covering much time, it's covering some of my vacation that is why... Thanks, Linus Walleij

12 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel March 2012