diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-07 10:55:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-07 10:55:12 -0500 |
| commit | 3589025867274ff28f689029ab8323301771c8ec (patch) | |
| tree | bc8f6b088d9b5ceec8e99602082f4d034800b8ef /arch/sandbox | |
| parent | 57dbc151437b36cc1105857d222df28b095236d7 (diff) | |
| parent | fdce9d35dc3671dfc6ce29b4c76e152cc5780869 (diff) | |
Merge branch '2018-12-06-master-imports'
- Various FAT fixes
- Hardware spinlock uclass
- DMA uclass
- Various am335x fixes
- DT resyncs for a number of TI platforms
- stm32 updates
Diffstat (limited to 'arch/sandbox')
| -rw-r--r-- | arch/sandbox/dts/test.dts | 12 | ||||
| -rw-r--r-- | arch/sandbox/include/asm/state.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 6722e18bc3..082fcec3f9 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -742,6 +742,18 @@ pinctrl { compatible = "sandbox,pinctrl"; }; + + hwspinlock@0 { + compatible = "sandbox,hwspinlock"; + }; + + dma: dma { + compatible = "sandbox,dma"; + #dma-cells = <1>; + + dmas = <&dma 0>, <&dma 1>, <&dma 2>; + dma-names = "m2m", "tx0", "rx0"; + }; }; #include "sandbox_pmic.dtsi" diff --git a/arch/sandbox/include/asm/state.h b/arch/sandbox/include/asm/state.h index 5a14485102..c724827f6c 100644 --- a/arch/sandbox/include/asm/state.h +++ b/arch/sandbox/include/asm/state.h @@ -101,6 +101,7 @@ struct sandbox_state { ulong next_tag; /* Next address tag to allocate */ struct list_head mapmem_head; /* struct sandbox_mapmem_entry */ + bool hwspinlock; /* Hardware Spinlock status */ }; /* Minimum space we guarantee in the state FDT when calling read/write*/ |