linaro-dev

linaro-dev@lists.linaro.org

4332 discussions

[PATCH v2] usb: gadget: storage_common: make FSG_NUM_BUFFERS variable size

by Per Forlin

From: Per Forlin <per.forlin(a)linaro.org> FSG_NUM_BUFFERS is set to 2 as default. Usually 2 buffers are enough to establish a good buffering pipeline. But when dealing with expensive request preparation (i.e. dma_map) there may be benefits of increasing the number of buffers. There is an extra cost for every first request, the others are prepared in parallel with an ongoing transfer. Every time all buffers are consumed there is an additional cost for the first request. Increasing the number of buffers decreases the risk of running out of buffers. Test set up * Running dd on the host reading from the mass storage device * cmdline: dd if=/dev/sdb of=/dev/null bs=4k count=$((256*100)) * Caches are dropped on the host and on the device before each run Measurements on a Snowball board with ondemand_govenor active. FSG_NUM_BUFFERS 2 104857600 bytes (105 MB) copied, 5.62173 s, 18.7 MB/s 104857600 bytes (105 MB) copied, 5.61811 s, 18.7 MB/s 104857600 bytes (105 MB) copied, 5.57817 s, 18.8 MB/s 104857600 bytes (105 MB) copied, 5.57769 s, 18.8 MB/s 104857600 bytes (105 MB) copied, 5.59654 s, 18.7 MB/s 104857600 bytes (105 MB) copied, 5.58948 s, 18.8 MB/s FSG_NUM_BUFFERS 4 104857600 bytes (105 MB) copied, 5.26839 s, 19.9 MB/s 104857600 bytes (105 MB) copied, 5.2691 s, 19.9 MB/s 104857600 bytes (105 MB) copied, 5.2711 s, 19.9 MB/s 104857600 bytes (105 MB) copied, 5.27174 s, 19.9 MB/s 104857600 bytes (105 MB) copied, 5.27261 s, 19.9 MB/s 104857600 bytes (105 MB) copied, 5.27135 s, 19.9 MB/s 104857600 bytes (105 MB) copied, 5.27249 s, 19.9 MB/s There may not be one optimal number for all boards. This is why the number is added to Kconfig. Signed-off-by: Per Forlin <per.forlin(a)linaro.org> Acked-by: Michal Nazarewicz <mina86(a)mina86.com> --- drivers/usb/gadget/Kconfig | 15 +++++++++++++++ drivers/usb/gadget/storage_common.c | 7 +++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index 029e288..1888a16 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -96,6 +96,21 @@ config USB_GADGET_VBUS_DRAW This value will be used except for system-specific gadget drivers that have more specific information. +config USB_GADGET_STORAGE_NUM_BUFFERS + int "Number of storage pipeline buffers" + range 2 64 + default 2 + help + Usually 2 buffers are enough to establish a good + buffering pipeline. But when dealing with expensive + request preparation (i.e. dma_map) there may be benefits of + increasing the number of buffers. There is an extra cost for + every first request, the others are prepared in parallel with + an ongoing transfer. Every time all buffers are consumed there is + an additional cost for the first request. Increasing the number + of buffers decreases the risk of running out of buffers. + If unsure, say 2. + config USB_GADGET_SELECTED boolean diff --git a/drivers/usb/gadget/storage_common.c b/drivers/usb/gadget/storage_common.c index 1fa4f70..683c972 100644 --- a/drivers/usb/gadget/storage_common.c +++ b/drivers/usb/gadget/storage_common.c @@ -262,8 +262,11 @@ static struct fsg_lun *fsg_lun_from_dev(struct device *dev) #define EP0_BUFSIZE 256 #define DELAYED_STATUS (EP0_BUFSIZE + 999) /* An impossibly large value */ -/* Number of buffers we will use. 2 is enough for double-buffering */ -#define FSG_NUM_BUFFERS 2 +/* + * Number of buffers we will use. + * 2 is usually enough for good buffering pipeline + */ +#define FSG_NUM_BUFFERS CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS /* Default size of buffer length. */ #define FSG_BUFLEN ((u32)16384) -- 1.7.4.1

14 years, 1 month

[PATCH 1/2] SMDKV310: MMC SPL: Remove unwanted dummy functions

by Chander Kashyap

Removed dummy functions in "mmc_spl/board/samsung/smdkv310/mmc_boot.c", @mmc_boot.c void do_undefined_instruction(struct pt_regs *pt_regs); void do_software_interrupt(struct pt_regs *pt_regs); void do_prefetch_abort(struct pt_regs *pt_regs); void do_data_abort(struct pt_regs *pt_regs); void do_not_used(struct pt_regs *pt_regs); void do_fiq(struct pt_regs *pt_regs); void do_irq(struct pt_regs *pt_regs); not required as called conditionally in start.S @start.S \#ifdef CONFIG_SPL_BUILD _undefined_instruction: .word _undefined_instruction _software_interrupt: .word _software_interrupt _prefetch_abort: .word _prefetch_abort _data_abort: .word _data_abort _not_used: .word _not_used _irq: .word _irq _fiq: .word _fiq _pad: .word 0x12345678 /* now 16*4=64 */ \#else _undefined_instruction: .word undefined_instruction _software_interrupt: .word software_interrupt _prefetch_abort: .word prefetch_abort _data_abort: .word data_abort _not_used: .word not_used _irq: .word irq _fiq: .word fiq _pad: .word 0x12345678 /* now 16*4=64 */ \#endif e.g. undefined_instruction: get_bad_stack bad_save_user_regs bl do_undefined_instruction Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- mmc_spl/board/samsung/smdkv310/Makefile | 1 + mmc_spl/board/samsung/smdkv310/mmc_boot.c | 30 ----------------------------- 2 files changed, 1 insertions(+), 30 deletions(-) diff --git a/mmc_spl/board/samsung/smdkv310/Makefile b/mmc_spl/board/samsung/smdkv310/Makefile index de2c1a2..1589f28 100644 --- a/mmc_spl/board/samsung/smdkv310/Makefile +++ b/mmc_spl/board/samsung/smdkv310/Makefile @@ -34,6 +34,7 @@ include $(TOPDIR)/config.mk LDSCRIPT= $(TOPDIR)/mmc_spl/board/$(BOARDDIR)/u-boot.lds LDFLAGS = -Bstatic -T $(mmcobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_MMC_SPL +AFLAGS += -DCONFIG_SPL_BUILD CFLAGS += -DCONFIG_MMC_SPL CFLAGS += -DCONFIG_SPL_BUILD diff --git a/mmc_spl/board/samsung/smdkv310/mmc_boot.c b/mmc_spl/board/samsung/smdkv310/mmc_boot.c index dea1b86..2f3e463 100644 --- a/mmc_spl/board/samsung/smdkv310/mmc_boot.c +++ b/mmc_spl/board/samsung/smdkv310/mmc_boot.c @@ -57,33 +57,3 @@ void board_init_r(gd_t *id, ulong dest_addr) void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) { } - -void do_undefined_instruction(struct pt_regs *pt_regs) -{ -} - -void do_software_interrupt(struct pt_regs *pt_regs) -{ -} - -void do_prefetch_abort(struct pt_regs *pt_regs) -{ -} - -void do_data_abort(struct pt_regs *pt_regs) -{ -} - -void do_not_used(struct pt_regs *pt_regs) -{ -} - -void do_fiq(struct pt_regs *pt_regs) -{ -} - -#ifndef CONFIG_USE_IRQ -void do_irq(struct pt_regs *pt_regs) -{ -} -#endif -- 1.7.4.1

14 years, 1 month

Changing default root file system to btrfs

by James Tunnicliffe

Hi, Our current default root file system, ext3, is proving to be a bottleneck for SD card performance. Not only does it take a long time to format the partitions, but it also takes a long time to write to. This slows down creating images on SD cards a lot. I just did a very simple experiment running linaro-media-create, writing an Ubuntu Desktop image to an SD card: ext3: 139.85user 35.27system 44:03.58elapsed 6%CPU (0avgtext+0avgdata 107360maxresident)k 2876115inputs+7048200outputs (958major+1677659minor)pagefaults 0swaps btrfs: 146.52user 34.48system 19:57.16elapsed 15%CPU (0avgtext+0avgdata 107408maxresident)k 4417521inputs+6542992outputs (138major+1779874minor)pagefaults 0swaps As I understand it, btrfs is considered OK for file systems running on systems that don't suffer from power failure, so for writing an image and testing it this should be fine. So, what do people think about switching? -- James Tunnicliffe

14 years, 1 month

[PATCH] usb: musb: ux500: optimize DMA callback routine

by Per Forlin

Skip the use of work queue and call musb_dma_completion() directly from DMA callback context. Here follows measurements on a Snowball board with ondemand governor active. Performance using work queue: (105 MB) copied, 6.23758 s, 16.8 MB/s (105 MB) copied, 5.7151 s, 18.3 MB/s (105 MB) copied, 5.83583 s, 18.0 MB/s (105 MB) copied, 5.93611 s, 17.7 MB/s Performance without work queue (105 MB) copied, 5.62173 s, 18.7 MB/s (105 MB) copied, 5.61811 s, 18.7 MB/s (105 MB) copied, 5.57817 s, 18.8 MB/s (105 MB) copied, 5.58549 s, 18.8 MB/s Signed-off-by: Per Forlin <per.forlin(a)linaro.org> Acked-by: Mian Yousaf Kaukab<mian.yousaf.kaukab(a)stericsson.com> --- drivers/usb/musb/ux500_dma.c | 43 ++--------------------------------------- 1 files changed, 3 insertions(+), 40 deletions(-) diff --git a/drivers/usb/musb/ux500_dma.c b/drivers/usb/musb/ux500_dma.c index ef4333f..46ba08f 100644 --- a/drivers/usb/musb/ux500_dma.c +++ b/drivers/usb/musb/ux500_dma.c @@ -37,7 +37,6 @@ struct ux500_dma_channel { struct dma_channel channel; struct ux500_dma_controller *controller; struct musb_hw_ep *hw_ep; - struct work_struct channel_work; struct dma_chan *dma_chan; unsigned int cur_len; dma_cookie_t cookie; @@ -56,52 +55,21 @@ struct ux500_dma_controller { dma_addr_t phy_base; }; -/* Work function invoked from DMA callback to handle tx transfers. */ -static void ux500_tx_work(struct work_struct *data) -{ - struct ux500_dma_channel *ux500_channel = container_of(data, - struct ux500_dma_channel, channel_work); - struct musb_hw_ep *hw_ep = ux500_channel->hw_ep; - struct musb *musb = hw_ep->musb; - unsigned long flags; - - dev_dbg(musb->controller, "DMA tx transfer done on hw_ep=%d\n", - hw_ep->epnum); - - spin_lock_irqsave(&musb->lock, flags); - ux500_channel->channel.actual_len = ux500_channel->cur_len; - ux500_channel->channel.status = MUSB_DMA_STATUS_FREE; - musb_dma_completion(musb, hw_ep->epnum, - ux500_channel->is_tx); - spin_unlock_irqrestore(&musb->lock, flags); -} - -/* Work function invoked from DMA callback to handle rx transfers. */ -static void ux500_rx_work(struct work_struct *data) +void ux500_dma_callback(void *private_data) { - struct ux500_dma_channel *ux500_channel = container_of(data, - struct ux500_dma_channel, channel_work); + struct dma_channel *channel = (struct dma_channel *)private_data; + struct ux500_dma_channel *ux500_channel = channel->private_data; struct musb_hw_ep *hw_ep = ux500_channel->hw_ep; struct musb *musb = hw_ep->musb; unsigned long flags; - dev_dbg(musb->controller, "DMA rx transfer done on hw_ep=%d\n", - hw_ep->epnum); - spin_lock_irqsave(&musb->lock, flags); ux500_channel->channel.actual_len = ux500_channel->cur_len; ux500_channel->channel.status = MUSB_DMA_STATUS_FREE; musb_dma_completion(musb, hw_ep->epnum, ux500_channel->is_tx); spin_unlock_irqrestore(&musb->lock, flags); -} - -void ux500_dma_callback(void *private_data) -{ - struct dma_channel *channel = (struct dma_channel *)private_data; - struct ux500_dma_channel *ux500_channel = channel->private_data; - schedule_work(&ux500_channel->channel_work); } static bool ux500_configure_channel(struct dma_channel *channel, @@ -330,7 +298,6 @@ static int ux500_dma_controller_start(struct dma_controller *c) void **param_array; struct ux500_dma_channel *channel_array; u32 ch_count; - void (*musb_channel_work)(struct work_struct *); dma_cap_mask_t mask; if ((data->num_rx_channels > UX500_MUSB_DMA_NUM_RX_CHANNELS) || @@ -347,7 +314,6 @@ static int ux500_dma_controller_start(struct dma_controller *c) channel_array = controller->rx_channel; ch_count = data->num_rx_channels; param_array = data->dma_rx_param_array; - musb_channel_work = ux500_rx_work; for (dir = 0; dir < 2; dir++) { for (ch_num = 0; ch_num < ch_count; ch_num++) { @@ -374,15 +340,12 @@ static int ux500_dma_controller_start(struct dma_controller *c) return -EBUSY; } - INIT_WORK(&ux500_channel->channel_work, - musb_channel_work); } /* Prepare the loop for TX channels */ channel_array = controller->tx_channel; ch_count = data->num_tx_channels; param_array = data->dma_tx_param_array; - musb_channel_work = ux500_tx_work; is_tx = 1; } -- 1.7.4.1

14 years, 1 month

thumb compiler flags

by Bernhard Rosenkranzer

Hi, I just spotted this bit in Android's Makefiles (inherited that way from AOSP): TARGET_arm_CFLAGS := [...] -fstrict-aliasing [...] [...] TARGET_thumb_CFLAGS := [...] -fno-strict-aliasing [...] This general assumption that arm code can handle strict aliasing, but thumb code can't, seems odd. My guess is that they started out using -fno-strict-aliasing everywhere, then fixed aliasing violations and "fixed" the compiler flags for arm, and didn't notice they're still turning it off for thumb -- either that, or they've run into toolchain bugs (that might be fixed in the Linaro toolchain), or it's a matter of "something we're building in thumb mode has aliasing violations and we're too lazy to figure out which part it is". Unless someone knows of a valid reason for doing things the way they did, simply taking it out (preferrably replacing it with -Werror=strict-aliasing, so we're likely to notice any aliasing violations if it comes down to "too lazy to figure out which part") should get us some free extra speed. (Not sure just how much we're actually building in thumb mode - may or may not be relevant.) ttyl bero

14 years, 1 month

sched_mc test scenario

by Daniel Lezcano

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi all, here is a few test scenario I would like to add to the pm-qa. test_01: the sched_mc feature is enabled in the kernel check the presence of the 'sched_mc_power_savings' file test_02: the topology is implemented in the kernel check the value of the physical_package_id file is different from "-1" test_03: the topology files are present check the presence of the topology files for each cpu: * core_id * core_siblings * core_siblings_list * physical_package_id * thread_siblings * thread_siblings_list test_04: the change are effective for sched_mc check the ability to change the value [0-2] of the 'sched_mc_power_savings' file test_05: the topology is consistent check the consistency of the topology files * for each package: * count the cores -> the number of cores is 2 ^ (nr_cores - 1) -> all core ids are between 0 and nr_cores - 1 Concerning the functional tests, I need some hints :) On the architecture we have, that will be difficult to verify sched_mc works as expected. If I understood correctly, in order to test that, we should have a dual Cortex-A9 to check a program with two processes eating a lot of cpu cycles will be bounded in the same socket_id when sched_mc_power_savings=2. The other processor staying idle or not running any of these processes, right ? AFAIK, there is no such hardware, no ? - -- <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJOOWIyAAoJEAKBbMCpUGYAGoEIAL7ETqYPdyCzS3c+4JYMrK72 AXMLu9W6stMfuTssyGZFBlsSbWsSDKbkqp8uzKc0zr8gw7KgQdVedHkBTn3H8QCi enAPoaIonkB7+UDNpg5zvrg4swLIMSJ5wBd7SVmFDnLiGIAf/seJac31ZtoLRV3A kT7wnusIQFATWVazlR110zNrLVA1rEdlOXBWudCYj4FPTnTde6mBqkvW1WMRDroP XAazklW7e7+NF2xo0/+7T2xT8Mudc3ELY5+KMF7j6YMCh/h8WSaSWh0baES0/Mie crFku0w+trXaniW6qnrxAWCyc0BB/MVbd60PJVJ25nnxTGo4JwwOf4hQZ5GHKfc= =7lNh -----END PGP SIGNATURE-----

14 years, 1 month

Re: Changing default root file system to btrfs

by David Long

> As I understand it, btrfs is considered OK for file systems running on > systems that don't suffer from power failure, so for writing an image > and testing it this should be fine. > > So, what do people think about switching? I too would be considered about filesystem integrity given the number of times I'm forced to yank the power cord on my board. What speed class card are you using though? I tried a low-end one at first and quickly decided the extra US$5 for a class 6 card (San Disk Extreme) paid back the next time I used l-m-c. -dl

14 years, 1 month

[Patch 01/11] MFD: DA9052 Code refactored to use regmap

by ashishj3

DA9052 MFD Code is refactored to add remap support in the DA9052. Recent changes to DA9052 battery module also required certain components to be added in this patch. Also set bits and clear bits are removed and instead da9052_reg_update() will be used in future. Signed-off-by: David Dajun Chen <dchen(a)diasemi.com> Signed-off-by: Ashish Jangam <ashish.jangam(a)kpitcummins.com> --- drivers/mfd/Kconfig | 2 + drivers/mfd/da9052-core.c | 243 ++++++++---------------------------- drivers/mfd/da9052-i2c.c | 73 +++-------- drivers/mfd/da9052-spi.c | 55 +++------ include/linux/mfd/da9052/da9052.h | 13 +-- include/linux/mfd/da9052/pdata.h | 3 +- include/linux/mfd/da9052/reg.h | 2 + 7 files changed, 98 insertions(+), 293 deletions(-) diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index e0de26a..9a77294 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -350,6 +350,7 @@ config MFD_DA9052_SPI bool "Support Dialog Semiconductor DA9052 PMIC with SPI" select MFD_CORE select PMIC_DA9052 + select REGMAP_SPI depends on SPI_MASTER=y help Support for the Dialog Semiconductor DA9052 PMIC @@ -361,6 +362,7 @@ config MFD_DA9052_I2C bool "Support Dialog Semiconductor DA9052 PMIC with I2C" select MFD_CORE select PMIC_DA9052 + select REGMAP_I2C depends on I2C=y help Support for the Dialog Semiconductor DA9052 PMIC diff --git a/drivers/mfd/da9052-core.c b/drivers/mfd/da9052-core.c index f572ad0..271fe5b 100644 --- a/drivers/mfd/da9052-core.c +++ b/drivers/mfd/da9052-core.c @@ -23,6 +23,10 @@ #include <linux/mfd/da9052/pdata.h> #include <linux/mfd/da9052/reg.h> +#define DA9052_IRQ_DCIN 0 +#define DA9052_IRQ_VBUS 1 +#define DA9052_IRQ_DCINREM 2 +#define DA9052_IRQ_VBUSREM 3 #define DA9052_IRQ_ALARM 5 #define DA9052_IRQ_NONKEY 8 #define DA9052_IRQ_CHGEND 11 @@ -176,243 +180,80 @@ EXPORT_SYMBOL_GPL(da9052_adc_temperature_read); int da9052_reg_read(struct da9052 *da9052, unsigned char reg) { - unsigned char val; - int ret; + int val, ret; if (reg > DA9052_MAX_REG_CNT) { dev_err(da9052->dev, "invalid reg %x\n", reg); return -EINVAL; } - mutex_lock(&da9052->io_lock); - - if (da9052->read_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->read_dev(da9052, reg, 1, &val); - if (ret) - goto err; + #ifdef CONFIG_MFD_DA9052_SPI + reg = (reg << 1) | 1; + #endif - mutex_unlock(&da9052->io_lock); + ret = regmap_read(da9052->regmap, reg, &val); + if (ret < 0) + return ret; return val; - -err: - mutex_unlock(&da9052->io_lock); - return ret; } EXPORT_SYMBOL_GPL(da9052_reg_read); int da9052_reg_write(struct da9052 *da9052, unsigned char reg, unsigned char val) { - int ret; - if (reg > DA9052_MAX_REG_CNT) { dev_err(da9052->dev, "invalid reg %x\n", reg); return -EINVAL; } - mutex_lock(&da9052->io_lock); + #ifdef CONFIG_MFD_DA9052_SPI + reg <<= 1; + #endif - if (da9052->write_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->write_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - mutex_unlock(&da9052->io_lock); - - return 0; - -err: - mutex_unlock(&da9052->io_lock); - return ret; + return regmap_write(da9052->regmap, reg, val); } EXPORT_SYMBOL_GPL(da9052_reg_write); int da9052_group_read(struct da9052 *da9052, unsigned char reg, unsigned reg_cnt, unsigned char *val) { - int ret; - if (reg > DA9052_MAX_REG_CNT) { dev_err(da9052->dev, "invalid reg %x\n", reg); return -EINVAL; } - mutex_lock(&da9052->io_lock); - - if (da9052->read_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->read_dev(da9052, reg, reg_cnt, val); - if (ret < 0) - goto err; + #ifdef CONFIG_MFD_DA9052_SPI + reg = (reg << 1) | 1; + #endif - mutex_unlock(&da9052->io_lock); - - return 0; - -err: - mutex_unlock(&da9052->io_lock); - return ret; + return regmap_bulk_read(da9052->regmap, reg, val, reg_cnt); } EXPORT_SYMBOL_GPL(da9052_group_read); int da9052_group_write(struct da9052 *da9052, unsigned char reg, unsigned reg_cnt, unsigned char *val) { - int ret; - - if (reg > DA9052_MAX_REG_CNT) { - dev_err(da9052->dev, "invalid reg %x\n", reg); - return -EINVAL; - } - - mutex_lock(&da9052->io_lock); - - if (da9052->write_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->write_dev(da9052, reg, reg_cnt, val); - if (ret < 0) - goto err; + #ifdef CONFIG_MFD_DA9052_SPI + reg <<= 1; + #endif - mutex_unlock(&da9052->io_lock); - - return 0; - -err: - mutex_unlock(&da9052->io_lock); - return ret; + return regmap_raw_write(da9052->regmap, reg, val, reg_cnt); } EXPORT_SYMBOL_GPL(da9052_group_write); int da9052_reg_update(struct da9052 *da9052, unsigned char reg, unsigned char bit_mask, unsigned char reg_val) { - int ret; - unsigned char val; - if (reg > DA9052_MAX_REG_CNT) { dev_err(da9052->dev, "invalid reg %x\n", reg); return -EINVAL; } - mutex_lock_interruptible(&da9052->io_lock); - - if (da9052->read_dev == NULL || da9052->write_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->read_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - val &= ~bit_mask; - val |= reg_val; - - ret = da9052->write_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - mutex_unlock(&da9052->io_lock); - - return 0; - -err: - mutex_unlock(&da9052->io_lock); - return ret; + return regmap_update_bits(da9052->regmap, reg, bit_mask, reg_val); } EXPORT_SYMBOL_GPL(da9052_reg_update); -int da9052_set_bits(struct da9052 *da9052, unsigned char reg, - unsigned char bit_mask) -{ - unsigned char val; - int ret; - - if (reg > DA9052_MAX_REG_CNT) { - dev_err(da9052->dev, "invalid reg %x\n", reg); - return -EINVAL; - } - - mutex_lock_interruptible(&da9052->io_lock); - - if (da9052->read_dev == NULL || da9052->write_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->read_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - val |= bit_mask; - - ret = da9052->write_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - mutex_unlock(&da9052->io_lock); - - return 0; - -err: - mutex_unlock(&da9052->io_lock); - return ret; -} -EXPORT_SYMBOL_GPL(da9052_set_bits); - -int da9052_clear_bits(struct da9052 *da9052, unsigned char reg, - unsigned char bit_mask) -{ - unsigned char val; - int ret; - - if (reg > DA9052_MAX_REG_CNT) { - dev_err(da9052->dev, "invalid reg %x\n", reg); - return -EINVAL; - } - - mutex_lock_interruptible(&da9052->io_lock); - - if (da9052->read_dev == NULL || da9052->write_dev == NULL) { - ret = -ENODEV; - goto err; - } - - ret = da9052->read_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - val &= ~bit_mask; - - ret = da9052->write_dev(da9052, reg, 1, &val); - if (ret < 0) - goto err; - - mutex_unlock(&da9052->io_lock); - - return 0; - -err: - mutex_unlock(&da9052->io_lock); - return ret; -} -EXPORT_SYMBOL_GPL(da9052_clear_bits); - static struct resource da9052_rtc_resource = { .name = "ALM", .start = DA9052_IRQ_ALARM, @@ -429,15 +270,39 @@ static struct resource da9052_onkey_resource = { static struct resource da9052_power_resources[] = { { - .name = "CHGEND", - .start = DA9052_IRQ_CHGEND, - .end = DA9052_IRQ_CHGEND, + .name = "BATT TEMP", + .start = DA9052_IRQ_TBAT, + .end = DA9052_IRQ_TBAT, .flags = IORESOURCE_IRQ, }, { - .name = "TBAT", - .start = DA9052_IRQ_TBAT, - .end = DA9052_IRQ_TBAT, + .name = "DCIN DET", + .start = DA9052_IRQ_DCIN, + .end = DA9052_IRQ_DCIN, + .flags = IORESOURCE_IRQ, + }, + { + .name = "DCIN REM", + .start = DA9052_IRQ_DCINREM, + .end = DA9052_IRQ_DCINREM, + .flags = IORESOURCE_IRQ, + }, + { + .name = "VBUS DET", + .start = DA9052_IRQ_VBUS, + .end = DA9052_IRQ_VBUS, + .flags = IORESOURCE_IRQ, + }, + { + .name = "VBUS REM", + .start = DA9052_IRQ_VBUSREM, + .end = DA9052_IRQ_VBUSREM, + .flags = IORESOURCE_IRQ, + }, + { + .name = "CHG END", + .start = DA9052_IRQ_CHGEND, + .end = DA9052_IRQ_CHGEND, .flags = IORESOURCE_IRQ, }, }; diff --git a/drivers/mfd/da9052-i2c.c b/drivers/mfd/da9052-i2c.c index c56793b..e6f8d87 100644 --- a/drivers/mfd/da9052-i2c.c +++ b/drivers/mfd/da9052-i2c.c @@ -1,5 +1,5 @@ /* - * I2C access for Da9052 PMICs. + * I2C access for DA9052 PMICs. * * Copyright(c) 2011 Dialog Semiconductor Ltd. * @@ -13,62 +13,25 @@ */ #include <linux/device.h> +#include <linux/err.h> #include <linux/mfd/core.h> #include <linux/i2c.h> #include <linux/mfd/da9052/da9052.h> #include <linux/mfd/da9052/reg.h> -int da9052_i2c_write_device(struct da9052 *da9052, unsigned char reg, - unsigned count, unsigned char *val) -{ - unsigned char msg[count+1]; - int ret; - - msg[0] = reg; - memcpy(&msg[1], val, count); - - ret = i2c_master_send(da9052->i2c_client, msg, count + 1); - if (ret < 0) - return ret; - if (ret != count + 1) - return -EIO; - - return 0; -} - -int da9052_i2c_read_device(struct da9052 *da9052, unsigned char reg, - unsigned count, unsigned char *val) -{ - int ret; - - ret = i2c_master_send(da9052->i2c_client, &reg, 1); - if (ret < 0) - return ret; - - ret = i2c_master_recv(da9052->i2c_client, val, count); - if (ret < 0) - return ret; - if (ret != count) - return -EIO; - - return 0; - -} - static int da9052_i2c_enable_multiwrite(struct da9052 *da9052) { - u8 reg_val; - int ret; + int reg_val, ret; - ret = da9052_i2c_read_device(da9052, DA9052_CONTROL_B_REG, 1, &reg_val); + ret = regmap_read(da9052->regmap, DA9052_CONTROL_B_REG, &reg_val); if (ret < 0) return ret; if (reg_val & DA9052_CONTROL_B_WRITEMODE) { reg_val = ~DA9052_CONTROL_B_WRITEMODE; - ret = da9052_i2c_write_device(da9052, DA9052_CONTROL_B_REG, 1, - &reg_val); + ret = regmap_write(da9052->regmap, + DA9052_CONTROL_B_REG, reg_val); if (ret < 0) return ret; } @@ -76,10 +39,14 @@ static int da9052_i2c_enable_multiwrite(struct da9052 *da9052) return 0; } +static struct regmap_config da9052_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +}; + static int __devinit da9052_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { - struct i2c_adapter *adapter; struct da9052 *da9052_i2c; int ret; @@ -87,27 +54,29 @@ static int __devinit da9052_i2c_probe(struct i2c_client *client, if (!da9052_i2c) return -ENOMEM; - adapter = to_i2c_adapter(client->dev.parent); - - if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { + if (!i2c_check_functionality(client->adapter, + I2C_FUNC_SMBUS_BYTE_DATA)) { dev_info(&client->dev, "Error in %s:i2c_check_functionality\n", __func__); return -ENODEV; } - da9052_i2c->i2c_client = client; da9052_i2c->dev = &client->dev; - i2c_set_clientdata(client, da9052_i2c); - da9052_i2c->write_dev = da9052_i2c_write_device; - da9052_i2c->read_dev = da9052_i2c_read_device; + da9052_i2c->regmap = regmap_init_i2c(client, &da9052_regmap_config); + if (IS_ERR(da9052_i2c->regmap)) { + ret = PTR_ERR(da9052_i2c->regmap); + dev_err(&client->dev, "Failed to allocate register map: %d\n", + ret); + goto err; + } ret = da9052_i2c_enable_multiwrite(da9052_i2c); if (ret < 0) goto err; - ret = da9052_device_init(da9052_i2c) + ret = da9052_device_init(da9052_i2c); if (ret != 0) goto err; diff --git a/drivers/mfd/da9052-spi.c b/drivers/mfd/da9052-spi.c index d787aa7..48ca027 100644 --- a/drivers/mfd/da9052-spi.c +++ b/drivers/mfd/da9052-spi.c @@ -13,46 +13,17 @@ */ #include <linux/device.h> +#include <linux/err.h> #include <linux/mfd/core.h> #include <linux/spi/spi.h> #include <linux/mfd/da9052/da9052.h> #include <linux/mfd/da9052/reg.h> -int da9052_spi_write_device(struct da9052 *da9052, unsigned char reg, - unsigned bytes, unsigned char *val) -{ - int raddr, ret; - unsigned char data[2]; - - for (raddr = reg; raddr < reg + bytes; raddr++) { - raddr = (raddr << 1); - data[0] = raddr; - data[1] = *val++; - - ret = spi_write(da9052->spi_dev, data, 2); - if (ret != 0) - return ret; - } - - return 0; -} - -int da9052_spi_read_device(struct da9052 *da9052, unsigned char reg, - unsigned bytes, unsigned char *val) -{ - int ret, raddr; - - for (raddr = reg; raddr < reg + bytes; raddr++) { - reg = ((raddr << 1) | da9052->rw_pol); - ret = spi_write_then_read(da9052->spi_dev, (u8 *)&reg, 2, - val, 2); - if (ret != 0) - return ret; - } - - return ret; -} +static struct regmap_config da9052_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +}; static int da9052_spi_probe(struct spi_device *spi) { @@ -69,19 +40,23 @@ static int da9052_spi_probe(struct spi_device *spi) da9052_spi->dev = &spi->dev; da9052_spi->spi_dev = spi; - da9052_spi->rw_pol = 1; dev_set_drvdata(&spi->dev, da9052_spi); - da9052_spi->write_dev = da9052_spi_write_device; - da9052_spi->read_dev = da9052_spi_read_device; + da9052_spi->regmap = regmap_init_spi(spi, &da9052_regmap_config); + if (IS_ERR(da9052_spi->regmap)) { + ret = PTR_ERR(da9052_spi->regmap); + dev_err(&spi->dev, "Failed to allocate register map: %d\n", + ret); + goto err; + } - ret = da9052_device_init(da9052_i2c) + ret = da9052_device_init(da9052_spi); if (ret != 0) - goto err_mem; + goto err; return 0; -err_mem: +err: kfree(da9052_spi); return ret; } diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h index 558f73b..3578e28 100644 --- a/include/linux/mfd/da9052/da9052.h +++ b/include/linux/mfd/da9052/da9052.h @@ -27,6 +27,7 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/mfd/core.h> +#include <linux/regmap.h> /* HWMON Channel Definations */ #define DA9052_ADC_VDDOUT 0 @@ -50,16 +51,12 @@ struct da9052 { struct device *dev; struct spi_device *spi_dev; struct i2c_client *i2c_client; + struct regmap *regmap; int irq_base; - u8 rw_pol; - u32 events_mask; + u32 events_mask; int chip_irq; - int (*read_dev) (struct da9052 *da9052, unsigned char reg, - unsigned bytes, unsigned char *val); - int (*write_dev) (struct da9052 *da9052, unsigned char reg, - unsigned bytes, unsigned char *val); }; /* ADC API */ @@ -77,10 +74,6 @@ int da9052_group_write(struct da9052 *da9052, unsigned char reg, unsigned bytes, unsigned char *val); int da9052_reg_update(struct da9052 *da9052, unsigned char reg, unsigned char bit_mask, unsigned char reg_val); -int da9052_set_bits(struct da9052 *da9052, unsigned char reg, - unsigned char bit_mask); -int da9052_clear_bits(struct da9052 *da9052, unsigned char reg, - unsigned char bit_mask); int da9052_device_init(struct da9052 *da9052); void da9052_device_exit(struct da9052 *da9052); diff --git a/include/linux/mfd/da9052/pdata.h b/include/linux/mfd/da9052/pdata.h index 75d82a3..b56aa7a 100644 --- a/include/linux/mfd/da9052/pdata.h +++ b/include/linux/mfd/da9052/pdata.h @@ -30,13 +30,12 @@ struct da9052; struct da9052_pdata { struct led_platform_data *pled; - struct da9052_wdt_platform_data *pwdt; - struct da9052_tsi_platform_data *ptsi; int (*init) (struct da9052 *da9052); int irq; int irq_base; int num_regulators; int gpio_base; + int use_for_apm; struct regulator_init_data *regulators[DA9052_MAX_REGULATORS]; }; diff --git a/include/linux/mfd/da9052/reg.h b/include/linux/mfd/da9052/reg.h index ac391b3..f521b7d 100644 --- a/include/linux/mfd/da9052/reg.h +++ b/include/linux/mfd/da9052/reg.h @@ -58,6 +58,8 @@ /*GPIO REGISTERS*/ #define DA9052_GPIO_0_1_REG 21 #define DA9052_GPIO_2_3_REG 22 +#define DA9052_GPIO_4_5_REG 23 +#define DA9052_GPIO_6_7_REG 24 #define DA9052_GPIO_14_15_REG 28 /*LDO AND BUCK REGISTERS*/

14 years, 1 month

Fwd: ADB/Android Screencast

by Fathi Boudra

forward to linaro-dev ml ---------- Forwarded message ---------- From: Frans Gifford <frans.gifford(a)linaro.org> Date: 3 August 2011 11:55 Subject: ADB/Android Screencast Hi all, I assume most people have used ADB and had to create a udev rule to set permissions on their board. We have a wiki page (https://wiki.linaro.org/Platform/Android/ConfigureAndUseAdbOnPanda) with the rules for Panda/TI and Snowball/ST-Ericsson, but it would be nice if some of you could add the rules for the other boards/vendors too so everything's in one place. Also, I wrote a short wiki page yesterday about getting androidscreencast running, it's a useful tool that lets you control an android device remotely from a PC. Feel free to update this if I missed anything out. Regards, Frans -- Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog

14 years, 1 month

[PATCH] SMDKV310: MMC_SPL: Fix building when using "make O="

by Chander Kashyap

Fixes dependency build error with "make O=" option. "make O=" option is used to specify output directory. Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- mmc_spl/board/samsung/smdkv310/Makefile | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mmc_spl/board/samsung/smdkv310/Makefile b/mmc_spl/board/samsung/smdkv310/Makefile index f1ce066..d4d7ad7 100644 --- a/mmc_spl/board/samsung/smdkv310/Makefile +++ b/mmc_spl/board/samsung/smdkv310/Makefile @@ -40,7 +40,7 @@ CFLAGS += -DCONFIG_PRELOADER SOBJS = start.o mem_setup.o lowlevel_init.o COBJS = mmc_boot.o -SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) __OBJS := $(SOBJS) $(COBJS) LNDIR := $(OBJTREE)/mmc_spl/board/$(BOARDDIR) @@ -76,25 +76,25 @@ $(mmcobj)u-boot.lds: $(LDSCRIPT) # create symbolic links for common files # from cpu directory -$(obj)start.S: +start.S: @rm -f $@ @ln -s $(TOPDIR)/arch/arm/cpu/armv7/start.S $@ # from board directory -$(obj)mem_setup.S: +mem_setup.S: @rm -f $@ @ln -s $(TOPDIR)/board/samsung/smdkv310/mem_setup.S $@ -$(obj)lowlevel_init.S: +lowlevel_init.S: @rm -f $@ @ln -s $(TOPDIR)/board/samsung/smdkv310/lowlevel_init.S $@ ######################################################################### -$(obj)%.o: $(obj)%.S +$(obj)%.o: %.S $(CC) $(AFLAGS) -c -o $@ $< -$(obj)%.o: $(obj)%.c +$(obj)%.o: %.c $(CC) $(CFLAGS) -c -o $@ $< # defines $(obj).depend target -- 1.7.4.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