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

Commit 1cfe0874 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'nomadik-dt-v3.14' of... 

Merge tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

From Linus Walleij:
Some Nomadik Device Tree updates for the v3.14 cycle:

- Drop 0x prefixes

- Get rid of explicit GPIO management

* tag 'nomadik-dt-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: nomadik: get rid of explicit ethernet GPIO management
  ARM: nomadik: Remove '0x's from nomadik stn8815 DTS file
parents e7b4a8df 6568eccd

arch/arm/boot/dts/ste-nomadik-s8815.dts

+0 −4
Original line number Diff line number Diff line
@@ -67,10 +67,6 @@ 


	/* Custom board node with GPIO pins to active etc */

	usb-s8815 {

		/* The S8815 is using this very GPIO pin for the SMSC91x IRQs */

		ethernet-gpio {

			gpios = <&gpio3 8 0x1>;

		};

		/* This will bias the MMC/SD card detect line */

		mmcsd-gpio {

			gpios = <&gpio3 16 0x1>;

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -769,14 +769,14 @@ 
		#size-cells = <1>;

		ranges;



		vica: intc@0x10140000 {

		vica: intc@10140000 {

			compatible = "arm,versatile-vic";

			interrupt-controller;

			#interrupt-cells = <1>;

			reg = <0x10140000 0x20>;

		};



		vicb: intc@0x10140020 {

		vicb: intc@10140020 {

			compatible = "arm,versatile-vic";

			interrupt-controller;

			#interrupt-cells = <1>;

arch/arm/mach-nomadik/cpu-8815.c

+0 −32
Original line number Diff line number Diff line
@@ -109,38 +109,6 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd) 
	writel(1, srcbase + 0x18);

}



/*

 * The SMSC911x IRQ is connected to a GPIO pin, but the driver expects

 * to simply request an IRQ passed as a resource. So the GPIO pin needs

 * to be requested by this hog and set as input.

 */

static int __init cpu8815_eth_init(void)

{

	struct device_node *eth;

	int gpio, irq, err;



	eth = of_find_node_by_path("/usb-s8815/ethernet-gpio");

	if (!eth) {

		pr_info("could not find any ethernet GPIO\n");

		return 0;

	}

	gpio = of_get_gpio(eth, 0);

	err = gpio_request(gpio, "eth_irq");

	if (err) {

		pr_info("failed to request ethernet GPIO\n");

		return -ENODEV;

	}

	err = gpio_direction_input(gpio);

	if (err) {

		pr_info("failed to set ethernet GPIO as input\n");

		return -ENODEV;

	}

	irq = gpio_to_irq(gpio);

	pr_info("enabled USB-S8815 ethernet GPIO %d, IRQ %d\n", gpio, irq);

	return 0;

}

device_initcall(cpu8815_eth_init);



/*

 * This GPIO pin turns on a line that is used to detect card insertion

 * on this board.