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

Commit 47e1993d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branches 'fixes' and 'fixes2' into devel-late 

* fixes:
  ixp4xx: fix compilation by adding gpiolib support

* fixes2:
  ARM: LPC32xx: Adjust dts files to gpio dt binding
parents 63bda79d 9dde0ae3 a035254a

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ config ARCH_IXP4XX 
	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select CLKSRC_MMIO

	select CPU_XSCALE

	select GENERIC_GPIO

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select NEED_MACH_IO_H

arch/arm/boot/dts/lpc32xx.dtsi

+2 −39
Original line number Diff line number Diff line
@@ -215,45 +215,8 @@ 
			gpio: gpio@40028000 {

				compatible = "nxp,lpc3220-gpio";

				reg = <0x40028000 0x1000>;

				/* create a private address space for enumeration */

				#address-cells = <1>;

				#size-cells = <0>;



				gpio_p0: gpio-bank@0 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <0>;

				};



				gpio_p1: gpio-bank@1 {

				gpio-controller;

					#gpio-cells = <2>;

					reg = <1>;

				};



				gpio_p2: gpio-bank@2 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <2>;

				};



				gpio_p3: gpio-bank@3 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <3>;

				};



				gpi_p3: gpio-bank@4 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <4>;

				};



				gpo_p3: gpio-bank@5 {

					gpio-controller;

					#gpio-cells = <2>;

					reg = <5>;

				};

				#gpio-cells = <3>; /* bank, pin, flags */

			};



			watchdog@4003C000 {

arch/arm/boot/dts/phy3250.dts

+2 −2
Original line number Diff line number Diff line
@@ -131,13 +131,13 @@ 
		compatible = "gpio-leds";



		led0 {

			gpios = <&gpo_p3 1 1>; /* GPO_P3 1, GPIO 80, active low */

			gpios = <&gpio 5 1 1>; /* GPO_P3 1, GPIO 80, active low */

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};



		led1 {

			gpios = <&gpo_p3 14 1>; /* GPO_P3 14, GPIO 93, active low */

			gpios = <&gpio 5 14 1>; /* GPO_P3 14, GPIO 93, active low */

			linux,default-trigger = "timer";

			default-state = "off";

		};

arch/arm/mach-ixp4xx/common.c

+46 −2
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/clockchips.h>

#include <linux/io.h>

#include <linux/export.h>

#include <linux/gpio.h>



#include <mach/udc.h>

#include <mach/hardware.h>
@@ -107,7 +108,7 @@ static signed char irq2gpio[32] = { 
	 7,  8,  9, 10, 11, 12, -1, -1,

};



int gpio_to_irq(int gpio)

static int ixp4xx_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)

{

	int irq;
@@ -117,7 +118,6 @@ int gpio_to_irq(int gpio) 
	}

	return -EINVAL;

}

EXPORT_SYMBOL(gpio_to_irq);



int irq_to_gpio(unsigned int irq)

{
@@ -383,12 +383,56 @@ static struct platform_device *ixp46x_devices[] __initdata = { 
unsigned long ixp4xx_exp_bus_size;

EXPORT_SYMBOL(ixp4xx_exp_bus_size);



static int ixp4xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

{

	gpio_line_config(gpio, IXP4XX_GPIO_IN);



	return 0;

}



static int ixp4xx_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,

					int level)

{

	gpio_line_set(gpio, level);

	gpio_line_config(gpio, IXP4XX_GPIO_OUT);



	return 0;

}



static int ixp4xx_gpio_get_value(struct gpio_chip *chip, unsigned gpio)

{

	int value;



	gpio_line_get(gpio, &value);



	return value;

}



static void ixp4xx_gpio_set_value(struct gpio_chip *chip, unsigned gpio,

				  int value)

{

	gpio_line_set(gpio, value);

}



static struct gpio_chip ixp4xx_gpio_chip = {

	.label			= "IXP4XX_GPIO_CHIP",

	.direction_input	= ixp4xx_gpio_direction_input,

	.direction_output	= ixp4xx_gpio_direction_output,

	.get			= ixp4xx_gpio_get_value,

	.set			= ixp4xx_gpio_set_value,

	.to_irq			= ixp4xx_gpio_to_irq,

	.base			= 0,

	.ngpio			= 16,

};



void __init ixp4xx_sys_init(void)

{

	ixp4xx_exp_bus_size = SZ_16M;



	platform_add_devices(ixp4xx_devices, ARRAY_SIZE(ixp4xx_devices));



	gpiochip_add(&ixp4xx_gpio_chip);



	if (cpu_is_ixp46x()) {

		int region;

arch/arm/mach-ixp4xx/include/mach/gpio.h

+1 −78
Original line number Diff line number Diff line 
/*

 * arch/arm/mach-ixp4xx/include/mach/gpio.h

 *

 * IXP4XX GPIO wrappers for arch-neutral GPIO calls

 *

 * Written by Milan Svoboda <msvoboda@ra.rockwell.com>

 * Based on PXA implementation by Philipp Zabel <philipp.zabel@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

 *

 */



#ifndef __ASM_ARCH_IXP4XX_GPIO_H

#define __ASM_ARCH_IXP4XX_GPIO_H



#include <linux/kernel.h>

#include <mach/hardware.h>



#define __ARM_GPIOLIB_COMPLEX



static inline int gpio_request(unsigned gpio, const char *label)

{

	return 0;

}



static inline void gpio_free(unsigned gpio)

{

	might_sleep();



	return;

}



static inline int gpio_direction_input(unsigned gpio)

{

	gpio_line_config(gpio, IXP4XX_GPIO_IN);

	return 0;

}



static inline int gpio_direction_output(unsigned gpio, int level)

{

	gpio_line_set(gpio, level);

	gpio_line_config(gpio, IXP4XX_GPIO_OUT);

	return 0;

}



static inline int gpio_get_value(unsigned gpio)

{

	int value;



	gpio_line_get(gpio, &value);



	return value;

}



static inline void gpio_set_value(unsigned gpio, int value)

{

	gpio_line_set(gpio, value);

}



#include <asm-generic/gpio.h>			/* cansleep wrappers */



extern int gpio_to_irq(int gpio);

#define gpio_to_irq gpio_to_irq

extern int irq_to_gpio(unsigned int irq);



#endif

/* empty */