September 2015 - U-Boot

[U-Boot] [PATCH 00/11] imx: mx6: support lcdif
by Peng Fan 20 Oct '15

20 Oct '15

This patch set is to introduce lcdif support for i.MX6. Now only i.MX6UL support is in this patchset. Patchset tested on mx6ul_14x14_evk and mx6ul_9x9_evk (needs 9x9 SPL patch applied). 1/11 There are two LCD interface for i.MX6SX and one interface for i.MX6UL, so change the prototype mxs_set_lcdclk to handle different interface. [2,3]/11 I am not sure, but from my understanding, the 'board_' should be discarded. 4/11 mx28 and mx6ul/sx have similar register layout and bit definitions, so move related structure and bit definitions to imx-common. [5,6,7]/11 is to add related CCM macros, clock apis for enable lcdif on i.MX6 8/11 support lcdif for i.MX6UL 14x14/9x9 board 9/11 Introduce lcdif_power_down, to make system stable when reset or boot os [10,11]/11 Need to call lcdif_power_down, before trigger wdog reset or boot os. Or we may met unexpected system hang. Peng Fan (11): mxs: add parameter base_addr for mxs_set_lcdclk sandisk: sfp: correct function name xfi3: correct function name imx: imx-common: move lcdif structure and macro definition to imx-common imx: mx6: fix register address imx: mx6: crm_reg: add LCDIF related macros imx: mx6: add clock api for lcdif imx: mx6ul_14x14_evk: support lcdif display video: mxsfb: introduce lcdif_power_down imx: mx6: implement reset_misc imx: imx-common: power down lcdif before boot os arch/arm/cpu/arm926ejs/mxs/clock.c | 2 +- arch/arm/cpu/armv7/mx6/clock.c | 239 ++++++++++++++++++++++ arch/arm/cpu/armv7/mx6/soc.c | 8 + arch/arm/imx-common/cpu.c | 3 + arch/arm/include/asm/arch-mx6/clock.h | 2 + arch/arm/include/asm/arch-mx6/crm_regs.h | 34 ++- arch/arm/include/asm/arch-mx6/imx-regs.h | 15 +- arch/arm/include/asm/arch-mxs/clock.h | 2 +- arch/arm/include/asm/arch-mxs/regs-lcdif.h | 201 +----------------- arch/arm/include/asm/imx-common/regs-lcdif.h | 222 ++++++++++++++++++++ arch/arm/include/asm/imx-common/sys_proto.h | 2 + board/creative/xfi3/xfi3.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 63 ++++++ board/sandisk/sansa_fuze_plus/sfp.c | 2 +- drivers/video/mxsfb.c | 19 +- include/configs/mx6ul_14x14_evk.h | 18 ++ 16 files changed, 620 insertions(+), 214 deletions(-) create mode 100644 arch/arm/include/asm/imx-common/regs-lcdif.h -- 1.8.4

3 15

[U-Boot] [PATCH] dfu: dfu_sf: Take the start address into account
by Fabio Estevam 20 Oct '15

20 Oct '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> The dfu_alt_info_spl variable allows passing a starting point for the binary to be flashed in the SPI NOR. For example, if we have 'dfu_alt_info_spl=spl raw 0x400', this means that we want to flash the binary starting at address 0x400. In order to do so we need to erase the entire sector and write to the the subsequent SPI NOR sectors taking such start address into account for the address calculations. Tested by succesfully writing SPL binary into 0x400 offset and the u-boot.img at offset 64 kiB of a SPL NOR. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/dfu/dfu_sf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index 448d95d..844da1f 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -23,17 +23,25 @@ static int dfu_read_medium_sf(struct dfu_entity *dfu, u64 offset, void *buf, return spi_flash_read(dfu->data.sf.dev, offset, *len, buf); } +static u64 find_sector(struct dfu_entity *dfu, u64 start, u64 offset) +{ + return ((start + offset) / dfu->data.sf.dev->sector_size) * + dfu->data.sf.dev->sector_size; +} + static int dfu_write_medium_sf(struct dfu_entity *dfu, u64 offset, void *buf, long *len) { int ret; - ret = spi_flash_erase(dfu->data.sf.dev, offset, + ret = spi_flash_erase(dfu->data.sf.dev, + find_sector(dfu, dfu->data.sf.start, offset), dfu->data.sf.dev->sector_size); if (ret) return ret; - ret = spi_flash_write(dfu->data.sf.dev, offset, *len, buf); + ret = spi_flash_write(dfu->data.sf.dev, dfu->data.sf.start + offset, + *len, buf); if (ret) return ret; -- 1.9.1

4 6

[U-Boot] [PATCH] dfu: dfu_sf: Use the erase sector size for erase operations
by Fabio Estevam 20 Oct '15

20 Oct '15

From: Fabio Estevam <fabio.estevam(a)freescale.com> SPI NOR flashes need to erase the entire sector size and we cannot pass any arbitrary length for the erase operation. To illustrate the problem: Copying data from PC to DFU device Download [=========================] 100% 478208 bytes Download done. state(7) = dfuMANIFEST, status(0) = No error condition is present state(10) = dfuERROR, status(14) = Something went wrong, but the device does not know what it was Done! In this case, the binary has 478208 bytes and the M25P32 SPI NOR has an erase sector of 64kB. 478208 = 7 entire sectors of 64kiB + 19456 bytes. Erasing the first seven 64 kB sectors works fine, but when trying to erase the remainding 19456 causes problem and the board hangs. Fix the issue by always erasing with the erase sector size. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/dfu/dfu_sf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dfu/dfu_sf.c b/drivers/dfu/dfu_sf.c index c3d3c3b..448d95d 100644 --- a/drivers/dfu/dfu_sf.c +++ b/drivers/dfu/dfu_sf.c @@ -28,7 +28,8 @@ static int dfu_write_medium_sf(struct dfu_entity *dfu, { int ret; - ret = spi_flash_erase(dfu->data.sf.dev, offset, *len); + ret = spi_flash_erase(dfu->data.sf.dev, offset, + dfu->data.sf.dev->sector_size); if (ret) return ret; -- 1.9.1

4 7

[U-Boot] [PATCH 1/2] dm: implement a Timer uclass
by Thomas Chou 19 Oct '15

19 Oct '15

Implement a Timer uclass to work with lib/time.c. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- common/board_r.c | 2 +- drivers/Kconfig | 2 ++ drivers/Makefile | 1 + drivers/timer/Kconfig | 9 ++++++++ drivers/timer/Makefile | 7 ++++++ drivers/timer/timer-uclass.c | 35 ++++++++++++++++++++++++++++++ drivers/timer/timer.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ include/dm/uclass-id.h | 1 + include/timer.h | 36 +++++++++++++++++++++++++++++++ 9 files changed, 143 insertions(+), 1 deletion(-) create mode 100644 drivers/timer/Kconfig create mode 100644 drivers/timer/Makefile create mode 100644 drivers/timer/timer-uclass.c create mode 100644 drivers/timer/timer.c create mode 100644 include/timer.h diff --git a/common/board_r.c b/common/board_r.c index f8c1baa..2d8ad11 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -829,7 +829,7 @@ init_fnc_t init_sequence_r[] = { initr_enable_interrupts, #endif #if defined(CONFIG_X86) || defined(CONFIG_MICROBLAZE) || defined(CONFIG_AVR32) \ - || defined(CONFIG_M68K) + || defined(CONFIG_M68K) || defined(CONFIG_DM_TIMER) timer_init, /* initialize timer */ #endif #if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) diff --git a/drivers/Kconfig b/drivers/Kconfig index 63c92c5..f9496f7 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -56,6 +56,8 @@ source "drivers/spi/Kconfig" source "drivers/thermal/Kconfig" +source "drivers/timer/Kconfig" + source "drivers/tpm/Kconfig" source "drivers/usb/Kconfig" diff --git a/drivers/Makefile b/drivers/Makefile index 9d0a595..692da78 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -48,6 +48,7 @@ obj-y += pcmcia/ obj-y += dfu/ obj-y += rtc/ obj-y += sound/ +obj-y += timer/ obj-y += tpm/ obj-y += twserial/ obj-y += video/ diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig new file mode 100644 index 0000000..97014f3 --- /dev/null +++ b/drivers/timer/Kconfig @@ -0,0 +1,9 @@ +menu "Timer Support" + +config DM_TIMER + bool "Enable Driver Model for Timer drivers" + depends on DM + help + Enable driver model for Timer access. + +endmenu diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile new file mode 100644 index 0000000..58acd7c --- /dev/null +++ b/drivers/timer/Makefile @@ -0,0 +1,7 @@ +# +# Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-$(CONFIG_DM_TIMER) += timer-uclass.o timer.o diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c new file mode 100644 index 0000000..1f088bf --- /dev/null +++ b/drivers/timer/timer-uclass.c @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <timer.h> + +int timer_get_count(struct udevice *dev, unsigned long *count) +{ + const struct dm_timer_ops *ops = device_get_ops(dev); + + if (!ops->get_count) + return -ENOSYS; + + return ops->get_count(dev, count); +} + +int timer_get_rate(struct udevice *dev, unsigned long *rate) +{ + const struct dm_timer_ops *ops = device_get_ops(dev); + + if (!ops->get_rate) + return -ENOSYS; + + return ops->get_rate(dev, rate); +} + +UCLASS_DRIVER(timer) = { + .id = UCLASS_TIMER, + .name = "timer", +}; diff --git a/drivers/timer/timer.c b/drivers/timer/timer.c new file mode 100644 index 0000000..648fd06 --- /dev/null +++ b/drivers/timer/timer.c @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <timer.h> + +DECLARE_GLOBAL_DATA_PTR; + +unsigned long notrace get_tbclk(void) +{ + struct udevice *dev; + unsigned long rate; + + uclass_first_device(UCLASS_TIMER, &dev); + if (!dev) + return 100000000; /* 100MHz, fail-safe */ + + timer_get_rate(dev, &rate); + + return rate; +} + +unsigned long notrace timer_read_counter(void) +{ + struct udevice *dev; + unsigned long count; + + uclass_first_device(UCLASS_TIMER, &dev); + if (!dev) + return 0; /* 0, fail-safe */ + + timer_get_count(dev, &count); + + return count; +} + +int timer_init(void) +{ + struct udevice *dev; + + uclass_first_device(UCLASS_TIMER, &dev); + if (!dev) + return -ENODEV; + + return 0; +} diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index 1eeec74..aff34a4 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -56,6 +56,7 @@ enum uclass_id { UCLASS_SPI_GENERIC, /* Generic SPI flash target */ UCLASS_SYSCON, /* System configuration device */ UCLASS_THERMAL, /* Thermal sensor */ + UCLASS_TIMER, /* Timer device */ UCLASS_TPM, /* Trusted Platform Module TIS interface */ UCLASS_USB, /* USB bus */ UCLASS_USB_DEV_GENERIC, /* USB generic device */ diff --git a/include/timer.h b/include/timer.h new file mode 100644 index 0000000..5d71612 --- /dev/null +++ b/include/timer.h @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2015 Thomas Chou <thomas(a)wytron.com.tw> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _DM_TIMER_H_ +#define _DM_TIMER_H_ + +int timer_get_count(struct udevice *dev, unsigned long *count); +int timer_get_rate(struct udevice *dev, unsigned long *rate); + +/* + * struct dm_timer_ops - Driver model Timer operations + * + * The uclass interface is implemented by all Timer devices which use + * driver model. + */ +struct dm_timer_ops { + /* + * Get the current timer count + * + * @dev: The Timer device + * @count: pointer that returns the currnet timer count + */ + int (*get_count)(struct udevice *dev, unsigned long *count); + /* + * Get the timer clock rate + * + * @dev: The Timer device + * @rate: pointer that returns the timer clock rate + */ + int (*get_rate)(struct udevice *dev, unsigned long *rate); +}; + +#endif /* _DM_TIMER_H_ */ -- 2.1.4

4 44

[U-Boot] [PATCH] RFC: dm: Add proposed timeline and guide for porting serial drivers
by Simon Glass 19 Oct '15

19 Oct '15

Add a README with a brief guide to porting serial drivers over to use driver model. Add a timeline also. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- I intend to cc the final patch to all U-Boot maintainers using something like this: (for f in $(find . -name MAINTAINERS); do grep ^M: $f; done) | \ awk '{$1=""; print "Series-cc:" $0}' |sort | uniq This is about 229 email address, of which 217 seem to be different people. doc/driver-model/serial-howto.txt | 58 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 doc/driver-model/serial-howto.txt diff --git a/doc/driver-model/serial-howto.txt b/doc/driver-model/serial-howto.txt new file mode 100644 index 0000000..76a75da --- /dev/null +++ b/doc/driver-model/serial-howto.txt @@ -0,0 +1,58 @@ +How to port a serial driver to driver model +=========================================== + +About 16 of 33 serial drivers have been converted as at September 2015. It +is time for maintainers to start converting over the remaining serial drivers: + + altera_jtag_uart.c + altera_uart.c + arm_dcc.c + lpc32xx_hsuart.c + mcfuart.c + mxs_auart.c + opencores_yanu.c + serial_bfin.c + serial_imx.c + serial_lpuart.c + serial_max3100.c + serial_pxa.c + serial_s3c24x0.c + serial_sa1100.c + serial_stm32.c + serial_xuartlite.c + usbtty.c + +You should complete this by Christmas 2015. + +Here is a suggested approach for converting your serial driver over to driver +model. Please feel free to update this file with your ideas and suggestions. + +- #ifdef out all your own serial driver code (#ifndef CONFIG_DM_SERIAL) +- Define CONFIG_DM_SERIAL for your board, vendor or architecture +- If the board does not already use driver model, you need CONFIG_DM also +- Your board should then build, but will not boot since there will be no serial + driver +- Add the U_BOOT_DRIVER piece at the end (e.g. copy serial_s5p.c for example) +- Add a private struct for the driver data - avoid using static variables +- Implement each of the driver methods, perhaps by calling your old methods +- You may need to adjust the function parameters so that the old and new + implementations can share most of the existing code +- If you convert all existing users of the driver, remove the pre-driver-model + code + +In terms of patches a conversion series typically has these patches: +- clean up / prepare the driver for conversion +- add driver model code +- convert at least one existing board to use driver model serial +- (if no boards remain that don't use driver model) remove the old code + +This may be a good time to move your board to use device tree also. Mostly +this involves these steps: + +- define CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE +- add your device tree files to arch/<arch>/dts +- update the Makefile there +- Add stdout-path to your /chosen device tree node if it is not already there +- build and get u-boot-dtb.bin so you can test it +- Your drivers can now use device tree +- For device tree in SPL, define CONFIG_SPL_OF_CONTROL -- 2.5.0.457.gab17608

3 6

[U-Boot] [PATCH 00/20] arm: rpi: Enable USB and Ethernet driver model Raspberry Pi
by Simon Glass 19 Oct '15

19 Oct '15

Raspberry Pi uses a DWC2 USB controller and a SMSC USB Ethernet adaptor. Neither of these currently support driver model. This series does the following: - Move Raspberry Pi to use device tree control (u-boot-dtb.bin instead of u-boot.bin) - Remove GPIO platform data (now uses device tree) - Remove serial platform data (now uses device tree) - Add 'ranges' support to simple-bus - Convert the DWC2 USB driver to support driver model - Convert the SMSC95XX USB Ethernet driver to support driver model - Enable CONFIG_DM_ETH and CONFIG_DM_USB on Raspberry Pi With Ethernet active the device list looks something like this: U-Boot> dm tree Class Probed Name ---------------------------------------- root [ + ] root_driver simple_bus [ + ] |-- soc gpio [ ] | |-- gpio@7e200000 serial [ + ] | |-- uart@7e201000 usb [ + ] | `-- usb@7e980000 usb_hub [ + ] | `-- usb_hub usb_hub [ + ] | `-- usb_hub eth [ + ] | `-- smsc95xx_eth simple_bus [ ] `-- clocks Raspberry Pi 2 is not converted as I do not have one to test at present. Simon Glass (20): dm: net: Support usbethaddr environment variable dm: usb: Allow USB Ethernet whenever CONFIG_DM_ETH is not defined dm: usb: Add an errno.h header to usb_ether.c dm: usb: Prepare dwc2 driver for driver-model conversion dm: usb: Add driver-model support to dwc2 net: smsc95xx: Sort the include files net: smsc95xx: Rename AX_RX_URB_SIZE to RX_URB_SIZE net: smsc95xx: Correct the error numbers net: smsc95xx: Prepare for conversion to driver model net: smsc95xx: Add driver-model support dm: serial: Update binding for PL01x serial UART dm: Support address translation for simple-bus arm: rpi: Define CONFIG_TFTP_TSIZE to show tftp size info arm: rpi: Bring in kernel device tree files arm: rpi: Device tree modifications for U-Boot arm: rpi: Enable device tree control for Rasberry Pi arm: rpi: Drop the UART console platform data arm: rpi: Drop the GPIO platform data arm: rpi: Move to driver model for USB arm: rpi: Use driver model for Ethernet arch/arm/dts/Makefile | 2 + arch/arm/dts/bcm2835-rpi-b.dts | 23 ++ arch/arm/dts/bcm2835-rpi.dtsi | 51 ++++ arch/arm/dts/bcm2835.dtsi | 194 ++++++++++++ arch/arm/dts/stv0991.dts | 2 +- arch/arm/mach-bcm283x/include/mach/gpio.h | 2 - board/raspberrypi/rpi/rpi.c | 24 -- common/cmd_usb.c | 7 +- configs/rpi_defconfig | 5 + doc/device-tree-bindings/serial/pl011.txt | 53 ++++ doc/device-tree-bindings/serial/pl01x.txt | 7 - drivers/core/device.c | 17 +- drivers/core/simple-bus.c | 30 ++ drivers/gpio/bcm2835_gpio.c | 20 ++ drivers/serial/serial_pl01x.c | 6 +- drivers/usb/eth/smsc95xx.c | 469 ++++++++++++++++++++---------- drivers/usb/eth/usb_ether.c | 1 + drivers/usb/host/dwc2.c | 247 ++++++++++++---- include/configs/rpi-common.h | 3 +- include/dm/device-internal.h | 12 + include/dt-bindings/pinctrl/bcm2835.h | 27 ++ net/eth.c | 7 +- 22 files changed, 966 insertions(+), 243 deletions(-) create mode 100644 arch/arm/dts/bcm2835-rpi-b.dts create mode 100644 arch/arm/dts/bcm2835-rpi.dtsi create mode 100644 arch/arm/dts/bcm2835.dtsi create mode 100644 doc/device-tree-bindings/serial/pl011.txt delete mode 100644 doc/device-tree-bindings/serial/pl01x.txt create mode 100644 include/dt-bindings/pinctrl/bcm2835.h -- 2.4.3.573.g4eafbef

10 60

[U-Boot] usb start crashing on arndale
by armdev 19 Oct '15

19 Oct '15

Hi, We have recently started working on arndale and running u-boot head on it. Seems like it is crashing on our setup with a data abort on usb start. Can anyone please confirm and suggest a fix / solution U-Boot 2014.04-rc1-00486-geeb72e6 (Mar 11 2014 - 11:44:32) for ARNDALE CPU: Exynos5250@1000MHz Board: Arndale I2C: i2c_init: failed to init bus 0 for speed = 100000 ready DRAM: 2 GiB trace: copying 00084f98 bytes of early data from 50000000 to beff0000 trace: enabled WARNING: Caches not enabled MMC: EXYNOS DWMMC: 0, EXYNOS DWMMC: 1 i2c_init: failed to init bus 0 for speed = 100000 In: serial Out: serial Err: serial Net: Net Initialization Skipped No ethernet found. Hit any key to stop autoboot: 0 ARNDALE # usb start (Re)start USB... USB0: data abort pc : [<bef8524c>] lr : [<bef85298>] sp : beb5f9c0 ip : 00000003 fp : 00000000 r10: 00000000 r9 : beb62ecc r8 : befbcc80 r7 : befbcc84 r6 : 0000ffff r5 : 000000ff r4 : 00000001 r3 : 00000000 r2 : 00000001 r1 : 000000ff r0 : 0000ffff Flags: nzCv IRQs off FIQs off Mode SVC_32 Resetting CPU ... Thanks and Regards Armdev@FTM Team

3 5

[U-Boot] [PATCH 0/2] Small Configuration tweaks for rockchip/firefly
by Sjoerd Simons 19 Oct '15

19 Oct '15

Further testing with u-boot on Rockchip revealed that loading the initrd above 512M seems to be problematic (just like with the dtb) and ofcourse that not being able to save the environment is annoying :) Resolve these things. Sjoerd Simons (2): rockchip: Also load the initrd below 512M rockchip: firefly: Save the environment on SD card include/configs/chromebook_jerry.h | 1 + include/configs/firefly-rk3288.h | 8 ++++++++ include/configs/rk3288_common.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) -- 2.5.1

2 6

[U-Boot] [PATCH v2 00/13] Better support of booting VxWorks via 'bootvx'
by Bin Meng 19 Oct '15

19 Oct '15

4 28

[U-Boot] [PATCH 1/6] dm: Rename dev_get_parentdata() to dev_get_parent_priv()
by Simon Glass 19 Oct '15

19 Oct '15

The current name is inconsistent with other driver model data access functions. Rename it and fix up all users. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/cmd_usb.c | 10 +++++----- common/usb_hub.c | 4 ++-- common/usb_storage.c | 2 +- doc/driver-model/usb-info.txt | 4 ++-- drivers/core/device.c | 2 +- drivers/misc/cros_ec_spi.c | 4 ++-- drivers/mtd/spi/sf_dataflash.c | 2 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/spi/fsl_qspi.c | 2 +- drivers/spi/ich.c | 2 +- drivers/spi/soft_spi.c | 2 +- drivers/spi/spi-uclass.c | 8 ++++---- drivers/usb/eth/smsc95xx.c | 4 ++-- drivers/usb/eth/usb_ether.c | 2 +- drivers/usb/host/ehci-hcd.c | 6 +++--- drivers/usb/host/usb-uclass.c | 8 ++++---- drivers/usb/host/xhci.c | 4 ++-- drivers/usb/musb-new/usb-compat.h | 10 +++++----- include/dm/device.h | 10 +++++----- include/pci.h | 2 +- include/spi.h | 2 +- include/usb.h | 2 +- test/dm/bus.c | 26 +++++++++++++------------- 23 files changed, 60 insertions(+), 60 deletions(-) diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 6bdbbc5..1ef55dc 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -281,7 +281,7 @@ static struct usb_device *usb_find_device(int devnum) if (!device_active(hub)) continue; - udev = dev_get_parentdata(hub); + udev = dev_get_parent_priv(hub); if (udev->devnum == devnum) return udev; @@ -291,7 +291,7 @@ static struct usb_device *usb_find_device(int devnum) if (!device_active(hub)) continue; - udev = dev_get_parentdata(dev); + udev = dev_get_parent_priv(dev); if (udev->devnum == devnum) return udev; } @@ -407,7 +407,7 @@ static void usb_show_tree_graph(struct usb_device *dev, char *pre) if (!device_active(child)) continue; - udev = dev_get_parentdata(child); + udev = dev_get_parent_priv(child); /* Ignore emulators, we only want real devices */ if (device_get_uclass_id(child) != UCLASS_USB_EMUL) { @@ -553,7 +553,7 @@ static void show_info(struct udevice *dev) struct udevice *child; struct usb_device *udev; - udev = dev_get_parentdata(dev); + udev = dev_get_parent_priv(dev); usb_display_desc(udev); usb_display_config(udev); for (device_find_first_child(dev, &child); @@ -641,7 +641,7 @@ static int do_usb(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) device_find_first_child(bus, &dev); if (dev && device_active(dev)) { - udev = dev_get_parentdata(dev); + udev = dev_get_parent_priv(dev); usb_show_tree(udev); } } diff --git a/common/usb_hub.c b/common/usb_hub.c index 415b45c..a92c9fb 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -230,7 +230,7 @@ int legacy_hub_port_reset(struct usb_device *dev, int port, #ifdef CONFIG_DM_USB int hub_port_reset(struct udevice *dev, int port, unsigned short *portstat) { - struct usb_device *udev = dev_get_parentdata(dev); + struct usb_device *udev = dev_get_parent_priv(dev); return legacy_hub_port_reset(udev, port, portstat); } @@ -610,7 +610,7 @@ int usb_hub_probe(struct usb_device *dev, int ifnum) #ifdef CONFIG_DM_USB int usb_hub_scan(struct udevice *hub) { - struct usb_device *udev = dev_get_parentdata(hub); + struct usb_device *udev = dev_get_parent_priv(hub); return usb_hub_configure(udev); } diff --git a/common/usb_storage.c b/common/usb_storage.c index b390310..0ccaeb4 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -1408,7 +1408,7 @@ int usb_stor_get_info(struct usb_device *dev, struct us_data *ss, static int usb_mass_storage_probe(struct udevice *dev) { - struct usb_device *udev = dev_get_parentdata(dev); + struct usb_device *udev = dev_get_parent_priv(dev); int ret; usb_disable_asynch(1); /* asynch transfer not allowed */ diff --git a/doc/driver-model/usb-info.txt b/doc/driver-model/usb-info.txt index 66f2dae..e07e5ba 100644 --- a/doc/driver-model/usb-info.txt +++ b/doc/driver-model/usb-info.txt @@ -84,7 +84,7 @@ The following primary data structures are in use: This holds information about a device on the bus. All devices have this structure, even the root hub. The controller itself does not have this structure. You can access it for a device 'dev' with - dev_get_parentdata(dev). It matches the old structure except that the + dev_get_parent_priv(dev). It matches the old structure except that the parent and child information is not present (since driver model handles that). Once the device is set up, you can find the device descriptor and current configuration descriptor in this structure. @@ -279,7 +279,7 @@ USB hubs are scanned as in the section above. While hubs have their own uclass, they share some common elements with controllers: - they both attach private data to their children (struct usb_device, -accessible for a child with dev_get_parentdata(child)) +accessible for a child with dev_get_parent_priv(child)) - they both use usb_child_pre_probe() to set up their children as proper USB devices diff --git a/drivers/core/device.c b/drivers/core/device.c index 0bc04d4..6edf846 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -390,7 +390,7 @@ void *dev_get_uclass_priv(struct udevice *dev) return dev->uclass_priv; } -void *dev_get_parentdata(struct udevice *dev) +void *dev_get_parent_priv(struct udevice *dev) { if (!dev) { dm_warn("%s: null device\n", __func__); diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c index 0686925..253d91a 100644 --- a/drivers/misc/cros_ec_spi.c +++ b/drivers/misc/cros_ec_spi.c @@ -24,7 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; int cros_ec_spi_packet(struct udevice *udev, int out_bytes, int in_bytes) { struct cros_ec_dev *dev = dev_get_uclass_priv(udev); - struct spi_slave *slave = dev_get_parentdata(dev->dev); + struct spi_slave *slave = dev_get_parent_priv(dev->dev); ulong start; uint8_t byte; int rv; @@ -84,7 +84,7 @@ int cros_ec_spi_command(struct udevice *udev, uint8_t cmd, int cmd_version, uint8_t **dinp, int din_len) { struct cros_ec_dev *dev = dev_get_uclass_priv(udev); - struct spi_slave *slave = dev_get_parentdata(dev->dev); + struct spi_slave *slave = dev_get_parent_priv(dev->dev); int in_bytes = din_len + 4; /* status, length, checksum, trailer */ uint8_t *out; uint8_t *p; diff --git a/drivers/mtd/spi/sf_dataflash.c b/drivers/mtd/spi/sf_dataflash.c index 3111f4f..b2a56da 100644 --- a/drivers/mtd/spi/sf_dataflash.c +++ b/drivers/mtd/spi/sf_dataflash.c @@ -577,7 +577,7 @@ static struct flash_info *jedec_probe(struct spi_slave *spi, u8 *id) */ static int spi_dataflash_probe(struct udevice *dev) { - struct spi_slave *spi = dev_get_parentdata(dev); + struct spi_slave *spi = dev_get_parent_priv(dev); struct spi_flash *spi_flash; struct flash_info *info; u8 idcode[5]; diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 954376d..3bf03f7 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -471,7 +471,7 @@ int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) int spi_flash_std_probe(struct udevice *dev) { - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *slave = dev_get_parent_priv(dev); struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); struct spi_flash *flash; diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 868df5f..02b557f 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -913,7 +913,7 @@ void spi_init(void) #else static int fsl_qspi_child_pre_probe(struct udevice *dev) { - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *slave = dev_get_parent_priv(dev); slave->max_write_size = TX_BUFFER_SIZE; diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 2e388e7..9a3e002 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -739,7 +739,7 @@ static int ich_spi_child_pre_probe(struct udevice *dev) struct udevice *bus = dev_get_parent(dev); struct ich_spi_platdata *plat = dev_get_platdata(bus); struct ich_spi_priv *priv = dev_get_priv(bus); - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *slave = dev_get_parent_priv(dev); /* * Yes this controller can only write a small number of bytes at diff --git a/drivers/spi/soft_spi.c b/drivers/spi/soft_spi.c index 6ae45f5..aa4abcc 100644 --- a/drivers/spi/soft_spi.c +++ b/drivers/spi/soft_spi.c @@ -200,7 +200,7 @@ static int soft_spi_ofdata_to_platdata(struct udevice *dev) static int soft_spi_probe(struct udevice *dev) { - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *slave = dev_get_parent_priv(dev); struct soft_spi_platdata *plat = dev->platdata; int cs_flags, clk_flags; diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index d666272..58388ef 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -124,7 +124,7 @@ static int spi_post_probe(struct udevice *bus) static int spi_child_pre_probe(struct udevice *dev) { struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); - struct spi_slave *slave = dev_get_parentdata(dev); + struct spi_slave *slave = dev_get_parent_priv(dev); /* * This is needed because we pass struct spi_slave around the place @@ -282,7 +282,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, ret = device_probe(dev); if (ret) goto err; - slave = dev_get_parentdata(dev); + slave = dev_get_parent_priv(dev); slave->dev = dev; } @@ -291,7 +291,7 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, goto err; *busp = bus; - *devp = dev_get_parentdata(dev); + *devp = dev_get_parent_priv(dev); debug("%s: bus=%p, slave=%p\n", __func__, bus, *devp); return 0; @@ -320,7 +320,7 @@ struct spi_slave *spi_setup_slave_fdt(const void *blob, int node, ret = device_get_child_by_of_offset(bus, node, &dev); if (ret) return NULL; - return dev_get_parentdata(dev); + return dev_get_parent_priv(dev); } /* Compatibility function - to be removed */ diff --git a/drivers/usb/eth/smsc95xx.c b/drivers/usb/eth/smsc95xx.c index dc8fa88..d4b5ff4 100644 --- a/drivers/usb/eth/smsc95xx.c +++ b/drivers/usb/eth/smsc95xx.c @@ -945,7 +945,7 @@ int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss, #ifdef CONFIG_DM_ETH static int smsc95xx_eth_start(struct udevice *dev) { - struct usb_device *udev = dev_get_parentdata(dev); + struct usb_device *udev = dev_get_parent_priv(dev); struct smsc95xx_private *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_platdata(dev); @@ -1029,7 +1029,7 @@ static int smsc95xx_free_pkt(struct udevice *dev, uchar *packet, int packet_len) int smsc95xx_write_hwaddr(struct udevice *dev) { - struct usb_device *udev = dev_get_parentdata(dev); + struct usb_device *udev = dev_get_parent_priv(dev); struct eth_pdata *pdata = dev_get_platdata(dev); struct smsc95xx_private *priv = dev_get_priv(dev); diff --git a/drivers/usb/eth/usb_ether.c b/drivers/usb/eth/usb_ether.c index 3c3e082..62d20f0 100644 --- a/drivers/usb/eth/usb_ether.c +++ b/drivers/usb/eth/usb_ether.c @@ -19,7 +19,7 @@ int usb_ether_register(struct udevice *dev, struct ueth_data *ueth, int rxsize) { - struct usb_device *udev = dev_get_parentdata(dev); + struct usb_device *udev = dev_get_parent_priv(dev); struct usb_interface_descriptor *iface_desc; bool ep_in_found = false, ep_out_found = false; struct usb_interface *iface; diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 135ef72..c85dbce 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -303,7 +303,7 @@ static void ehci_update_endpt2_dev_n_port(struct usb_device *udev, ttdev = udev; parent = udev->dev; - uparent = dev_get_parentdata(parent); + uparent = dev_get_parent_priv(parent); while (uparent->speed != USB_SPEED_HIGH) { struct udevice *dev = parent; @@ -313,9 +313,9 @@ static void ehci_update_endpt2_dev_n_port(struct usb_device *udev, return; } - ttdev = dev_get_parentdata(dev); + ttdev = dev_get_parent_priv(dev); parent = dev->parent; - uparent = dev_get_parentdata(parent); + uparent = dev_get_parent_priv(parent); } parent_devnum = uparent->devnum; #else diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c index c66ebb6..7f6a9a6 100644 --- a/drivers/usb/host/usb-uclass.c +++ b/drivers/usb/host/usb-uclass.c @@ -289,7 +289,7 @@ static struct usb_device *find_child_devnum(struct udevice *parent, int devnum) if (!device_active(parent)) return NULL; - udev = dev_get_parentdata(parent); + udev = dev_get_parent_priv(parent); if (udev->devnum == devnum) return udev; @@ -575,7 +575,7 @@ int usb_scan_device(struct udevice *parent, int port, udev->portnr = port; debug("Calling usb_setup_device(), portnr=%d\n", udev->portnr); parent_udev = device_get_uclass_id(parent) == UCLASS_USB_HUB ? - dev_get_parentdata(parent) : NULL; + dev_get_parent_priv(parent) : NULL; ret = usb_setup_device(udev, priv->desc_before_addr, parent_udev); debug("read_descriptor for '%s': ret=%d\n", parent->name, ret); if (ret) @@ -638,7 +638,7 @@ int usb_detect_change(void) if (!device_active(dev)) continue; - udev = dev_get_parentdata(dev); + udev = dev_get_parent_priv(dev); if (usb_get_port_status(udev, udev->portnr, &status) < 0) /* USB request failed */ @@ -694,7 +694,7 @@ struct udevice *usb_get_bus(struct udevice *dev) int usb_child_pre_probe(struct udevice *dev) { - struct usb_device *udev = dev_get_parentdata(dev); + struct usb_device *udev = dev_get_parent_priv(dev); struct usb_dev_platdata *plat = dev_get_parent_platdata(dev); int ret; diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 307e1a6..ca598aa 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1119,7 +1119,7 @@ static struct usb_device *get_usb_device(struct udevice *dev) if (device_get_uclass_id(dev) == UCLASS_USB) udev = dev_get_uclass_priv(dev); else - udev = dev_get_parentdata(dev); + udev = dev_get_parent_priv(dev); return udev; } @@ -1150,7 +1150,7 @@ static int xhci_submit_control_msg(struct udevice *dev, struct usb_device *udev, } else { while (!is_root_hub(hub->parent)) hub = hub->parent; - uhop = dev_get_parentdata(hub); + uhop = dev_get_parent_priv(hub); root_portnr = uhop->portnr; } } diff --git a/drivers/usb/musb-new/usb-compat.h b/drivers/usb/musb-new/usb-compat.h index 53fe4ff..1c41e2a 100644 --- a/drivers/usb/musb-new/usb-compat.h +++ b/drivers/usb/musb-new/usb-compat.h @@ -82,7 +82,7 @@ static inline u16 find_tt(struct usb_device *udev) */ ttdev = udev; parent = udev->dev; - uparent = dev_get_parentdata(parent); + uparent = dev_get_parent_priv(parent); while (uparent->speed != USB_SPEED_HIGH) { struct udevice *dev = parent; @@ -92,9 +92,9 @@ static inline u16 find_tt(struct usb_device *udev) return 0; } - ttdev = dev_get_parentdata(dev); + ttdev = dev_get_parent_priv(dev); parent = dev->parent; - uparent = dev_get_parentdata(parent); + uparent = dev_get_parent_priv(parent); } return (uparent->devnum << 8) | (ttdev->portnr - 1); @@ -119,12 +119,12 @@ static inline struct usb_device *usb_dev_get_parent(struct usb_device *udev) * If these 2 are not the same we are being called from * usb_scan_device() and udev itself is the parent. */ - if (dev_get_parentdata(udev->dev) != udev) + if (dev_get_parent_priv(udev->dev) != udev) return udev; /* We are being called normally, use the parent pointer */ if (device_get_uclass_id(parent) == UCLASS_USB_HUB) - return dev_get_parentdata(parent); + return dev_get_parent_priv(parent); return NULL; } diff --git a/include/dm/device.h b/include/dm/device.h index 8519612..f152008 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -233,18 +233,18 @@ void *dev_get_parent_platdata(struct udevice *dev); void *dev_get_uclass_platdata(struct udevice *dev); /** - * dev_get_parentdata() - Get the parent data for a device + * dev_get_parent_priv() - Get the parent private data for a device * - * The parent data is data stored in the device but owned by the parent. - * For example, a USB device may have parent data which contains information - * about how to talk to the device over USB. + * The parent private data is data stored in the device but owned by the + * parent. For example, a USB device may have parent data which contains + * information about how to talk to the device over USB. * * This checks that dev is not NULL, but no other checks for now * * @dev Device to check * @return parent data, or NULL if none */ -void *dev_get_parentdata(struct udevice *dev); +void *dev_get_parent_priv(struct udevice *dev); /** * dev_get_priv() - Get the private data for a device diff --git a/include/pci.h b/include/pci.h index e24c970..ed135a5 100644 --- a/include/pci.h +++ b/include/pci.h @@ -797,7 +797,7 @@ struct udevice; * * Every device on a PCI bus has this per-child data. * - * It can be accessed using dev_get_parentdata(dev) if dev->parent is a + * It can be accessed using dev_get_parent_priv(dev) if dev->parent is a * PCI bus (i.e. UCLASS_PCI) * * @devfn: Encoded device and function index - see PCI_DEVFN() diff --git a/include/spi.h b/include/spi.h index 51fdfd6..b4d2723 100644 --- a/include/spi.h +++ b/include/spi.h @@ -88,7 +88,7 @@ struct dm_spi_slave_platdata { * struct spi_slave - Representation of a SPI slave * * For driver model this is the per-child data used by the SPI bus. It can - * be accessed using dev_get_parentdata() on the slave device. The SPI uclass + * be accessed using dev_get_parent_priv() on the slave device. The SPI uclass * sets uip per_child_auto_alloc_size to sizeof(struct spi_slave), and the * driver should not override it. Two platform data fields (max_hz and mode) * are copied into this structure to provide an initial value. This allows diff --git a/include/usb.h b/include/usb.h index 88ebbe6..3d0facb 100644 --- a/include/usb.h +++ b/include/usb.h @@ -96,7 +96,7 @@ enum { * (the hubs) have this as parent data. Hubs are children of controllers or * other hubs and there is always a single root hub for each controller. * Therefore struct usb_device can always be accessed with - * dev_get_parentdata(dev), where dev is a USB device. + * dev_get_parent_priv(dev), where dev is a USB device. * * Pointers exist for obtaining both the device (could be any uclass) and * controller (UCLASS_USB) from this structure. The controller does not have diff --git a/test/dm/bus.c b/test/dm/bus.c index a215905..3b5a23b 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -46,7 +46,7 @@ static int testbus_child_post_bind(struct udevice *dev) static int testbus_child_pre_probe(struct udevice *dev) { - struct dm_test_parent_data *parent_data = dev_get_parentdata(dev); + struct dm_test_parent_data *parent_data = dev_get_parent_priv(dev); parent_data->flag += FLAG_CHILD_PROBED; @@ -64,7 +64,7 @@ static int testbus_child_pre_probe_uclass(struct udevice *dev) static int testbus_child_post_remove(struct udevice *dev) { - struct dm_test_parent_data *parent_data = dev_get_parentdata(dev); + struct dm_test_parent_data *parent_data = dev_get_parent_priv(dev); struct dm_test_state *dms = test_state; parent_data->flag += FLAG_CHILD_REMOVED; @@ -215,20 +215,20 @@ static int test_bus_parent_data(struct unit_test_state *uts) /* Check that parent data is allocated */ ut_assertok(device_find_child_by_seq(bus, 0, true, &dev)); - ut_asserteq_ptr(NULL, dev_get_parentdata(dev)); + ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); ut_assertok(device_get_child_by_seq(bus, 0, &dev)); - parent_data = dev_get_parentdata(dev); + parent_data = dev_get_parent_priv(dev); ut_assert(NULL != parent_data); /* Check that it starts at 0 and goes away when device is removed */ parent_data->sum += 5; ut_asserteq(5, parent_data->sum); device_remove(dev); - ut_asserteq_ptr(NULL, dev_get_parentdata(dev)); + ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); /* Check that we can do this twice */ ut_assertok(device_get_child_by_seq(bus, 0, &dev)); - parent_data = dev_get_parentdata(dev); + parent_data = dev_get_parent_priv(dev); ut_assert(NULL != parent_data); parent_data->sum += 5; ut_asserteq(5, parent_data->sum); @@ -239,11 +239,11 @@ static int test_bus_parent_data(struct unit_test_state *uts) uclass_foreach_dev(dev, uc) { /* Ignore these if they are not on this bus */ if (dev->parent != bus) { - ut_asserteq_ptr(NULL, dev_get_parentdata(dev)); + ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); continue; } ut_assertok(device_probe(dev)); - parent_data = dev_get_parentdata(dev); + parent_data = dev_get_parent_priv(dev); parent_data->sum = value; value += 5; @@ -255,7 +255,7 @@ static int test_bus_parent_data(struct unit_test_state *uts) /* Ignore these if they are not on this bus */ if (dev->parent != bus) continue; - parent_data = dev_get_parentdata(dev); + parent_data = dev_get_parent_priv(dev); ut_asserteq(value, parent_data->sum); value += 5; @@ -311,10 +311,10 @@ static int dm_test_bus_parent_ops(struct unit_test_state *uts) /* Ignore these if they are not on this bus */ if (dev->parent != bus) continue; - ut_asserteq_ptr(NULL, dev_get_parentdata(dev)); + ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); ut_assertok(device_probe(dev)); - parent_data = dev_get_parentdata(dev); + parent_data = dev_get_parent_priv(dev); ut_asserteq(FLAG_CHILD_PROBED, parent_data->flag); } @@ -322,10 +322,10 @@ static int dm_test_bus_parent_ops(struct unit_test_state *uts) /* Ignore these if they are not on this bus */ if (dev->parent != bus) continue; - parent_data = dev_get_parentdata(dev); + parent_data = dev_get_parent_priv(dev); ut_asserteq(FLAG_CHILD_PROBED, parent_data->flag); ut_assertok(device_remove(dev)); - ut_asserteq_ptr(NULL, dev_get_parentdata(dev)); + ut_asserteq_ptr(NULL, dev_get_parent_priv(dev)); ut_asserteq_ptr(dms->removed, dev); } test_state = NULL; -- 2.6.0.rc2.230.g3dd15c0

2 12