diff options
author | Tom Rini <trini@konsulko.com> | 2020-03-31 10:07:01 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-03-31 10:07:01 -0400 |
commit | 150db4264d210f6fd4fbf5e0e9cafc135eb13c17 (patch) | |
tree | 34ab1f6c9c0eb1878ab3a2d824d47f7a73ef4ea9 /arch | |
parent | 1104dde6e89f3d3ab07284e7c871cc33037f1198 (diff) | |
parent | 7f6b0f3357bd25c7ed23f8f5a76a99ab9a0fd398 (diff) |
Merge branch '2020-03-31-master-imports'
- mpc8xxx GPIO, SPI bugfixes
- Add VxWorks to FIT images
- macb ethernet driver bugfix
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/dts/gdsys/mpc8308.dtsi | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/dts/gdsys/mpc8308.dtsi b/arch/powerpc/dts/gdsys/mpc8308.dtsi index 23e7403d91..1a319e2328 100644 --- a/arch/powerpc/dts/gdsys/mpc8308.dtsi +++ b/arch/powerpc/dts/gdsys/mpc8308.dtsi @@ -17,6 +17,7 @@ /dts-v1/; #include <dt-bindings/memory/mpc83xx-sdram.h> +#include <dt-bindings/clk/mpc83xx-clk.h> / { compatible = "fsl,mpc8308rdb"; @@ -50,6 +51,11 @@ }; }; + socclocks: clocks { + compatible = "fsl,mpc8308-clk"; + #clock-cells = <1>; + }; + board_lbc: localbus@e0005000 { #address-cells = <2>; #size-cells = <1>; @@ -173,6 +179,7 @@ reg = <0x7000 0x1000>; interrupts = <16 0x8>; interrupt-parent = <&ipic>; + clocks = <&socclocks MPC83XX_CLK_CSB>; mode = "cpu"; }; |