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

Commit 0292f8a8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt-v4.15' of... 

Merge tag 'uniphier-dt-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

Pull "UniPhier ARM SoC DT updates for v4.15" from Masahiro Yamada:

- add thermal monitor and thermal zone nodes
- fix W=2 warnings
- add GPIO controller nodes and related properties
- add resets properties

* tag 'uniphier-dt-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  ARM: dts: uniphier: add resets properties
  ARM: dts: uniphier: add GPIO hog definition
  ARM: dts: uniphier: route on-board device IRQ to GPIO controller
  ARM: dts: uniphier: add GPIO controller nodes
  ARM: dts: uniphier: fix W=2 build warnings
  ARM: dts: uniphier: add nodes of thermal monitor and thermal zone for PXs2
parents 2132910e a1763a82

arch/arm/boot/dts/uniphier-ld4-ref.dts

+9 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
};



&ethsc {

	interrupts = <0 49 4>;

	interrupts = <1 8>;

};



&serial0 {
@@ -53,6 +53,14 @@ 
	status = "okay";

};



&gpio {

	xirq1 {

		gpio-hog;

		gpios = <121 0>;

		input;

	};

};



&i2c0 {

	status = "okay";

};

arch/arm/boot/dts/uniphier-ld4.dtsi

+24 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
			clock-frequency = <24576000>;

		};



		arm_timer_clk: arm_timer_clk {

		arm_timer_clk: arm-timer {

			#clock-cells = <0>;

			compatible = "fixed-clock";

			clock-frequency = <50000000>;
@@ -71,6 +71,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart0>;

			clocks = <&peri_clk 0>;

			resets = <&peri_rst 0>;

		};



		serial1: serial@54006900 {
@@ -81,6 +82,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart1>;

			clocks = <&peri_clk 1>;

			resets = <&peri_rst 1>;

		};



		serial2: serial@54006a00 {
@@ -91,6 +93,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart2>;

			clocks = <&peri_clk 2>;

			resets = <&peri_rst 2>;

		};



		serial3: serial@54006b00 {
@@ -101,6 +104,21 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_uart3>;

			clocks = <&peri_clk 3>;

			resets = <&peri_rst 3>;

		};



		gpio: gpio@55000000 {

			compatible = "socionext,uniphier-gpio";

			reg = <0x55000000 0x200>;

			interrupt-parent = <&aidet>;

			interrupt-controller;

			#interrupt-cells = <2>;

			gpio-controller;

			#gpio-cells = <2>;

			gpio-ranges = <&pinctrl 0 0 0>;

			gpio-ranges-group-names = "gpio_range";

			ngpios = <136>;

			socionext,interrupt-ranges = <0 48 13>, <14 62 2>;

		};



		i2c0: i2c@58400000 {
@@ -113,6 +131,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c0>;

			clocks = <&peri_clk 4>;

			resets = <&peri_rst 4>;

			clock-frequency = <100000>;

		};
@@ -126,6 +145,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c1>;

			clocks = <&peri_clk 5>;

			resets = <&peri_rst 5>;

			clock-frequency = <100000>;

		};
@@ -139,6 +159,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c2>;

			clocks = <&peri_clk 6>;

			resets = <&peri_rst 6>;

			clock-frequency = <400000>;

		};
@@ -152,6 +173,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_i2c3>;

			clocks = <&peri_clk 7>;

			resets = <&peri_rst 7>;

			clock-frequency = <100000>;

		};
@@ -302,6 +324,7 @@ 
			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_nand2cs>;

			clocks = <&sys_clk 2>;

			resets = <&sys_rst 2>;

		};

	};

};

arch/arm/boot/dts/uniphier-ld6b-ref.dts

+9 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
};



&ethsc {

	interrupts = <0 52 4>;

	interrupts = <4 8>;

};



&serial0 {
@@ -55,6 +55,14 @@ 
	status = "okay";

};



&gpio {

	xirq4 {

		gpio-hog;

		gpios = <124 0>;

		input;

	};

};



&i2c0 {

	status = "okay";

};

arch/arm/boot/dts/uniphier-pinctrl.dtsi

+23 −23
Original line number Diff line number Diff line
@@ -8,117 +8,117 @@ 
 */



&pinctrl {

	pinctrl_aout: aout_grp {

	pinctrl_aout: aout {

		groups = "aout";

		function = "aout";

	};



	pinctrl_emmc: emmc_grp {

	pinctrl_emmc: emmc {

		groups = "emmc", "emmc_dat8";

		function = "emmc";

	};



	pinctrl_ether_mii: ether_mii_grp {

	pinctrl_ether_mii: ether-mii {

		groups = "ether_mii";

		function = "ether_mii";

	};



	pinctrl_ether_rgmii: ether_rgmii_grp {

	pinctrl_ether_rgmii: ether-rgmii {

		groups = "ether_rgmii";

		function = "ether_rgmii";

	};



	pinctrl_ether_rmii: ether_rmii_grp {

	pinctrl_ether_rmii: ether-rmii {

		groups = "ether_rmii";

		function = "ether_rmii";

	};



	pinctrl_i2c0: i2c0_grp {

	pinctrl_i2c0: i2c0 {

		groups = "i2c0";

		function = "i2c0";

	};



	pinctrl_i2c1: i2c1_grp {

	pinctrl_i2c1: i2c1 {

		groups = "i2c1";

		function = "i2c1";

	};



	pinctrl_i2c2: i2c2_grp {

	pinctrl_i2c2: i2c2 {

		groups = "i2c2";

		function = "i2c2";

	};



	pinctrl_i2c3: i2c3_grp {

	pinctrl_i2c3: i2c3 {

		groups = "i2c3";

		function = "i2c3";

	};



	pinctrl_i2c4: i2c4_grp {

	pinctrl_i2c4: i2c4 {

		groups = "i2c4";

		function = "i2c4";

	};



	pinctrl_nand: nand_grp {

	pinctrl_nand: nand {

		groups = "nand";

		function = "nand";

	};



	pinctrl_nand2cs: nand2cs_grp {

	pinctrl_nand2cs: nand2cs {

		groups = "nand", "nand_cs1";

		function = "nand";

	};



	pinctrl_sd: sd_grp {

	pinctrl_sd: sd {

		groups = "sd";

		function = "sd";

	};



	pinctrl_sd1: sd1_grp {

	pinctrl_sd1: sd1 {

		groups = "sd1";

		function = "sd1";

	};



	pinctrl_system_bus: system_bus_grp {

	pinctrl_system_bus: system-bus {

		groups = "system_bus", "system_bus_cs1";

		function = "system_bus";

	};



	pinctrl_uart0: uart0_grp {

	pinctrl_uart0: uart0 {

		groups = "uart0";

		function = "uart0";

	};



	pinctrl_uart1: uart1_grp {

	pinctrl_uart1: uart1 {

		groups = "uart1";

		function = "uart1";

	};



	pinctrl_uart2: uart2_grp {

	pinctrl_uart2: uart2 {

		groups = "uart2";

		function = "uart2";

	};



	pinctrl_uart3: uart3_grp {

	pinctrl_uart3: uart3 {

		groups = "uart3";

		function = "uart3";

	};



	pinctrl_usb0: usb0_grp {

	pinctrl_usb0: usb0 {

		groups = "usb0";

		function = "usb0";

	};



	pinctrl_usb1: usb1_grp {

	pinctrl_usb1: usb1 {

		groups = "usb1";

		function = "usb1";

	};



	pinctrl_usb2: usb2_grp {

	pinctrl_usb2: usb2 {

		groups = "usb2";

		function = "usb2";

	};



	pinctrl_usb3: usb3_grp {

	pinctrl_usb3: usb3 {

		groups = "usb3";

		function = "usb3";

	};

arch/arm/boot/dts/uniphier-pro4-ref.dts

+9 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
};



&ethsc {

	interrupts = <0 50 4>;

	interrupts = <2 8>;

};



&serial0 {
@@ -55,6 +55,14 @@ 
	status = "okay";

};



&gpio {

	xirq2 {

		gpio-hog;

		gpios = <122 0>;

		input;

	};

};



&i2c0 {

	status = "okay";

};