leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UniPhier ARM SoC DT updates for v4.15

Browse Source 
- add thermal monitor and thermal zone nodes
 - fix W=2 warnings
 - add GPIO controller nodes and related properties
 - add resets properties
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZ7idNAAoJED2LAQed4NsG9lQP/3saHzlm0SWnGNT15978yRbX
 FWq0VlsGiTfvFN9sYdlon4I+qIoIWEeSVqQbIwFJScqnlspldFIU3boWCIyOAESx
 UB5M3Luqd5OHPplqx8GczpLrjWUNeMvK8gbUoFCoF427LJxiO/XzFX8UoT3serH1
 3j4zzrvLbifTVzxLCIoYHpNi3bJWc5KAPblQtl8S7dGFy4P4C3XjZ8gsmchBVbo4
 gZFIYrMS/pLp378L5XGCC7Slspi8QJNj/7xtJo1CiBaQH35670gDtZiUpSmCwf8U
 YK2DC48K4M0pOkToz++AHHWt3a4Keuyso9xxE6fguOMzdHSk6HLq6A4YG7Tinhmt
 C0HeHx/C5LYsPJyX750Pt20wHZQsPh47Mw3YI6eMocMJvc470hMnASqb8xGaNa2u
 izqKFAjML8nhXLQp4vDo9SZ0ePAQaeCF6SbrrsJuCuUpP7W5vHln+z9wsdu4ufyc
 KMg/w6FDJjtn3O2iRSdmOafmpCjSKCTpBzEoHbhXU7B4l+8lYotgfZX04roUsYAG
 G6TjRpvNeDJ8rC+9O3tEOw/zUfqlmqPNfYGBtqgaW+yNWCLn7E0wnSvlNm9YO5jv
 wZIwmqFUMki674KqowZ/6sqLSmjkvLxxPB4opTeZURPtmKb2o7FLJotoXIJ613Lw
 jH/ln+8V1DY1A6I4zl/c
 =HpOe
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2017-10-30 13:43:36 +01:00
commit 0292f8a8f8
11 changed files with 240 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boot/dts/uniphier-ld4-ref.dts
View File

@ -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";
};

25
arch/arm/boot/dts/uniphier-ld4.dtsi
View File

@ -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>;
};
};
};

10
arch/arm/boot/dts/uniphier-ld6b-ref.dts
View File

@ -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";
};

46
arch/arm/boot/dts/uniphier-pinctrl.dtsi
View File

@ -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";
};

10
arch/arm/boot/dts/uniphier-pro4-ref.dts
View File

@ -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";
};

27
arch/arm/boot/dts/uniphier-pro4.dtsi
View File

@ -45,7 +45,7 @@
clock-frequency = <25000000>;
};
arm_timer_clk: arm_timer_clk {
arm_timer_clk: arm-timer {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <50000000>;
@ -79,6 +79,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0>;
clocks = <&peri_clk 0>;
resets = <&peri_rst 0>;
};
serial1: serial@54006900 {
@ -89,6 +90,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
clocks = <&peri_clk 1>;
resets = <&peri_rst 1>;
};
serial2: serial@54006a00 {
@ -99,6 +101,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart2>;
clocks = <&peri_clk 2>;
resets = <&peri_rst 2>;
};
serial3: serial@54006b00 {
@ -109,6 +112,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 = <248>;
socionext,interrupt-ranges = <0 48 16>, <16 154 5>;
};
i2c0: i2c@58780000 {
@ -121,6 +139,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>;
clocks = <&peri_clk 4>;
resets = <&peri_rst 4>;
clock-frequency = <100000>;
};
@ -134,6 +153,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
clocks = <&peri_clk 5>;
resets = <&peri_rst 5>;
clock-frequency = <100000>;
};
@ -147,6 +167,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
clocks = <&peri_clk 6>;
resets = <&peri_rst 6>;
clock-frequency = <100000>;
};
@ -160,6 +181,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>;
clocks = <&peri_clk 7>;
resets = <&peri_rst 7>;
clock-frequency = <100000>;
};
@ -173,6 +195,7 @@
#size-cells = <0>;
interrupts = <0 25 4>;
clocks = <&peri_clk 9>;
resets = <&peri_rst 9>;
clock-frequency = <400000>;
};
@ -184,6 +207,7 @@
#size-cells = <0>;
interrupts = <0 26 4>;
clocks = <&peri_clk 10>;
resets = <&peri_rst 10>;
clock-frequency = <400000>;
};
@ -322,6 +346,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>;
clocks = <&sys_clk 2>;
resets = <&sys_rst 2>;
};
};
};

29
arch/arm/boot/dts/uniphier-pro5.dtsi
View File

@ -37,7 +37,7 @@
};
};
cpu_opp: opp_table {
cpu_opp: opp-table {
compatible = "operating-points-v2";
opp-shared;
@ -119,7 +119,7 @@
clock-frequency = <20000000>;
};
arm_timer_clk: arm_timer_clk {
arm_timer_clk: arm-timer {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <50000000>;
@ -166,6 +166,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0>;
clocks = <&peri_clk 0>;
resets = <&peri_rst 0>;
};
serial1: serial@54006900 {
@ -176,6 +177,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
clocks = <&peri_clk 1>;
resets = <&peri_rst 1>;
};
serial2: serial@54006a00 {
@ -186,6 +188,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart2>;
clocks = <&peri_clk 2>;
resets = <&peri_rst 2>;
};
serial3: serial@54006b00 {
@ -196,6 +199,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 = <248>;
socionext,interrupt-ranges = <0 48 16>, <16 154 5>;
};
i2c0: i2c@58780000 {
@ -208,6 +226,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>;
clocks = <&peri_clk 4>;
resets = <&peri_rst 4>;
clock-frequency = <100000>;
};
@ -221,6 +240,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
clocks = <&peri_clk 5>;
resets = <&peri_rst 5>;
clock-frequency = <100000>;
};
@ -234,6 +254,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
clocks = <&peri_clk 6>;
resets = <&peri_rst 6>;
clock-frequency = <100000>;
};
@ -247,6 +268,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>;
clocks = <&peri_clk 7>;
resets = <&peri_rst 7>;
clock-frequency = <100000>;
};
@ -260,6 +282,7 @@
#size-cells = <0>;
interrupts = <0 25 4>;
clocks = <&peri_clk 9>;
resets = <&peri_rst 9>;
clock-frequency = <400000>;
};
@ -271,6 +294,7 @@
#size-cells = <0>;
interrupts = <0 26 4>;
clocks = <&peri_clk 10>;
resets = <&peri_rst 10>;
clock-frequency = <400000>;
};
@ -385,6 +409,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>;
clocks = <&sys_clk 2>;
resets = <&sys_rst 2>;
};
};
};

80
arch/arm/boot/dts/uniphier-pxs2.dtsi
View File

@ -7,6 +7,8 @@
* SPDX-License-Identifier: (GPL-2.0+ OR MIT)
*/
#include <dt-bindings/thermal/thermal.h>
/ {
compatible = "socionext,uniphier-pxs2";
#address-cells = <1>;
@ -16,7 +18,7 @@
#address-cells = <1>;
#size-cells = <0>;
cpu@0 {
cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <0>;
@ -24,9 +26,10 @@
enable-method = "psci";
next-level-cache = <&l2>;
operating-points-v2 = <&cpu_opp>;
#cooling-cells = <2>;
};
cpu@1 {
cpu1: cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <1>;
@ -36,7 +39,7 @@
operating-points-v2 = <&cpu_opp>;
};
cpu@2 {
cpu2: cpu@2 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <2>;
@ -46,7 +49,7 @@
operating-points-v2 = <&cpu_opp>;
};
cpu@3 {
cpu3: cpu@3 {
device_type = "cpu";
compatible = "arm,cortex-a9";
reg = <3>;
@ -57,7 +60,7 @@
};
};
cpu_opp: opp_table {
cpu_opp: opp-table {
compatible = "operating-points-v2";
opp-shared;
@ -107,13 +110,42 @@
clock-frequency = <25000000>;
};
arm_timer_clk: arm_timer_clk {
arm_timer_clk: arm-timer {
#clock-cells = <0>;
compatible = "fixed-clock";
clock-frequency = <50000000>;
};
};
thermal-zones {
cpu-thermal {
polling-delay-passive = <250>; /* 250ms */
polling-delay = <1000>; /* 1000ms */
thermal-sensors = <&pvtctl>;
trips {
cpu_crit: cpu-crit {
temperature = <95000>; /* 95C */
hysteresis = <2000>;
type = "critical";
};
cpu_alert: cpu-alert {
temperature = <85000>; /* 85C */
hysteresis = <2000>;
type = "passive";
};
};
cooling-maps {
map {
trip = <&cpu_alert>;
cooling-device = <&cpu0
THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
soc {
compatible = "simple-bus";
#address-cells = <1>;
@ -141,6 +173,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0>;
clocks = <&peri_clk 0>;
resets = <&peri_rst 0>;
};
serial1: serial@54006900 {
@ -151,6 +184,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart1>;
clocks = <&peri_clk 1>;
resets = <&peri_rst 1>;
};
serial2: serial@54006a00 {
@ -161,6 +195,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart2>;
clocks = <&peri_clk 2>;
resets = <&peri_rst 2>;
};
serial3: serial@54006b00 {
@ -171,6 +206,24 @@
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>,
<&pinctrl 96 0 0>;
gpio-ranges-group-names = "gpio_range0",
"gpio_range1";
ngpios = <232>;
socionext,interrupt-ranges = <0 48 16>, <16 154 5>,
<21 217 3>;
};
i2c0: i2c@58780000 {
@ -183,6 +236,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>;
clocks = <&peri_clk 4>;
resets = <&peri_rst 4>;
clock-frequency = <100000>;
};
@ -196,6 +250,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
clocks = <&peri_clk 5>;
resets = <&peri_rst 5>;
clock-frequency = <100000>;
};
@ -209,6 +264,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
clocks = <&peri_clk 6>;
resets = <&peri_rst 6>;
clock-frequency = <100000>;
};
@ -222,6 +278,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>;
clocks = <&peri_clk 7>;
resets = <&peri_rst 7>;
clock-frequency = <100000>;
};
@ -233,6 +290,7 @@
#size-cells = <0>;
interrupts = <0 45 4>;
clocks = <&peri_clk 8>;
resets = <&peri_rst 8>;
clock-frequency = <400000>;
};
@ -244,6 +302,7 @@
#size-cells = <0>;
interrupts = <0 25 4>;
clocks = <&peri_clk 9>;
resets = <&peri_rst 9>;
clock-frequency = <400000>;
};
@ -255,6 +314,7 @@
#size-cells = <0>;
interrupts = <0 26 4>;
clocks = <&peri_clk 10>;
resets = <&peri_rst 10>;
clock-frequency = <400000>;
};
@ -358,6 +418,13 @@
compatible = "socionext,uniphier-pxs2-reset";
#reset-cells = <1>;
};
pvtctl: pvtctl {
compatible = "socionext,uniphier-pxs2-thermal";
interrupts = <0 3 4>;
#thermal-sensor-cells = <0>;
socionext,tmod-calibration = <0x0f86 0x6844>;
};
};
nand: nand@68000000 {
@ -369,6 +436,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>;
clocks = <&sys_clk 2>;
resets = <&sys_rst 2>;
};
};
};

10
arch/arm/boot/dts/uniphier-sld8-ref.dts
View File

@ -38,7 +38,7 @@
};
&ethsc {
interrupts = <0 48 4>;
interrupts = <0 8>;
};
&serial0 {
@ -53,6 +53,14 @@
status = "okay";
};
&gpio {
xirq0 {
gpio-hog;
gpios = <120 0>;
input;
};
};
&i2c0 {
status = "okay";
};

29
arch/arm/boot/dts/uniphier-sld8.dtsi
View File

@ -37,7 +37,7 @@
clock-frequency = <25000000>;
};
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,25 @@
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>,
<&pinctrl 104 0 0>,
<&pinctrl 112 0 0>;
gpio-ranges-group-names = "gpio_range0",
"gpio_range1",
"gpio_range2";
ngpios = <136>;
socionext,interrupt-ranges = <0 48 13>, <14 62 2>;
};
i2c0: i2c@58400000 {
@ -113,6 +135,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c0>;
clocks = <&peri_clk 4>;
resets = <&peri_rst 4>;
clock-frequency = <100000>;
};
@ -126,6 +149,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
clocks = <&peri_clk 5>;
resets = <&peri_rst 5>;
clock-frequency = <100000>;
};
@ -139,6 +163,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c2>;
clocks = <&peri_clk 6>;
resets = <&peri_rst 6>;
clock-frequency = <400000>;
};
@ -152,6 +177,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c3>;
clocks = <&peri_clk 7>;
resets = <&peri_rst 7>;
clock-frequency = <100000>;
};
@ -302,6 +328,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand2cs>;
clocks = <&sys_clk 2>;
resets = <&sys_rst 2>;
};
};
};

3
arch/arm/boot/dts/uniphier-support-card.dtsi
View File

@ -11,11 +11,12 @@
status = "okay";
ranges = <1 0x00000000 0x42000000 0x02000000>;
support_card: support_card@1,1f00000 {
support_card: support-card@1,1f00000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x00000000 1 0x01f00000 0x00100000>;
interrupt-parent = <&gpio>;
ethsc: ethernet@0 {
compatible = "smsc,lan9118", "smsc,lan9115";