Simple answer- both.
Longer answer- What must we do to attain salvation? What is important? Faith in God, and service to him, faith in his Son's ransom sacrifice's power to redeem us, practicing the fruitages of the Holy Spirit, prayer, doing our utmost to avoid sin, and helping others do the same are what matter. It's all there in the NT. Want some citations? You can look these up online at http://bible.gospelcom.net/bible/ there's 17 Bible versions available there.
Putting faith in God (YHWH), his Son, Jesus Christ, his Son's ransom sacrifice's power to redeem us, and his inspired word the Holy Bible - Hebrews 10:12, 26; 11:6; 11:1-40; John 3:16-21; Romans chapters 4, 5 & 6; Romans 10: 9-17; Acts 4:12; 10:43; Matthew 26:28; Mark 3:28-30; James 4:17; 5:15; 1 John 4:9-14;Luke 13:23,24; 1 Timothy 4:10.
Real faith compels us to works, service to God - James 2:26; Acts 26:20; Hebrews 10: 23-25.
Practicing the fruitages of the Holy Spirit, doing our utmost to avoid sin -Galatians 5:19-25;1 Corinthians 6: 9,10; Matthew 12:31.
Prayer - Matthew 5:44, 6:9, 26:41; 1 Thessalonians 5:17; James 5:16; Romans 12:21; Phillipians 4:6; Colossians 4:2; 1 Peter 4:7.
There are many more scriptures that provide insight on these things necessary for salvation. Everthing else outside the scope of these things is principle, prophesy, and dissertation. It's all a matter of setting priorities and importance. Does that answer your question?