diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 22:30:25 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 22:30:26 +0100 |
| commit | 4287ec9afa4dd56d031f66495b7e0b67cdd91cb4 (patch) | |
| tree | a7a6ca0b3dc52fd6814057b7c3dba16451cfe7a0 /include/dt-bindings | |
| parent | Merge tag 'at91-5.7-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91... (diff) | |
| parent | arm64: dts: meson-g12b-odroid-n2: add SPIFC controller node (diff) | |
| download | linux-4287ec9afa4dd56d031f66495b7e0b67cdd91cb4.tar.xz linux-4287ec9afa4dd56d031f66495b7e0b67cdd91cb4.zip | |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.7 (round 2)
- G12[ab]: add SPI support, enable on odroid-n2
* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson-g12b-odroid-n2: add SPIFC controller node
arm64: dts: khadas-vim3: add SPIFC controller node
arm64: dts: meson-g12: add the SPIFC nodes
arm64: dts: meson-g12: split emmc pins to select 4 or 8 bus width
arm64: dts: meson-g12-common: add spicc controller nodes
dt-bindings: clk: g12a-clkc: add SPICC SCLK Source clock IDs
dt-bindings: clk: meson: add the gxl internal dac gate
Link: https://lore.kernel.org/r/7hftdyhfq4.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/gxbb-clkc.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 0837c1a7ae49..b0d65d73db96 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -143,5 +143,7 @@ #define CLKID_CPU1_CLK 253 #define CLKID_CPU2_CLK 254 #define CLKID_CPU3_CLK 255 +#define CLKID_SPICC0_SCLK 258 +#define CLKID_SPICC1_SCLK 261 #endif /* __G12A_CLKC_H */ diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index db0763e96173..4073eb7a9da1 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -146,5 +146,6 @@ #define CLKID_CTS_VDAC 201 #define CLKID_HDMI_TX 202 #define CLKID_HDMI 205 +#define CLKID_ACODEC 206 #endif /* __GXBB_CLKC_H */ |