Samsung has agreed to pay Apple $548m (362m) as part of a deal to settle a long-running patent dispute.

The arrangement was revealed in papers filed to a California court by both companies on Thursday.

The dispute began in 2011 when Apple said Samsung was using some of its patented technologies without permission.

The payment does not mean the end of the row as, next year, a US court will decide if Apple deserves more damages.

A joint case management statement filed to the California court revealed that Samsung had agreed to pay Apple within 10 days of receiving an invoice.

The payment is part of a bigger $1bn damages award that Apple was granted in 2012 by a jury that considered the case. That total was reduced on appeal to $930m. Further legal action split this total into two parts - a $548m chunk for technology patents and a $382m chunk for allegations that Samsung copied Apple's packaging materials.

A jury is due to decide on the second damages award in 2016.

Despite agreeing to pay the first part of the settlement, Samsung said it reserved the right to get its money back if there were further developments in the case. The US Patent and Trademark Office (USPTO) is currently reviewing some of the patents Apple used in the court case.

Apple has disputed Samsung's right to a refund if the patents are ruled invalid.

BBC News