Commit graph

3424 commits

Author SHA1 Message Date
Sascha Hauer
d297851b1a Merge branch 'for-next/blspec' 2015-07-06 12:43:29 +02:00
Sascha Hauer
f037355761 Merge branch 'for-next/pwm' 2015-07-03 08:38:20 +02:00
Sascha Hauer
18ea2863bf Merge branch 'for-next/omap'
Conflicts:
	arch/arm/boards/beagle/board.c
2015-07-03 08:38:17 +02:00
Sascha Hauer
7b4e61bbf9 Merge branch 'for-next/mtd'
Conflicts:
	drivers/mtd/core.c
2015-07-03 08:37:52 +02:00
Sascha Hauer
f2a2894c27 Merge branch 'for-next/misc' 2015-07-03 08:37:40 +02:00
Sascha Hauer
c5438404db Merge branch 'for-next/imx-bbu-nand-fcb'
Conflicts:
	common/Kconfig
2015-07-03 08:37:36 +02:00
Sascha Hauer
021dda6744 Merge branch 'for-next/cfi-flash' 2015-07-03 08:37:29 +02:00
Sascha Hauer
4db5b72d0c usb: musb: Use proper timeout loop
Poll for a well defined time in musb_init. The current counting loop
takes too short for some devices. Tested on OMAP3 with a rather slowish
memory stick.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-03 07:06:28 +02:00
Sascha Hauer
5c29d3627e bus: omap-gpmc: Add Generic device support
This adds support for generic devices like NOR flash and
ethernet to the gpmc bus driver.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-02 08:23:29 +02:00
Sascha Hauer
08120e2166 of: export of_platform_device_create
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-02 08:23:29 +02:00
Sascha Hauer
89d597c860 bus: omap-gpmc: fix wrong bit setting
GPMC_CONFIG4_WEEXTRADELAY should be set depending on we_extra_delay,
not on oe_extra_delay. This seems to be copy-pasted from two lines above.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-07-02 08:23:28 +02:00
Sascha Hauer
5f51ca71f6 mtd: m25p80: Fix Kconfig dependencies
The m25p80 driver now depends on MTD_SPI_NOR which is disabled in all
defconfigs, so this effectively disables the m25p80 driver in all
defconfigs. Fix this by selecting MTD_SPI_NOR which is library code
without further dependencies. Also let m25p80 depend on SPI because
it needs the SPI code and won't link without it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-29 07:13:23 +02:00
Sascha Hauer
3fc17ce4c8 mtd: m25p80: make flash_name const
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-29 07:07:30 +02:00
Sascha Hauer
5f11e80670 mtd: Make devname argument to add_mtd_device const
add_mtd_device duplicates the string where necessary, so make it
const.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-29 07:04:55 +02:00
Lucas Stach
5f751d1397 MCI: pxa: depend on right symbol
Now that we also have PXA3XX support the dependency on
ARCH_PXA is too broad for this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 11:56:25 +02:00
Lucas Stach
a04b87aad0 usb: gadget: pxa27x: depend on right symbol
Now that we also have PXA3XX support the dependency on
ARCH_PXA is too broad for this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 11:56:24 +02:00
Sascha Hauer
8163be9a12 net: smc911x: Add device tree support
There should probably be more compatible entries, but this is what
the kernel driver matches for.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 11:56:23 +02:00
Sascha Hauer
dc2abefb94 serial: ns16550: Fix reading clock-frequency property
The clock-frequency property is never read because the driver
bails out earlier when it is unable to clk_get the clk. Move
the clock-frequency read out to the dt setup code which is
executed before the driver bails out due to the missing clk.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 11:56:23 +02:00
Sascha Hauer
1dd5262eb9 net: Make set_ethaddr argument const
The set_ethaddr callback should not modify the MAC address passed to it, so
make it const.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 11:56:22 +02:00
Sascha Hauer
c54fb2ecbd ubi: Lower 'already attached' message to debug level
The caller will show a message, no need to do this in UBI. This
is for the case when mtd_detect calls ubi_attach_mtd_dev. mtd_detect
does not know whether this is already attached and it's not an error.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 09:21:37 +02:00
Sascha Hauer
542a81fff3 mtd: detect ubi devices automatically
Hook UBI attachment into the mtd class devices detect function. This
makes it possible to attach ubi devices with 'detect nand0.root'.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 09:21:37 +02:00
Sascha Hauer
adb3c6359d ubi: Use preditable device names
Instead of naming all ubi devices and cdev names ubi<num> append
'.ubi' to the original mtd name. This makes ubi device and cdev
names predictable. With this ubi0 becomes nand0.root.ubi. Also
do the same for volume names, so ubi0.root becomes nand0.root.ubi.root.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 09:21:36 +02:00
Sascha Hauer
75aed480a5 driver: detect: detect parent devices aswell
Let device_detect_by_name detect parent devices aswell. We
separate the devname strings by colons and call device_detect()
for each component. This makes it possible for example to

detect nand0.root.ubi.root

With the above detect will be called for nand0, nand0.root, nand0.root.ubi
and nand0.root.ubi.root. The nand0.root detection step will detect the
UBI volume and attach it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-26 09:21:36 +02:00
Lucas Stach
b22d27436b PCI: remove bogus host bridge setup skipping
Apparently this was here to fix issues with some QEMU version,
but hasn't worked in the intended way for a long time. The probe
code should be mature enough by now, so this workaround isn't
needed anymore.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-25 08:37:42 +02:00
Lucas Stach
0fee6f111f PCI: rework BAR size calculation
The probe code now does a much better job at detecting bad BARs.
Also make sure to preserve any previous content of the BAR
registers if we don't relocate them.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-25 08:37:42 +02:00
Sascha Hauer
636d384ed4 mtd: cfi-flash: Add mtd concat support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-23 16:59:54 +02:00
Sascha Hauer
ce72d46f42 mtd: Add mtd concat support
The mtd concat layer supports concatenating several MTD devices
into a single one. This is nearly as-is from the corresponding
Kernel code.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-23 16:59:54 +02:00
Sascha Hauer
713285ca19 mtd: cfi-flash: remove dead code
CFG_FLASH_PROTECTION is never defined, remove the code. Also
remove code inside #if 0.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 10:38:31 +02:00
Sascha Hauer
9746f02cae mtd: cfi-flash: Coding style cleanup
- use consistent variable types (drop uchar, ushort and friends)
- remove whitespace between functions and opening brace
- Add some blank lines to rectify code
- drop 'rc' and 'retcode' and use 'ret' consistently
- Do not put variable assignment into if()
- drop unncessary braces

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 10:38:31 +02:00
Sascha Hauer
6be93f2fce mtd: cfi-flash: use unaligned accessor functions
Some members in struct cfi_qry are unaligned. Use get_unaligned_*
to access them. Fixes unaligned aborts on busses which don't support
unaligned accesses.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 09:27:59 +02:00
Sascha Hauer
9c48ac000b mtd: cfi-flash: turn some messages into vdbg
Some messages produce a lot of log spam. Turn them into
dev_vdbg to make some more important messages more visible.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 09:27:59 +02:00
Sascha Hauer
81d8fa83b4 mtd: cfi-flash: return 0 for success
Use zero as success return code and negative standard error codes
consistently in the driver.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 09:26:52 +02:00
Sascha Hauer
0203b33d14 mtd: cfi-flash: make flash_detect_width more readable
Use variables instead of long defines to get the loops into a single
line. Also use goto to move the deeply indented code more to the left.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 09:17:16 +02:00
Sascha Hauer
20a096120a mtd: cfi-flash: remove unnecessary ifdefs
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 09:17:16 +02:00
Sascha Hauer
25b42d1fe7 mtd: cfi-flash: replace ifdef with IS_ENABLED
TO get rid of some ifdefs. While at it add the vendor code of
the unsupported vendor to the error message.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 09:16:40 +02:00
Sascha Hauer
2ec3921248 mtd: cfi-flash: statically initialize instead of memset
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 08:59:59 +02:00
Sascha Hauer
bbc89b5754 mtd: cfi-flash: save indention level
Bail out early in flash_get_size() and save an indention level.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 08:58:56 +02:00
Sascha Hauer
1099bd178e mtd: cfi-flash: We can print longlongs
printf supports printing longlongs, so drop print_longlong.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-22 08:58:15 +02:00
Sascha Hauer
745594d51a fs: ubifs: Implement Linux rootarg
Add the parameter to boot from ubifs fileystems. This assumes that
there will be only one UBI device registered in the kernel, otherwise
there is no way to predict the ubi number.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-18 09:01:01 +02:00
Sascha Hauer
b7b0b348a5 mtd: m25p80: Whitespace cleanup
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-17 08:03:58 +02:00
Sascha Hauer
af2cc97ede PWM: Add MXS PWM support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 12:00:41 +02:00
Sascha Hauer
605621a3c8 PWM: Allow multiple PWMs per device node
Matching a device node is enough since a device node may have
multiple PWMs. Check for a id aswell.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 12:00:41 +02:00
Sascha Hauer
cd616c4642 ARM: i.MX28: Add PWM clk support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 12:00:41 +02:00
Sascha Hauer
3149ad20e7 video: Add PWM backlight support
This adds a backlight driver for backlights controlled by a PWM.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 12:00:41 +02:00
Sascha Hauer
e3ea90860e video: Add backlight support
This adds a small backlight layer. It provides a backlight device
on which the brightness parameter can be used to adjust the brightness.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 11:52:58 +02:00
Sascha Hauer
16fd24847d video: stmfb: Add device tree support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 11:52:54 +02:00
Sascha Hauer
ff40732d0a mtd: partition: implement write_oob
To enable mtd_write_oob for partitions.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2015-06-12 08:28:04 +02:00
Sascha Hauer
e349701487 Merge branch 'for-next/state' 2015-06-09 09:26:44 +02:00
Sascha Hauer
3a32e7acd4 Merge branch 'for-next/spi-nor' 2015-06-09 09:26:44 +02:00
Sascha Hauer
7a429bfb3b Merge branch 'for-next/misc' 2015-06-09 09:26:44 +02:00