9
0
Fork 0
Commit Graph

15445 Commits

Author SHA1 Message Date
Yegor Yefremov 2846e53d2d arm: baltos: define baltos_sram_init() return type as void
As stated in the routine's description this routine is to return void,
hence fix its declaration to remove compiler warning.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-13 09:13:17 +01:00
Jean-Christophe PLAGNIOL-VILLARD 27f3f993b8 fix: console: expose consoles in devfs
on 64bit ssize_t is not an int but a long

so use the protype for fops_write ssize_t

common/console.c: In function ‘console_register’:
common/console.c:373:22: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
  newcdev->fops.write = fops_write;

in commit b4f55fcf35
By Bastian Stender <bst@pengutronix.de>

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-13 08:19:30 +01:00
Sascha Hauer 97d2da3d98 Merge branch 'for-next/video' 2017-03-13 08:16:53 +01:00
Sascha Hauer 6b926567c0 Merge branch 'for-next/usb' 2017-03-13 08:16:44 +01:00
Sascha Hauer a2e3bad25f Merge branch 'for-next/rpi' 2017-03-13 08:16:44 +01:00
Sascha Hauer 6134116686 Merge branch 'for-next/mvebu' 2017-03-13 08:16:44 +01:00
Sascha Hauer e0093dcf23 Merge branch 'for-next/misc' 2017-03-13 08:16:44 +01:00
Sascha Hauer 4e11672653 Merge branch 'for-next/imx' 2017-03-13 08:16:44 +01:00
Sascha Hauer 93c55ce098 Merge branch 'for-next/efi' 2017-03-13 08:16:43 +01:00
Sascha Hauer 12b6a916d6 Merge branch 'for-next/dts' 2017-03-13 08:16:39 +01:00
Sascha Hauer 56d9a9815a Merge branch 'for-next/at91' 2017-03-13 08:16:38 +01:00
Sascha Hauer 957bb6b6bc dts: update to v4.11-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:56:15 +01:00
Sascha Hauer cc2392cf4f dts: update to v4.10-rc8
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:56:02 +01:00
Sascha Hauer a614f64d72 Release v2017.03.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:50:24 +01:00
Marc Kleine-Budde 939d3a7684 fastboot: abort autoboot timeout when fastboot gadget is activated
This patch adds a call to "console_countdown_abort()" to abort a currently or
upcoming running console timeout.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:43:27 +01:00
Marc Kleine-Budde e3dda8553e console_countdown: add possibility to abort countdown by external commands
This patch makes it possible to abort a console countdown by an external
command, for example when fastboot is used. This requires additional
modifications in the external commands, a call to "console_countdown_abort()"
has to be inserted.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:43:27 +01:00
Marc Kleine-Budde 3d92ea4738 console_countdown: width to of countdown to 4 digits
This patch increases the displayed width of the countdown to 4 digits,
otherwise waiting for more then 99 seconds doesn't look good.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:43:26 +01:00
Sascha Hauer dfcfb5b831 bbu: Search for cdev names aswell
In bbu_find_handler_by_device() search for cdev names aswell since some
update handlers are registered with their cdev name and not the full
path.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:28:10 +01:00
Jean-Christophe PLAGNIOL-VILLARD be0c9a3fad parameter: fix read only int support
pass PARAM_FLAG_RO flag for read only it
so we can not change them

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:13:41 +01:00
Jean-Christophe PLAGNIOL-VILLARD f210382b3f video: make enable/disable ops optional
Some framebuffers cannot be enabled/disabled, so make the corresponding
ops optional.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:12:11 +01:00
Sascha Hauer f8f3f26f8b video: call fb_[en|dis]able instead of fops directly
We have fb_enable and fb_disable which handle enabling of a
framebuffer, so use it instead of calling into the ops directly.
This gets the enable count straight.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-10 08:07:25 +01:00
Andrey Smirnov a76714f7f9 clocksource: at91: Move to 'drivers/clocksource'
Move PIT driver code to 'drivers/clocsource' and accomodate it by
adjusting Kconfig variables. Rename the file to 'timer-atmel-pit.c' to
re-align the driver with code in Linux kernel.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov d6200fe415 spi: atmel_spi: Use VERSION register instead of CPU type
Use VERSION register instead of CPU type to determine IP block's version
and capabilities. This what corresponding Linux kernel driver does.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov dd0f42879b spi: atmel_spi: Configure CS GPIO as output
On AT91 GPIOs default to being inputs, so we need to explicitly
configure CS gpio to being an output.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov d5f52220e6 usb: echi-atmel: Check result of ehci_register()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov 05c34d220c usb: ehci-atmel: Zero ehci_data before using it
Zero ehci_data before using it as an argument for echi_register,
otherwise bogus values (some of which are interpreted as callbacks) will
be passed through, resulting in illegal memory accesses.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov ef54fb4b1f usb: echi-atmel: Convert global variables to private data
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov b52eb5a9a2 usb: ehci-atmel: Check result of clk_enable()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:28 +01:00
Andrey Smirnov bf09557360 usb: ohci-at91: Check result of clk_enable()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:27 +01:00
Andrey Smirnov fb1ff1794a usb: ohci-at91: Convert global variables to private data
Store driver data in per-device private variable as opposed to storing
it in global vairables.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:27 +01:00
Andrey Smirnov 56f3bd1cd3 usb: ohci-at91: Check result of clk_get()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:27 +01:00
Andrey Smirnov 6dc7545135 serial: atmel: Check result of clk_get()
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:27 +01:00
Andrey Smirnov 3494084017 of: base: Use scoring in DT device matching
Port Linux kernel algorithm for both of_device_is_compatible() and
of_match_node(). With this change former now returns a score on the
scale of 0 to INT_MAX/2, and the latter goes through all compatiblity
entries and selects the entry that has the best matching score.

This is needed for SoCs where IP blocks are backwards compatible and
corresponding OF nodes can proclaim compatibility with several entries
found in driver's compatiblity table. One such example would be PIO
pinctrl block on AT91SAM9x5 SoCs which declare compatibility with with
both "atmel,at91sam9x5-pinctrl" and "atmel,at91rm9200-pinctrl".

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 11:51:27 +01:00
Sascha Hauer 2b9bcff79a usb: gadget: properly release f_multi_opts
The usbgadget commands uses statically allocated f_multi_opts and passes
this to usb_multi_register(). These f_multi_opts are of course no
longer valid when we leave the usbgadget command. Luckily we do not use
the data after we left the usbgadget command, so this never has been a
problem. However, f_multi_opts has some allocated members which we can
not free anymore on gadget unregistration because we no longer have the
pointer to them.

Fix this by adding a release function to struct f_multi_opts. This way
we can allocate all memory dynamically and properly free it when not
used anymore.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 09:37:03 +01:00
Sascha Hauer 25fd64ed22 usb: gadget: print a meaningful error message
We can only register one USB multi gadget, so check for it being
already registered and print a meaningful error message if it is.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 09:36:58 +01:00
Sascha Hauer 400988a831 usb: imx: Fix setting of dev->priv
Since fc10539f7d the usbmisc pointer must be stored in dev->priv,
but dev->priv has never been set. Fix this.

Fixes: fc10539f7d usb: imx: Make usb-misc multi instance safe

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 09:31:57 +01:00
Sascha Hauer d6ef702f4f usb: imx: role_registered contains role
role_registered contains the role, it's not a bool indicating that
a role is registered.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 09:29:56 +01:00
David Jander 0482159e9a drivers: clk: clk-imx6.c: Don't gate LDB and IPUs
Depending on CONFIG_DRIVER_VIDEO_IMX_IPUV3 to decide whether to
gate IPU clocks or not is rather fragile. Any inadvertent
dependency on the IPU (like setting the NoC AQoS registers for
i.MX6QP) will result in a freeze if CONFIG_DRIVER_VIDEO_IMX_IPUV3
is disabled.

Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:17:01 +01:00
Andrey Smirnov a8b41f2c72 clk: Make COMMON_CLK_OF_PROVIDER depend on OFTREE
Make COMMON_CLK_OF_PROVIDER depend on OFTREE, this way checking for:

	defined(CONFIG_OFTREE) && defined(CONFIG_COMMON_CLK_OF_PROVIDER)

can be simplified to just:

	defined(CONFIG_COMMON_CLK_OF_PROVIDER)

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Andrey Smirnov b5ea2c6acc clk: Port two helper functions from Linux
Port of_clk_get_parent_count() and of_clk_parent_fill() from Linux.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Andrey Smirnov da1752b370 pinctrl: at91: Implement .get_direction hook
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Andrey Smirnov 15426d5c46 pinctrl: at91: Fix a bug in at91_pinctrl_set_state()
Pin number, as specified in OF pinumx entries, is relative to each bank
start, whereas both at91_mux_pin() and at91_pinctrl_set_conf() asssume
absolute pin numbering, so we need to take into account each bank's pin
base and convert pin number appropriately. Failing to do so results in
any pinmux configuration being applied to pins in bank A.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Andrey Smirnov 7d9679a33a pinctrl: at91: Fix a bug in at91_pinctrl_set_conf()
Pin_to_controller returns struct at91_gpio_chip, whereas at91_mux_*
functions expect void __iomem * pointing to controller register
window. Fix the code to do appropriate conversion between the two.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Andrey Smirnov 943a9eeac4 regmap: Implement syscon_node_to_regmap()
Implement syscon_node_to_regmap() to simplify porting kernel code.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Andrey Smirnov 2574148ad9 at91: Fix bug/typo in debug_ll.h
Correct "COFNIG" to "CONFIG".

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:13:38 +01:00
Oleksij Rempel 19d5f3a77f ARM: imx233-olinuxino: add CONFIG_CONSOLE_ACTIVATE_ALL
if not set, barebox will use first console by default.
On this board first console is KEYBOARD_GPIO, so we will end
in unusable state.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 08:02:18 +01:00
Oleksij Rempel 3ca576cc4a scripts: imx/mxs remove mxs-usb-loader
... and use imx-usb-loader instead

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 07:57:52 +01:00
Oleksij Rempel 701f728c2a scripts: imx imx-usb-loader: add support for imx23 and imx28
This code was rewrtitten from mxs-usb-loader.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 07:41:22 +01:00
Jean-Christophe PLAGNIOL-VILLARD 534c1fac3e x86: efi: fix logo support
we need to copy the logo section too

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 07:37:21 +01:00
Jean-Christophe PLAGNIOL-VILLARD c09bec96cb efi: add veriable to report secure boot support and status
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2017-03-09 07:36:16 +01:00