Reverts changes made in 9f9d92b2df
9f9d92b2df
Pass compiling under esp-idf-tests/merge_soc_tmp/merge_for_soc_headers branch.(only change some names of register and INUM).