openwrt/staging/blogic.git
11 years agoARM: shmobile: r8a7740: Remove GETHER function GPIOs
Laurent Pinchart [Wed, 17 Apr 2013 23:06:57 +0000 (01:06 +0200)]
ARM: shmobile: r8a7740: Remove GETHER function GPIOs

Those GPIOs have been deprecated by the pinctrl API. They are unused and
unneeded, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: Remove BSC function GPIOs
Laurent Pinchart [Wed, 17 Apr 2013 23:06:57 +0000 (01:06 +0200)]
ARM: shmobile: r8a7740: Remove BSC function GPIOs

Those GPIOs have been deprecated by the pinctrl API. They are unused and
unneeded, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: Remove INTC function GPIOs
Laurent Pinchart [Wed, 17 Apr 2013 23:06:57 +0000 (01:06 +0200)]
ARM: shmobile: r8a7740: Remove INTC function GPIOs

Those GPIOs have been deprecated by the pinctrl API. They are unused and
unneeded, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7740: Remove SCIF function GPIOs
Laurent Pinchart [Wed, 17 Apr 2013 23:06:57 +0000 (01:06 +0200)]
ARM: shmobile: r8a7740: Remove SCIF function GPIOs

Those GPIOs have been deprecated by the pinctrl API. They are unused and
unneeded, remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl
Bastian Hecht [Wed, 17 Apr 2013 10:34:02 +0000 (10:34 +0000)]
ARM: shmobile: armadillo800eva: Convert SCIFA1 to pinctrl

We use the new pinctrl framework now.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove HDMI function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove HDMI function GPIOS

All r8a7740 platforms now use the pinctrl API to control the HDMI pins,
the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove FSI function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove FSI function GPIOS

All r8a7740 platforms now use the pinctrl API to control the FSI pins,
the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove CEU function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove CEU function GPIOS

All r8a7740 platforms now use the pinctrl API to control the CEU pins,
the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove GETHER function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove GETHER function GPIOS

All r8a7740 platforms now use the pinctrl API to control the GETHER
pins, the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove BSC function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove BSC function GPIOS

All r8a7740 platforms now use the pinctrl API to control the BSC pins,
the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove INTC function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove INTC function GPIOS

All r8a7740 platforms now use the pinctrl API to control the INTC pins,
the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Remove SCIF function GPIOS
Laurent Pinchart [Wed, 17 Apr 2013 23:05:50 +0000 (01:05 +0200)]
sh-pfc: r8a7740: Remove SCIF function GPIOS

All r8a7740 platforms now use the pinctrl API to control the SCIF pins,
the corresponding function GPIOS are unused. Remove them.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bonito: Don't configure LCDC routing manually
Laurent Pinchart [Mon, 22 Apr 2013 22:17:58 +0000 (00:17 +0200)]
ARM: shmobile: bonito: Don't configure LCDC routing manually

LCDC routing is configured automatically in the PFC driver, don't
configure it manually in board code.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bonito: Register pinctrl mapping for BSC
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: bonito: Register pinctrl mapping for BSC

Replace the GPIO-based BSC pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bonito: Register pinctrl mapping for INTC
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: bonito: Register pinctrl mapping for INTC

Replace the GPIO-based INTC pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bonito: Register pinctrl mapping for SCIF
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: bonito: Register pinctrl mapping for SCIF

Replace the GPIO-based SCIF pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: bonito: Remove empty core devices array
Laurent Pinchart [Wed, 17 Apr 2013 23:27:32 +0000 (01:27 +0200)]
ARM: shmobile: bonito: Remove empty core devices array

The core devices array is empty, passing it to platform_add_devices() is
a no-op. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Replace GPIO_PORTx with GPIO port numbers
Laurent Pinchart [Mon, 22 Apr 2013 22:32:52 +0000 (00:32 +0200)]
ARM: shmobile: armadillo800eva: Replace GPIO_PORTx with GPIO port numbers

The PFC GPIO API implementation moved to using port numbers. Replace all
GPIO_PORTx enum usage with the corresponding port number. The GPIO_PORTx
enum values are identical to the port number on this platform.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Don't configure LCDC routing manually
Laurent Pinchart [Mon, 22 Apr 2013 22:17:58 +0000 (00:17 +0200)]
ARM: shmobile: armadillo800eva: Don't configure LCDC routing manually

LCDC routing is configured automatically in the PFC driver, don't
configure it manually in board code.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Register pinctrl mapping for HDMI
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: armadillo800eva: Register pinctrl mapping for HDMI

Replace the GPIO-based HDMI pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Register pinctrl mapping for FSI
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: armadillo800eva: Register pinctrl mapping for FSI

Replace the GPIO-based FSI pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Register pinctrl mapping for CEU0
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: armadillo800eva: Register pinctrl mapping for CEU0

Replace the GPIO-based CEU0 pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Register pinctrl mapping for GETHER
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: armadillo800eva: Register pinctrl mapping for GETHER

Replace the GPIO-based GETHER pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC
Laurent Pinchart [Wed, 17 Apr 2013 23:18:41 +0000 (01:18 +0200)]
ARM: shmobile: armadillo800eva: Register pinctrl mapping for INTC

Replace the GPIO-based INTC pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Hardcode the LCDC0 output
Laurent Pinchart [Fri, 19 Apr 2013 09:52:59 +0000 (11:52 +0200)]
sh-pfc: r8a7740: Hardcode the LCDC0 output

The r8a7740 has two LCDC units and two sets of LCDC output signals. By
default LCDC0 is routed to the LCD0 signals, and LCDC1 to the LCD1
signals. However, LCDC1 can be routed to the LCD0 signals by setting bit
MSEL6 in MSEL3CR (the LCD0 signals are further pinmuxed the usual way).

This could be configured by duplicating the LCD0 pin groups for LCDC1.
However, this would unnecessarily complicate the LCD pin groups, as no
r8a7740 board supported in mainline use such a configuration. Hardcode
the MSEL3CR MSEL6 bit to 0 for now.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add HDMI pin groups and functions
Laurent Pinchart [Wed, 17 Apr 2013 23:04:30 +0000 (01:04 +0200)]
sh-pfc: r8a7740: Add HDMI pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add FSI pin groups and functions
Laurent Pinchart [Wed, 17 Apr 2013 23:04:30 +0000 (01:04 +0200)]
sh-pfc: r8a7740: Add FSI pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add CEU pin groups and functions
Laurent Pinchart [Wed, 17 Apr 2013 23:04:30 +0000 (01:04 +0200)]
sh-pfc: r8a7740: Add CEU pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add GETHER pin groups and functions
Laurent Pinchart [Wed, 17 Apr 2013 23:04:30 +0000 (01:04 +0200)]
sh-pfc: r8a7740: Add GETHER pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add BSC pin groups and functions
Laurent Pinchart [Wed, 17 Apr 2013 23:04:30 +0000 (01:04 +0200)]
sh-pfc: r8a7740: Add BSC pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Declare missing INTC function
Laurent Pinchart [Thu, 18 Apr 2013 08:54:18 +0000 (10:54 +0200)]
sh-pfc: r8a7740: Declare missing INTC function

When adding the INTC pin groups the INTC function hasn't been added to
the functions list. Fix it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add SCIF pin groups and functions
Laurent Pinchart [Wed, 17 Apr 2013 23:04:30 +0000 (01:04 +0200)]
sh-pfc: r8a7740: Add SCIF pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add bias (pull-up/down) pinconf support
Laurent Pinchart [Tue, 23 Apr 2013 12:24:19 +0000 (14:24 +0200)]
sh-pfc: sh7372: Add bias (pull-up/down) pinconf support

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: sh7372: Remove all GPIOs
Laurent Pinchart [Sun, 21 Apr 2013 22:05:41 +0000 (00:05 +0200)]
ARM: shmobile: sh7372: Remove all GPIOs

Function GPIOs are not used anymore, and all code use the GPIO numbers
directly. Remove the GPIOs enumeration.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Remove function GPIOs
Laurent Pinchart [Sun, 21 Apr 2013 22:05:16 +0000 (00:05 +0200)]
sh-pfc: sh7372: Remove function GPIOs

No sh7372 platform use the function GPIOs API. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Replace GPIO_PORTx enum with GPIO port numbers
Laurent Pinchart [Sun, 21 Apr 2013 22:02:06 +0000 (00:02 +0200)]
sh-pfc: sh7372: Replace GPIO_PORTx enum with GPIO port numbers

The PFC GPIO API implementation moved to using port numbers. Replace all
GPIO_PORTx enum usage with the corresponding port number. The GPIO_PORTx
enum values are identical to the port number on this platform.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for USBHS
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for USBHS

Replace the GPIO-based USBHS pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for TSC2007
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for TSC2007

Replace the GPIO-based TSC2007 pinmux configuration by a pinctrl
mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Simplify tsc2007 pen state read function
Laurent Pinchart [Sun, 21 Apr 2013 16:56:15 +0000 (18:56 +0200)]
ARM: shmobile: ap4evb: Simplify tsc2007 pen state read function

The pen state is retrieved by reading the state of a pin used as an IRQ.
There's no need to reconfigure the pin as a pure GPIO, as the IRQ pin
state can be read.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for SMSC911x
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for SMSC911x

Replace the GPIO-based SMSC911x pinmux configuration by a pinctrl
mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for SCIF
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for SCIF

Replace the GPIO-based SCIF pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for LCD
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for LCD

Replace the GPIO-based LCD pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for KEYSC
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for KEYSC

Replace the GPIO-based KEYSC pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for HDMI
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for HDMI

Replace the GPIO-based HDMI pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for FSI
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for FSI

Replace the GPIO-based FSI pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: ap4evb: Register pinctrl mapping for CEU
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: ap4evb: Register pinctrl mapping for CEU

Replace the GPIO-based CEU pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for USBHS
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for USBHS

Replace the GPIO-based USBHS pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for TCA6416
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for TCA6416

Replace the GPIO-based TCA6416 pinmux configuration by a pinctrl
mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for ST1232
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for ST1232

Replace the GPIO-based ST1232 pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for SMSC911x
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for SMSC911x

Replace the GPIO-based SMSC911x pinmux configuration by a pinctrl
mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register IRQ pinctrl mapping for SDHI0
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register IRQ pinctrl mapping for SDHI0

Replace the GPIO-based SDHI0 IRQ pinmux configuration by a pinctrl
mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for SCIF
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for SCIF

Replace the GPIO-based SCIF pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for LCD
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for LCD

Replace the GPIO-based LCD pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for HDMI
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for HDMI

Replace the GPIO-based HDMI pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for FSI
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for FSI

Replace the GPIO-based FSI pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for FLCTL
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for FLCTL

Replace the GPIO-based FLCTL pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for CEU
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for CEU

Replace the GPIO-based CEU pinmux configuration by a pinctrl mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: mackerel: Register pinctrl mapping for the ADXL34X
Laurent Pinchart [Fri, 19 Apr 2013 11:29:48 +0000 (13:29 +0200)]
ARM: shmobile: mackerel: Register pinctrl mapping for the ADXL34X

Replace the GPIO-based ADXL34X pinmux configuration by a pinctrl
mapping.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add USB pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add USB pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add SCIF pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add SCIF pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add LCDC pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add LCDC pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add KEYSC pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add KEYSC pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add INTC pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add INTC pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add HDMI pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add HDMI pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add FSI pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add FSI pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add FLCTL pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add FLCTL pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add CEU pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add CEU pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: sh7372: Add BSC pin groups and functions
Laurent Pinchart [Fri, 19 Apr 2013 10:31:08 +0000 (12:31 +0200)]
sh-pfc: sh7372: Add BSC pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: add SDHI support
Kuninori Morimoto [Fri, 19 Apr 2013 03:08:23 +0000 (20:08 -0700)]
sh-pfc: r8a7778: add SDHI support

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7778: add common PFC macro helper
Kuninori Morimoto [Fri, 19 Apr 2013 03:07:34 +0000 (20:07 -0700)]
sh-pfc: r8a7778: add common PFC macro helper

pfc-r8a7778 will have many devices pfc support in the future,
and current pfc-r8a7778 is using pin/mux definition macro for SCIF.
The device definition style using macro is readable code IMO,
but creating new macro for each devices is not good sense.
This patch adds common SH_PFC_xx() macro for each new feature devices

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7779: add VIN pin groups
Vladimir Barinov [Tue, 16 Apr 2013 22:17:28 +0000 (22:17 +0000)]
sh-pfc: r8a7779: add VIN pin groups

Add VIN DATA[0:7]/CLK/HSYNC/VSYNC pin groups to R8A7779 PFC driver.

Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
[horms+renesas@verge.net.au: trivial rebase on top of
 "sh-pfc: r8a7779: Don't group USB OVC and PENC pins"]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7779: use RCAR_GP_PIN() on _GP_GPIO() macro
Kuninori Morimoto [Tue, 9 Apr 2013 04:54:18 +0000 (04:54 +0000)]
sh-pfc: r8a7779: use RCAR_GP_PIN() on _GP_GPIO() macro

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7779: Replace hardcoded pin numbers with RCAR_GP_PIN macro
Laurent Pinchart [Mon, 8 Apr 2013 10:05:31 +0000 (12:05 +0200)]
sh-pfc: r8a7779: Replace hardcoded pin numbers with RCAR_GP_PIN macro

Use the RCAR_GP_PIN macro to convert from the documentation pin number
space to the linear pinctrl space.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7740: Add SCIFA1 data group
Bastian Hecht [Wed, 17 Apr 2013 10:34:01 +0000 (10:34 +0000)]
sh-pfc: r8a7740: Add SCIFA1 data group

Add SCIFA1 as preparation to switch to pinctrl in board files.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: Add r8a7778 pinmux support
Kuninori Morimoto [Fri, 12 Apr 2013 05:37:20 +0000 (05:37 +0000)]
sh-pfc: Add r8a7778 pinmux support

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
11 years agosh-pfc: r8a7790: Don't use GPIO enum entries
Laurent Pinchart [Mon, 8 Apr 2013 09:36:20 +0000 (11:36 +0200)]
sh-pfc: r8a7790: Don't use GPIO enum entries

Refactor the GPIO macro magic to use GPIO numbers directly instead of
the GPIO_GP_x_y enum entries. This will allow removing the GPIO enum
entries from the mach/r8a7790.h header.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7790: Remove function GPIOs
Laurent Pinchart [Mon, 8 Apr 2013 09:36:19 +0000 (11:36 +0200)]
sh-pfc: r8a7790: Remove function GPIOs

No r8a7770 platform use the function GPIOs API. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: fixed typo in changelog: r8a7779 -> r8a7770]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7790: Remove GPIO data
Laurent Pinchart [Mon, 8 Apr 2013 09:36:18 +0000 (11:36 +0200)]
sh-pfc: r8a7790: Remove GPIO data

GPIOs are now handled by a separate driver, remove GPIO data from the
SoC information structure.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7790: Add SCIF, SCIFA and SCIFB pin groups and functions
Laurent Pinchart [Mon, 8 Apr 2013 09:36:16 +0000 (11:36 +0200)]
sh-pfc: r8a7790: Add SCIF, SCIFA and SCIFB pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7790: Add INTC pin groups and functions
Laurent Pinchart [Mon, 8 Apr 2013 09:36:15 +0000 (11:36 +0200)]
sh-pfc: r8a7790: Add INTC pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7790: Add ETH pin groups and functions
Laurent Pinchart [Mon, 8 Apr 2013 09:36:14 +0000 (11:36 +0200)]
sh-pfc: r8a7790: Add ETH pin groups and functions

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: Remove dependency on GPIOLIB
Laurent Pinchart [Tue, 9 Apr 2013 14:06:01 +0000 (14:06 +0000)]
sh-pfc: Remove dependency on GPIOLIB

Make GPIO support optional for platforms that don't support GPIOLIB.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: Add entries for INTC external IRQs
Bastian Hecht [Tue, 9 Apr 2013 10:48:50 +0000 (10:48 +0000)]
sh-pfc: Add entries for INTC external IRQs

We add all necessary entries to support the external IRQs from the INTC.

Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: Initial r8a7790 PFC support
Koji Matsuoka [Mon, 8 Apr 2013 02:08:53 +0000 (11:08 +0900)]
sh-pfc: Initial r8a7790 PFC support

Add initial PFC support for the r8a7790 SoC.

At this point only GPIO interface is supported, move to
newer interfaces planned as incremental changes.

Original authors is Koji Matsuoka-san, thanks for him
and his team for the heavy lifting. Adjusted by Magnus
to work together with updated code in drivers/pinctrl.

Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@rms.renesas.com>
Signed-off-by: Magnus Damm <damm@opensource.se>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: r8a7778: Register PFC device
Kuninori Morimoto [Fri, 12 Apr 2013 05:37:50 +0000 (05:37 +0000)]
ARM: shmobile: r8a7778: Register PFC device

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>
11 years agoARM: shmobile: add GPIO IRQ macro
Kuninori Morimoto [Thu, 18 Apr 2013 06:41:30 +0000 (23:41 -0700)]
ARM: shmobile: add GPIO IRQ macro

R-Car series gpio_rcar driver can control GPIO IRQ today.
It needs base IRQ number for gpio_rcar_config :: .irq_base
This patch adds macro for GPIO IRQ.
This patch was tested on Bock-W board

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agogpio-rcar: Add RCAR_GP_PIN macro
Laurent Pinchart [Mon, 8 Apr 2013 09:36:13 +0000 (11:36 +0200)]
gpio-rcar: Add RCAR_GP_PIN macro

Pins are numbered in the R-Car family documentation using a bank number
and a pin number in the bank. As the Linux pin number space is linear,
we need to flatten this by multiplying the bank number by 32 and adding
the pin number. The resulting number bear no directly visible
relationship  to the documentation, making it error-prone.

Add a RCAR_GP_PIN macro to convert from the documentation pin number
space to the linear Linux space.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[horms+renesas@verge.net.au: non-trivial rebase on top of
 "sh-pfc: r8a7779: Don't group USB OVC and PENC pins"]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agogpio-rcar: Add support for IRQ_TYPE_EDGE_BOTH
Simon Horman [Fri, 24 May 2013 09:47:24 +0000 (18:47 +0900)]
gpio-rcar: Add support for IRQ_TYPE_EDGE_BOTH

As hardware support for this feature is not universal for all SoCs a flag,
has_both_edge_trigger, has been added to the platform data of the driver to
allow this feature to be enabled.

The motivation for this is to allow use of the gpio-keys driver on the
lager board which is based on the r8a7790 SoC. The V2 of this patch has been
fully exercised using that driver on that board.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agogpio-rcar: Make the platform data gpio_base field signed
Laurent Pinchart [Fri, 10 May 2013 14:48:36 +0000 (16:48 +0200)]
gpio-rcar: Make the platform data gpio_base field signed

The gpio_base field is used to specify the desired GPIO base for the
GPIO controller. The GPIO core can automatically allocate a GPIO number
range when the base is set to -1. To make this possible, make the field
signed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agogpio-rcar: R-Car GPIO IRQ share interrupt
Kuninori Morimoto [Thu, 18 Apr 2013 06:40:57 +0000 (23:40 -0700)]
gpio-rcar: R-Car GPIO IRQ share interrupt

R-Car H1 or Gen2 GPIO interrupts are assigned per each GPIO domain,
but, Gen1 E1/M1 GPIO interrupts are shared for all GPIO domain.
gpio-rcar driver needs IRQF_SHARED flags for these.
This patch was tested on Bock-W board

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoARM: shmobile: sh73a0: Update CMT clockevent rating to 80
Simon Horman [Wed, 22 May 2013 10:47:05 +0000 (19:47 +0900)]
ARM: shmobile: sh73a0: Update CMT clockevent rating to 80

Update the CMT clockevent rating from 125 to 80.

This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
Avoid dummy clockevent being preferred over real").

The patch noted above reduces the rating of dummy clockevent from 400 to 100.
This patch reduces the rating of CMT so that it is once again less than that
of the dummy clockevent.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agosh-pfc: r8a7779: Don't group USB OVC and PENC pins
Laurent Pinchart [Tue, 21 May 2013 10:39:31 +0000 (12:39 +0200)]
sh-pfc: r8a7779: Don't group USB OVC and PENC pins

The USB_OVCn pins are alternate options for USB over-current detection
when using a 3.3V USB interface. As they're not mandatory they can be
used independently of the USB PENC pins. Don't group the USB_OVCn and
PENC pins to avoid conflicts when the USB_OVCn pins are used by another
function.

Reported-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
11 years agoLinux 3.10-rc2
Linus Torvalds [Mon, 20 May 2013 21:37:38 +0000 (14:37 -0700)]
Linux 3.10-rc2

11 years agoMerge tag 'stable/for-linus-3.10-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...
Linus Torvalds [Mon, 20 May 2013 21:25:19 +0000 (14:25 -0700)]
Merge tag 'stable/for-linus-3.10-rc1-tag' of git://git./linux/kernel/git/konrad/xen

Pull Xen fixes from Konrad Rzeszutek Wilk:
 - Regression fix in xen privcmd fixing a memory leak.
 - Add Documentation for tmem driver.
 - Simplify and remove code in the tmem driver.
 - Cleanups.

* tag 'stable/for-linus-3.10-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: Fixed assignment error in if statement
  xen/xenbus: Fixed over 80 character limit issue
  xen/xenbus: Fixed indentation error in switch case
  xen/tmem: Don't use self[ballooning|shrinking] if frontswap is off.
  xen/tmem: Remove the usage of '[no|]selfballoon' and use 'tmem.selfballooning' bool instead.
  xen/tmem: Remove the usage of 'noselfshrink' and use 'tmem.selfshrink' bool instead.
  xen/tmem: Remove the boot options and fold them in the tmem.X parameters.
  xen/tmem: s/disable_// and change the logic.
  xen/tmem: Fix compile warning.
  xen/tmem: Split out the different module/boot options.
  xen/tmem: Move all of the boot and module parameters to the top of the file.
  xen/tmem: Cleanup. Remove the parts that say temporary.
  xen/privcmd: fix condition in privcmd_close()

11 years agoMerge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
Linus Torvalds [Mon, 20 May 2013 18:36:52 +0000 (11:36 -0700)]
Merge tag 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:

 - Error path fixes for abituguru and iio_hwmon drivers.

 - Drop erroneously created attributes from nct6775 driver.

 - Drop redundant safety on cache lifetime for tmp401 driver.

 - Add explicit maintainer for LM95234 and TMP401 drivers.

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  MAINTAINERS: Add myself as maintainer for LM95234 and TMP401 drivers
  hwmon: (tmp401) Drop redundant safety on cache lifetime
  hwmon: fix error return code in abituguru_probe()
  hwmon: (iio_hwmon) Fix null pointer dereference
  hwmon: (nct6775) Do not create non-existing attributes
  hwmon: (iio_hwmon) Fix missing iio_channel_release_all call if devm_kzalloc fail

11 years agox86: Fix bit corruption at CPU resume time
Linus Torvalds [Mon, 20 May 2013 18:36:03 +0000 (11:36 -0700)]
x86: Fix bit corruption at CPU resume time

In commit 78d77df71510 ("x86-64, init: Do not set NX bits on non-NX
capable hardware") we added the early_pmd_flags that gets the NX bit set
when a CPU supports NX. However, the new variable was marked __initdata,
because the main _use_ of this is in an __init routine.

However, the bit setting happens from secondary_startup_64(), which is
called not only at bootup, but on every secondary CPU start.  Including
resuming from STR and at CPU hotplug time.  So the value cannot be
__initdata.

Reported-bisected-and-tested-by: Michal Hocko <mhocko@suse.cz>
Cc: stable@vger.kernel.org # v3.9
Acked-by: Peter Anvin <hpa@linux.intel.com>
Cc: Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoxen: Fixed assignment error in if statement
Lisa Nguyen [Thu, 16 May 2013 05:59:40 +0000 (22:59 -0700)]
xen: Fixed assignment error in if statement

Fixed assignment error in if statement in balloon.c

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
11 years agoxen/xenbus: Fixed over 80 character limit issue
Lisa Nguyen [Thu, 16 May 2013 06:48:03 +0000 (23:48 -0700)]
xen/xenbus: Fixed over 80 character limit issue

Fixed the format length of the xenbus_backend_ioctl()
function to meet the 80 character limit in
xenbus_dev_backend.c

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
11 years agoxen/xenbus: Fixed indentation error in switch case
Lisa Nguyen [Thu, 16 May 2013 06:47:11 +0000 (23:47 -0700)]
xen/xenbus: Fixed indentation error in switch case

Fixed the indentation error in the switch case in
xenbus_dev_backend.c

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
11 years agoMerge tag 'pinctrl-fixes-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Mon, 20 May 2013 14:59:46 +0000 (07:59 -0700)]
Merge tag 'pinctrl-fixes-v3.10-2' of git://git./linux/kernel/git/linusw/linux-pinctrl

Pull pinctrl fixes from Linus Walleij:

 - Three fixes to make the boot path for device tree work properly on
   the Nomadik pin controller.

 - Compile warning fix for the vt8500 driver.

 - Fix error path in pinctrl-single.

 - Free mappings in error path of the Lantiq controller.

 - Documentation fixes.

* tag 'pinctrl-fixes-v3.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  pinctrl/lantiq: Free mapping configs for both pin and groups
  pinctrl: single: fix error return code in pcs_parse_one_pinctrl_entry()
  pinctrl: generic: Fix typos and clarify comments
  pinctrl: vt8500: Fix incorrect data in WM8750 pinctrl table
  pinctrl: abx500: Rejiggle platform data and DT initialisation
  pinctrl: abx500: Specify failed sub-driver by ID instead of driver_data