* [PATCH V2] wanrouter: Remove it and the drivers that depend on it
From: Joe Perches @ 2012-11-13 20:17 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121113.144406.1610017702502358739.davem@davemloft.net>
Remove wanrouter as it's obsolete and has not been updated
by sangoma since 2.4.3 or so and it's not used anymore.
Remove obsolete cyclomx drivers.
Update files that include now deleted wanrouter bits.
Signed-off-by: Joe Perches <joe@perches.com>
---
On Tue, 2012-11-13 at 14:44 -0500, David Miller wrote:
> Remove wanrouter as it's obsolete and has not been updated
> > by sangoma since 2.4.3 or so and it's not used anymore.
> >
> > Remove obsolete cyclomx drivers.
> > Update defconfig files that enable wanrouter.
> > Update files that include now deleted wanrouter bits.
> []
> I'm fine with this change, except the arch defconfig bits.
>
> We've been leaving those alone, and letting the arch maintainers
> do the updates themselves periodically.
>
> Please resubmit this with those parts removed.
That seems an odd workflow as it leaves dangling CONFIG_<foo>
options set, but I guess it doesn't hurt so here it is.
I just removed the modified arch/.../<foo>defconfig files.
Documentation/ioctl/ioctl-number.txt | 1 -
Documentation/magic-number.txt | 1 -
Documentation/zh_CN/magic-number.txt | 1 -
drivers/isdn/i4l/isdn_x25iface.c | 1 -
drivers/isdn/i4l/isdn_x25iface.h | 1 -
drivers/net/wan/Kconfig | 54 --
drivers/net/wan/Makefile | 5 -
drivers/net/wan/cycx_drv.c | 569 ------------
drivers/net/wan/cycx_main.c | 346 --------
drivers/net/wan/cycx_x25.c | 1602 ----------------------------------
include/linux/cyclomx.h | 77 --
include/linux/cycx_drv.h | 64 --
include/linux/wanrouter.h | 129 ---
include/uapi/linux/Kbuild | 1 -
include/uapi/linux/wanrouter.h | 452 ----------
net/Kconfig | 1 -
net/Makefile | 1 -
net/socket.c | 1 -
net/wanrouter/Kconfig | 27 -
net/wanrouter/Makefile | 7 -
net/wanrouter/patchlevel | 1 -
net/wanrouter/wanmain.c | 782 -----------------
net/wanrouter/wanproc.c | 380 --------
23 files changed, 0 insertions(+), 4504 deletions(-)
delete mode 100644 drivers/net/wan/cycx_drv.c
delete mode 100644 drivers/net/wan/cycx_main.c
delete mode 100644 drivers/net/wan/cycx_x25.c
delete mode 100644 include/linux/cyclomx.h
delete mode 100644 include/linux/cycx_drv.h
delete mode 100644 include/linux/wanrouter.h
delete mode 100644 include/uapi/linux/wanrouter.h
delete mode 100644 net/wanrouter/Kconfig
delete mode 100644 net/wanrouter/Makefile
delete mode 100644 net/wanrouter/patchlevel
delete mode 100644 net/wanrouter/wanmain.c
delete mode 100644 net/wanrouter/wanproc.c
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 2152b0e..028a034 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -179,7 +179,6 @@ Code Seq#(hex) Include File Comments
'V' C0 media/davinci/vpfe_capture.h conflict!
'V' C0 media/si4713.h conflict!
'W' 00-1F linux/watchdog.h conflict!
-'W' 00-1F linux/wanrouter.h conflict!
'W' 00-3F sound/asound.h conflict!
'X' all fs/xfs/xfs_fs.h conflict!
and fs/xfs/linux-2.6/xfs_ioctl32.h
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index 82761a3..0c39e72 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -122,7 +122,6 @@ SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c
COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c
I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c
TRIDENT_CARD_MAGIC 0x5072696E trident_card sound/oss/trident.c
-ROUTER_MAGIC 0x524d4157 wan_device include/linux/wanrouter.h
SCC_MAGIC 0x52696368 gs_port drivers/char/scc.h
SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c
GDA_MAGIC 0x58464552 gda arch/mips/include/asm/sn/gda.h
diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index 4263022..51b7e15 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -122,7 +122,6 @@ SLAB_C_MAGIC 0x4f17a36d kmem_cache mm/slab.c
COW_MAGIC 0x4f4f4f4d cow_header_v1 arch/um/drivers/ubd_user.c
I810_CARD_MAGIC 0x5072696E i810_card sound/oss/i810_audio.c
TRIDENT_CARD_MAGIC 0x5072696E trident_card sound/oss/trident.c
-ROUTER_MAGIC 0x524d4157 wan_device include/linux/wanrouter.h
SCC_MAGIC 0x52696368 gs_port drivers/char/scc.h
SAVEKMSG_MAGIC1 0x53415645 savekmsg arch/*/amiga/config.c
GDA_MAGIC 0x58464552 gda arch/mips/include/asm/sn/gda.h
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
index e2d4e58..d00c86d 100644
--- a/drivers/isdn/i4l/isdn_x25iface.c
+++ b/drivers/isdn/i4l/isdn_x25iface.c
@@ -21,7 +21,6 @@
#include <linux/netdevice.h>
#include <linux/concap.h>
#include <linux/slab.h>
-#include <linux/wanrouter.h>
#include <net/x25device.h>
#include "isdn_x25iface.h"
diff --git a/drivers/isdn/i4l/isdn_x25iface.h b/drivers/isdn/i4l/isdn_x25iface.h
index 0b26e3b..ca08e08 100644
--- a/drivers/isdn/i4l/isdn_x25iface.h
+++ b/drivers/isdn/i4l/isdn_x25iface.h
@@ -19,7 +19,6 @@
#endif
#include <linux/skbuff.h>
-#include <linux/wanrouter.h>
#include <linux/isdn.h>
#include <linux/concap.h>
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index d58431e..0c077b0 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -356,60 +356,6 @@ config SDLA
To compile this driver as a module, choose M here: the
module will be called sdla.
-# Wan router core.
-config WAN_ROUTER_DRIVERS
- tristate "WAN router drivers"
- depends on WAN_ROUTER
- ---help---
- Connect LAN to WAN via Linux box.
-
- Select driver your card and remember to say Y to "Wan Router."
- You will need the wan-tools package which is available from
- <ftp://ftp.sangoma.com/>.
-
- Note that the answer to this question won't directly affect the
- kernel except for how subordinate drivers may be built:
- saying N will just cause the configurator to skip all
- the questions about WAN router drivers.
-
- If unsure, say N.
-
-config CYCLADES_SYNC
- tristate "Cyclom 2X(tm) cards (EXPERIMENTAL)"
- depends on WAN_ROUTER_DRIVERS && (PCI || ISA)
- ---help---
- Cyclom 2X from Cyclades Corporation <http://www.avocent.com/> is an
- intelligent multiprotocol WAN adapter with data transfer rates up to
- 512 Kbps. These cards support the X.25 and SNA related protocols.
-
- While no documentation is available at this time please grab the
- wanconfig tarball in
- <http://www.conectiva.com.br/~acme/cycsyn-devel/> (with minor changes
- to make it compile with the current wanrouter include files; efforts
- are being made to use the original package available at
- <ftp://ftp.sangoma.com/>).
-
- Feel free to contact me or the cycsyn-devel mailing list at
- <acme@conectiva.com.br> and <cycsyn-devel@bazar.conectiva.com.br> for
- additional details, I hope to have documentation available as soon as
- possible. (Cyclades Brazil is writing the Documentation).
-
- The next questions will ask you about the protocols you want the
- driver to support (for now only X.25 is supported).
-
- If you have one or more of these cards, say Y to this option.
-
- To compile this driver as a module, choose M here: the
- module will be called cyclomx.
-
-config CYCLOMX_X25
- bool "Cyclom 2X X.25 support (EXPERIMENTAL)"
- depends on CYCLADES_SYNC
- help
- Connect a Cyclom 2X card to an X.25 network.
-
- Enabling X.25 support will enlarge your kernel by about 11 kB.
-
# X.25 network drivers
config LAPBETHER
tristate "LAPB over Ethernet driver (EXPERIMENTAL)"
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index df70248..c135ef4 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -5,10 +5,6 @@
# Rewritten to use lists instead of if-statements.
#
-cyclomx-y := cycx_main.o
-cyclomx-$(CONFIG_CYCLOMX_X25) += cycx_x25.o
-cyclomx-objs := $(cyclomx-y)
-
obj-$(CONFIG_HDLC) += hdlc.o
obj-$(CONFIG_HDLC_RAW) += hdlc_raw.o
obj-$(CONFIG_HDLC_RAW_ETH) += hdlc_raw_eth.o
@@ -28,7 +24,6 @@ obj-$(CONFIG_LANMEDIA) += lmc/
obj-$(CONFIG_DLCI) += dlci.o
obj-$(CONFIG_SDLA) += sdla.o
-obj-$(CONFIG_CYCLADES_SYNC) += cycx_drv.o cyclomx.o
obj-$(CONFIG_LAPBETHER) += lapbether.o
obj-$(CONFIG_SBNI) += sbni.o
obj-$(CONFIG_N2) += n2.o
diff --git a/drivers/net/wan/cycx_drv.c b/drivers/net/wan/cycx_drv.c
deleted file mode 100644
index 2a3ecae..0000000
diff --git a/drivers/net/wan/cycx_main.c b/drivers/net/wan/cycx_main.c
deleted file mode 100644
index 81fbbad..0000000
diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
deleted file mode 100644
index 06f3f63..0000000
diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h
deleted file mode 100644
index b88f7f4..0000000
diff --git a/include/linux/cycx_drv.h b/include/linux/cycx_drv.h
deleted file mode 100644
index 12fe6b0..0000000
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
deleted file mode 100644
index cec4b41..0000000
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index e194387..c54b7e7 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -408,7 +408,6 @@ header-y += virtio_ring.h
header-y += virtio_rng.h
header-y += vt.h
header-y += wait.h
-header-y += wanrouter.h
header-y += watchdog.h
header-y += wimax.h
header-y += wireless.h
diff --git a/include/uapi/linux/wanrouter.h b/include/uapi/linux/wanrouter.h
deleted file mode 100644
index 7617df2..0000000
diff --git a/net/Kconfig b/net/Kconfig
index 30b48f5..4cf4bb5 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -209,7 +209,6 @@ source "net/ipx/Kconfig"
source "drivers/net/appletalk/Kconfig"
source "net/x25/Kconfig"
source "net/lapb/Kconfig"
-source "net/wanrouter/Kconfig"
source "net/phonet/Kconfig"
source "net/ieee802154/Kconfig"
source "net/mac802154/Kconfig"
diff --git a/net/Makefile b/net/Makefile
index 4f4ee08..c5aa8b3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -26,7 +26,6 @@ obj-$(CONFIG_BRIDGE) += bridge/
obj-$(CONFIG_NET_DSA) += dsa/
obj-$(CONFIG_IPX) += ipx/
obj-$(CONFIG_ATALK) += appletalk/
-obj-$(CONFIG_WAN_ROUTER) += wanrouter/
obj-$(CONFIG_X25) += x25/
obj-$(CONFIG_LAPB) += lapb/
obj-$(CONFIG_NETROM) += netrom/
diff --git a/net/socket.c b/net/socket.c
index 2ca51c7..5c4d82c 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -69,7 +69,6 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/mutex.h>
-#include <linux/wanrouter.h>
#include <linux/if_bridge.h>
#include <linux/if_frad.h>
#include <linux/if_vlan.h>
diff --git a/net/wanrouter/Kconfig b/net/wanrouter/Kconfig
deleted file mode 100644
index a157a2e..0000000
diff --git a/net/wanrouter/Makefile b/net/wanrouter/Makefile
deleted file mode 100644
index 4da14bc..0000000
diff --git a/net/wanrouter/patchlevel b/net/wanrouter/patchlevel
deleted file mode 100644
index c043eea..0000000
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
deleted file mode 100644
index 2ab7850..0000000
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
deleted file mode 100644
index c43612e..0000000
--
1.7.8.112.g3fd21
^ permalink raw reply related
* [PATCH] ARM: kirkwood: Add Plat'Home OpenBlocks A6 support
From: Nobuhiro Iwamatsu @ 2012-11-13 19:54 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121113123739.GS22042@titan.lakedaemon.net>
Hi,
On Tue, Nov 13, 2012 at 9:37 PM, Jason Cooper <jason@lakedaemon.net> wrote:
> Nobuhiro,
>
> On Tue, Nov 13, 2012 at 04:43:09PM +0900, Nobuhiro Iwamatsu wrote:
>> Add support for Plat'Home OpenBlocks A6 using the device tree
>> where possible.
>> This commit supports SATA, USB, ether and serial console.
>>
>> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> ---
>> V2:
>> - Remove unnecessary value from bootargs.
>> - Update comment for MPP table.
>> - Remove kirkwood_uart0_init().
>
> Thanks for the patch. One small note. In the future, please add a 'V2'
> to the subject line, eg "[PATCH V2] ...". It really helps us keep track of
> which one to merge.
Although I knew about it , I forgot adding "V2".
>
> No need to resend, I'll keep track of it since I'm about to pull
> everything together over the next few days.
Thank you.
>
> thx,
>
> Jason.
Best regards,
Nobuhiro
--
Nobuhiro Iwamatsu
iwamatsu at {nigauri.org / debian.org}
GPG ID: 40AD1FA6
^ permalink raw reply
* [PATCH] wanrouter: Remove it and the drivers that depend on it
From: David Miller @ 2012-11-13 19:44 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <67fe0c5701a8c7cfe06b178cf04b1c5c06592714.1352548454.git.joe@perches.com>
From: Joe Perches <joe@perches.com>
Date: Sat, 10 Nov 2012 06:20:55 -0800
> Remove wanrouter as it's obsolete and has not been updated
> by sangoma since 2.4.3 or so and it's not used anymore.
>
> Remove obsolete cyclomx drivers.
> Update defconfig files that enable wanrouter.
> Update files that include now deleted wanrouter bits.
>
> Signed-off-by: Joe Perches <joe@perches.com>
I'm fine with this change, except the arch defconfig bits.
We've been leaving those alone, and letting the arch maintainers
do the updates themselves periodically.
Please resubmit this with those parts removed.
Thanks.
^ permalink raw reply
* [PATCH] ARM: tegra: trimslice: enable SPI flash
From: Stephen Warren @ 2012-11-13 19:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352834633-1426-1-git-send-email-swarren@wwwdotorg.org>
On 11/13/2012 12:23 PM, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
>
> TrimSlice contains a 1MiB SPI flash. Represent this in the device tree.
I've applied this to Tegra's for-3.8/dt branch.
^ permalink raw reply
* [PATCH] arm: zynq: add system level control register manager
From: Daniel Borkmann @ 2012-11-13 19:25 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121113183700.GK1718@beefymiracle.amer.corp.natinst.com>
On Tue, Nov 13, 2012 at 7:37 PM, Josh Cartwright <josh.cartwright@ni.com> wrote:
> On Fri, Nov 09, 2012 at 10:49:07AM +0100, Daniel Borkmann wrote:
>> On Thu, Nov 8, 2012 at 5:01 PM, Josh Cartwright <joshc@eso.teric.us> wrote:
>> > On Wed, Oct 31, 2012 at 07:36:12PM +0100, Daniel Borkmann wrote:
>> >> This patch for the Xilinx Zynq ARM architecture adds management of system
>> >> level control register. The code is taken from the Xilinx-internal Linux
>> >> Git tree and cleaned up a bit for mainline integration. Besides others,
>> >> this patch is needed in order to integrate further drivers for Zynq such as
>> >> the Zynq xemacps networking device driver. The patch is aganst the latest
>> >> arm-soc tree.
>> >>
>> >> Signed-off-by: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch>
>> >> Cc: Michal Simek <michals@xilinx.com>
>> >> Cc: John Linn <john.linn@xilinx.com>
>> >> Cc: Arnd Bergmann <arnd@arndb.de>
>> >> ---
>> >
>> > These changes will conflict with my pending clk patchset [1], as I'm
>> > introducing bindings for the SLCR (and its clk interfaces).
>>
>> Oops, okay. Then your's has priority, of course.
>
> I did not mean to discourage. I just meant to say that we should work
> out how this work can be done on top of the clk changes.
>
>> > It seems like a hefty chunk of the out-of-tree slcr driver is related to
>> > configuring MIO. I think it would be really nice if this driver was
>> > reworked to use the pinctrl subsystem, and also to provide suitable
>> > device tree bindings.
>>
>> Agreed. If there's a chance to help with further Zynq integration and
>> to develop this driver with testing on Qemu for ARM Zynq, I'd like to
>> give it a try. (The board is a bit expensive as a hobby only.)
>
> My concern is that, especially regarding the configuration of MIO, being
> able to do adequate testing will require real hardware. It isn't clear
> to me what the state of qemu's slcr/mio model is.
I added Peter Crosthwaite into CC, since he could provide an answer to
that (I've been told).
^ permalink raw reply
* [PATCH] ARM: tegra: trimslice: enable SPI flash
From: Stephen Warren @ 2012-11-13 19:23 UTC (permalink / raw)
To: linux-arm-kernel
From: Stephen Warren <swarren@nvidia.com>
TrimSlice contains a 1MiB SPI flash. Represent this in the device tree.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/boot/dts/tegra20-trimslice.dts | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 27fb8a6..f4e0428 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -254,6 +254,16 @@
clock-frequency = <400000>;
};
+ spi at 7000c380 {
+ status = "okay";
+ spi-max-frequency = <48000000>;
+ spi-flash at 0 {
+ compatible = "winbond,w25q80bl";
+ reg = <0>;
+ spi-max-frequency = <48000000>;
+ };
+ };
+
i2c at 7000c400 {
status = "okay";
clock-frequency = <400000>;
--
1.7.0.4
^ permalink raw reply related
* [PATCH v5 0/4] arch/arm: support seccomp
From: Andy Lutomirski @ 2012-11-13 19:23 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352587485-18348-1-git-send-email-keescook@chromium.org>
On 11/10/2012 02:44 PM, Kees Cook wrote:
> This adds support for seccomp BPF to ARM. When built with the seccomp
> improvement patch waiting in linux-next ("seccomp: Make syscall skipping
> and nr changes more consistent"), this passes the seccomp regression
> test suite: https://github.com/redpig/seccomp
I don't know if this matters much on ARM, but should something like
https://git.kernel.org/?p=linux/kernel/git/luto/linux.git;a=commit;h=dee1ae5a05149f30baeccb4b8f68f22525ba9ca2
be added?
--Andy
>
> Thanks,
>
> -Kees
>
> ---
> v5:
> - clean up seccomp failure path, as requested by Will Deacon.
> v4:
> - fixed syscall_get_arch, thanks to Will Deacon.
> v3:
> - updates suggested by Russell King:
> - reduced scope of expansion
> - leveraged TIF_SYSCALL_WORK bit mask
> - fixed syscall==-1 short-circuit logic
> v2:
> - expanded ptrace_syscall_trace() into both callers and do
> secure_computing() hookup there, as requested by Al Viro.
>
^ permalink raw reply
* [PATCH 1/2] arm/mm: L2CC shared mutex with ARM TZ
From: Abhimanyu Kapur @ 2012-11-13 19:22 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121113171745.GA6370@linaro.org>
> Date: Tue, 13 Nov 2012 17:17:45 +0000
> From: dave.martin at linaro.org
> To: etienne.carriere at st.com
> Subject: Re: [PATCH 1/2] arm/mm: L2CC shared mutex with ARM TZ
> CC: rabin.vincent at stericsson.com; linux at arm.linux.org.uk; srinidhi.kasagar at stericsson.com; Marc.Zyngier at arm.com; Catalin.Marinas at arm.com; linus.walleij at linaro.org; Will.Deacon at arm.com; linux-arm-kernel at lists.infradead.org
>
> On Tue, Nov 13, 2012 at 04:08:14PM +0000, Etienne CARRIERE wrote:
> > From: Etienne Carriere <etienne.carriere@stericsson.com>
> >
> >
> >
> > Secure code in TrustZone space may need to perform L2 cache
> >
> > maintenance operations. A shared mutex is required to synchronize
> >
> > linux l2cc maintenance and TZ l2cc maintenance.
>
If you are using PL310 with thrustzone support then the L2 cache lines are secure bit tagged ; your design should be such that the secure (TZ) side only does operations on secure cache lines and non-secure side does operations only on non-secure cache lines. So each entity (TZ and nonTZ) if maintains their own cache and ensures integrity before switching over via monitor, this might not be needed.
Abhi> 1) Why is this not a denial-of-service risk? (i.e., why can the Normal> World not simply hold the mutex forever?)
>
> 2) The memory types on both sides have to be _exactly_ the same, not
> just "cached", otherwise unpredictable behaviour may occur when accessing
> the mutex. It is not obvious how this is ensured.
>
> 3) Many people seem to delegate L2 cache maintenence requests via SMC
> in these situations. Can you do that instead?
>
>
> Cheers
> ---Dave
>
> > The TZ mutex is an "arch_spinlock": a 32bit DDR cell (ARMv7-A mutex).
> >
> > Linux L2 cache driver must lock TZ mutex if enabled.
> >
> >
> >
> > Signed-off-by: Etienne Carriere <etienne.carriere@stericsson.com>
> >
> > ---
> >
> > arch/arm/include/asm/outercache.h | 9 ++++
> >
> > arch/arm/mm/cache-l2x0.c | 87 +++++++++++++++++++++++++++++----------
> >
> > 2 files changed, 74 insertions(+), 22 deletions(-)
> >
> >
> >
> > diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/
> > outercache.h
> >
> > index 53426c6..7aa5eac 100644
> >
> > --- a/arch/arm/include/asm/outercache.h
> >
> > +++ b/arch/arm/include/asm/outercache.h
> >
> > @@ -35,6 +35,7 @@ struct outer_cache_fns {
> >
> > #endif
> >
> > void (*set_debug)(unsigned long);
> >
> > void (*resume)(void);
> >
> > + bool (*tz_mutex)(unsigned long);
> >
> > };
> >
> > #ifdef CONFIG_OUTER_CACHE
> >
> > @@ -81,6 +82,13 @@ static inline void outer_resume(void)
> >
> > outer_cache.resume();
> >
> > }
> >
> > +static inline bool outer_tz_mutex(unsigned long addr)
> >
> > +{
> >
> > + if (outer_cache.tz_mutex)
> >
> > + return outer_cache.tz_mutex(addr);
> >
> > + return false;
> >
> > +}
> >
> > +
> >
> > #else
> >
> > static inline void outer_inv_range(phys_addr_t start, phys_addr_t end)
> >
> > @@ -92,6 +100,7 @@ static inline void outer_flush_range(phys_addr_t start,
> > phys_addr_t end)
> >
> > static inline void outer_flush_all(void) { }
> >
> > static inline void outer_inv_all(void) { }
> >
> > static inline void outer_disable(void) { }
> >
> > +static inline bool outer_tz_mutex(unsigned long addr) { return false; }
> >
> > #endif
> >
> > diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
> >
> > index a53fd2a..eacdc74 100644
> >
> > --- a/arch/arm/mm/cache-l2x0.c
> >
> > +++ b/arch/arm/mm/cache-l2x0.c
> >
> > @@ -41,6 +41,26 @@ struct l2x0_of_data {
> >
> > void (*resume)(void);
> >
> > };
> >
> > +/*
> >
> > + * arch_spinlock (single 32bit DDR mutex cell) pointer to synchronise
> >
> > + * L2CC maintenance between linux world and secure world (ARM TZ).
> >
> > + */
> >
> > +arch_spinlock_t *l2x0_tz_mutex;
> >
> > +
> >
> > +#define l2x0_spin_lock_irqsave(flags) \
> >
> > + do
> > {
> > \
> >
> > + raw_spin_lock_irqsave(&l2x0_lock, flags);
> > \
> >
> > + if (l2x0_tz_mutex)
> > \
> >
> > + arch_spin_lock(l2x0_tz_mutex);
> > \
> >
> > + } while (0)
> >
> > +
> >
> > +#define l2x0_spin_unlock_irqrestore(flags) \
> >
> > + do
> > {
> > \
> >
> > + if (l2x0_tz_mutex)
> > \
> >
> > + arch_spin_unlock(l2x0_tz_mutex);
> > \
> >
> > + raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> > \
> >
> > + } while (0)
> >
> > +
> >
> > static inline void cache_wait_way(void __iomem *reg, unsigned long mask)
> >
> > {
> >
> > /* wait for cache operation by line or way to complete */
> >
> > @@ -126,9 +146,9 @@ static void l2x0_cache_sync(void)
> >
> > {
> >
> > unsigned long flags;
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > cache_sync();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void __l2x0_flush_all(void)
> >
> > @@ -145,9 +165,9 @@ static void l2x0_flush_all(void)
> >
> > unsigned long flags;
> >
> > /* clean all ways */
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > __l2x0_flush_all();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_clean_all(void)
> >
> > @@ -155,11 +175,11 @@ static void l2x0_clean_all(void)
> >
> > unsigned long flags;
> >
> > /* clean all ways */
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > writel_relaxed(l2x0_way_mask, l2x0_base + L2X0_CLEAN_WAY);
> >
> > cache_wait_way(l2x0_base + L2X0_CLEAN_WAY, l2x0_way_mask);
> >
> > cache_sync();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_inv_all(void)
> >
> > @@ -167,13 +187,13 @@ static void l2x0_inv_all(void)
> >
> > unsigned long flags;
> >
> > /* invalidate all ways */
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > /* Invalidating when L2 is enabled is a nono */
> >
> > BUG_ON(readl(l2x0_base + L2X0_CTRL) & 1);
> >
> > writel_relaxed(l2x0_way_mask, l2x0_base + L2X0_INV_WAY);
> >
> > cache_wait_way(l2x0_base + L2X0_INV_WAY, l2x0_way_mask);
> >
> > cache_sync();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_inv_range(unsigned long start, unsigned long end)
> >
> > @@ -181,7 +201,7 @@ static void l2x0_inv_range(unsigned long start, unsigned
> > long end)
> >
> > void __iomem *base = l2x0_base;
> >
> > unsigned long flags;
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > if (start & (CACHE_LINE_SIZE - 1)) {
> >
> > start &= ~(CACHE_LINE_SIZE - 1);
> >
> > debug_writel(0x03);
> >
> > @@ -206,13 +226,13 @@ static void l2x0_inv_range(unsigned long start, unsigned
> > long end)
> >
> > }
> >
> > if (blk_end < end) {
> >
> > - raw_spin_unlock_irqrestore(&
> > l2x0_lock, flags);
> >
> > - raw_spin_lock_irqsave(&
> > l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore
> > (flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > }
> >
> > }
> >
> > cache_wait(base + L2X0_INV_LINE_PA, 1);
> >
> > cache_sync();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_clean_range(unsigned long start, unsigned long end)
> >
> > @@ -225,7 +245,7 @@ static void l2x0_clean_range(unsigned long start, unsigned
> > long end)
> >
> > return;
> >
> > }
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > start &= ~(CACHE_LINE_SIZE - 1);
> >
> > while (start < end) {
> >
> > unsigned long blk_end = start + min(end - start,
> > 4096UL);
> >
> > @@ -236,13 +256,13 @@ static void l2x0_clean_range(unsigned long start,
> > unsigned long end)
> >
> > }
> >
> > if (blk_end < end) {
> >
> > - raw_spin_unlock_irqrestore(&
> > l2x0_lock, flags);
> >
> > - raw_spin_lock_irqsave(&
> > l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore
> > (flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > }
> >
> > }
> >
> > cache_wait(base + L2X0_CLEAN_LINE_PA, 1);
> >
> > cache_sync();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_flush_range(unsigned long start, unsigned long end)
> >
> > @@ -255,7 +275,7 @@ static void l2x0_flush_range(unsigned long start, unsigned
> > long end)
> >
> > return;
> >
> > }
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > start &= ~(CACHE_LINE_SIZE - 1);
> >
> > while (start < end) {
> >
> > unsigned long blk_end = start + min(end - start,
> > 4096UL);
> >
> > @@ -268,24 +288,24 @@ static void l2x0_flush_range(unsigned long start,
> > unsigned long end)
> >
> > debug_writel(0x00);
> >
> > if (blk_end < end) {
> >
> > - raw_spin_unlock_irqrestore(&
> > l2x0_lock, flags);
> >
> > - raw_spin_lock_irqsave(&
> > l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore
> > (flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > }
> >
> > }
> >
> > cache_wait(base + L2X0_CLEAN_INV_LINE_PA, 1);
> >
> > cache_sync();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_disable(void)
> >
> > {
> >
> > unsigned long flags;
> >
> > - raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > + l2x0_spin_lock_irqsave(flags);
> >
> > __l2x0_flush_all();
> >
> > writel_relaxed(0, l2x0_base + L2X0_CTRL);
> >
> > dsb();
> >
> > - raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + l2x0_spin_unlock_irqrestore(flags);
> >
> > }
> >
> > static void l2x0_unlock(u32 cache_id)
> >
> > @@ -307,6 +327,28 @@ static void l2x0_unlock(u32 cache_id)
> >
> > }
> >
> > }
> >
> > +/* Enable/disable external mutex shared with TZ code */
> >
> > +static bool l2x0_tz_mutex_cfg(unsigned long addr)
> >
> > +{
> >
> > + unsigned long flags;
> >
> > +
> >
> > + raw_spin_lock_irqsave(&l2x0_lock, flags);
> >
> > +
> >
> > + if (addr && l2x0_tz_mutex && (addr != (uint)l2x0_tz_mutex)) {
> >
> > + raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + pr_err("%s: a TZ mutex is already enabled\n",
> > __func__);
> >
> > + return false;
> >
> > + }
> >
> > +
> >
> > + l2x0_tz_mutex = (arch_spinlock_t *)addr;
> >
> > + /* insure mutex ptr is updated before lock is released */
> >
> > + smp_wmb();
> >
> > +
> >
> > + raw_spin_unlock_irqrestore(&l2x0_lock, flags);
> >
> > + pr_debug("\n%s: %sable TZ mutex\n\n", __func__, (addr) ? "en" :
> > "dis");
> >
> > + return true;
> >
> > +}
> >
> > +
> >
> > void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
> >
> > {
> >
> > u32 aux;
> >
> > @@ -380,6 +422,7 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32
> > aux_mask)
> >
> > outer_cache.inv_all = l2x0_inv_all;
> >
> > outer_cache.disable = l2x0_disable;
> >
> > outer_cache.set_debug = l2x0_set_debug;
> >
> > + outer_cache.tz_mutex = l2x0_tz_mutex_cfg;
> >
> > printk(KERN_INFO "%s cache controller enabled\n", type);
> >
> > printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL
> > 0x%08x, Cache size: %d B\n",
> >
> >
> >
> > --
> >
> > 1.7.11.3
> >
> >
> >
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121113/ce5f15d9/attachment-0001.html>
^ permalink raw reply
* [PATCHv9 0/8] ARM: OMAP4: core retention support
From: Kevin Hilman @ 2012-11-13 19:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352731307.2406.40.camel@sokoban>
Tero Kristo <t-kristo@ti.com> writes:
> On Tue, 2012-11-06 at 13:19 -0800, Kevin Hilman wrote:
>> Tero Kristo <t-kristo@ti.com> writes:
>>
>> > Hi Kevin,
>> >
>> > On Mon, 2012-11-05 at 14:23 -0800, Kevin Hilman wrote:
>> >> Hi Tero,
>> >>
>> >> Tero Kristo <t-kristo@ti.com> writes:
>> >>
>> >> > Hi,
>> >> >
>> >> > Changes compared to previous version:
>> >> > - rebased on top of 3.7-rc1
>> >> > - applies on top of latest func pwrst code (v6)
>> >> > - added back patch #1 to this set (it wasn't queued yet after all)
>> >> > - added patch #7 for fixing a bug in the functional pwrst code
>> >> > - added patch #8 for fixing a regression with MUSB PHY power handling
>> >> > (not quite sure if this is the correct way to fix this or not)
>> >> >
>> >> > Tested with omap4460 gp panda + omap4430 emu blaze boards, with cpuidle +
>> >> > suspend.
>> >> >
>> >> > Branch also available here:
>> >> > git://gitorious.org/~kristo/omap-pm/omap-pm-work.git
>> >> > branch: mainline-3.7-rc1-omap4-ret-v9
>> >>
>> >> I tested this branch on 4430/Panda and 4460/Panda-ES and I'm seeing
>> >> several domains not hitting target power state in suspend[1].
>> >>
>> >> Am I missing some other fixes? Using omap2plus_defconfig, I tried your
>> >> branch alone, and merged with v3.7-rc4, and I get the same errors.
>>
>> [...]
>>
>> > This looks like a combination of boot loader/kernel problems. My guess
>> > is that l3init is probably held on by the USB, and both ivahd / tesla
>> > are held on by some DSP/IVA modules which are not idling properly.
>> >
>> > The last patch in this set should fix the USB problems at least
>> > partially, but also the USB DPLL itself might be in wrong state,
>> > attached patch might help for that one and get l3init to idle.
>> >
>> > For DSP I don't have a patch right now, what is the boot loader you are
>> > using? (Can you provide git / commit / config info?)
>>
>> I was using mainline u-boot at tag v2012.04.01 when I saw the errors.
>>
>> To check the bootloader, I upgraded to the latest mainline tag
>> (v2012.10) and the problems are gone on both 4430/Panda and
>> 4460/Panda-ES... Interesting.
>>
>> That suggests that there's still some kernel assumptions/dependencies on
>> the bootloader that need to be addressed.
>
> After a little bit of looking into this, this is pretty similar to what
> I was working on quite a while back once I tried to get the core ret
> work with mainline kernel. I ended up sending patches against the
> boot-loader as there wasn't a readily visible solution to some of the
> issues on kernel side => so now if you update the u-boot, it gets fixed.
Yes, recent u-boots have become much more sane in what they initialze.
Now, there is a bare set of "essential" clocks/pads that are configured,
so that probably explains why things work better with a sane bootloader.
Kevin
> I am seeing (at least) following subsystems being non-idle with the old
> bootloader:
> - M3 cortex (stuck in transition)
> - DSP (stuck in transition)
> - SL2IF (stuck in transition)
> - FSUSB (stuck in transition)
>
> ...but I am not aware of any way to get these to working properly from
> this state without POR. Some of them probably require firmware to be
> loaded and letting them out of reset also (M3 / DSP.) Benoit, do you
> have any clues?
>
> -Tero
^ permalink raw reply
* [PATCH 3/3] ARM: config: tegra: enable SFLASH controller driver
From: Stephen Warren @ 2012-11-13 19:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352783021-25393-4-git-send-email-ldewangan@nvidia.com>
On 11/12/2012 10:03 PM, Laxman Dewangan wrote:
> Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Thanks, squashed into Tegra's for-3.8/defconfig branch.
^ permalink raw reply
* [GIT PULL 6/6] omap gpmc changes for v3.8 merge window
From: Tony Lindgren @ 2012-11-13 19:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1352828737-887235>
The following changes since commit 6ba54ab4a49bbad736b0254aa6bdf0cb83013815:
ARM: OMAP: Remove omap_init_consistent_dma_size() (2012-11-06 16:01:19 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/gpmc-signed
for you to fetch changes up to 86983087096c072214a229ccad614536d55e483f:
Merge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/gpmc (2012-11-12 15:28:11 -0800)
----------------------------------------------------------------
omap GPMC (General Purpose Memory Controller) updates via Afzal Mohammed <afzal@ti.com>:
These changes provide a generic gpmc timing calculation method,
migrates existing peripherals that makes use of custom gpmc timing
calculation method to use the new generic one.
The generic timing routine has been tested with onenand, smsc911x,
and tusb6010 devices connected to GPMC in addition to simulating
other devices support in the mainline kernel.
----------------------------------------------------------------
Afzal Mohammed (6):
ARM: OMAP2+: nand: remove redundant rounding
ARM: OMAP2+: gpmc: handle additional timings
ARM: OMAP2+: gpmc: generic timing calculation
ARM: OMAP2+: onenand: generic timing calculation
ARM: OMAP2+: smc91x: generic timing calculation
ARM: OMAP2+: tusb6010: generic timing calculation
Tony Lindgren (1):
Merge tag 'gpmc-generic-timing' of git://gitorious.org/x0148406-public/linux-kernel into omap-for-v3.8/gpmc
Documentation/bus-devices/ti-gpmc.txt | 122 +++++++++++
arch/arm/mach-omap2/gpmc-nand.c | 26 +--
arch/arm/mach-omap2/gpmc-onenand.c | 143 ++++---------
arch/arm/mach-omap2/gpmc-smc91x.c | 43 ++--
arch/arm/mach-omap2/gpmc.c | 373 ++++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/gpmc.h | 113 ++++++++--
arch/arm/mach-omap2/usb-tusb6010.c | 181 ++++-------------
7 files changed, 709 insertions(+), 292 deletions(-)
create mode 100644 Documentation/bus-devices/ti-gpmc.txt
^ permalink raw reply
* [PATCH 2/3] ARM: tegra: Add OF_DEV_AUXDATA for sflash driver in board dt
From: Stephen Warren @ 2012-11-13 19:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352783021-25393-3-git-send-email-ldewangan@nvidia.com>
On 11/12/2012 10:03 PM, Laxman Dewangan wrote:
> Add OF_DEV_AUXDATA for sflash controller driver for Tegra20
> board dt files.
> Set the parent clock of sflash controller to PLLP and configure
> clock to 20MHz.
Thanks, applied to Tegra's for-3.8/soc branch.
^ permalink raw reply
* [PATCH 1/3] ARM: tegra: dts: add sflash controller dt entry
From: Stephen Warren @ 2012-11-13 19:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352783021-25393-2-git-send-email-ldewangan@nvidia.com>
On 11/12/2012 10:03 PM, Laxman Dewangan wrote:
> Nvidia's Tegra20 have the SPI (SFLASH) controller to
> interface with spi flash device which is used for system
> boot. Add DT entry for this controller.
Thanks, applied to Tegra's for-3.8/dt branch.
^ permalink raw reply
* [PATCH V2] ARM: tegra: retain L2 content over CPU suspend/resume
From: Stephen Warren @ 2012-11-13 19:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352772288-2290-1-git-send-email-josephl@nvidia.com>
On 11/12/2012 07:04 PM, Joseph Lo wrote:
> The L2 RAM is in different power domain from the CPU cluster. So the
> L2 content can be retained over CPU suspend/resume. To do that, we
> need to disable L2 after the MMU is disabled, and enable L2 before
> the MMU is enabled. But the L2 controller is in the same power domain
> with the CPU cluster. We need to restore it's settings and re-enable
> it after the power be resumed.
Thanks, applied to Tegra's for-3.8/cpuidle branch.
^ permalink raw reply
* [GIT PULL 5/6] omap board changes for v3.8 merge window
From: Tony Lindgren @ 2012-11-13 19:12 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1352828737-887235>
The following changes since commit ddffeb8c4d0331609ef2581d84de4d763607bd37:
Linux 3.7-rc1 (2012-10-14 14:41:04 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/board-v2-signed
for you to fetch changes up to 0449410b0b8aeafa9b7e8bb719e4eeda8a5623fd:
ARM: OMAP1: use BUG_ON where possible (2012-11-12 15:20:44 -0800)
----------------------------------------------------------------
Board updates for omaps mostly to deal with enabling
display support with device tree until the bindings
are ready.
----------------------------------------------------------------
Pavel Machek (1):
ARM: OMAP2+: Nokia N9/N900/N950 -- mention product names
Sasha Levin (1):
ARM: OMAP1: use BUG_ON where possible
Tomi Valkeinen (3):
OMAP: panda: move display init from board file to dss-common.c
OMAP: omap4sdp: move display init from board file to dss-common.c
OMAP: board-generic: enable DSS for panda & sdp boards
arch/arm/mach-omap1/board-fsample.c | 3 +-
arch/arm/mach-omap1/board-h2.c | 3 +-
arch/arm/mach-omap1/board-h3.c | 3 +-
arch/arm/mach-omap1/board-perseus2.c | 3 +-
arch/arm/mach-omap2/Kconfig | 4 +-
arch/arm/mach-omap2/Makefile | 2 +-
arch/arm/mach-omap2/board-4430sdp.c | 157 +------------------
arch/arm/mach-omap2/board-generic.c | 10 ++
arch/arm/mach-omap2/board-omap4panda.c | 68 +-------
arch/arm/mach-omap2/board-rm680.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/dss-common.c | 276 +++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/dss-common.h | 14 ++
13 files changed, 311 insertions(+), 236 deletions(-)
create mode 100644 arch/arm/mach-omap2/dss-common.c
create mode 100644 arch/arm/mach-omap2/dss-common.h
^ permalink raw reply
* [GIT PULL 4/6] omap pm updates for v3.8 merge window
From: Tony Lindgren @ 2012-11-13 19:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1352828737-887235>
The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/pm-signed
for you to fetch changes up to 46bf4a562207c5ebd24e1dde5e5ee326cd3d6b91:
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.8/pm (2012-11-06 17:06:37 -0800)
----------------------------------------------------------------
PM updates for omaps via Kevin Hilman <khilman@deeprootsystems.com>:
- Minor pr_warn() cleanup for OMAP2+ Voltage Processor (VP)
- OMAP: SmartReflex: pass device-independent data via platform_data
- OMAP voltage layer updates towards supporting auto-retention/auto-off
----------------------------------------------------------------
Jean Pihet (2):
ARM: OMAP: hwmod: align the SmartReflex fck names
ARM: OMAP: SmartReflex: pass device dependent data via platform data
Nishanth Menon (2):
ARM: OMAP2+: PM: VP: minor pr_warn updates
ARM: OMAP3+: PM: VP: use uV for max and min voltage limits
Tero Kristo (13):
ARM: OMAP: voltage: renamed vp_vddmin and vp_vddmax fields
ARM: OMAP3+: voltage: introduce omap vc / vp params for voltagedomains
ARM: OMAP3: VC: calculate ramp times
ARM: OMAP4: voltage: add support for VOLTSETUP_x_OFF register
ARM: OMAP4: VC: calculate ramp times
ARM: OMAP: add support for oscillator setup
ARM: OMAP3+: vp: use new vp_params for calculating vddmin and vddmax
ARM: OMAP3+: voltage: use oscillator data to calculate setup times
ARM: OMAP: TWL: change the vddmin / vddmax voltages to spec
ARM: OMAP3+: voltage: remove unused volt_setup_time parameter
ARM: OMAP4: vc: fix channel configuration
ARM: OMAP4: VC: setup I2C parameters based on board data
ARM: OMAP4: TWL: enable high speed mode for PMIC communication
Tony Lindgren (3):
Merge tag 'for_3.8-cleanup-pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm
Merge tag 'for_3.8-pm-sr' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm
Merge tag 'for_3.8-pm-voltage' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/pm
Vishwanath Sripathy (1):
ARM: OMAP4: OPP: add OMAP4460 definitions
arch/arm/mach-omap2/clock33xx_data.c | 12 +-
arch/arm/mach-omap2/clock3xxx_data.c | 12 +-
arch/arm/mach-omap2/clock44xx_data.c | 6 +-
arch/arm/mach-omap2/control.h | 1 +
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 +-
arch/arm/mach-omap2/omap_opp_data.h | 9 +-
arch/arm/mach-omap2/omap_twl.c | 73 +----
arch/arm/mach-omap2/opp4xxx_data.c | 98 +++++-
arch/arm/mach-omap2/pm.c | 30 ++
arch/arm/mach-omap2/pm.h | 10 +
arch/arm/mach-omap2/sr_device.c | 13 +
arch/arm/mach-omap2/vc.c | 451 ++++++++++++++++++++++++--
arch/arm/mach-omap2/vc.h | 8 +-
arch/arm/mach-omap2/vc3xxx_data.c | 22 ++
arch/arm/mach-omap2/vc44xx_data.c | 28 ++
arch/arm/mach-omap2/voltage.h | 44 ++-
arch/arm/mach-omap2/voltagedomains3xxx_data.c | 5 +
arch/arm/mach-omap2/voltagedomains44xx_data.c | 23 +-
arch/arm/mach-omap2/vp.c | 19 +-
arch/arm/mach-omap2/vp.h | 7 +
arch/arm/mach-omap2/vp3xxx_data.c | 10 +
arch/arm/mach-omap2/vp44xx_data.c | 15 +
drivers/power/avs/smartreflex.c | 54 +--
include/linux/power/smartreflex.h | 14 +-
24 files changed, 792 insertions(+), 180 deletions(-)
^ permalink raw reply
* [GIT PULL 3/6] omap device tree updates for v3.8 merge window
From: Tony Lindgren @ 2012-11-13 19:10 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1352828737-887235>
The following changes since commit edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a:
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-09 14:58:01 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/dt-signed
for you to fetch changes up to d308ba50a1234b299a00e63a95e61fdeb2f1a2df:
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt (2012-11-09 14:58:34 -0800)
----------------------------------------------------------------
Device tree related changes for omaps updating the
various .dts files, and timer related changes to allow
configuring the timer via device tree.
----------------------------------------------------------------
Afzal Mohammed (2):
ARM: dts: AM33XX: Add rtc node
usb: musb: dsps: dt binding - add resources, example
Ajay Kumar Gupta (1):
ARM: dts: AM33XX: Add usbss node
AnilKumar Ch (18):
ARM: dts: AM33XX: Add device tree OPP table
ARM: dts: AM33XX: Add basic pinctrl device tree data
ARM: dts: AM33XX: Add D_CAN device tree data
ARM: dts: AM33XX: Add lis331dlh device tree data to am335x-evm
ARM: dts: AM33XX: Add temperature sensor device tree data to am335x-evm
ARM: dts: AM33XX: Add tsl2550 ambient light sensor DT data
ARM: dts: Add am335x-evmsk.dts
Documentation: dt: i2c: Update trivial-devices list
ARM: dts: AM33XX: Add pinmux configuration for matrix keypad to EVM
ARM: dts: AM33XX: Add matrix keypad device tree data to am335x-evm
ARM: dts: AM33XX: Add pinmux configuration for volume-keys to EVM
ARM: dts: AM33XX: Add volume-keys device tree data to am335x-evm
ARM: dts: AM33XX: Add pinmux configuration for user-leds to BONE
ARM: dts: AM33XX: Add user-leds device tree data to am335x-bone
ARM: dts: AM33XX: Add pinmux configuration for gpio-leds to EVMSK
ARM: dts: AM33XX: Add user-leds device tree data to am335x-evmsk
ARM: dts: AM33XX: Add pinmux configuration for gpio-keys to EVMSK
ARM: dts: AM33XX: Add push-buttons device tree data to am335x-evmsk
Benoit Cousson (3):
ARM: dts: OMAP: Move interrupt-parent to the root node to avoid duplication
ARM: dts: OMAP: Rename pandaES and var_som for consistency
ARM: dts: Makefile: Add the am335x-evmsk target in dtbs list
Jon Hunter (11):
ARM: dts: Add omap3-beagle.dts
ARM: dts: OMAP: Add timer nodes
ARM: dts: OMAP: Add counter-32k nodes
ARM: dts: OMAP4: Update timer addresses
ARM: dts: OMAP5: Add timer nodes
ARM: dts: OMAP5: Add counter node
ARM: OMAP3: Dynamically disable secure timer nodes for secure devices
ARM: OMAP: Add function to request a timer by capability
ARM: OMAP3: Add generic machine descriptor for boards with OMAP3 GP devices
ARM: OMAP: Add DT support for timer driver
ARM: OMAP2+: Add device-tree support for 32kHz counter
Kishon Vijay Abraham I (3):
ARM: dts: Add twl6030-usb data
ARM: dts: Add twl4030-usb data
ARM: dts: OMAP4: add *reg* property for ocp2scp
Lokesh Vutla (3):
ARM: dts: omap5-evm: Fix size of memory defined for EVM
ARM: dts: omap5: EMIF device tree data for OMAP5 boards
ARM: dts: omap5-evm: LPDDR2 memory device details for EVM
Philip, Avinash (1):
ARM: dts: AM33XX: Add SPI node
Ricardo Neri (2):
ARM: dts: omap4-panda: Add pinmux configuration for HDMI
ARM: dts: omap4-sdp: Add pinmux configuration for HDMI
Sebastien Guiriec (4):
ARM: dts: omap5: Update GPIO with address space and interrupts
ARM: dts: omap5: Update I2C with address space and interrupts
ARM: dts: omap5: Update UART with address space and interrupts
ARM: dts: omap5: Update MMC with address space and interrupts
Tony Lindgren (5):
Merge branch 'for_3.8/dts' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.8/dt
Merge branch 'dev-dt-timer' of github.com:jonhunter/linux into omap-for-v3.8/dt
Merge branch 'for_3.8/dts_part2' of git://git.kernel.org/.../bcousson/linux-omap-dt into omap-for-v3.8/dt
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
.../devicetree/bindings/arm/omap/counter.txt | 15 ++
.../devicetree/bindings/arm/omap/timer.txt | 31 +++
.../devicetree/bindings/bus/omap-ocp2scp.txt | 18 ++
.../devicetree/bindings/i2c/trivial-devices.txt | 2 +
.../devicetree/bindings/usb/am33xx-usb.txt | 21 ++
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/am335x-bone.dts | 50 +++++
arch/arm/boot/dts/am335x-evm.dts | 118 ++++++++++
arch/arm/boot/dts/am335x-evmsk.dts | 250 +++++++++++++++++++++
arch/arm/boot/dts/am33xx.dtsi | 156 +++++++++++--
arch/arm/boot/dts/omap2.dtsi | 86 +++++++
arch/arm/boot/dts/omap2420.dtsi | 16 +-
arch/arm/boot/dts/omap2430.dtsi | 19 +-
arch/arm/boot/dts/omap3-beagle-xm.dts | 6 -
arch/arm/boot/dts/omap3-beagle.dts | 67 ++++++
arch/arm/boot/dts/omap3.dtsi | 107 ++++++++-
arch/arm/boot/dts/omap4-panda-a4.dts | 17 ++
.../dts/{omap4-pandaES.dts => omap4-panda-es.dts} | 9 +
arch/arm/boot/dts/omap4-panda.dts | 22 ++
arch/arm/boot/dts/omap4-sdp-es23plus.dts | 17 ++
arch/arm/boot/dts/omap4-sdp.dts | 22 ++
.../dts/{omap4-var_som.dts => omap4-var-som.dts} | 0
arch/arm/boot/dts/omap4.dtsi | 105 ++++++++-
arch/arm/boot/dts/omap5-evm.dts | 13 +-
arch/arm/boot/dts/omap5.dtsi | 178 ++++++++++++++-
arch/arm/boot/dts/samsung_k3pe0e000b.dtsi | 67 ++++++
arch/arm/boot/dts/twl4030.dtsi | 27 +++
arch/arm/boot/dts/twl6030.dtsi | 5 +
arch/arm/mach-omap2/board-generic.c | 17 ++
arch/arm/mach-omap2/timer.c | 203 ++++++++++++++---
arch/arm/plat-omap/dmtimer.c | 95 +++++++-
arch/arm/plat-omap/include/plat/dmtimer.h | 1 +
32 files changed, 1675 insertions(+), 91 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/omap/counter.txt
create mode 100644 Documentation/devicetree/bindings/arm/omap/timer.txt
create mode 100644 arch/arm/boot/dts/am335x-evmsk.dts
create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
create mode 100644 arch/arm/boot/dts/omap4-panda-a4.dts
rename arch/arm/boot/dts/{omap4-pandaES.dts => omap4-panda-es.dts} (70%)
create mode 100644 arch/arm/boot/dts/omap4-sdp-es23plus.dts
rename arch/arm/boot/dts/{omap4-var_som.dts => omap4-var-som.dts} (100%)
create mode 100644 arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
^ permalink raw reply
* [PATCH 1/6] ARM/dts: omap4-panda: Add pinmux configuration for HDMI
From: Ricardo Neri @ 2012-11-13 19:10 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1352121259-5836-2-git-send-email-tomi.valkeinen@ti.com>
Hi Tomi,
On 11/05/2012 07:14 AM, Tomi Valkeinen wrote:
> From: Ricardo Neri <ricardo.neri@ti.com>
>
> Add the pinmux configuration for HDMI and TPD12S015A. Configure the
> gpios for the TPD12S015A and SDA, SCL and CEC for HDMI.
Do you plan to upstream the complete DT-boot support for DSS
(specifically, HDMI) for 3.8? I am asking so that I can upstream the
audio part.
Thanks!
Ricardo
>
> Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
> ---
> arch/arm/boot/dts/omap4-panda-a4.dts | 17 +++++++++++++++++
> arch/arm/boot/dts/omap4-panda.dts | 18 ++++++++++++++++++
> arch/arm/boot/dts/omap4-pandaES.dts | 9 +++++++++
> 3 files changed, 44 insertions(+)
> create mode 100644 arch/arm/boot/dts/omap4-panda-a4.dts
>
> diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts b/arch/arm/boot/dts/omap4-panda-a4.dts
> new file mode 100644
> index 0000000..75466d2
> --- /dev/null
> +++ b/arch/arm/boot/dts/omap4-panda-a4.dts
> @@ -0,0 +1,17 @@
> +/*
> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +/include/ "omap4-panda.dts"
> +
> +/* Pandaboard Rev A4+ have external pullups on SCL & SDA */
> +&dss_hdmi_pins {
> + pinctrl-single,pins = <
> + 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
> + 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
> + 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
> + >;
> +};
> diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
> index e8f927c..8060f5b 100644
> --- a/arch/arm/boot/dts/omap4-panda.dts
> +++ b/arch/arm/boot/dts/omap4-panda.dts
> @@ -65,6 +65,8 @@
> &twl6040_pins
> &mcpdm_pins
> &mcbsp1_pins
> + &dss_hdmi_pins
> + &tpd12s015_pins
> >;
>
> twl6040_pins: pinmux_twl6040_pins {
> @@ -92,6 +94,22 @@
> 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */
> >;
> };
> +
> + dss_hdmi_pins: pinmux_dss_hdmi_pins {
> + pinctrl-single,pins = <
> + 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
> + 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */
> + 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */
> + >;
> + };
> +
> + tpd12s015_pins: pinmux_tpd12s015_pins {
> + pinctrl-single,pins = <
> + 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */
> + 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */
> + 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */
> + >;
> + };
> };
>
> &i2c1 {
> diff --git a/arch/arm/boot/dts/omap4-pandaES.dts b/arch/arm/boot/dts/omap4-pandaES.dts
> index d4ba43a..73bc1a6 100644
> --- a/arch/arm/boot/dts/omap4-pandaES.dts
> +++ b/arch/arm/boot/dts/omap4-pandaES.dts
> @@ -22,3 +22,12 @@
> "AFML", "Line In",
> "AFMR", "Line In";
> };
> +
> +/* PandaboardES has external pullups on SCL & SDA */
> +&dss_hdmi_pins {
> + pinctrl-single,pins = <
> + 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */
> + 0x5c 0x100 /* hdmi_scl.hdmi_scl INPUT | MODE 0 */
> + 0x5e 0x100 /* hdmi_sda.hdmi_sda INPUT | MODE 0 */
> + >;
> +};
>
^ permalink raw reply
* [GIT PULL 2/6] omap prcm cleanup for v3.8 merge window, part2
From: Tony Lindgren @ 2012-11-13 19:07 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <pull-1352828737-887235>
The following changes since commit 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33:
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm (2012-10-26 13:32:22 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-prcm-part2-signed
for you to fetch changes up to cc4b1e24b93dd529b1d49258bee044d319b5b129:
ARM: OMAP2: Fix compillation error in cm_common (2012-11-12 13:42:46 -0800)
----------------------------------------------------------------
More PRCM cleanups via Paul Walmsley <paul@pwsan.com>:
Second set of OMAP PRCM cleanups for 3.8.
These patches remove the use of omap_prcm_get_reset_sources() from the
OMAP watchdog driver, and remove mach-omap2/prcm.c and
plat-omap/include/plat/prcm.h.
Basic test logs for this branch on top of Tony's cleanup-prcm branch
at commit 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 are here:
http://www.pwsan.com/omap/testlogs/prcm_cleanup_b_3.8/20121108151646/
However, cleanup-prcm at 7fc54fd3 does not include some fixes
that are needed for a successful test. With several reverts,
fixes, and workarounds applied, the following test logs were
obtained:
http://www.pwsan.com/omap/testlogs/TEST_prcm_cleanup_b_3.8/20121108151930/
which indicate that the series tests cleanly.
This second pull request updates one of the patches which broke
with rmk's allnoconfigs, and also updates the tag description to
indicate that 7fc54fd3 is building cleanly here.
----------------------------------------------------------------
Paul Walmsley (17):
ARM: OMAP1: CGRM: fix omap1_get_reset_sources() return type
ARM: OMAP2+: WDT: move init; add read_reset_sources pdata function pointer
watchdog: OMAP: use standard GETBOOTSTATUS interface; use platform_data fn ptr
ARM: OMAP2+: PRCM: remove omap_prcm_get_reset_sources()
ARM: OMAP2+: common: remove mach-omap2/common.c globals and map_common_io code
ARM: OMAP2/3: PRM: add SoC reset functions (using the CORE DPLL method)
ARM: OMAP2xxx: clock: remove global 'dclk' variable
ARM: OMAP2xxx: clock: move virt_prcm_set code into clkt2xxx_virt_prcm_set.c
ARM: OMAP2+: PRCM: create SoC-specific chip restart functions
ARM: OMAP2+: board files: use SoC-specific system restart functions
ARM: OMAP2xxx: APLL/CM: convert to use omap2_cm_wait_module_ready()
ARM: OMAP2+: CM/clock: convert _omap2_module_wait_ready() to use SoC-independent CM functions
ARM: OMAP2+: PRCM: remove omap2_cm_wait_idlest()
ARM: OMAP2+: PRCM: split and relocate the PRM/CM globals setup
ARM: OMAP2+: PRCM: consolidate PRCM-related timeout macros
ARM: OMAP2+: hwmod: call to _omap4_disable_module() should use the SoC-specific call
ARM: OMAP2+: PRCM: remove obsolete prcm.[ch]
Peter Ujfalusi (1):
ARM: OMAP2: Fix compillation error in cm_common
Tony Lindgren (1):
Merge tag 'omap-cleanup-b2-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/cleanup-prcm
arch/arm/mach-omap1/common.h | 2 +-
arch/arm/mach-omap1/devices.c | 21 ++-
arch/arm/mach-omap1/reset.c | 9 +-
arch/arm/mach-omap2/Makefile | 7 +-
arch/arm/mach-omap2/am33xx.h | 1 +
arch/arm/mach-omap2/board-2430sdp.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-3630sdp.c | 2 +-
arch/arm/mach-omap2/board-4430sdp.c | 2 +-
arch/arm/mach-omap2/board-am3517crane.c | 2 +-
arch/arm/mach-omap2/board-am3517evm.c | 2 +-
arch/arm/mach-omap2/board-apollon.c | 2 +-
arch/arm/mach-omap2/board-cm-t35.c | 18 +--
arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
arch/arm/mach-omap2/board-devkit8000.c | 2 +-
arch/arm/mach-omap2/board-generic.c | 10 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-igep0020.c | 4 +-
arch/arm/mach-omap2/board-ldp.c | 2 +-
arch/arm/mach-omap2/board-n8x0.c | 6 +-
arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
arch/arm/mach-omap2/board-omap3evm.c | 2 +-
arch/arm/mach-omap2/board-omap3logic.c | 4 +-
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
arch/arm/mach-omap2/board-omap3touchbook.c | 2 +-
arch/arm/mach-omap2/board-omap4panda.c | 2 +-
arch/arm/mach-omap2/board-overo.c | 2 +-
arch/arm/mach-omap2/board-rm680.c | 4 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/board-ti8168evm.c | 4 +-
arch/arm/mach-omap2/board-zoom.c | 4 +-
arch/arm/mach-omap2/clkt2xxx_apll.c | 57 ++------
arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 36 ++++-
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 70 ++++++++--
arch/arm/mach-omap2/clkt_iclk.c | 1 -
arch/arm/mach-omap2/clock.c | 57 +++++++-
arch/arm/mach-omap2/clock.h | 28 ----
arch/arm/mach-omap2/clock2420_data.c | 26 +---
arch/arm/mach-omap2/clock2430_data.c | 26 +---
arch/arm/mach-omap2/clock2xxx.c | 16 ---
arch/arm/mach-omap2/clock2xxx.h | 9 +-
arch/arm/mach-omap2/cm-regbits-24xx.h | 2 +
arch/arm/mach-omap2/cm.h | 20 ++-
arch/arm/mach-omap2/cm2xxx.c | 128 +++++++++++++++++-
arch/arm/mach-omap2/cm2xxx.h | 4 +
arch/arm/mach-omap2/cm2xxx_3xxx.h | 8 +-
arch/arm/mach-omap2/cm3xxx.c | 66 ++++++++++
arch/arm/mach-omap2/cm3xxx.h | 5 +
arch/arm/mach-omap2/cm_common.c | 71 +++++++++-
arch/arm/mach-omap2/cminst44xx.h | 2 +
arch/arm/mach-omap2/common.c | 183 --------------------------
arch/arm/mach-omap2/common.h | 133 +++++--------------
arch/arm/mach-omap2/control.c | 10 +-
arch/arm/mach-omap2/control.h | 2 +
arch/arm/mach-omap2/cpuidle34xx.c | 1 -
arch/arm/mach-omap2/devices.c | 26 ----
arch/arm/mach-omap2/display.c | 2 +-
arch/arm/mach-omap2/hdq1w.c | 4 +-
arch/arm/mach-omap2/i2c.c | 6 +-
arch/arm/mach-omap2/id.c | 7 +-
arch/arm/mach-omap2/io.c | 86 +++++++++---
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/msdi.c | 4 +-
arch/arm/mach-omap2/omap2-restart.c | 65 +++++++++
arch/arm/mach-omap2/omap3-restart.c | 36 +++++
arch/arm/mach-omap2/omap4-common.c | 19 +++
arch/arm/mach-omap2/omap_hwmod.c | 8 +-
arch/arm/mach-omap2/pm34xx.c | 1 -
arch/arm/mach-omap2/powerdomain.c | 2 -
arch/arm/mach-omap2/prcm-common.h | 22 ----
arch/arm/mach-omap2/prcm.c | 189 ---------------------------
arch/arm/mach-omap2/prcm_mpu44xx.c | 17 +++
arch/arm/mach-omap2/prcm_mpu44xx.h | 9 +-
arch/arm/mach-omap2/prm.h | 24 +++-
arch/arm/mach-omap2/prm2xxx.c | 15 ++-
arch/arm/mach-omap2/prm2xxx.h | 2 +
arch/arm/mach-omap2/prm2xxx_3xxx.h | 7 -
arch/arm/mach-omap2/prm3xxx.c | 16 ++-
arch/arm/mach-omap2/prm3xxx.h | 2 +
arch/arm/mach-omap2/prm44xx.c | 1 -
arch/arm/mach-omap2/prm_common.c | 16 ++-
arch/arm/mach-omap2/prminst44xx.h | 2 +
arch/arm/mach-omap2/sdrc.c | 8 +-
arch/arm/mach-omap2/sdrc.h | 2 +
arch/arm/mach-omap2/ti81xx.h | 9 ++
arch/arm/mach-omap2/wd_timer.c | 40 +++++-
arch/arm/plat-omap/include/plat/prcm.h | 37 ------
drivers/watchdog/omap_wdt.c | 26 ++--
include/linux/platform_data/omap-wd-timer.h | 38 ++++++
90 files changed, 992 insertions(+), 851 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap2-restart.c
create mode 100644 arch/arm/mach-omap2/omap3-restart.c
delete mode 100644 arch/arm/mach-omap2/prcm.c
delete mode 100644 arch/arm/plat-omap/include/plat/prcm.h
create mode 100644 include/linux/platform_data/omap-wd-timer.h
^ permalink raw reply
* [PATCH] clocksource: arm_generic: use integer math helpers
From: John Stultz @ 2012-11-13 19:06 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1351520658-23028-1-git-send-email-linus.walleij@linaro.org>
On 10/29/2012 07:24 AM, Linus Walleij wrote:
> This will make the two crucial integer divisions in the generic
> ARM arch timer used for ARMv8 use the kernel DIV_ROUND_CLOSEST()
> helper inline from <linux/kernel.h> so they get more precise.
>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Applied. Thanks
-john
^ permalink raw reply
* [PATCH] arm: zynq: add system level control register manager
From: Josh Cartwright @ 2012-11-13 19:03 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <39e6578d-01c8-4a05-8819-e089454c139a@CO9EHSMHS017.ehs.local>
On Tue, Nov 13, 2012 at 06:42:42PM +0000, John Linn wrote:
> > -----Original Message-----
> > From: Josh Cartwright [mailto:josh.cartwright at ni.com]
> > Sent: Tuesday, November 13, 2012 10:34 AM
> > To: Michal Simek
> > Cc: Josh Cartwright; Daniel Borkmann; Arnd Bergmann; linux-arm-kernel at lists.infradead.org; John Linn
> > Subject: Re: [PATCH] arm: zynq: add system level control register manager
> >
> > On Mon, Nov 12, 2012 at 11:35:46AM +0000, Michal Simek wrote:
> > > > 3. Figure out MIO pinctrl support and bindings (?)
> > >
> > > We will look at this topic more closely.
> >
> > For some clarification: are you (or someone at Xilinx) actively looking
> > at this?
>
> Hi Josh,
>
> No one is looking at it that I know of (other than maybe Michal). Our
> previous thinking was that this was low priority as the first stage
> boot loader sets up the MIO prior to the kernel running. U-boot needs
> the MIO setup for some set of devices also.
>
> I don't know the use cases for dynamic MIO, or I'm just
> misunderstanding what the pinctrl really does. Do designers often
> build a board to deal with being able use the pins for multiple
> purposes?
I'm less concerned about dynamic (runtime) MIO configuration. What I
would personally like to see put into place before the peripherals are
moved over is for the MIO configuration to be explicitly modelled in the
device tree, instead of implicitly in the u-boot/kernel handoff as you
have described.
I think that also means the logic to commit whatever MIO configuration
described in the device tree to hardware would be there, too.
Josh
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121113/e4664d1c/attachment.sig>
^ permalink raw reply
* [GIT PULL 1/6] omap cleanup fixes for v3.8 merge window
From: Tony Lindgren @ 2012-11-13 19:03 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121113174413.GC6801@atomide.com>
* Tony Lindgren <tony@atomide.com> [121113 09:46]:
> * Tony Lindgren <tony@atomide.com> [121112 17:07]:
> > * Tony Lindgren <ton@atomide.com> [121112 17:01]:
Ah, I have a typo ^^^ in my script..
> Hmm looks like requests 2 - 6 never made it to the lists
> for whatever reason. I'll resend these, no changes have been
> made to the pull requests.
..which probably causes the rest of the thread to be blocked
by the mailing lists. I'll post the missing pull requests
manually to the second attempt which also has the typo in
the first message. Sorry for the spam.
Tony
^ permalink raw reply
* [PATCH v2] Add support for generic BCM SoC chipsets
From: Christian Daudt @ 2012-11-13 19:02 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <50A1D06A.2010000@wwwdotorg.org>
On 12-11-12 08:45 PM, Stephen Warren wrote:
> On 11/11/2012 07:57 AM, Christian Daudt wrote:
>> In order to start upstreaming Broadcom SoC support, create
>> a starting hierarchy, arch and dts files.
>> The first support SoC family that is planned is the
>> BCM281XX (BCM28145/28150/28155/28160) family of dual A9 mobile SoC cores
>> This code is just the skeleton code for get the machine upstreamed. It
>> has been made MULTIPLATFORM compatible.
>> Next steps
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> +dtb-$(CONFIG_ARCH_BCM) += capri-brt.dtb
> I think that needs to be renamed too.
done
>
>> diff --git a/arch/arm/boot/dts/bcm281xx.dtsi b/arch/arm/boot/dts/bcm281xx.dtsi
>> +/ {
>> + model = "BCM281xx SoC";
>> + compatible = "bcm,bcm281xx";
> I think this should list the specific SoC rather than (or perhaps in
> addition to) a wildcard.
The idea here is that bcm281xx contains the family-wide definitions, and
once there are multiple boards that use the same specific chip then I'd
create a chip-specific dtsi file. So eventually it'd be:
bcm281xx.dtsi - for the family
bcm28145.dtsi
bcm28155.dtsi
... for chip-specific
and
bcm28160-brt.dts
... for board specific.
But to simplify I'm just starting with bcm281xx and bcm28160-brt
> Out of curiosity though, what kind of differences exist between the
> various SoCs this wildcard is intended to cover;
> bcm28145/28150/28155/28160? Are they simply package/pinout differences,
> or something more involved?
It mostly revolves around single or dual memory controller, and POP or
external DDR. I've only used internal names prior to upstreaming, and it
turns out that my understanding of the numbering is not quite right, so
I'll be adjusting the patchset a bit before sending the next version out.
>> + uart at 3e000000 {
>> + compatible = "snps,dw-apb-uart";
> As I mentioned in my earlier reply, I think this should indicate the
> specific instantiation of the IP too; something like
> bcm,bcm28160-dw-apb-uart.
ok. added.
>> diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
>> + help
>> + This enables support for system based on Broadcom SoCs.
>> + It currently supports BCM28145/28150/28155/28160 chips.
> The indentation looks a little odd there.
fixed.
>> diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
>> +static const char * const capri_dt_compat[] = { "bcm,capri", NULL, };
> I think that needs to be updated too.
fixed.
>
^ permalink raw reply
* [PATCH V4 3/3] clocksource: time-armada-370-xp converted to clk framework
From: John Stultz @ 2012-11-13 18:58 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1351621413-3637-4-git-send-email-gregory.clement@free-electrons.com>
On 10/30/2012 11:23 AM, Gregory CLEMENT wrote:
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> cc: John Stultz <johnstul@us.ibm.com>
> ---
> arch/arm/boot/dts/armada-370-db.dts | 4 ----
> arch/arm/boot/dts/armada-370-xp.dtsi | 1 +
> drivers/clocksource/time-armada-370-xp.c | 11 ++++++-----
> 3 files changed, 7 insertions(+), 9 deletions(-)
This is missing the patch description. Since none of it is
code/hardware I'm familiar with, I can't really closely review whats
being done. So its much more critical that the patch have a clear
description of what its doing.
thanks
-john
^ permalink raw reply
* [PATCH V2 3/3] clocksource: time-armada-370-xp converted to clk framework
From: John Stultz @ 2012-11-13 18:57 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20121030115223.18780.29992@nucleus>
On 10/30/2012 04:52 AM, Mike Turquette wrote:
> Quoting Gregory CLEMENT (2012-10-01 14:12:06)
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> I'm not sure this patch should go through me. Perhaps John Stultz?
I can apply it to my tree, but really none of it is generic, so in the
future I'd almost rather someone who could reasonably audit the changes
for correctness merge it instead (although I always appreciate being
Cc'ed into the loop).
thanks
-john
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox