mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge 5.1-rc6 into staging-next
We want the fixes in here as well as this resolves an iio driver merge issue. Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
commit
817de6b859
777 changed files with 8115 additions and 4465 deletions
18
include/dt-bindings/clock/sifive-fu540-prci.h
Normal file
18
include/dt-bindings/clock/sifive-fu540-prci.h
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/*
|
||||
* Copyright (C) 2018-2019 SiFive, Inc.
|
||||
* Wesley Terpstra
|
||||
* Paul Walmsley
|
||||
*/
|
||||
|
||||
#ifndef __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H
|
||||
#define __DT_BINDINGS_CLOCK_SIFIVE_FU540_PRCI_H
|
||||
|
||||
/* Clock indexes for use by Device Tree data and the PRCI driver */
|
||||
|
||||
#define PRCI_CLK_COREPLL 0
|
||||
#define PRCI_CLK_DDRPLL 1
|
||||
#define PRCI_CLK_GEMGXLPLL 2
|
||||
#define PRCI_CLK_TLCLK 3
|
||||
|
||||
#endif
|
||||
|
|
@ -51,7 +51,10 @@
|
|||
#define RESET_SD_EMMC_A 44
|
||||
#define RESET_SD_EMMC_B 45
|
||||
#define RESET_SD_EMMC_C 46
|
||||
/* 47-60 */
|
||||
/* 47 */
|
||||
#define RESET_USB_PHY20 48
|
||||
#define RESET_USB_PHY21 49
|
||||
/* 50-60 */
|
||||
#define RESET_AUDIO_CODEC 61
|
||||
/* 62-63 */
|
||||
/* RESET2 */
|
||||
|
|
|
|||
Loading…
Reference in a new issue