9
0
Fork 0
Commit Graph

14556 Commits

Author SHA1 Message Date
Sascha Hauer 0aa0bfc944 ARM: start: simplify board_data sdram allocation
We already have a pointer for barebox_boarddata, so use it to
request the corresponding SDRAM region instead of calculating
it again.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-20 08:30:34 +02:00
Sascha Hauer 1e992a195c ARM: start: do not change barebox_boarddata
barebox_boarddata should stay the original boarddata and not
be modified. Keep a local pointer in barebox_arm_boot_dtb()
instead.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-20 08:30:34 +02:00
Sascha Hauer 22d7d604f1 ARM: start: Fix arm_mem_barebox_image for !CONFIG_RELOCATABLE
Fixes: 65071bd arm: Clarify memory layout calculation

arm_mem_barebox_image() shall return the beginning of the barebox
image (and thus the end of the malloc region). For relocatable
images we can return a suitable location, but for non relocatable
images we do not have a choice: We must return TEXT_BASE. If TEXT_BASE
happens to be outside the memory region between membase and endmem
we can return the base of the ramoops area.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Markus Pargmann <mpa@pengutronix.de>
2016-06-20 08:30:22 +02:00
Alexander Aring b0e1847f13 ifup: fix handling when ip env is not given
This patch handles the ip env to "" if no ip env is given. Otherwise
we get a NULL pointer derefence.

Signed-off-by: Alexander Aring <aar@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-15 07:43:01 +02:00
Sascha Hauer 6ac698af96 Merge branch 'for-next/ubiformat' 2016-06-14 09:13:42 +02:00
Sascha Hauer d059216c48 Merge branch 'for-next/ubi' 2016-06-14 09:13:41 +02:00
Sascha Hauer 82d89b8b8e Merge branch 'for-next/socfpga' 2016-06-14 09:13:41 +02:00
Sascha Hauer d395a2d561 Merge branch 'for-next/mxs' 2016-06-14 09:13:41 +02:00
Sascha Hauer db17be7f34 Merge branch 'for-next/mtd' 2016-06-14 09:13:41 +02:00
Sascha Hauer 6bfb591cc1 Merge branch 'for-next/misc' 2016-06-14 09:13:41 +02:00
Sascha Hauer 336dcea5a1 Merge branch 'for-next/mips' 2016-06-14 09:13:41 +02:00
Sascha Hauer 0fcd7fdbb9 Merge branch 'for-next/imx' 2016-06-14 09:13:40 +02:00
Sascha Hauer f0a3a956b8 Merge branch 'for-next/e1000' 2016-06-14 09:13:40 +02:00
Sascha Hauer 8b9a7f6dd9 Merge branch 'for-next/dts' 2016-06-14 09:13:39 +02:00
Sascha Hauer 2b948a834c Merge branch 'for-next/bootm' 2016-06-14 09:13:35 +02:00
Sascha Hauer bfcdde1553 Merge branch 'for-next/arm' 2016-06-14 09:13:26 +02:00
Sascha Hauer 5f987cd3f7 Merge branch 'for-next/aiodev' 2016-06-14 09:13:26 +02:00
Sascha Hauer 7fe927ca77 Release v2016.06.0
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:45:35 +02:00
Antony Pavlov 9881dc1f93 MIPS: ath79: dts: use ar9331.dtsi from linux v4.7-rc2
Nowadays we have AR9331 devicetree from linux v4.7-rc2
in the file dts/src/mips/qca/ar9331.dtsi.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:39:55 +02:00
Antony Pavlov 5017fa5258 MIPS: ath79: dts: tplink-mr3020.dts: sync with linux v4.7-rc2
Also sync black-swift.dts with tplink-mr3020.dts.

And also see this linux kernel commit:

    commit 2c3694d2e6ead3964aafb31e4e529de219ced92b
    Author: Antony Pavlov <antonynpavlov@gmail.com>
    Date:   Thu Mar 17 06:34:19 2016 +0300

        MIPS: ath79: add initial support for TP-LINK MR3020

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:39:55 +02:00
Antony Pavlov f1772f4798 MIPS: ath79: dts: sync spi stuff with linux v4.7-rc2
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:39:55 +02:00
Antony Pavlov 3104cf598c MIPS: ath79: dts: sync uart stuff with linux v4.7-rc2
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:39:55 +02:00
Antony Pavlov 5253099564 MIPS: ath79: dts: sync clk stuff with linux v4.7-rc2
Please see these linux kernel ath79 commits:

    commit 1e6a3492e7bb12aa8ee26050ff6829c39ebaa152
    Author: Antony Pavlov <antonynpavlov@gmail.com>
    Date:   Thu Mar 17 06:34:17 2016 +0300

        MIPS: dts: qca: introduce AR9331 devicetree

    commit 5ae5c452e3361612cd8182eb8bdfecf0ebf42288
    Author: Antony Pavlov <antonynpavlov@gmail.com>
    Date:   Thu Mar 17 06:34:18 2016 +0300

        MIPS: ath79: update devicetree clock support for AR9331

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:39:55 +02:00
Antony Pavlov 9f4e3730bd clk: ar933x: fix copyright header
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:39:55 +02:00
grodriguez a945a51b76 Fix genphy_restart_aneg() for Micrel's ksz9031.
Commit da89ee8f2e ("Center FLP timing at 16ms") breaks
genphy_restart_aneg() for Micrel's ksz9031. According to the
datasheet, the ksz9031 requires a wait of 1ms after clearing
the PDOWN bit and before read/write access to any PHY registers.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-14 08:32:15 +02:00
Sascha Hauer bab585f501 dts: update to v4.7-rc2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 12:43:53 +02:00
Sascha Hauer 86186c2322 dts: update to v4.7-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 12:43:53 +02:00
Antony Pavlov ad198abad5 MIPS: dts: add generated files to clean rule
This commit is based on Sascha's ARM commits:

    commit a9e7e68279
    Author: Sascha Hauer <s.hauer@pengutronix.de>
    Date:   Fri Dec 11 08:02:02 2015 +0100

        ARM: dts: Add *.dtb.lzo to clean files

    commit f5b552f1fe
    Author: Sascha Hauer <s.hauer@pengutronix.de>
    Date:   Fri May 9 09:11:49 2014 +0200

        ARM: dts: Add generated files to clean rule

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 09:17:10 +02:00
Sascha Hauer 0cf29e11ef dts: update to v4.6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:31:23 +02:00
Sascha Hauer 35ff9adce7 dts: update to v4.6-rc7
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:31:13 +02:00
Sascha Hauer d9cefd38d3 dts: update to v4.6-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:31:09 +02:00
Sascha Hauer c672e87588 dts: update to v4.6-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:31:05 +02:00
Sascha Hauer ad85fd3b31 dts: update to v4.6-rc4
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:31:01 +02:00
Sascha Hauer 6e6cb6c407 dts: update to v4.6-rc3
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:30:56 +02:00
Sascha Hauer a4f4bc65b3 dts: update to v4.6-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:29:57 +02:00
Sascha Hauer 83e61900b0 dts: update to v4.5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:29:37 +02:00
Sascha Hauer 6ea52c3bc3 dts: update to v4.5-rc7
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:29:20 +02:00
Sascha Hauer f82bd86b6b dts: update to v4.5-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-13 07:29:12 +02:00
Lucas Stach ad741d94b3 fs: squashfs: use correct format specifier
Fixes:
fs/squashfs/inode.c: warning: format '%d' expects argument
of type 'int', but argument 3 has type 'long long int'

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-07 08:10:09 +02:00
Trent Piepho edb96cf3d7 mci: Fix version numbers again
The SD and eMMC version numbers are a pain to print and sort, since
they are inconsistent in if a two digit minor version shdoulde be
treated as a single number or as minor and micro version numbers.

This allows version 1.10 and 4.5 and 4.41, where 41 is less than 5.

Signed-off-by: Trent Piepho <tpiepho@kymetacorp.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-07 08:06:43 +02:00
Andrey Smirnov 4ff3269a70 e1000: Expose i210's external flash as MTD
Add code needed to access SPI-NOR flash attached to i210 as a regular
MTD device.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov a74b97f009 e1000: Expose i210's iNVM as a cdev
Add code needed to expose iNVM memory on the chip as a cdev. The
driver also registers a dummy "invm" device that exposes "locked"
property which is used to implement iNMV line locking feature.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 91d3dd2fd8 e1000: Add a "poll register" function
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 72f02e6c0b e1000: Add EEPROM access locking for i210
As per datasheet (section 4.6 p. 147) accessing EEPROM on i210
requires software to hold a corresponding lock bit in SW_FW_SYNC
register.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 741cdaf506 e1000: Properly release SW_FW_SYNC semaphore bits
As described in the datasheet Software/Firmware synchronisation bits
are expected to be released by the software after it is done using
it. Add a porper subroutine to do that instead of relying on the
Firmware clearing those bits due to timeout.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 2bac167769 e1000: Refactor Flash/EEPROM reading code
Refactor Flash/EEPROM reading code to use vtable with pointers to
small, specialized functions based on the flash class instead of big
monolithic funtions whose behaviour is driven by a number of flags and
variables.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 580ad4021c e1000: Remove unnecessary intialization
We always call e1000_init_eeprom_params() as a part of probing, so
there's no need check if it needs to be called in e1000_read_eeprom().

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 224174354f e1000: Fix a bug in e1000_probe()
There are several reasons why that code in e1000_probe had to be
changed:

 - It reads from chip variant specific register (present only on
   i210) in a chip variant agnostic codepath

 - It makes no sense to check for FLUPD bit to make a decision weither
   to validate EEPROM or not since its function per datasheet is:

   " ... Flash Update.

     Writing 1b to this bit causes the content of the internal 4 KB
     shadow RAM to be written into one of the first two 4 KB sectors
     of the Flash device (Sector 0 or Sector 1). The bit is
     self-cleared immediately... "

   and it is only through sheer serendipity the defined value for
   bitmask for FLUPD is equivalent to bitmask for FLASH_DETECTED bit
   which is the bit we actually care about and need to test against
   (FLUPD for i210 has a different bitmask)

Fix those problems by replacing the i210 specific check inside of
e1000_validate_eeprom_checksum() with a chip agnostic one and using
correct bitmask.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov e1e4976931 e1000: Consolidate Microwire EEPROM init code
All of the chips that bitbang Microwire to access EEPROM appear to be
configured in the same way, so move common code into a separate
function and make use of it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00
Andrey Smirnov 81f2d33a83 e1000: Consolidate SPI EEPROM init code
All of the chips that bitbang SPI to access EEPROM appear to be
configured in the same way, so move common code into a separate
function and make use of it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2016-06-03 09:14:14 +02:00