aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux into next/dtOlof Johansson2013-04-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Maxime Ripard: SunXi dt additions for 3.10, take 3 - Remove sunxi.dtsi and only use one dtsi for each SoC - Various compatible renamings to be consistent with the other platforms * tag 'sunxi-dt-for-3.10-3' of git://github.com/mripard/linux: ARM: sunxi: dt: Update watchdog compatible string ARM: sunxi: dt: Update interrupt controller compatible string ARM: sunxi: dt: Update timer compatible string ARM: sunxi: dt: Reorganize the dtsi Signed-off-by: Olof Johansson <olof@lixom.net>
| * ARM: sunxi: dt: Update watchdog compatible stringMaxime Ripard2013-04-08
| | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * ARM: sunxi: dt: Update interrupt controller compatible stringMaxime Ripard2013-04-08
| | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * ARM: sunxi: dt: Update timer compatible stringMaxime Ripard2013-04-08
| | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * ARM: sunxi: dt: Reorganize the dtsiMaxime Ripard2013-04-08
| | | | | | | | | | | | | | | | | | In the early days, the A10 and A13 shared quite some code. Nowadays it shares less and less code, the A31 diverging even more, so it doesn't make much sense to continue to maintain this structure, just use one DTSI for every SoC, and that's it. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* | Merge tag 'tegra-for-3.10-fixes-for-mmc' of ↵Arnd Bergmann2013-04-09
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/dt From Stephen Warren <swarren@wwwdotorg.org>: ARM: tegra: DT-related fixes needed by the MMC tree In order to convert the Tegra MMC driver to using mmc_of_parse(), some bugs in the Tegra device-tree content need to be fixed first; it's currently wrong but unused, and mmc_of_parse() causes that data to be used for the first time. * tag 'tegra-for-3.10-fixes-for-mmc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra: ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc host Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | ARM: dts: tegra: fix the activate polarity of cd-gpio in mmc hostJoseph Lo2013-03-11
| | | | | | | | | | | | | | | | | | | | | | | | The GPIO pin of SD slot card detection should active low. Signed-off-by: Joseph Lo <josephl@nvidia.com> Tested-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Stephen Warren <swarren@nvidia.com>
* | | Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann2013-04-09
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Nicolas Ferre <nicolas.ferre@atmel.com>: One macb DT node move for 9x5 family: 9g15 doesn't have an Ethernet interface. Little fixes mainly related to at91sam9x5 DT, IIO ADC bindings, pinctrl for at91sam9260/g20 DT and the RTC addition. Addition of the Acme Systems Aria G25 board. * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encoding ARM: at91: dts: add adc resolution stuff ARM: at91: add Acme Systems Aria G25 board ARM: at91/dt: fix macb node declaration ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi ARM: at91/trivial: fix model name for SAM9G15-EK ARM: at91/trivial: typos in compatible property ARM: at91/at91sam9x5: add RTC node Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | ARM: at91/at91sam9260.dtsi: fix u(s)art pinctrl encodingDouglas Gilbert2013-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Douglas Gilbert <dgilbert@interlog.com> [nicolas.ferre@atmel.com: fix rts/cts for usart3] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: stable <stable@vger.kernel.org> [3.8+]
| * | | ARM: at91: dts: add adc resolution stuffLudovic Desroches2013-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ADC low and high resolution configuration and which one to use. Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: add Acme Systems Aria G25 boardDouglas Gilbert2013-04-04
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Douglas Gilbert <dgilbert@interlog.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91/dt: fix macb node declarationNicolas Ferre2013-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Macb0 node cannot be activated in generic sam9x5ek.dtsi file as the sam9g15 does not have one. Move the macb0 & macb1 activation in board .dts file that support them. Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsiNicolas Ferre2013-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the malformed "mem=" bootargs parameter in at91sam9x5ek.dtsi Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: stable <stable@vger.kernel.org> # 3.8+
| * | | ARM: at91/trivial: fix model name for SAM9G15-EKNicolas Ferre2013-03-26
| | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: stable <stable@vger.kernel.org> # 3.8+
| * | | ARM: at91/trivial: typos in compatible propertyNicolas Ferre2013-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - unneeded whitespace - missing double quote Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Cc: stable <stable@vger.kernel.org> # 3.8+
| * | | ARM: at91/at91sam9x5: add RTC nodeNicolas Ferre2013-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* | | | Merge tag 'sunxi-dt-for-3.10-2' of git://github.com/mripard/linux into next/dtArnd Bergmann2013-04-08
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Maxime Ripard <maxime.ripard@free-electrons.com>: ARM: sunxi: dt additions for 3.10, take 2 - Rename the clock compatible introduced in the first pull request for 3.10 - Complete the UART support for A13 and A10 - Adds clock gates support * tag 'sunxi-dt-for-3.10-2' of git://github.com/mripard/linux: arm: sunxi: Add clock to pinctrl node arm: sunxi: use the right clock phandles for UARTs arm: sunxi: Add clock definitions for AXI, AHB, APB0, APB1 gates ARM: sunxi: cubieboard: Add UART muxing ARM: sunxi: hackberry: Add UART muxing ARM: sunxi: dt: Add A10 UARTs to the dtsi. ARM: sunxi: dt: Add uart3 dt node ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsi ARM: sunxi: Rename uart nodes to serial ARM: sunxi: dt: Use clocks property instead of clock-frequency for the UARTs arm: sunxi: rename clock compatible strings Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | arm: sunxi: Add clock to pinctrl nodeEmilio López2013-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The port controller needs the apb0_pio clock enabled to be able to work. This commit declares that on the device tree. Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | arm: sunxi: use the right clock phandles for UARTsEmilio López2013-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the UARTs are connected to clock gates; now that our clock driver is able to handle them, make the switch. Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | arm: sunxi: Add clock definitions for AXI, AHB, APB0, APB1 gatesEmilio López2013-04-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds the corresponding DT bindings for all the AXI, AHB, APB0 and APB1 gates. Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | ARM: sunxi: cubieboard: Add UART muxingEmilio López2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously relied on the bootloader to do the muxing of the UART for the Cubieboard. Don't rely on it anymore and use pinctrl. Also remove uart1, as it is not enabled by default and it's not exposed on the board headers. Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | ARM: sunxi: hackberry: Add UART muxingMaxime Ripard2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We previously relied on the bootloader to do the muxing of the UART for the Hackberry. Don't rely on it anymore and use pinctrl. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar>
| * | | ARM: sunxi: dt: Add A10 UARTs to the dtsi.Maxime Ripard2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Allwinner A10 SoC has 8 available UARTs, which is 6 more than on the A13, so add the missing UARTs to the sun4i-a10 dtsi. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar>
| * | | ARM: sunxi: dt: Add uart3 dt nodeMaxime Ripard2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both A10 and A13 Allwinner SoCs have a Synopsys APB uart3 device available, so add it to the sunxi.dtsi file Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar>
| * | | ARM: sunxi: dt: Move uart0 to sun4i-a10.dtsiMaxime Ripard2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UART0 is only available on the Allwinner A10 SoCs, and not on the A13, so move the uart0 node to sun4i-a10.dtsi. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar> Tested-by: Emilio López <emilio@elopez.com.ar>
| * | | ARM: sunxi: Rename uart nodes to serialMaxime Ripard2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The other architecture use serial@address for their uart nodes, so rename our uart dt nodes to be consistent Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | ARM: sunxi: dt: Use clocks property instead of clock-frequency for the UARTsMaxime Ripard2013-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will be especially useful when we will have the clock definitions in the device tree. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Emilio López <emilio@elopez.com.ar> Tested-by: Emilio López <emilio@elopez.com.ar>
| * | | arm: sunxi: rename clock compatible stringsEmilio López2013-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the introduction of the Allwinner SoC platforms, sunxi was initially meant as a generic name for all the variants of the Allwinner SoC. It was ok at the time of the support of only the A10 and A13 that look pretty much the same; but it's beginning to be troublesome with the future addition of the Allwinner A31 (sun6i) that is quite different, and would introduce some weird logic, where sunxi would actually mean in some case sun4i and sun5i but without sun6i... Moreover, it makes the compatible strings naming scheme not consistent with other architectures, where usually for this kind of compability, we just use the oldest SoC name that has this IP, so let's do just this. Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* | | | Merge tag 'bcm2835-for-3.10-dt' of ↵Arnd Bergmann2013-04-08
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi into next/dt From Stephen Warren <swarren@wwwdotorg.org>: ARM: bcm2835: device tree updates This branch adds two devices to the BCM2835 SoC device tree: the SPI controller and the HW random number generator. The SPI controller isn't actually instantiated in the Raspberry Pi device tree, since there are no on-board SPI devices; it's up to the end-user to modify their own device-tree to describe whatever they have attached. * tag 'bcm2835-for-3.10-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi: ARM: bcm2835: add Broadcom BCM2835 RNG to the device tree ARM: bcm2835: add SPI device to DT Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | | ARM: bcm2835: add Broadcom BCM2835 RNG to the device treeLubomir Rintel2013-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a device tree binding for random number generator present on Broadcom BCM2835 SoC, used in Raspberry Pi and Roku 2 devices. Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> Tested-by: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
| * | | | ARM: bcm2835: add SPI device to DTStephen Warren2013-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BCM2835 has a single instance of the "SPI0"-type SPI master controller. Instantiate it in the SoC .dtsi file, Don't enable it in the Raspberry Pi board .dts file, since we have no idea what is actually connected, and hence no idea what to set the bus clock rate to. Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
* | | | | Merge branch 'zynq/core' of git://git.xilinx.com/linux-xlnx into next/dtArnd Bergmann2013-04-08
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Michal Simek <michal.simek@xilinx.com>: It enables pmu support for zynq. * 'zynq/core' of git://git.xilinx.com/linux-xlnx: arm: zynq: Add support for pmu Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | | | arm: zynq: Add support for pmuMichal Simek2013-04-04
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Zynq is standard PMU with 2 interrupt per core. There is also access via register which is not used right now. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
* | | | | Merge tag 'sunxi-dt-for-3.10' of git://github.com/mripard/linux into next/dtArnd Bergmann2013-03-23
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Maxime Ripard <maxime.ripard@free-electrons.com>: Allwinner sunxi DT additions for 3.10 * tag 'sunxi-dt-for-3.10' of git://github.com/mripard/linux: arm: sunxi: Add clock definitions for the new clock driver ARM: sunxi: dt: Add support for the PineRiver Mini X-plus sunxi: a10-cubieboard: Add user LEDs to the device tree sunxi: a13-olinuxino: Add user LED to the device tree sunxi: dts: Report the pinctrl nodes as gpio-controllers Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | | arm: sunxi: Add clock definitions for the new clock driverEmilio López2013-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces proper clock definitions on sunxi.dtsi, to be used with the new clock driver for sunxi. Signed-off-by: Emilio López <emilio@elopez.com.ar> Acked-by: Mike Turquette <mturquette@linaro.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | | ARM: sunxi: dt: Add support for the PineRiver Mini X-plusMaxime Ripard2013-03-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This board comes with an Allwinner A10, two external USB ports, a SD Card reader, 1GB of RAM, the usual video connectors and an onboard wifi chip. Of course, the support is quite minimal for now... Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | | sunxi: a10-cubieboard: Add user LEDs to the device treeEmilio López2013-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cubieboard has two LEDs available for use, a blue one (labeled LED1) and a green one (labeled LED2). Signed-off-by: Emilio López <emilio@elopez.com.ar> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | | sunxi: a13-olinuxino: Add user LED to the device treeMaxime Ripard2013-03-05
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
| * | | | sunxi: dts: Report the pinctrl nodes as gpio-controllersMaxime Ripard2013-03-05
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
* | | | Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dtArnd Bergmann2013-03-21
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Nicolas Ferre <nicolas.ferre@atmel.com>: DT modifications for at91rm9200 and at91sam9x5 SoCs, mainly around I2C. Also some cleanup of some unneeded properties and conflicting nodes. One more DT-only board based on at91rm9200. * tag 'at91-dt' of git://github.com/at91linux/linux-at91: ARM: at91/at91sam9x5cm: add 1-wire chip on CM board ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd ARM: at91/dt: gpio-keys: remove address-cells and size-cells properties ARM: at91: add MPA 1600 DT board ARM: at91: add pinctrl nodes to i2c-gpio on RM92000 DT ARM: at91: add TWI bindings to RM9200 DT ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrl ARM: at91: dt: at91sam9x5: add i2c pinctrl Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| * | | ARM: at91/at91sam9x5cm: add 1-wire chip on CM boardRichard Genoud2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add the 1-wire chip present on the CM board to the DTS. As the pin is also used by leds, it's disabled by default. If the board really wants it, it can be enabled in the board DTS. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcdRichard Genoud2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On at91sam9x5ek, macb0 is enabled, so it conflicts with i2c2 (PB4) same for i2c1, (conflicts with LCD). Moreover, only i2c0 is used on this board. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91/dt: gpio-keys: remove address-cells and size-cells propertiesNicolas Ferre2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gpio-keys nodes are not using the "reg" property in their sub nodes. So, there is no need to define #address-cells and #size-cells properties in gpio-keys nodes: we remove them. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: add MPA 1600 DT boardJoachim Eastwood2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joachim Eastwood <manabian@gmail.com> [nicolas.ferre@atmel.com: remove unneeded address-cells and size-cells to gpio-keys] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: add pinctrl nodes to i2c-gpio on RM92000 DTJoachim Eastwood2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPIO pins used by i2c-gpio must be set to multi drive (open drain) to work properly. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: add TWI bindings to RM9200 DTJoachim Eastwood2013-03-21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrlRichard Genoud2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i2c-gpio is sometimes used in place of i2c-at91. This adds the pin muxes for the gpios. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | ARM: at91: dt: at91sam9x5: add i2c pinctrlRichard Genoud2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the at19 i2c controller pin muxes for at91sam9x5 based boards. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Acked-by: Ludovic Desroches <ludovic.desroches@atmel.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| * | | Linux 3.9-rc3Linus Torvalds2013-03-17
| | | |
| * | | perf,x86: fix link failure for non-Intel configsDavid Rientjes2013-03-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 1d9d8639c063 ("perf,x86: fix kernel crash with PEBS/BTS after suspend/resume") introduces a link failure since perf_restore_debug_store() is only defined for CONFIG_CPU_SUP_INTEL: arch/x86/power/built-in.o: In function `restore_processor_state': (.text+0x45c): undefined reference to `perf_restore_debug_store' Fix it by defining the dummy function appropriately. Signed-off-by: David Rientjes <rientjes@google.com> Cc: stable@vger.kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>