From: David S. Miller Date: Mon, 5 May 2014 17:19:00 +0000 (-0400) Subject: Merge branch 'am437x' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=05f4640979e0d67fae56be42393fb5b81a0293de;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'am437x' George Cherian says: ==================== The series adds CPTS support for AM4372. Patch 1 - DT changes w.r.t clock changes for AM33xx. Patch 2 - CPTS clock name harcoding in the driver is removed. Easier to pass the clock name from dt rather than hardcoding in driver. Also in prepration for DRA7x CPTS support. Patch 3 - Enable the CPTS support for both DRA7x and AM4372 in the driver. Patch 4 - Enable the Annexe F for L2 PTP for AM437x and DRA7x. Patch 5 - Change the default clocksource to dpll_core_m5 Patch 6 - DT changes for AM4372. v1 -> v2 Patch 1 and 2 Re-ordering. Seperate TS_BITS define for Hw version V2 and V3 ==================== Signed-off-by: David S. Miller --- 05f4640979e0d67fae56be42393fb5b81a0293de