Merge branch 'v4.6-shared/clkids' into v4.6-armsoc/dts32