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

This pull request contains Broadcom ARM64-based SoCs changes for 5.10,

Browse Source 
please pull the following:
 
 - Adrian changes the status properties from "ok" to "okay"
 
 - Andre fixes the SP805 watchdog nodes to have the correct clock names
   and binding for the Northstar 2 platform
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl9Zj0kACgkQh9CWnEQH
 BwRDcRAAyDCykidY8pkamoGnfYZQDGmrKedBlXYuTGRjRtIR0BwBZ7EmkLgVp5uT
 KJ5pKUeL7Zx1w5+v2njAF7qxW+pdLYsp6UYHtxpb33FSwhkPV5jwNmPq1/kXdyPm
 lud7qSzx5DPlD21bKsNwwnMS3fsqsF8OWX8kqdxabkNgwgvHGVc6S+xma+WI3fVY
 P6zZBxMfU/oE7xS4ZpHxA2o4z+Yvl/6BPOvqIB+Ic+2rIc11ZcYG3P4l/dfuuY3y
 sDYDmCTy7J1unRlVkGTAWVBQpEuoWnqyZVP7BqhzG/dx4GADyDbdn1XX7VM2wwru
 kW+Xrpae3Ar1p6ZvlwGbBs9+aHWqe2fAYKNrMzp5d1at9mFEs/i9Wswz8usHaFZ5
 je7nKTrhpf3QAXPvSsZwmkqcd59yC+6BhDczI3NUZ4IBKQNtcGVJo9RT/jNgDfar
 TbJ7u1yYEh5TLQPPWDIWMOUPhtI4ZnFjzSIFmJVFaM77KvJFNCJSjF0lYjno4s1m
 i7GW8U871waVp77TpfP5u6Beg5ClqBgnXFq8ceCJ4jJLODEEXYAjqP6omrpJxUSg
 9FNRo6m2CJVMbaodL0dBH5S/X+J3jiSPLp6gYkMQRMpA7qZa168Mhh5DJq4Rcm3G
 ks4oigW7G+/jcfyxUiNu3GuhOci5XVpenVDgRkc4Bveh5b/MfDA=
 =d42J
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-5.10/devicetree-arm64' of https://github.com/Broadcom/stblinux into arm/dt

This pull request contains Broadcom ARM64-based SoCs changes for 5.10,
please pull the following:

- Adrian changes the status properties from "ok" to "okay"

- Andre fixes the SP805 watchdog nodes to have the correct clock names
  and binding for the Northstar 2 platform

* tag 'arm-soc/for-5.10/devicetree-arm64' of https://github.com/Broadcom/stblinux:
  arm64: dts: broadcom: Fix SP805 clock-names
  arm64: dts: broadcom: replace status value "ok" by "okay"

Link: https://lore.kernel.org/r/20200912032153.1216354-2-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-09-13 11:36:10 -07:00
commit 5f37a0d903
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
View File

@ -576,7 +576,7 @@
reg = <0x66090000 0x1000>;
interrupts = <GIC_SPI 406 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&iprocslow>, <&iprocslow>;
clock-names = "wdogclk", "apb_pclk";
clock-names = "wdog_clk", "apb_pclk";
};
gpio_g: gpio@660a0000 {

2
arch/arm64/boot/dts/broadcom/stingray/bcm958742-base.dtsi
View File

@ -151,7 +151,7 @@
};
&nand {
status = "ok";
status = "okay";
nandcs@0 {
compatible = "brcm,nandcs";
reg = <0>;

2
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi
View File

@ -438,7 +438,7 @@
reg = <0x000c0000 0x1000>;
interrupts = <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&hsls_25m_div2_clk>, <&hsls_div4_clk>;
clock-names = "wdogclk", "apb_pclk";
clock-names = "wdog_clk", "apb_pclk";
timeout-sec = <60>;
};