Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d729d33 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v3.13/gpio' of... 

Merge tag 'davinci-for-v3.13/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers

From Sekhar Nori, GPIO driver updates for DaVinci:

This pull request moves DaVinci GPIO driver to use platform device
framework and the corresponding changes needed to keep GPIO working on
existing DaVinci boards. This is a pre-requisite to DT support for GPIO.

* tag 'davinci-for-v3.13/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: gpio: use gpiolib API instead of inline functions
  ARM: davinci: board: gpio device creation
  ARM: davinci: da8xx boards: gpio device creation
  ARM: davinci: support gpio platform device
  ARM: davinci: da8xx: support gpio platform device
  gpio: davinci: move to platform device
  gpio: davinci: coding style correction

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a10c2ac f1a4c52f

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -847,7 +847,6 @@ config ARCH_DAVINCI 
	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select HAVE_IDE

	select NEED_MACH_GPIO_H

	select TI_PRIV_EDMA

	select USE_OF

	select ZONE_DMA

arch/arm/mach-davinci/board-da830-evm.c

+10 −4
Original line number Diff line number Diff line
@@ -22,17 +22,19 @@ 
#include <linux/mtd/partitions.h>

#include <linux/spi/spi.h>

#include <linux/spi/flash.h>

#include <linux/platform_data/gpio-davinci.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mtd-davinci-aemif.h>

#include <linux/platform_data/spi-davinci.h>

#include <linux/platform_data/usb-davinci.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/common.h>

#include <mach/cp_intc.h>

#include <mach/mux.h>

#include <linux/platform_data/mtd-davinci.h>

#include <mach/da8xx.h>

#include <linux/platform_data/usb-davinci.h>

#include <linux/platform_data/mtd-davinci-aemif.h>

#include <linux/platform_data/spi-davinci.h>



#define DA830_EVM_PHY_ID		""

/*
@@ -591,6 +593,10 @@ static __init void da830_evm_init(void) 
	struct davinci_soc_info *soc_info = &davinci_soc_info;

	int ret;



	ret = da830_register_gpio();

	if (ret)

		pr_warn("da830_evm_init: GPIO init failed: %d\n", ret);



	ret = da830_register_edma(da830_edma_rsv);

	if (ret)

		pr_warning("da830_evm_init: edma registration failed: %d\n",

arch/arm/mach-davinci/board-da850-evm.c

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/platform_device.h>

#include <linux/platform_data/gpio-davinci.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mtd-davinci-aemif.h>

#include <linux/platform_data/spi-davinci.h>
@@ -38,6 +39,7 @@ 
#include <linux/spi/flash.h>

#include <linux/wl12xx.h>



#include <mach/common.h>

#include <mach/cp_intc.h>

#include <mach/da8xx.h>

#include <mach/mux.h>
@@ -1437,6 +1439,10 @@ static __init void da850_evm_init(void) 
{

	int ret;



	ret = da850_register_gpio();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);



	ret = pmic_tps65070_init();

	if (ret)

		pr_warn("%s: TPS65070 PMIC init failed: %d\n", __func__, ret);

arch/arm/mach-davinci/board-dm355-evm.c

+11 −4
Original line number Diff line number Diff line
@@ -22,15 +22,17 @@ 
#include <media/tvp514x.h>

#include <linux/spi/spi.h>

#include <linux/spi/eeprom.h>

#include <linux/platform_data/gpio-davinci.h>

#include <linux/platform_data/i2c-davinci.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mmc-davinci.h>

#include <linux/platform_data/usb-davinci.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <linux/platform_data/i2c-davinci.h>

#include <mach/serial.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mmc-davinci.h>

#include <linux/platform_data/usb-davinci.h>

#include <mach/common.h>



#include "davinci.h"
@@ -375,6 +377,11 @@ static struct spi_board_info dm355_evm_spi_info[] __initconst = { 
static __init void dm355_evm_init(void)

{

	struct clk *aemif;

	int ret;



	ret = dm355_gpio_register();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);



	gpio_request(1, "dm9000");

	gpio_direction_input(1);

arch/arm/mach-davinci/board-dm355-leopard.c

+10 −4
Original line number Diff line number Diff line
@@ -19,15 +19,16 @@ 
#include <linux/clk.h>

#include <linux/spi/spi.h>

#include <linux/spi/eeprom.h>

#include <linux/platform_data/i2c-davinci.h>

#include <linux/platform_data/mmc-davinci.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/usb-davinci.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <linux/platform_data/i2c-davinci.h>

#include <mach/common.h>

#include <mach/serial.h>

#include <linux/platform_data/mtd-davinci.h>

#include <linux/platform_data/mmc-davinci.h>

#include <linux/platform_data/usb-davinci.h>



#include "davinci.h"
@@ -234,6 +235,11 @@ static struct spi_board_info dm355_leopard_spi_info[] __initconst = { 
static __init void dm355_leopard_init(void)

{

	struct clk *aemif;

	int ret;



	ret = dm355_gpio_register();

	if (ret)

		pr_warn("%s: GPIO init failed: %d\n", __func__, ret);



	gpio_request(9, "dm9000");

	gpio_direction_input(9);