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

Commit 55689bfa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-pinmux-for-v3.12' of... 

Merge tag 'renesas-pinmux-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

From Simon Horman:
Renesas ARM based SoC pinmux updates for v3.12

SH Mobile pinctrl DT support

* tag 'renesas-pinmux-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: kzm9g-reference: Add LED1-LED4 to the device tree
  ARM: shmobile: kzm9g-reference: Move SDHI regulators to DT
  ARM: shmobile: kzm9g-reference: Move pinctrl mappings to device tree
  ARM: shmobile: marzen-reference: Add LED2-LED4 to the device tree
  ARM: shmobile: marzen-reference: Move pinctrl mappings to device tree
  ARM: shmobile: armadillo-reference: Add LED1-LED4 to the device tree
  ARM: shmobile: armadillo-reference: Move st1232 reset GPIO to DT
  ARM: shmobile: armadillo-reference: Add st1232 pin mappings
  ARM: shmobile: armadillo-reference: Move pinctrl mappings to device tree
  ARM: shmobile: sh73a0: Add pin control device to device tree
  ARM: shmobile: sh7372: Add pin control device to device tree
  ARM: shmobile: r8a7790: Add GPIO controller devices to device tree
  ARM: shmobile: r8a7790: Add pin control device to device tree
  ARM: shmobile: r8a7779: Add GPIO controller devices to device tree
  ARM: shmobile: r8a7779: Add pin control device to device tree
  ARM: shmobile: r8a7778: Add GPIO controller devices to device tree
  ARM: shmobile: r8a7778: Add pin control device to device tree
  ARM: shmobile: r8a7740: Add pin control device to device tree
  ARM: shmobile: r8a73a4: Add pin control device to device tree

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/boot/dts/r8a73a4.dtsi
	arch/arm/boot/dts/r8a7790.dtsi
parents 38494429 14692739

arch/arm/boot/dts/r8a73a4.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -185,6 +185,13 @@ 
		status = "disabled";

	};



	pfc: pfc@e6050000 {

		compatible = "renesas,pfc-r8a73a4";

		reg = <0 0xe6050000 0 0x9000>;

		gpio-controller;

		#gpio-cells = <2>;

	};



	sdhi0: sdhi@ee100000 {

		compatible = "renesas,r8a73a4-sdhi";

		reg = <0 0xee100000 0 0x100>;

arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts

+34 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


/dts-v1/;

/include/ "r8a7740.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "armadillo 800 eva reference";
@@ -33,6 +34,21 @@ 
		regulator-boot-on;

	};



	leds {

		compatible = "gpio-leds";

		led1 {

			gpios = <&pfc 102 GPIO_ACTIVE_HIGH>;

		};

		led2 {

			gpios = <&pfc 111 GPIO_ACTIVE_HIGH>;

		};

		led3 {

			gpios = <&pfc 110 GPIO_ACTIVE_HIGH>;

		};

		led4 {

			gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;

		};

	};

};



&i2c0 {
@@ -41,5 +57,23 @@ 
		reg = <0x55>;

		interrupt-parent = <&irqpin1>;

		interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */

		pinctrl-0 = <&st1232_pins>;

		pinctrl-names = "default";

		gpios = <&pfc 166 GPIO_ACTIVE_LOW>;

	};

};



&pfc {

	pinctrl-0 = <&scifa1_pins>;

	pinctrl-names = "default";



	scifa1_pins: scifa1 {

		renesas,groups = "scifa1_data";

		renesas,function = "scifa1";

	};



	st1232_pins: st1232 {

		renesas,groups = "intc_irq10";

		renesas,function = "intc";

	};

};

arch/arm/boot/dts/r8a7740.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -139,4 +139,12 @@ 
			      0 72 0x4

			      0 73 0x4>;

	};



	pfc: pfc@e6050000 {

		compatible = "renesas,pfc-r8a7740";

		reg = <0xe6050000 0x8000>,

		      <0xe605800c 0x20>;

		gpio-controller;

		#gpio-cells = <2>;

	};

};

arch/arm/boot/dts/r8a7778.dtsi

+66 −0
Original line number Diff line number Diff line
@@ -32,4 +32,70 @@ 
		reg = <0xfe438000 0x1000>,

		      <0xfe430000 0x100>;

	};



	gpio0: gpio@ffc40000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc40000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 0x4>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 0 32>;

		#interrupt-cells = <2>;

		interrupt-controller;

	};



	gpio1: gpio@ffc41000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc41000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 0x4>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 32 32>;

		#interrupt-cells = <2>;

		interrupt-controller;

	};



	gpio2: gpio@ffc42000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc42000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 0x4>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 64 32>;

		#interrupt-cells = <2>;

		interrupt-controller;

	};



	gpio3: gpio@ffc43000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc43000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 0x4>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 96 32>;

		#interrupt-cells = <2>;

		interrupt-controller;

	};



	gpio4: gpio@ffc44000 {

		compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";

		reg = <0xffc44000 0x2c>;

		interrupt-parent = <&gic>;

		interrupts = <0 103 0x4>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-ranges = <&pfc 0 128 27>;

		#interrupt-cells = <2>;

		interrupt-controller;

	};



	pfc: pfc@fffc0000 {

		compatible = "renesas,pfc-r8a7778";

		reg = <0xfffc000 0x118>;

		#gpio-range-cells = <3>;

	};

};

arch/arm/boot/dts/r8a7779-marzen-reference.dts

+49 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


/dts-v1/;

/include/ "r8a7779.dtsi"

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "marzen";
@@ -37,6 +38,9 @@ 
	lan0@18000000 {

		compatible = "smsc,lan9220", "smsc,lan9115";

		reg = <0x18000000 0x100>;

		pinctrl-0 = <&lan0_pins>;

		pinctrl-names = "default";



		phy-mode = "mii";

		interrupt-parent = <&gic>;

		interrupts = <0 28 0x4>;
@@ -44,4 +48,49 @@ 
		vddvario-supply = <&fixedregulator3v3>;

		vdd33a-supply = <&fixedregulator3v3>;

	};



	leds {

		compatible = "gpio-leds";

		led2 {

			gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;

		};

		led3 {

			gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;

		};

		led4 {

			gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;

		};

	};

};



&pfc {

	pinctrl-0 = <&scif2_pins &scif4_pins &sdhi0_pins>;

	pinctrl-names = "default";



	lan0_pins: lan0 {

		intc {

			renesas,groups = "intc_irq1_b";

			renesas,function = "intc";

		};

		lbsc {

			renesas,groups = "lbsc_ex_cs0";

			renesas,function = "lbsc";

		};

	};



	scif2_pins: scif2 {

		renesas,groups = "scif2_data_c";

		renesas,function = "scif2";

	};



	scif4_pins: scif4 {

		renesas,groups = "scif4_data";

		renesas,function = "scif4";

	};



	sdhi0_pins: sdhi0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd",

				 "sdhi0_wp";

		renesas,function = "sdhi0";

	};

};