Skip to content

L
linux
Commit af3fe473 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'sti-dt-for-v4.9-1' of... 

Merge tag 'sti-dt-for-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

Pull "STi dts fixes and new STi 96board support" from Patrice Chotard:

Add thermal node for STiH407 family boards
Add specific nodes for STMicroelectronics 96Board
Add new B2260 STi board file = 96Board
Fix ahci issue on STiH407 family
Fix debugfs/pinctrl kernel warning
Update gpio-cells and gpio specifier

* tag 'sti-dt-for-v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: dts: STiH41x-b2020: Update gpio specifier
  ARM: dts: STiH418-B2199: Update gpio specifier
  ARM: dts: STiH407-pinctrl: Update gpio-cells to 2
  ARM: dts: STi: Introduce B2260 board
  ARM: dts: STiH407-family: Add ports-implemented property in sata nodes
  ARM: dts: STiH407-pinctrl: Add pinctrl_rgmii1_mdio_1 node
  ARM: dts: STiH407: Move non-removable property to board file
  ARM: dts: STiH407-pinctrl: Add i2c2_alt2_1 node
  ARM: dts: STiH410: Add thermal node
  ARM: dts: STiH407: Move pio20 node to fix kernel warning
parents 3abb0c6c ba5ba119
Hide whitespace changes
Inline Side-by-side
Showing with 259 additions and 42 deletions
arch/arm/boot/dts/Makefile
View file @ af3fe473
......@@ -686,6 +686,7 @@ dtb-$(CONFIG_ARCH_SPEAR6XX) += \
dtb-$(CONFIG_ARCH_STI) += \
stih407-b2120.dtb \
stih410-b2120.dtb \
stih410-b2260.dtb \
stih415-b2000.dtb \
stih415-b2020.dtb \
stih416-b2000.dtb \
......
arch/arm/boot/dts/stih407-family.dtsi
View file @ af3fe473
......@@ -553,7 +553,6 @@ mmc0: sdhci@09060000 {
clock-names = "mmc";
clocks = <&clk_s_c0_flexgen CLK_MMC_0>;
bus-width = <8>;
non-removable;
};
mmc1: sdhci@09080000 {
......@@ -608,6 +607,8 @@ sata0: sata@9b20000 {
clock-names = "ahci_clk";
clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
ports-implemented = <0x1>;
status = "disabled";
};
......@@ -631,6 +632,8 @@ sata1: sata@9b28000 {
clock-names = "ahci_clk";
clocks = <&clk_s_c0_flexgen CLK_ICN_REG>;
ports-implemented = <0x1>;
status = "disabled";
};
......
arch/arm/boot/dts/stih407-pinctrl.dtsi
View file @ af3fe473
......@@ -58,7 +58,7 @@ pin-controller-sbc {
pio0: gpio@09610000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x100>;
......@@ -66,7 +66,7 @@ pio0: gpio@09610000 {
};
pio1: gpio@09611000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1000 0x100>;
......@@ -74,7 +74,7 @@ pio1: gpio@09611000 {
};
pio2: gpio@09612000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2000 0x100>;
......@@ -82,7 +82,7 @@ pio2: gpio@09612000 {
};
pio3: gpio@09613000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x3000 0x100>;
......@@ -90,7 +90,7 @@ pio3: gpio@09613000 {
};
pio4: gpio@09614000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x4000 0x100>;
......@@ -99,7 +99,7 @@ pio4: gpio@09614000 {
pio5: gpio@09615000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x5000 0x100>;
......@@ -230,6 +230,13 @@ st,pins {
};
};
pinctrl_rgmii1_mdio_1: rgmii1-mdio-1 {
st,pins {
mdio = <&pio1 0 ALT1 OUT BYPASS 0>;
mdc = <&pio1 1 ALT1 OUT NICLK 0 CLK_A>;
};
};
pinctrl_mii1: mii1 {
st,pins {
txd0 = <&pio0 0 ALT1 OUT SE_NICLK_IO 0 CLK_A>;
......@@ -373,7 +380,7 @@ pin-controller-front0 {
pio10: pio@09200000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x100>;
......@@ -381,7 +388,7 @@ pio10: pio@09200000 {
};
pio11: pio@09201000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1000 0x100>;
......@@ -389,7 +396,7 @@ pio11: pio@09201000 {
};
pio12: pio@09202000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2000 0x100>;
......@@ -397,7 +404,7 @@ pio12: pio@09202000 {
};
pio13: pio@09203000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x3000 0x100>;
......@@ -405,7 +412,7 @@ pio13: pio@09203000 {
};
pio14: pio@09204000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x4000 0x100>;
......@@ -413,7 +420,7 @@ pio14: pio@09204000 {
};
pio15: pio@09205000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x5000 0x100>;
......@@ -421,7 +428,7 @@ pio15: pio@09205000 {
};
pio16: pio@09206000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x6000 0x100>;
......@@ -429,7 +436,7 @@ pio16: pio@09206000 {
};
pio17: pio@09207000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x7000 0x100>;
......@@ -437,7 +444,7 @@ pio17: pio@09207000 {
};
pio18: pio@09208000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x8000 0x100>;
......@@ -445,7 +452,7 @@ pio18: pio@09208000 {
};
pio19: pio@09209000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x9000 0x100>;
......@@ -523,6 +530,13 @@ st,pins {
scl = <&pio15 5 ALT2 BIDIR>;
};
};
pinctrl_i2c2_alt2_1: i2c2-alt2-1 {
st,pins {
sda = <&pio12 6 ALT2 BIDIR>;
scl = <&pio12 5 ALT2 BIDIR>;
};
};
};
i2c3 {
......@@ -916,6 +930,15 @@ pin-controller-front1 {
interrupt-names = "irqmux";
ranges = <0 0x09210000 0x10000>;
pio20: pio@09210000 {
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x100>;
st,bank-name = "PIO20";
};
tsin4 {
pinctrl_tsin4_serial_alt1: tsin4_serial_alt1 {
st,pins {
......@@ -927,15 +950,6 @@ st,pins {
};
};
};
pio20: pio@09210000 {
gpio-controller;
#gpio-cells = <1>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x100>;
st,bank-name = "PIO20";
};
};
pin-controller-rear {
......@@ -951,7 +965,7 @@ pin-controller-rear {
pio30: gpio@09220000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x0 0x100>;
......@@ -959,7 +973,7 @@ pio30: gpio@09220000 {
};
pio31: gpio@09221000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1000 0x100>;
......@@ -967,7 +981,7 @@ pio31: gpio@09221000 {
};
pio32: gpio@09222000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2000 0x100>;
......@@ -975,7 +989,7 @@ pio32: gpio@09222000 {
};
pio33: gpio@09223000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x3000 0x100>;
......@@ -983,7 +997,7 @@ pio33: gpio@09223000 {
};
pio34: gpio@09224000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x4000 0x100>;
......@@ -991,7 +1005,7 @@ pio34: gpio@09224000 {
};
pio35: gpio@09225000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x5000 0x100>;
......@@ -1090,7 +1104,7 @@ pin-controller-flash {
pio40: gpio@09230000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0 0x100>;
......@@ -1098,7 +1112,7 @@ pio40: gpio@09230000 {
};
pio41: gpio@09231000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x1000 0x100>;
......@@ -1106,7 +1120,7 @@ pio41: gpio@09231000 {
};
pio42: gpio@09232000 {
gpio-controller;
#gpio-cells = <1>;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
reg = <0x2000 0x100>;
......
arch/arm/boot/dts/stih410-b2260.dts 0 → 100644
View file @ af3fe473
/*
* Copyright (C) 2016 STMicroelectronics (R&D) Limited.
* Author: Patrice Chotard <patrice.chotard@st.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
/dts-v1/;
#include "stih410.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "STiH410 B2260";
compatible = "st,stih410-b2260", "st,stih410";
chosen {
bootargs = "console=ttyAS1,115200";
linux,stdout-path = &uart1;
};
memory {
device_type = "memory";
reg = <0x40000000 0x40000000>;
};
aliases {
ttyAS1 = &uart1;
ethernet0 = &ethernet0;
};
soc {
leds {
compatible = "gpio-leds";
user_green_1 {
label = "User_green_1";
gpios = <&pio1 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat";
default-state = "off";
};
user_green_2 {
label = "User_green_2";
gpios = <&pio4 1 GPIO_ACTIVE_LOW>;
default-state = "off";
};
user_green_3 {
label = "User_green_3";
gpios = <&pio2 1 GPIO_ACTIVE_LOW>;
default-state = "off";
};
user_green_4 {
label = "User_green_4";
gpios = <&pio2 5 GPIO_ACTIVE_LOW>;
default-state = "off";
};
};
/* Low speed expansion connector */
uart0: serial@9830000 {
label = "LS-UART0";
status = "okay";
};
/* Low speed expansion connector */
uart1: serial@9831000 {
label = "LS-UART1";
status = "okay";
};
/* Low speed expansion connector */
spi0: spi@9844000 {
label = "LS-SPI0";
cs-gpio = <&pio30 3 0>;
status = "okay";
};
/* Low speed expansion connector */
i2c0: i2c@9840000 {
label = "LS-I2C0";
status = "okay";
};
/* Low speed expansion connector */
i2c1: i2c@9841000 {
label = "LS-I2C1";
status = "okay";
};
/* high speed expansion connector */
i2c2: i2c@9842000 {
label = "HS-I2C2";
pinctrl-0 = <&pinctrl_i2c2_alt2_1>;
status = "okay";
};
/* high speed expansion connector */
i2c3: i2c@9843000 {
label = "HS-I2C3";
pinctrl-0 = <&pinctrl_i2c3_alt3_0>;
status = "okay";
};
mmc0: sdhci@09060000 {
pinctrl-0 = <&pinctrl_sd0>;
bus-width = <4>;
status = "okay";
};
/* high speed expansion connector */
mmc1: sdhci@09080000 {
status = "okay";
};
pwm0: pwm@9810000 {
status = "okay";
};
pwm1: pwm@9510000 {
status = "okay";
};
usb2_picophy1: phy2 {
status = "okay";
};
usb2_picophy2: phy3 {
status = "okay";
};
ohci0: usb@9a03c00 {
status = "okay";
};
ehci0: usb@9a03e00 {
status = "okay";
};
ohci1: usb@9a83c00 {
status = "okay";
};
ehci1: usb@9a83e00 {
status = "okay";
};
ethernet0: dwmac@9630000 {
phy-mode = "rgmii";
pinctrl-0 = <&pinctrl_rgmii1 &pinctrl_rgmii1_mdio_1>;
snps,phy-bus-name = "stmmac";
snps,phy-bus-id = <0>;
snps,phy-addr = <0>;
snps,reset-gpio = <&pio0 7 0>;
snps,reset-active-low;
snps,reset-delays-us = <0 10000 1000000>;
status = "okay";
};
/* SSC11 to HDMI */
hdmiddc: i2c@9541000 {
/* HDMI V1.3a supports Standard mode only */
clock-frequency = <100000>;
st,i2c-min-scl-pulse-width-us = <0>;
st,i2c-min-sda-pulse-width-us = <5>;
status = "okay";
};
sti-display-subsystem {
sti_hdmi: sti-hdmi@8d04000 {
status = "okay";
};
};
miphy28lp_phy: miphy28lp@9b22000 {
phy_port1: port@9b2a000 {
st,osc-force-ext;
};
};
sata1: sata@9b28000 {
status = "okay";
};
};
};
arch/arm/boot/dts/stih410.dtsi
View file @ af3fe473
......@@ -227,5 +227,13 @@ bdisp0:bdisp@9f10000 {
clock-names = "bdisp";
clocks = <&clk_s_c0_flexgen CLK_IC_BDISP_0>;
};
thermal@91a0000 {
compatible = "st,stih407-thermal";
reg = <0x91a0000 0x28>;
clock-names = "thermal";
clocks = <&clk_sysin>;
interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
};
};
};
arch/arm/boot/dts/stih418-b2199.dts
View file @ af3fe473
......@@ -8,6 +8,7 @@
*/
/dts-v1/;
#include "stih418.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
model = "STiH418 B2199";
compatible = "st,stih418-b2199", "st,stih418";
......@@ -35,14 +36,12 @@ sbc_serial0: serial@9530000 {
leds {
compatible = "gpio-leds";
red {
#gpio-cells = <2>;
label = "Front Panel LED";
gpios = <&pio4 1 0>;
gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
green {
#gpio-cells = <2>;
gpios = <&pio1 3 0>;
gpios = <&pio1 3 GPIO_ACTIVE_HIGH>;
default-state = "off";
};
};
......@@ -86,6 +85,7 @@ mmc0: sdhci@09060000 {
sd-uhs-sdr50;
sd-uhs-sdr104;
sd-uhs-ddr50;
non-removable;
};
miphy28lp_phy: miphy28lp@9b22000 {
......
arch/arm/boot/dts/stih41x-b2020.dtsi
View file @ af3fe473
......@@ -7,6 +7,7 @@
* publishhed by the Free Software Foundation.
*/
#include "stih41x-b2020x.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
memory{
device_type = "memory";
......@@ -30,13 +31,12 @@ sbc_serial1: serial@fe531000 {
leds {
compatible = "gpio-leds";
red {
#gpio-cells = <1>;
label = "Front Panel LED";
gpios = <&pio4 1>;
gpios = <&pio4 1 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
green {
gpios = <&pio4 7>;
gpios = <&pio4 7 GPIO_ACTIVE_HIGH>;
default-state = "off";
};
};
......
arch/arm/boot/dts/stihxxx-b2120.dtsi
View file @ af3fe473
......@@ -65,6 +65,7 @@ i2c@9540000 {
};
mmc0: sdhci@09060000 {
non-removable;
status = "okay";
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7