Merge tag 'u-boot-amlogic-20201005' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- generate unique mac address from SoC serial on S400 board - Add USB support for GXL and AXG SoCs - Update Gadget code to use the new GXL and AXG USB glue driver - Add a VIM3 board support to add dynamic PCIe enable in OS DT - Fix AXG pinmux with requesting GPIOs - Add missing GPIOA_18 for AXG pinctrl - Add Amlogic PWM driver
This commit is contained in:
@@ -145,5 +145,7 @@
|
||||
#define CLKID_CPU3_CLK 255
|
||||
#define CLKID_SPICC0_SCLK 258
|
||||
#define CLKID_SPICC1_SCLK 261
|
||||
#define CLKID_NNA_AXI_CLK 264
|
||||
#define CLKID_NNA_CORE_CLK 267
|
||||
|
||||
#endif /* __G12A_CLKC_H */
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
#define RESET_SYS_CPU_L2 58
|
||||
#define RESET_SYS_CPU_P 59
|
||||
#define RESET_SYS_CPU_MBIST 60
|
||||
/* 61 */
|
||||
#define RESET_ACODEC 61
|
||||
/* 62 */
|
||||
/* 63 */
|
||||
/* RESET2 */
|
||||
|
||||
18
include/dt-bindings/sound/meson-aiu.h
Normal file
18
include/dt-bindings/sound/meson-aiu.h
Normal file
@@ -0,0 +1,18 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __DT_MESON_AIU_H
|
||||
#define __DT_MESON_AIU_H
|
||||
|
||||
#define AIU_CPU 0
|
||||
#define AIU_HDMI 1
|
||||
#define AIU_ACODEC 2
|
||||
|
||||
#define CPU_I2S_FIFO 0
|
||||
#define CPU_SPDIF_FIFO 1
|
||||
#define CPU_I2S_ENCODER 2
|
||||
#define CPU_SPDIF_ENCODER 3
|
||||
|
||||
#define CTRL_I2S 0
|
||||
#define CTRL_PCM 1
|
||||
#define CTRL_OUT 2
|
||||
|
||||
#endif /* __DT_MESON_AIU_H */
|
||||
10
include/dt-bindings/sound/meson-g12a-toacodec.h
Normal file
10
include/dt-bindings/sound/meson-g12a-toacodec.h
Normal file
@@ -0,0 +1,10 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __DT_MESON_G12A_TOACODEC_H
|
||||
#define __DT_MESON_G12A_TOACODEC_H
|
||||
|
||||
#define TOACODEC_IN_A 0
|
||||
#define TOACODEC_IN_B 1
|
||||
#define TOACODEC_IN_C 2
|
||||
#define TOACODEC_OUT 3
|
||||
|
||||
#endif /* __DT_MESON_G12A_TOACODEC_H */
|
||||
Reference in New Issue
Block a user