Commit b95f1be7 authored by Neil Armstrong's avatar Neil Armstrong
Browse files

Merge branch 'v6.3/bindings' of... 

Merge branch 'v6.3/bindings' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux

 into HEAD

Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
parents 1b929c02 340ea839

include/dt-bindings/power/meson-g12a-power.h

+1 −0
Original line number Diff line number Diff line
@@ -9,5 +9,6 @@ 


#define PWRC_G12A_VPU_ID		0

#define PWRC_G12A_ETH_ID		1

#define PWRC_G12A_NNA_ID		2



#endif

include/dt-bindings/reset/amlogic,meson-g12a-reset.h

+3 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ 
#define RESET_PARSER_FETCH		72

#define RESET_CTL			73

#define RESET_PARSER_TOP		74

/*					75-77	*/

/*					75	*/

#define RESET_NNA			76

/*					77	*/

#define RESET_DVALIN			78

#define RESET_HDMITX			79

/*					80-95	*/