The 35-year-old rapper, whose real name is Calvin Broadus, turned himself over to authorities at the Orange County Jail on Monday morning. He was expected to post $150,000 bail, said Susan Schroeder of the district attorney's office.
If convicted, he could be sentenced to three years in prison.
The Sept. 27 incident occurred as Snoop Dogg prepared to take a flight to San Francisco. At the time of his arrest, he told deputies the baton was a prop for a movie, a spokesman for the sheriff's office has said.
The weapon charge was filed Thursday and an arrest warrant was issued. Snoop Dogg's attorney, Donald Etra, has called the charge "bogus."
Snoop's spokesperson, Meredith O'Sullivan, said in a statement Monday that Snoop "welcomes an expedited trial which will reveal that these charges are completely unwarranted."
Last month, the rapper was arrested at Bob Hope Airport in Burbank for investigation of illegal drug and gun possession. He posted $35,000 bail and was ordered to appear in court Dec. 12.