UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

STi DT fixes: 

- Remove duplicated rng node in stih407-family.dtsi
 - Fix complain about IRQ_TYPE_NONE usage in stih418.dtsi
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCgA1FiEEXyrViUccKBz9c35Jysd4L3sz/6YFAl6Zh/UXHHBhdHJpY2Uu
 Y2hvdGFyZEBzdC5jb20ACgkQysd4L3sz/6bduA/+Nf+eY0ftqGk8bQQJ99wcbzrp
 ewO3ocq/9coS8Pu3Wr6smcVcZGozQx2nmlOdaSCqjqyiV85osreQJnlpSPjvQBxl
 4ST8an4dVi4I2Ci9QizES1Yg+zs/BNlfmfgR8d1lkS4HiDF9W+NVjA7cEN0s0bRv
 Y2yuU3dpbFcclpWvBTInqC49ek3iKmAv28wfzXlAPhtz8hKx6PR1oaUZilw3HiYe
 2xho9+paUpTzYMMMCRzFeJ/bBD2OfBZbLeo9Yp/40cxdrLLGjzTfjULXF5ZJGywv
 ytvi0WFq+34TuN5+SmV4pOINB7nqxfrFpQr31RbPF1SaH7VC46hKrECqd5g1/uPV
 bpp1udnaaVLillC8cQOQn99+PzRlHSFseq6l8EMxm0Hc4Z7dhDHtybZoduPYAONY
 oEO3hIgA9x80IHMRszupwS3duvLMIW4JsJWkTW/mZZAKVEJ36LsaPNQ0BugG0+HJ
 qbyeycqvKCYI20sw7Wyu2+Sqg3IMpwghCCtP/tyGRtbBIWpNev2YjVbWDOVwjvjQ
 7ROGYqs/RNLuu8XtgJ3j7bS4wxJFjBHkIJvmccgkKYplit0f5r2+FUlAm75lO3IW
 sPV5pLFG/5D061AP9KwiRKVMyCmelen1/sJuNi0ql0zDHJWmovdVfyq0IfxphlQw
 XkIhmx8WETNxGX5ETC4=
 =1MYc
 -----END PGP SIGNATURE-----

Merge tag 'sti-dt-for-v5.8-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into arm/dt

STi DT fixes:
- Remove duplicated rng node in stih407-family.dtsi
- Fix complain about IRQ_TYPE_NONE usage in stih418.dtsi

* tag 'sti-dt-for-v5.8-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  dts: arm: stih407-family: remove duplicated rng nodes
  dts: arm: stih418: Fix complain about IRQ_TYPE_NONE usage

Link: https://lore.kernel.org/r/4b0c02e7-a247-50c0-d729-88d16b9dd7fd@st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2020-05-21 11:51:28 +02:00
parent 161af8fd02 7f21a85085
commit dca296dd15
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/boot/dts/stih407-family.dtsi
View File

@ -767,20 +767,6 @@
<&clk_s_c0_flexgen CLK_ETH_PHY>;
};
rng10: rng@8a89000 {
compatible = "st,rng";
reg = <0x08a89000 0x1000>;
clocks = <&clk_sysin>;
status = "okay";
};
rng11: rng@8a8a000 {
compatible = "st,rng";
reg = <0x08a8a000 0x1000>;
clocks = <&clk_sysin>;
status = "okay";
};
mailbox0: mailbox@8f00000 {
compatible = "st,stih407-mailbox";
reg = <0x8f00000 0x1000>;

8
arch/arm/boot/dts/stih418.dtsi
View File

@ -50,7 +50,7 @@
ohci0: usb@9a03c00 {
compatible = "st,st-ohci-300x";
reg = <0x9a03c00 0x100>;
interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;
interrupts = <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
<&softreset STIH407_USB2_PORT0_SOFTRESET>;
@ -62,7 +62,7 @@
ehci0: usb@9a03e00 {
compatible = "st,st-ehci-300x";
reg = <0x9a03e00 0x100>;
interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb0>;
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
@ -76,7 +76,7 @@
ohci1: usb@9a83c00 {
compatible = "st,st-ohci-300x";
reg = <0x9a83c00 0x100>;
interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;
interrupts = <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
<&softreset STIH407_USB2_PORT1_SOFTRESET>;
@ -88,7 +88,7 @@
ehci1: usb@9a83e00 {
compatible = "st,st-ehci-300x";
reg = <0x9a83e00 0x100>;
interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1>;
clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;