openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: Keystone DTS for 4.17 

- Andrew's various DTS warning fixes
  - clock address separator fix
  - EDAC support for EMIF
  - serial dts node unit address format fix
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJaneBhAAoJEHJsHOdBp5c/bckP/AhiGBDwbLIaT+Ch32j7X0Vz
 Z9TCRSIbUxkbFIE/6KVQkHSLWbdhA3POnWZzk41Mh+qCXDlreSZmGYXgQywI6XIA
 MkNLibHSJ6vfXP11L0qsIFvftUJtyK44u9U2MFDBZTmXXCqKbVNAvLT41nVCN7f1
 cjkKG13uTNIRHShY7B4G7wiJ9z/+SiEJab4VGoKULSw9kDTIRskFukX2pAD3732t
 KPysHuSvRp7wlMkAAp9/gM68czA60+VebZRS5eFOKwS7iGkE2fd4nqEF6HT79NgA
 XeNYucc+UudVVqTzP1V1RZlAjIh5AxK/ogTPPcJ04Dh5BRno0VMauoSDNt+aaNKW
 6Xo36sEGBCzbpnGw6Q9r54Fty5N93zw5BW4yHuWLnbVNNB/JVH8OcVGpoJGrEkwv
 HxoXytEgJKtHhRzFexIOqY60l6WFO0zNy1iBK6BvMYPl6Qg+GU7p7wwdIfRyQuYE
 SS5Hq3cnZdrEXFNsTBMsM1eqAsL3+SSWKdYFPSCfFNRe9CTEIGldv4ofaRQh+vvn
 W101lxXwFOHye/9oiOZk5Q60UKbZbNy2Vi+XQA5lxB99qlXA+bGOWdei1j8vj30K
 UY/NRuKc57GWfMWm4gzzPRY30dBtlY9eFcvDADe64N2fx//Yd+Zate/gdZ4Blm3q
 3dWhsuFq9RNhXHCvVKav
 =FCaw
 -----END PGP SIGNATURE-----

Merge tag 'keystone_dts_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Pull "ARM: Keystone DTS for 4.17" from Santosh Shilimkar:

 - Andrew's various DTS warning fixes
 - clock address separator fix
 - EDAC support for EMIF
 - serial dts node unit address format fix

* tag 'keystone_dts_for_4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone-k2g: Fix unit-address formatting for serial nodes
  dt-bindings: memory: ti-emif: add edac support under emif
  ARM: dts: keystone-k2e-clocks: Fix missing unit address separator
  ARM: dts: keystone-k2g: Move usb-phy nodes out of soc0
  ARM: dts: keystone-k2g: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone-k2g: Move keystone_irq to under device-state-control
  ARM: dts: keystone-k2hk: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone-k2l: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone-k2e: Move keystone_dsp_gpio to under device-state-control
  ARM: dts: keystone: Move reset-controller to under device-state-control
  ARM: dts: keystone: Move keystone_irq to under device-state-control
This commit is contained in:
Arnd Bergmann 2018-03-07 15:41:43 +01:00
parent e94e5cb859 07f3398d38
commit ea99a3546a
7 changed files with 168 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
View File

@ -3,7 +3,9 @@
EMIF - External Memory Interface - is an SDRAM controller used in
TI SoCs. EMIF supports, based on the IP revision, one or more of
DDR2/DDR3/LPDDR2 protocols. This binding describes a given instance
of the EMIF IP and memory parts attached to it.
of the EMIF IP and memory parts attached to it. Certain revisions
of the EMIF controller also contain optional ECC support, which
corrects one bit errors and detects two bit errors.
Required properties:
- compatible : Should be of the form "ti,emif-<ip-rev>" where <ip-rev>
@ -11,6 +13,8 @@ Required properties:
compatible should be one of the following:
"ti,emif-am3352"
"ti,emif-am4372"
"ti,emif-dra7xx"
"ti,emif-keystone"
- phy-type : <u32> indicating the DDR phy type. Following are the
allowed values
@ -22,6 +26,7 @@ Required properties:
- ti,hwmods : For TI hwmods processing and omap device creation
the value shall be "emif<n>" where <n> is the number of the EMIF
instance with base 1.
- interrupts : interrupt used by the controller
Required only for "ti,emif-am3352" and "ti,emif-am4372":
- sram : Phandles for generic sram driver nodes,
@ -71,3 +76,9 @@ emif: emif@4c000000 {
sram = <&pm_sram_code
&pm_sram_data>;
};
emif1: emif@4c000000 {
compatible = "ti,emif-dra7xx";
reg = <0x4c000000 0x200>;
interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
};

2
arch/arm/boot/dts/keystone-k2e-clocks.dtsi
View File

@ -42,7 +42,7 @@ clkusb1: clkusb1@2350004 {
domain-id = <0>;
};
clkhyperlink0: clkhyperlink02350030 {
clkhyperlink0: clkhyperlink0@2350030 {
#clock-cells = <0>;
compatible = "ti,keystone,psc-clock";
clocks = <&chipclk12>;

13
arch/arm/boot/dts/keystone-k2e.dtsi
View File

@ -109,11 +109,14 @@ pscrst: reset-controller {
};
};
dspgpio0: keystone_dsp_gpio@2620240 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
devctrl: device-state-control@2620000 {
dspgpio0: keystone_dsp_gpio@240 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x240 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
};
dsp0: dsp@10800000 {

69
arch/arm/boot/dts/keystone-k2g.dtsi
View File

@ -69,6 +69,24 @@ pmu {
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
};
usbphy {
#address-cells = <1>;
#size-cells = <0>;
compatible = "simple-bus";
usb0_phy: usb-phy@0 {
compatible = "usb-nop-xceiv";
reg = <0>;
status = "disabled";
};
usb1_phy: usb-phy@1 {
compatible = "usb-nop-xceiv";
reg = <1>;
status = "disabled";
};
};
soc0: soc@0 {
#address-cells = <1>;
#size-cells = <1>;
@ -97,8 +115,28 @@ k2g_pinctrl: pinmux@2621000 {
};
devctrl: device-state-control@2620000 {
compatible = "ti,keystone-devctrl", "syscon";
compatible = "ti,keystone-devctrl", "syscon", "simple-mfd";
reg = <0x02620000 0x1000>;
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x02620000 0x1000>;
kirq0: keystone_irq@2a0 {
compatible = "ti,keystone-irq";
reg = <0x2a0 0x10>;
interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
interrupt-controller;
#interrupt-cells = <1>;
ti,syscon-dev = <&devctrl 0x2a0>;
};
dspgpio0: keystone_dsp_gpio@240 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x240 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
};
uart0: serial@2530c00 {
@ -113,7 +151,7 @@ uart0: serial@2530c00 {
status = "disabled";
};
uart1: serial@02531000 {
uart1: serial@2531000 {
compatible = "ti,da830-uart", "ns16550a";
current-speed = <115200>;
reg-shift = <2>;
@ -125,7 +163,7 @@ uart1: serial@02531000 {
status = "disabled";
};
uart2: serial@02531400 {
uart2: serial@2531400 {
compatible = "ti,da830-uart", "ns16550a";
current-speed = <115200>;
reg-shift = <2>;
@ -188,21 +226,6 @@ i2c2: i2c@2530800 {
status = "disabled";
};
kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = <GIC_SPI 1 IRQ_TYPE_EDGE_RISING>;
interrupt-controller;
#interrupt-cells = <1>;
ti,syscon-dev = <&devctrl 0x2a0>;
};
dspgpio0: keystone_dsp_gpio@2620240 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
dsp0: dsp@10800000 {
compatible = "ti,k2g-dsp";
reg = <0x10800000 0x00100000>,
@ -460,11 +483,6 @@ mcasp2: mcasp@2344000 {
status = "disabled";
};
usb0_phy: usb-phy@0 {
compatible = "usb-nop-xceiv";
status = "disabled";
};
keystone_usb0: keystone-dwc3@2680000 {
compatible = "ti,keystone-dwc3";
#address-cells = <1>;
@ -488,11 +506,6 @@ usb0: usb@2690000 {
};
};
usb1_phy: usb-phy@1 {
compatible = "usb-nop-xceiv";
status = "disabled";
};
keystone_usb1: keystone-dwc3@2580000 {
compatible = "ti,keystone-dwc3";
#address-cells = <1>;

104
arch/arm/boot/dts/keystone-k2hk.dtsi
View File

@ -87,60 +87,70 @@ pscrst: reset-controller {
};
};
dspgpio0: keystone_dsp_gpio@2620240 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
devctrl: device-state-control@2620000 {
dspgpio0: keystone_dsp_gpio@240 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x240 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
dspgpio1: keystone_dsp_gpio@2620244 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x244>;
};
dspgpio1: keystone_dsp_gpio@244 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x244 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x244>;
};
dspgpio2: keystone_dsp_gpio@2620248 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x248>;
};
dspgpio2: keystone_dsp_gpio@248 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x248 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x248>;
};
dspgpio3: keystone_dsp_gpio@262024c {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x24c>;
};
dspgpio3: keystone_dsp_gpio@24c {
compatible = "ti,keystone-dsp-gpio";
reg = <0x24c 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x24c>;
};
dspgpio4: keystone_dsp_gpio@2620250 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x250>;
};
dspgpio4: keystone_dsp_gpio@250 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x250 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x250>;
};
dspgpio5: keystone_dsp_gpio@2620254 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x254>;
};
dspgpio5: keystone_dsp_gpio@254 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x254 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x254>;
};
dspgpio6: keystone_dsp_gpio@2620258 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x258>;
};
dspgpio6: keystone_dsp_gpio@258 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x258 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x258>;
};
dspgpio7: keystone_dsp_gpio@262025c {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x25c>;
dspgpio7: keystone_dsp_gpio@25c {
compatible = "ti,keystone-dsp-gpio";
reg = <0x25c 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x25c>;
};
};
dsp0: dsp@10800000 {

52
arch/arm/boot/dts/keystone-k2l.dtsi
View File

@ -289,32 +289,38 @@ osr: sram@70000000 {
clocks = <&clkosr>;
};
dspgpio0: keystone_dsp_gpio@2620240 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
devctrl: device-state-control@2620000 {
dspgpio0: keystone_dsp_gpio@240 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x240 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x240>;
};
dspgpio1: keystone_dsp_gpio@2620244 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x244>;
};
dspgpio1: keystone_dsp_gpio@244 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x244 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x244>;
};
dspgpio2: keystone_dsp_gpio@2620248 {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x248>;
};
dspgpio2: keystone_dsp_gpio@248 {
compatible = "ti,keystone-dsp-gpio";
reg = <0x248 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x248>;
};
dspgpio3: keystone_dsp_gpio@262024c {
compatible = "ti,keystone-dsp-gpio";
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x24c>;
dspgpio3: keystone_dsp_gpio@24c {
compatible = "ti,keystone-dsp-gpio";
reg = <0x24c 0x4>;
gpio-controller;
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x24c>;
};
};
dsp0: dsp@10800000 {

35
arch/arm/boot/dts/keystone.dtsi
View File

@ -87,15 +87,28 @@ psc: power-sleep-controller@2350000 {
};
devctrl: device-state-control@2620000 {
compatible = "ti,keystone-devctrl", "syscon";
compatible = "ti,keystone-devctrl", "syscon", "simple-mfd";
reg = <0x02620000 0x1000>;
};
#address-cells = <1>;
#size-cells = <1>;
ranges = <0x0 0x02620000 0x1000>;
rstctrl: reset-controller {
compatible = "ti,keystone-reset";
ti,syscon-pll = <&pllctrl 0xe4>;
ti,syscon-dev = <&devctrl 0x328>;
ti,wdt-list = <0>;
kirq0: keystone_irq@2a0 {
compatible = "ti,keystone-irq";
reg = <0x2a0 0x4>;
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
interrupt-controller;
#interrupt-cells = <1>;
ti,syscon-dev = <&devctrl 0x2a0>;
};
rstctrl: reset-controller@328 {
compatible = "ti,keystone-reset";
reg = <0x328 0x10>;
ti,syscon-pll = <&pllctrl 0xe4>;
ti,syscon-dev = <&devctrl 0x328>;
ti,wdt-list = <0>;
};
};
/include/ "keystone-clocks.dtsi"
@ -282,14 +295,6 @@ aemif: aemif@21000A00 {
1 0 0x21000A00 0x00000100>;
};
kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
interrupt-controller;
#interrupt-cells = <1>;
ti,syscon-dev = <&devctrl 0x2a0>;
};
pcie0: pcie@21800000 {
compatible = "ti,keystone-pcie", "snps,dw-pcie";
clocks = <&clkpcie>;