]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
10 years agoARM: shmobile: Enable DSW2 with gpio-keys on KZM9D
Magnus Damm [Wed, 13 Nov 2013 23:03:45 +0000 (08:03 +0900)]
ARM: shmobile: Enable DSW2 with gpio-keys on KZM9D

Use the gpio-keys driver to support the 4 pins on the
dip switch DSW2 which is mounted on the KZM9D board.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: armadillo-reference: Use low level IRQ for ST1231
Laurent Pinchart [Tue, 19 Nov 2013 12:59:49 +0000 (13:59 +0100)]
ARM: shmobile: armadillo-reference: Use low level IRQ for ST1231

The device is configured to generate an active-low interrupt signal that
needs to be acknowledged by the host. Configure the IRQ to trigger on
low level.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use r8a7790 suffix for IRQC compat string
Magnus Damm [Wed, 20 Nov 2013 00:07:40 +0000 (09:07 +0900)]
ARM: shmobile: Use r8a7790 suffix for IRQC compat string

Add "renesas,irqc-r8a7790" to the compatible string for IRQC
in case of r8a7790. This makes the IRQC follow the same style
as the other devices and also makes it more future proof.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use r8a7790 suffix for MMCIF compat string
Magnus Damm [Wed, 20 Nov 2013 00:05:53 +0000 (09:05 +0900)]
ARM: shmobile: Use r8a7790 suffix for MMCIF compat string

Add "renesas,mmcif-r8a7790" to the compatible string for MMCIF
in case of r8a7790. This makes the MMCIF follow the same style
as the other devices and also makes it more future proof.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Add r8a7791 thermal device node to DTS
Magnus Damm [Wed, 20 Nov 2013 07:59:48 +0000 (16:59 +0900)]
ARM: shmobile: Add r8a7791 thermal device node to DTS

Hook up the r8a7791 thermal sensor to the DTS.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Add r8a7790 thermal device node to DTS
Magnus Damm [Wed, 20 Nov 2013 07:59:30 +0000 (16:59 +0900)]
ARM: shmobile: Add r8a7790 thermal device node to DTS

Hook up the r8a7790 thermal sensor to the DTS.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Configure r8a7791 PFC on Koelsch via DTS
Magnus Damm [Wed, 20 Nov 2013 07:36:59 +0000 (16:36 +0900)]
ARM: shmobile: Configure r8a7791 PFC on Koelsch via DTS

Configure the "D" set of data signals for SCIF0 and SCIF1
on the Koelsch board to setup pinctrl serial console bits.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use r8a7791 suffix for IRQC compat string
Magnus Damm [Wed, 20 Nov 2013 04:18:05 +0000 (13:18 +0900)]
ARM: shmobile: Use r8a7791 suffix for IRQC compat string

Add "renesas,irqc-r8a7791" to the compatible string for IRQC
in case of r8a7791. This makes the IRQC follow the same style
as the other devices and also makes it more future proof.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: sh73a0: fixup sdhi compatible name
Kuninori Morimoto [Wed, 20 Nov 2013 03:18:09 +0000 (19:18 -0800)]
ARM: shmobile: sh73a0: fixup sdhi compatible name

sh73a0 != r8a7740

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen: remove SDHI0 WP pin setting
Kuninori Morimoto [Wed, 20 Nov 2013 03:17:55 +0000 (19:17 -0800)]
ARM: shmobile: marzen: remove SDHI0 WP pin setting

WP pin is not implemented on Marzen

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen: remove SDHI0 WP pin setting from DTS
Kuninori Morimoto [Wed, 20 Nov 2013 03:17:41 +0000 (19:17 -0800)]
ARM: shmobile: marzen: remove SDHI0 WP pin setting from DTS

WP pin is not implemented on Marzen

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221
Laurent Pinchart [Sat, 9 Nov 2013 12:23:58 +0000 (13:23 +0100)]
ARM: shmobile: kzm9g-reference: Use falling edge IRQ for LAN9221

The device is configured to generate an active-low interrupt signal that
is automatically deasserted without requiring any action from the host.
Configure the IRQ to trigger on falling edge.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221
Laurent Pinchart [Sat, 9 Nov 2013 12:23:57 +0000 (13:23 +0100)]
ARM: shmobile: bockw-reference: Use falling edge IRQ for LAN9221

The device is configured to generate an active-low interrupt signal that
is automatically deasserted without requiring any action from the host.
Configure the IRQ to trigger on falling edge.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221
Laurent Pinchart [Sat, 9 Nov 2013 12:23:56 +0000 (13:23 +0100)]
ARM: shmobile: marzen-reference: Use falling edge IRQ for LAN9221

The device is configured to generate an active-low interrupt signal that
is automatically deasserted without requiring any action from the host.
Use falling edge trigger as that is the configuration currently used on
the board.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use interrupt macros in board DT files
Laurent Pinchart [Sat, 9 Nov 2013 12:23:55 +0000 (13:23 +0100)]
ARM: shmobile: Use interrupt macros in board DT files

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use interrupt macros in SoC DT files
Laurent Pinchart [Tue, 19 Nov 2013 02:18:25 +0000 (03:18 +0100)]
ARM: shmobile: Use interrupt macros in SoC DT files

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use #include in device tree sources
Laurent Pinchart [Sat, 9 Nov 2013 12:23:53 +0000 (13:23 +0100)]
ARM: shmobile: Use #include in device tree sources

In order to allow usage of the preprocessor in the SoC device tree
sources, switch from /include/ to #include.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: enable HSPI0 on DTS
Kuninori Morimoto [Fri, 1 Nov 2013 01:22:53 +0000 (18:22 -0700)]
ARM: shmobile: bockw: enable HSPI0 on DTS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add HSPI suppport on DTSI
Kuninori Morimoto [Fri, 1 Nov 2013 01:22:21 +0000 (18:22 -0700)]
ARM: shmobile: r8a7778: add HSPI suppport on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add I2C support on DTSI
Kuninori Morimoto [Fri, 4 Oct 2013 06:44:15 +0000 (23:44 -0700)]
ARM: shmobile: r8a7778: add I2C support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: emev2: Add clock tree description in DT
Takashi Yoshii [Tue, 8 Oct 2013 05:33:07 +0000 (14:33 +0900)]
ARM: shmobile: emev2: Add clock tree description in DT

Add minimum clock tree description to .dts file.
This provides same set of clocks as current sh-clkfwk version .c
code does.

Signed-off-by: Takashi Yoshii <takasi-y@ops.dti.ne.jp>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: lager: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:38:16 +0000 (19:38 -0700)]
ARM: shmobile: lager: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:38:04 +0000 (19:38 -0700)]
ARM: shmobile: marzen: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:37:48 +0000 (19:37 -0700)]
ARM: shmobile: bockw: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: kzm9g: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:37:39 +0000 (19:37 -0700)]
ARM: shmobile: kzm9g: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: ape6evm: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:37:26 +0000 (19:37 -0700)]
ARM: shmobile: ape6evm: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: armadillo: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:37:14 +0000 (19:37 -0700)]
ARM: shmobile: armadillo: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name.

This patch removed un-used "touchscreen" label

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: sh73a0: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:36:22 +0000 (19:36 -0700)]
ARM: shmobile: sh73a0: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7790: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:36:13 +0000 (19:36 -0700)]
ARM: shmobile: r8a7790: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7779: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:36:02 +0000 (19:36 -0700)]
ARM: shmobile: r8a7779: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:35:42 +0000 (19:35 -0700)]
ARM: shmobile: r8a7778: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a73a4: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:35:31 +0000 (19:35 -0700)]
ARM: shmobile: r8a73a4: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name and related clock.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7740: tidyup DT node naming
Kuninori Morimoto [Tue, 22 Oct 2013 02:35:08 +0000 (19:35 -0700)]
ARM: shmobile: r8a7740: tidyup DT node naming

According to ePAPR spec,
this patch tidies up DT node name and related clock.

This patch also adds missing SDHI2 entry

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen: add SDHI support on DTS
Kuninori Morimoto [Fri, 11 Oct 2013 06:36:44 +0000 (23:36 -0700)]
ARM: shmobile: marzen: add SDHI support on DTS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7779: add SDHI support on DTSI
Kuninori Morimoto [Fri, 11 Oct 2013 06:36:22 +0000 (23:36 -0700)]
ARM: shmobile: r8a7779: add SDHI support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: add SDHI support on DTS
Kuninori Morimoto [Fri, 11 Oct 2013 06:36:01 +0000 (23:36 -0700)]
ARM: shmobile: bockw: add SDHI support on DTS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add SDHI support on DTSI
Kuninori Morimoto [Fri, 11 Oct 2013 06:35:46 +0000 (23:35 -0700)]
ARM: shmobile: r8a7778: add SDHI support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: fixup MMC pin conflict on DTS
Kuninori Morimoto [Fri, 11 Oct 2013 06:34:33 +0000 (23:34 -0700)]
ARM: shmobile: bockw: fixup MMC pin conflict on DTS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: add MMCIF support on DTS
Kuninori Morimoto [Fri, 4 Oct 2013 01:32:34 +0000 (18:32 -0700)]
ARM: shmobile: bockw: add MMCIF support on DTS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add MMCIF support on DTSI
Kuninori Morimoto [Fri, 4 Oct 2013 01:32:22 +0000 (18:32 -0700)]
ARM: shmobile: r8a7778: add MMCIF support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: remove manual PFC settings on reference
Kuninori Morimoto [Fri, 4 Oct 2013 01:32:01 +0000 (18:32 -0700)]
ARM: shmobile: bockw: remove manual PFC settings on reference

Current Bock-W reference is calling PFC initializer manually,
but now, it can use DTS PFC.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: add default PFC settings on DTS
Kuninori Morimoto [Fri, 4 Oct 2013 01:31:16 +0000 (18:31 -0700)]
ARM: shmobile: bockw: add default PFC settings on DTS

SCIF0 PFC setting is needed as default

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: Fix pin control device address in DT
Laurent Pinchart [Thu, 3 Oct 2013 17:35:41 +0000 (19:35 +0200)]
ARM: shmobile: r8a7778: Fix pin control device address in DT

The PFC device is erroneously declared at address 0xfffc000 instead of
0xfffc0000. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7791 Koelsch DT reference DTS bits
Magnus Damm [Tue, 8 Oct 2013 06:30:09 +0000 (15:30 +0900)]
ARM: shmobile: r8a7791 Koelsch DT reference DTS bits

Add DTS for the DT reference version of the Koelsch board support.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7791 GPIO device tree node
Magnus Damm [Tue, 8 Oct 2013 03:39:30 +0000 (12:39 +0900)]
ARM: shmobile: r8a7791 GPIO device tree node

Add GPIO controllers to the r8a7791 DTSI file.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7791 PFC device tree node
Magnus Damm [Tue, 8 Oct 2013 03:39:01 +0000 (12:39 +0900)]
ARM: shmobile: r8a7791 PFC device tree node

Add a DT node for the r8a7791 PFC device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: lager: add MMCIF support on DTS
Kuninori Morimoto [Mon, 7 Oct 2013 04:26:58 +0000 (21:26 -0700)]
ARM: shmobile: lager: add MMCIF support on DTS

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: lager: add default PFC settings on DTS
Kuninori Morimoto [Mon, 7 Oct 2013 04:26:40 +0000 (21:26 -0700)]
ARM: shmobile: lager: add default PFC settings on DTS

SCIF0/SCIF1 PFC setting is needed as default

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7779: tidyup I2C driver name on DTSI
Kuninori Morimoto [Fri, 4 Oct 2013 06:44:44 +0000 (23:44 -0700)]
ARM: shmobile: r8a7779: tidyup I2C driver name on DTSI

10e8d4f6dddb0f9dc408c2f2bde8399b243a42ca
(ARM: mach-shmobile: r8a7779: Minimal setup using DT)
added I2C driver, but it was SH-Mobile I2C.
R-Car H1 needs R-Car I2C driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add I2C support on DTSI
Kuninori Morimoto [Fri, 4 Oct 2013 06:44:15 +0000 (23:44 -0700)]
ARM: shmobile: r8a7778: add I2C support on DTSI

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7790: tidyup clock table order
Kuninori Morimoto [Tue, 19 Nov 2013 09:05:23 +0000 (01:05 -0800)]
ARM: shmobile: r8a7790: tidyup clock table order

SuperH lookups clock is using CLKDEV_CON/DEV/ICK_ID() macro
for a long term.
But in these days, the ICK clock is defined in random place.
This patch arranges it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7790: fixup I2C clock source
Kuninori Morimoto [Tue, 19 Nov 2013 09:04:35 +0000 (01:04 -0800)]
ARM: shmobile: r8a7790: fixup I2C clock source

I2C clock is based on P clock, not HP clock

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7790: care EXTAL divider settings
Kuninori Morimoto [Tue, 19 Nov 2013 09:04:20 +0000 (01:04 -0800)]
ARM: shmobile: r8a7790: care EXTAL divider settings

EXTAL clock frequency needs 1/2 when
(MD14, MD13, MD19) = (1, x, x).

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Add r8a7791 clocks for thermal devices
Magnus Damm [Wed, 20 Nov 2013 08:00:05 +0000 (17:00 +0900)]
ARM: shmobile: Add r8a7791 clocks for thermal devices

Add the r8a7791 thermal device as legacy clocks.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Add r8a7791 thermal platform device
Magnus Damm [Wed, 20 Nov 2013 07:59:56 +0000 (16:59 +0900)]
ARM: shmobile: Add r8a7791 thermal platform device

Add a thermal platform device for the legacy case
on the r8a7791 SoC. This keeps the r8a7791 in sync
with the r8a7790 sister device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Add r8a7790 clocks for thermal devices
Magnus Damm [Wed, 20 Nov 2013 07:59:39 +0000 (16:59 +0900)]
ARM: shmobile: Add r8a7790 clocks for thermal devices

Add the r8a7790 DT thermal device to the legacy clocks.

Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
Laurent Pinchart [Sat, 9 Nov 2013 12:33:48 +0000 (13:33 +0100)]
ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY

SH-Mobile platforms are transitioning from non-multiplatform to
multiplatform kernel. A new ARCH_SHMOBILE_MULTI configuration symbol has
been created to group all multiplatform-enabled SH-Mobile SoCs. The
existing ARCH_SHMOBILE configuration symbol groups SoCs that haven't
been converted yet.

This arrangement works fine for the arch/ code, but lots of drivers
needed on both ARCH_SHMOBILE and ARCH_SHMOBILE_MULTI depend on
ARCH_SHMOBILE only. In order to avoid changing them, rename
ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY, and create a new boolean
ARCH_SHMOBILE configuration symbol that is selected by both
ARCH_SHMOBILE_LEGACY and ARCH_SHMOBILE_MULTI.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7791: Add DU and LVDS clocks
Laurent Pinchart [Wed, 13 Nov 2013 13:01:42 +0000 (14:01 +0100)]
ARM: shmobile: r8a7791: Add DU and LVDS clocks

The ZX parent clock isn't implemented yet, add it as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Select USE_OF on EMEV2
Magnus Damm [Fri, 8 Nov 2013 10:09:34 +0000 (19:09 +0900)]
ARM: shmobile: Select USE_OF on EMEV2

Now when the legacy KZM9D board code is gone, make sure
USE_OF is selected in case of the EMEV2 SoC.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add HSPI clock support for DT
Kuninori Morimoto [Fri, 1 Nov 2013 01:22:39 +0000 (18:22 -0700)]
ARM: shmobile: r8a7778: add HSPI clock support for DT

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Remove legacy platform devices from EMEV2 SoC code
Magnus Damm [Wed, 6 Nov 2013 23:21:38 +0000 (08:21 +0900)]
ARM: shmobile: Remove legacy platform devices from EMEV2 SoC code

Now when KZM9D legacy C board support code is
gone then remove emev2_add_standard_devices()
and all the platform devices from setup-emev2.c.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Remove legacy KZM9D board code
Magnus Damm [Wed, 6 Nov 2013 23:21:29 +0000 (08:21 +0900)]
ARM: shmobile: Remove legacy KZM9D board code

Remove the C and platform device version of KZM9D.

The DT version of KZM9D board support can now instead
directly be used with SoC specific code in setup-emev2.c.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Use ->init_late() in shared EMEV2 case
Magnus Damm [Wed, 6 Nov 2013 23:21:20 +0000 (08:21 +0900)]
ARM: shmobile: Use ->init_late() in shared EMEV2 case

Hook up shmobile_init_late() to enable various
code such as suspend-to-RAM and CPUIdle.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Add shared EMEV2 code for ->init_machine()
Magnus Damm [Wed, 6 Nov 2013 23:21:11 +0000 (08:21 +0900)]
ARM: shmobile: Add shared EMEV2 code for ->init_machine()

Add a SoC specific function that initializes
clocks and starts DT probing in case of EMEV2.

This EMEV2 SoC support code may be built for
either legacy SHMOBILE or SMOBILE_MULTI.

The change allows us to support existing board
specific KZM9D DTB with these SoC specific
DT_MACHINE_START() callbacks.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Enable MTU2 on r7s72100
Magnus Damm [Wed, 6 Nov 2013 10:43:32 +0000 (19:43 +0900)]
ARM: shmobile: Enable MTU2 on r7s72100

Add MTU2 as r7s72100 system timer.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7790: add QSPI support
Hiep Cao Minh [Tue, 22 Oct 2013 02:21:11 +0000 (11:21 +0900)]
ARM: shmobile: r8a7790: add QSPI support

Adds support for QSPI on the r8a7790.

Signed-off-by: Hiep Cao Minh <cm-hiep@jinso.co.jp>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7790: Add USBHS clock support
Valentine Barshak [Wed, 9 Oct 2013 22:14:46 +0000 (02:14 +0400)]
ARM: shmobile: r8a7790: Add USBHS clock support

This adds USBHS clock support.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7779: add SDHI clock support for DT
Kuninori Morimoto [Fri, 11 Oct 2013 06:36:10 +0000 (23:36 -0700)]
ARM: shmobile: r8a7779: add SDHI clock support for DT

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add SDHI clock support for DT
Kuninori Morimoto [Fri, 11 Oct 2013 06:35:17 +0000 (23:35 -0700)]
ARM: shmobile: r8a7778: add SDHI clock support for DT

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add MMCIF clock support for DT
Kuninori Morimoto [Fri, 4 Oct 2013 01:32:10 +0000 (18:32 -0700)]
ARM: shmobile: r8a7778: add MMCIF clock support for DT

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Select GPIO in case of the r7s72100 SoC
Magnus Damm [Wed, 9 Oct 2013 22:57:42 +0000 (07:57 +0900)]
ARM: shmobile: Select GPIO in case of the r7s72100 SoC

The r7s72100 contains GPIO controllers so make sure the GPIO
subsystem can be built by selecting ARCH_WANT_OPTIONAL_GPIOLIB.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a73a4: don't use named irq for DMAEngine
Kuninori Morimoto [Tue, 8 Oct 2013 05:59:23 +0000 (22:59 -0700)]
ARM: shmobile: r8a73a4: don't use named irq for DMAEngine

sh-dma-engine driver doesn't care irq name.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7791 GPIO platform device support
Magnus Damm [Tue, 8 Oct 2013 03:39:39 +0000 (12:39 +0900)]
ARM: shmobile: r8a7791 GPIO platform device support

Add GPIO controller platform devices for the r8a7791 SoC.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Select GPIO in case of the r8a7791 SoC
Magnus Damm [Tue, 8 Oct 2013 03:39:20 +0000 (12:39 +0900)]
ARM: shmobile: Select GPIO in case of the r8a7791 SoC

Make it possible to build GPIO on r8a7791.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7791 PFC platform device support
Magnus Damm [Tue, 8 Oct 2013 03:39:10 +0000 (12:39 +0900)]
ARM: shmobile: r8a7791 PFC platform device support

Add a platform device for the r8a7791 PFC device.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Select IRQC in case of the r8a7791 SoC
Magnus Damm [Tue, 8 Oct 2013 03:16:08 +0000 (12:16 +0900)]
ARM: shmobile: Select IRQC in case of the r8a7791 SoC

The r8a7791 contains IRQC hardware so make sure
the driver gets built by selecting RENESAS_IRQC.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7779: add I2C clock for DT
Kuninori Morimoto [Fri, 4 Oct 2013 06:45:03 +0000 (23:45 -0700)]
ARM: shmobile: r8a7779: add I2C clock for DT

10e8d4f6dddb0f9dc408c2f2bde8399b243a42ca
(ARM: mach-shmobile: r8a7779: Minimal setup using DT)
added I2C driver for DT, but it didn't add clock.
This patch adds missing clock for I2C

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: r8a7778: add I2C clock for DT
Kuninori Morimoto [Fri, 4 Oct 2013 06:43:54 +0000 (23:43 -0700)]
ARM: shmobile: r8a7778: add I2C clock for DT

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig
Simon Horman [Fri, 8 Nov 2013 23:47:45 +0000 (08:47 +0900)]
ARM: shmobile: kzm9d: Enable AUTO_ZRELADDR in defconfig

This is required to allow the load address to be supplied
as an environment variable when building a uImage.

LOADADDR=0x40008000 ARCH=arm make uImage

This is necessary since "ARM: shmobile: Remove legacy KZM9D board code"

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: bockw: enable HPB-DMAC in defconfig
Sergei Shtylyov [Sat, 28 Sep 2013 20:11:28 +0000 (00:11 +0400)]
ARM: shmobile: bockw: enable HPB-DMAC in defconfig

Enable HPB-DMAC driver in 'bockw_defconfig'.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen: enable HPB-DMAC in defconfig
Sergei Shtylyov [Sat, 28 Sep 2013 20:12:33 +0000 (00:12 +0400)]
ARM: shmobile: marzen: enable HPB-DMAC in defconfig

Enable HPB-DMAC driver in 'marzen_defconfig'.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: marzen: Do not enable CONFIG_SMC911X in defconfig

CONFIG_SMC911X is not needed by marzen.
It appears to have been accidently enabled as well
as CONFIG_SMSC911X which is needed by marzen.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: marzen: Enable CONFIG_PACKET in defconfig

CONFIG_PACKET is required for the ISC dhcpd daemon function.
This change brings the marzen defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: bockw: Enable CONFIG_PACKET in defconfig

CONFIG_PACKET is required for the ISC dhcpd daemon function.
This change brings the bockw defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: marzen: Do not enable CONFIG_DEVTMPFS defconfig

This change brings the marzen defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: bockw: Do not enable CONFIG_DEVTMPFS defconfig

This change brings the bockw defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: marzen: Enable CONFIG_VFP in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: marzen: Enable CONFIG_VFP in defconfig

CONFIG_VFP is required to boot into a Debian armhf user-space.
This change brings the marzen defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: bockw: Enable CONFIG_VFP in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: bockw: Enable CONFIG_VFP in defconfig

CONFIG_VFP is required to boot into a Debian armhf user-space.
This change brings the bockw defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: marzen: Do not disable CONFIG_INOTIFY_USER in defconfig

CONFIG_INOTIFY_USER is required for udev to function.
This change brings the marzen defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: bockw: Do not disable CONFIG_INOTIFY_USER in defconfig

CONFIG_INOTIFY_USER is required for udev to function.
This change brings the bockw defconfig into line with
other shmobile defconfigs.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: marzen: Do not set command line in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: marzen: Do not set command line in defconfig

As a set towards moving shmobile towards multi-platform
the kernel command line should be set in the DTB rather than
in the kernel config.

marzen already has the command line present in its DTS file
but it was being overrirden by the kernel config.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: bockw: Do not set command line in defconfig
Simon Horman [Thu, 10 Oct 2013 06:12:17 +0000 (15:12 +0900)]
ARM: shmobile: bockw: Do not set command line in defconfig

As a set towards moving shmobile towards multi-platform
the kernel command line should be set in the DTB rather than
in the kernel config.

bockw already has the command line present in its DTS file
but it was being overrirden by the kernel config.

A side effect of this change is that "rw" is now present
on the command line which allows a boot using nfs root to
succeed in the case where userspace expects to be able
to write to the root filesystem.

Signed-off-by: Simon Horman <horms@verge.net.au>
10 years agoARM: shmobile: bockw: enable CONFIG_REGULATOR
Kuninori Morimoto [Fri, 4 Oct 2013 01:30:30 +0000 (18:30 -0700)]
ARM: shmobile: bockw: enable CONFIG_REGULATOR

CONFIG_REGULATOR is required from MMCIF and SMSC

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoARM: shmobile: Genmai defconfig
Magnus Damm [Wed, 2 Oct 2013 06:06:25 +0000 (15:06 +0900)]
ARM: shmobile: Genmai defconfig

Add a defconfig for the Genmai board. In the future this board will
use a shared defconfig for multiplatform, but until CCF is implemented
this will be used.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
10 years agoLinux 3.13-rc1 v3.13-rc1
Linus Torvalds [Fri, 22 Nov 2013 19:30:55 +0000 (11:30 -0800)]
Linux 3.13-rc1

10 years agoMerge tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux...
Linus Torvalds [Fri, 22 Nov 2013 18:58:14 +0000 (10:58 -0800)]
Merge tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs

Pull minor eCryptfs fix from Tyler Hicks:
 "Quiet static checkers by removing unneeded conditionals"

* tag 'ecryptfs-3.13-rc1-quiet-checkers' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
  eCryptfs: file->private_data is always valid

10 years agoMerge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Fri, 22 Nov 2013 18:57:31 +0000 (10:57 -0800)]
Merge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

Pull second set of sound fixes from Takashi Iwai:
 "A collection of small fixes in HD-audio quirks and runtime PM, ASoC
  rcar, abs8500 and other codecs.  Most of commits are for stable
  kernels, too"

* tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda - Set current_headset_type to ALC_HEADSET_TYPE_ENUM (janitorial)
  ALSA: hda - Provide missing pin configs for VAIO with ALC260
  ALSA: hda - Add headset quirk for Dell Inspiron 3135
  ALSA: hda - Fix the headphone jack detection on Sony VAIO TX
  ALSA: hda - Fix missing bass speaker on ASUS N550
  ALSA: hda - Fix unbalanced runtime PM notification at resume
  ASoC: arizona: Set FLL to free-run before disabling
  ALSA: hda - A casual Dell Headset quirk
  ASoC: rcar: fixup dma_async_issue_pending() timing
  ASoC: rcar: off by one in rsnd_scu_set_route()
  ASoC: wm5110: Add post SYSCLK register patch for rev D chip
  ASoC: ab8500: Revert to using custom I/O functions
  ALSA: hda - Also enable mute/micmute LED control for "Lenovo dock" fixup
  ALSA: firewire-lib: include sound/asound.h to refer to snd_pcm_format_t
  ALSA: hda - Select FW_LOADER from CONFIG_SND_HDA_CODEC_CA0132_DSP
  ALSA: hda - Enable mute/mic-mute LEDs for more Thinkpads with Realtek codec
  ASoC: rcar: fixup mod access before checking

10 years agoMerge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Linus Torvalds [Fri, 22 Nov 2013 18:56:11 +0000 (10:56 -0800)]
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Pull DRM fixes from Dave Airlie:
 "I was going to leave this until post -rc1 but sysfs fixes broke
  hotplug in userspace, so I had to fix it harder, otherwise a set of
  pulls from intel, radeon and vmware,

  The vmware/ttm changes are bit larger but since its early and they are
  unlikely to break anything else I put them in, it lets vmware work
  with dri3"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (36 commits)
  drm/sysfs: fix hotplug regression since lifetime changes
  drm/exynos: g2d: fix memory leak to userptr
  drm/i915: Fix gen3 self-refresh watermarks
  drm/ttm: Remove set_need_resched from the ttm fault handler
  drm/ttm: Don't move non-existing data
  drm/radeon: hook up backlight functions for CI and KV family.
  drm/i915: Replicate BIOS eDP bpp clamping hack for hsw
  drm/i915: Do not enable package C8 on unsupported hardware
  drm/i915: Hold pc8 lock around toggling pc8.gpu_idle
  drm/i915: encoder->get_config is no longer optional
  drm/i915/tv: add ->get_config callback
  drm/radeon/cik: Add macrotile mode array query
  drm/radeon/cik: Return backend map information to userspace
  drm/vmwgfx: Make vmwgfx dma buffers prime aware
  drm/vmwgfx: Make surfaces prime-aware
  drm/vmwgfx: Hook up the prime ioctls
  drm/ttm: Add a minimal prime implementation for ttm base objects
  drm/vmwgfx: Fix false lockdep warning
  drm/ttm: Allow execbuf util reserves without ticket
  drm/i915: restore the early forcewake cleanup
  ...

10 years agoMerge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
Linus Torvalds [Fri, 22 Nov 2013 18:53:47 +0000 (10:53 -0800)]
Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI updates from Bjorn Helgaas:
 "Miscellaneous
   - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
   - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"

* tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
  PCI: Fix whitespace, capitalization, and spelling errors

10 years agoMerge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
Linus Torvalds [Fri, 22 Nov 2013 18:52:03 +0000 (10:52 -0800)]
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

Pull SCSI target updates from Nicholas Bellinger:
 "Things have been quiet this round with mostly bugfixes, percpu
  conversions, and other minor iscsi-target conformance testing changes.

  The highlights include:

   - Add demo_mode_discovery attribute for iscsi-target (Thomas)
   - Convert tcm_fc(FCoE) to use percpu-ida pre-allocation
   - Add send completion interrupt coalescing for ib_isert
   - Convert target-core to use percpu-refcounting for se_lun
   - Fix mutex_trylock usage bug in iscsit_increment_maxcmdsn
   - tcm_loop updates (Hannes)
   - target-core ALUA cleanups + prep for v3.14 SCSI Referrals support (Hannes)

  v3.14 is currently shaping to be a busy development cycle in target
  land, with initial support for T10 Referrals and T10 DIF currently on
  the roadmap"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
  iscsi-target: chap auth shouldn't match username with trailing garbage
  iscsi-target: fix extract_param to handle buffer length corner case
  iscsi-target: Expose default_erl as TPG attribute
  target_core_configfs: split up ALUA supported states
  target_core_alua: Make supported states configurable
  target_core_alua: Store supported ALUA states
  target_core_alua: Rename ALUA_ACCESS_STATE_OPTIMIZED
  target_core_alua: spellcheck
  target core: rename (ex,im)plict -> (ex,im)plicit
  percpu-refcount: Add percpu-refcount.o to obj-y
  iscsi-target: Do not reject non-immediate CmdSNs exceeding MaxCmdSN
  iscsi-target: Convert iscsi_session statistics to atomic_long_t
  target: Convert se_device statistics to atomic_long_t
  target: Fix delayed Task Aborted Status (TAS) handling bug
  iscsi-target: Reject unsupported multi PDU text command sequence
  ib_isert: Avoid duplicate iscsit_increment_maxcmdsn call
  iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
  target: Core does not need blkdev.h
  target: Pass through I/O topology for block backstores
  iser-target: Avoid using FRMR for single dma entry requests
  ...