9
0
Fork 0
Commit Graph

11270 Commits

Author SHA1 Message Date
Sebastian Hesselbarth 7267215538 clocksource: mvebu: split initialization for Armada 370/XP
Timers found on Marvell Armada 370 and XP require different setup.
While timer clock on Armada 370 can be derived from a divided
reference clocks, Armada XP always uses a 25MHz reference.

This also updates compatibles to destinguish timers for both SoCs
and fixes some whitespace issues on defines.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:04 +02:00
Sebastian Hesselbarth 7e750b691c ARM: mvebu: add 25MHz fixed clock for Armada XP
Armada XP timers can be run from a 25MHz fixed clock. Add the corrsponding
clock and clock alias to SoC setup.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:04 +02:00
Sebastian Hesselbarth 5be6482b48 clk: mvebu: fix Armada 370 TCLK frequencies
This fixes Armada 370 TCLK frequencies that are off by
a factor of 10.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:03 +02:00
Sebastian Hesselbarth 524bb1a287 ARM: mvebu: move lowlevel code to lowlevel.c
mach-mvebu has two files containing lowlevel code. Consolidate both into
mach-mvebu/lowlevel.c. Also put the now empty mach-mvebu/common.c into
non-lowlevel obj-y as it will be used for common non-lowlevel code later.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:03 +02:00
Sebastian Hesselbarth 6656115566 ARM: mvebu: delete unused mach/mvebu.h
This removes the stale mach/mvebu.h include as there is no user of it.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:03 +02:00
Sebastian Hesselbarth ddc20d1537 ARM: mvebu: set default TEXT_BASE by SoC
All current boards use the same TEXT_BASE, therefore set the default
TEXT_BASE by SoC instead of by board.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:03 +02:00
Sebastian Hesselbarth 90256ab908 ARM: mvebu: set model and default hostname for Dove
Set default model and hostname based on SoC name.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
2014-06-24 08:25:03 +02:00
Sascha Hauer 9313920df6 dts: update to v3.16-rc1
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-19 09:41:51 +02:00
Sascha Hauer 83e875e1f4 dts: update to v3.15-rc8
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-19 09:41:51 +02:00
Sascha Hauer 9b715c6a44 dts: update to v3.15-rc7
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-19 09:41:51 +02:00
Sascha Hauer ff3085135f dts: update to v3.15-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-19 09:41:51 +02:00
Sascha Hauer 6e64f44b23 ARM: dts: i.MX51 babbage: remove unused hoggrp
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-19 09:41:51 +02:00
Antony Pavlov 636052ce1d commands: gpio_direction_output: add missed VALUE parameter to help message
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-17 20:35:40 +02:00
Philipp Zabel cfd028800e ARM: AM335x: Beaglebone: Fix memory setup for Beaglebone black
Commit 0d6392de4a introduced a stripped
down device tree used for both white and black Beaglebone variants
that included the 256 MiB memory node from am335x-bone-common.dtsi.
This leads to the following error in the MLO:

    mmu: Critical Error: Can't request SDRAM region for ttb at 9fff4000

This patch removes the (for the Beaglebone black) invalid memory size
from the common device tree and instead registers the memory bank
manually in the board file.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-17 20:33:53 +02:00
Herve Codina 3ee907d89e mtd: use long long dev param for size
Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-13 06:27:34 +02:00
Herve Codina f2e86a2964 param: Add support for long long read only dev param
Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-13 06:27:34 +02:00
Sascha Hauer aca00bb719 ARM: Phytec-phyCARD-imx27: Add missing compatible check
Only run pca100 code when it's actually a pca100. While at it
consolidate two initcalls.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-12 08:33:55 +02:00
Sascha Hauer 693b92d58a Merge branch 'pu/mii-tool' 2014-06-11 08:48:45 +02:00
Sascha Hauer 40a1897e88 mips: Fix dtb build rules
Add intermediate .S files to .SECONDARY. Otherwise make deletes them
and regenerates them each build.
Also remove KBUILD_DTBS since the make system descends in dts/ anyway.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:48:39 +02:00
Sascha Hauer 7eb8f2a59c mii-tool: Fix gigabit advertise / link partner ability mixup
bmcr2 contains the gigabit advertise bits and lpa2 contains the gigabit
link partner ability bits, not the other way round.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:47:40 +02:00
Sascha Hauer e5a0223b9e mii-tool: Fix gigabit link test
media_list tests for gigabit phys like this:

if (mask & BMCR_SPEED1000)

mask does not contain the value of the BMCR register though, so the
test is completely bogus. Test for mask2 instead which is only
nonzero when the phy has gigabit capabilities.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:47:40 +02:00
Sascha Hauer 68376f82e8 mii-tool: Fix string length
media_list writes into a static string. Worst case length of this string
is 125 bytes, but the function only allocates 100 bytes. Use 256 bytes which
is long enough for some extensions.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:47:40 +02:00
Antony Pavlov 8e89bc594a treewide: remove address of the Free Software Foundation
The FSF address has changed; The FSF site says that
address is

  Free Software Foundation
  51 Franklin Street, Fifth Floor
  Boston, MA 02110-1301
  USA

(see http://www.fsf.org/about/contact/)

Instead of updating it each time the address changes,
just drop it completely treewide.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-11 08:35:25 +02:00
Sascha Hauer 70579ca94f mtd: partition: implement lock/unlock
CFI Nor flashes need lock/unlock which is not implemented for partitions.
Fix this.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 13:55:23 +02:00
Sascha Hauer 02fed023e1 mtd: partition: Fix multi eraseregion chips
The current code counts the eraseregions a new partition spans and
sets the partitions number of eraseregions accordingly, but the code
forgets to allocate and fill in the eraseregions for the partition
mtd device. This makes the erase operation crash with a NULL pointer
exception.
This patch fixes this with the same approach the kernel uses: Set
the number of eraseregions to 1 unconditionally and the eraseregion
size to the maximum of the eraseregions found in the partition.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 13:52:03 +02:00
Antony Pavlov 436ea81f52 MIPS: dts: add .gitignore for generated files
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 09:08:57 +02:00
Antony Pavlov 6af1781bbb make .gitignore files visible to git
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 09:08:57 +02:00
Herve Codina d2d058365c mtd: fix mtd erasesize
Set mtd erasize using max erasesize from erase regions

Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 08:38:39 +02:00
Herve Codina 4d032fd6fa mtd: Fix writesize parameter value
Signed-off-by: Herve Codina <Herve.CODINA@celad.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-10 08:38:21 +02:00
Sascha Hauer 811a79e07e Merge branch 'pu/warnings' 2014-06-06 06:37:09 +02:00
Alexander Shiyan b085ae5e64 ARM: dts: Remove orphaned i.MX27 DT template
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:36:38 +02:00
Alexander Shiyan 905d36b841 2048: Reset score on startup
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-06 06:33:53 +02:00
Sascha Hauer 0d6392de4a ARM: AM335x: Beaglebone: Use stripped down devicetree for MLO
The beaglebone white and black have different devicetrees. Both
get linked into the MLO which makes it too big. Use a devicetree
generated from am335x-bone-common.dtsi which both board variants
can share. This reduces the binary size by about 30k.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 12:09:11 +02:00
Sascha Hauer 13eb0229c1 mips: Add builtin dtb to dtb-y
Otherwise a rebuild of the dtb file is triggered each build.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:21:42 +02:00
Sascha Hauer 68ad2e4daa gui: IMAGE_RENDERER does not depend on VIDEO
Image renderer may not be particularly useful without framebuffer
support, but technically it does not depend on VIDEO. Fixes:

warning: (CMD_SPLASH) selects IMAGE_RENDERER which has unmet direct dependencies (VIDEO)

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:18:34 +02:00
Sascha Hauer 4cbecde30c commands: drvinfo: Make locally used function static
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:18:06 +02:00
Sascha Hauer 3aa17a1e18 PPC: FSL DDR: Fix compiler warning
Fixes:

arch/ppc/boards/freescale-p1022ds/ddr.c: In function 'fsl_ddr_board_info':
arch/ppc/boards/freescale-p1022ds/ddr.c:39:21: warning: assignment discards 'const' qualifier from pointer target type [enabled by default]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:17:28 +02:00
Sascha Hauer 0ad84fb2c2 mips: ar9331: Add missing #address-cells/#size-cells properties
SPI nodes need valid #address-cells/#size-cells properties.
Fixes:

Warning (reg_format): "reg" property in /soc/spi@bf000000/m25p80@0 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/spi@bf000000/m25p80@0
Warning (avoid_default_addr_size): Relying on default #size-cells value for /soc/spi@bf000000/m25p80@0

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:16:23 +02:00
Sascha Hauer eb2c63d089 mips: dlink-dir-320: refresh defconfig
Fixes:

arch/mips/configs/dlink-dir-320_defconfig:52:warning: override: reassigning to symbol CMD_DHCP
arch/mips/configs/dlink-dir-320_defconfig:54:warning: override: reassigning to symbol CMD_PING
arch/mips/configs/dlink-dir-320_defconfig:55:warning: override: reassigning to symbol CMD_TFTP
arch/mips/configs/dlink-dir-320_defconfig:64:warning: override: reassigning to symbol FS_TFTP

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:03:55 +02:00
Sascha Hauer 4550f93fb7 ARM: friendlyarm_mini2440: refresh defconfig
Fixes:

arch/arm/configs/friendlyarm_mini2440_defconfig:38:warning: override: reassigning to symbol CMD_TFTP
arch/arm/configs/friendlyarm_mini2440_defconfig:46:warning: override: reassigning to symbol FS_TFTP

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:03:10 +02:00
Sascha Hauer e0d9920f40 ARM: MXS: Remove unused variables
Fixes:

arch/arm/boards/crystalfontz-cfa10036/cfa10036.c: In function 'cfa10036_devices_init':
arch/arm/boards/crystalfontz-cfa10036/cfa10036.c:119:9: warning: unused variable 'ret' [-Wunused-variable]
arch/arm/boards/chumby_falconwing/falconwing.c: In function 'falconwing_devices_init':
arch/arm/boards/chumby_falconwing/falconwing.c:287:9: warning: unused variable 'rc' [-Wunused-variable]
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c: In function 'imx23_olinuxino_devices_init':
arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c:118:9: warning: unused variable 'rc' [-Wunused-variable]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 10:02:04 +02:00
Sascha Hauer 8f8a18906b fix format specifiers
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 09:35:31 +02:00
Lucas Stach 08a33804a1 tegra: refresh defconfig
Mainly for Jetson TK1 support, but -next moved
some stuff around. Also enable some filesystems.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:15 +02:00
Lucas Stach a2226db2d2 tegra: add NVIDIA Jetson-TK1 board support
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:15 +02:00
Lucas Stach 8f385481a7 images: add Tegra124 image build rules
Allows to build persistent images for the Tegra124
line of SoCs.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:15 +02:00
Lucas Stach 77b9a2120c tegra: pmc: add Tegra124 compatible
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:15 +02:00
Lucas Stach 35a0081a83 mci: tegra: add Tegra124 compatible
The controller is similar enough to the ones found
on earlier generation SoCs to not need any additional
changes.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:15 +02:00
Lucas Stach dc726ec5b5 clk: tegra: add Tegra124 driver
Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:15 +02:00
Lucas Stach 89b062b430 clk: tegra: don't bug out on zero PLL postdiv
As the real value is 2^p a input value of 0 is
actually valid.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:14 +02:00
Lucas Stach d95bb6f81f clk: tegra: allow variable sized muxes
Tegra124 extended the mux by 1bit to allow for
more PLL sources.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2014-06-05 08:01:14 +02:00