Merge branch 'v3.20-clk/new-ids' into v3.20-armsoc/dts