| Message ID | 1486983983-32506-1-git-send-email-andy.yan@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 13, 2017 at 07:06:23PM +0800, Andy Yan wrote: > Rockchip finally named the SOC as RV1108, so change it. > Also move the compatible list to one compatible per line. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > --- > > .../devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) Acked-by: Rob Herring <robh@kernel.org>
Am Montag, 13. Februar 2017, 19:06:23 CET schrieb Andy Yan: > Rockchip finally named the SOC as RV1108, so change it. > Also move the compatible list to one compatible per line. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de>
On Mon, Feb 13, 2017 at 12:06 PM, Andy Yan <andy.yan@rock-chips.com> wrote: > Rockchip finally named the SOC as RV1108, so change it. > Also move the compatible list to one compatible per line. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> This does not apply on my v4.11-rc1-based tree. Please rebase and resend all patches you want me to merge, include any ACKs from Rob, Heiko etc. Yours, Linus Walleij
diff --git a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt index 4722bc6..a4f3ef2 100644 --- a/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt @@ -19,11 +19,17 @@ The pins are grouped into up to 5 individual pin banks which need to be defined as gpio sub-nodes of the pinmux controller. Required properties for iomux controller: - - compatible: one of "rockchip,rk1108-pinctrl", "rockchip,rk2928-pinctrl" - "rockchip,rk3066a-pinctrl", "rockchip,rk3066b-pinctrl" - "rockchip,rk3188-pinctrl", "rockchip,rk3228-pinctrl" - "rockchip,rk3288-pinctrl", "rockchip,rk3368-pinctrl" - "rockchip,rk3399-pinctrl" + - compatible: should be + "rockchip,rv1108-pinctrl": for Rockchip RV1108 + "rockchip,rk2928-pinctrl": for Rockchip RK2928 + "rockchip,rk3066a-pinctrl": for Rockchip RK3066a + "rockchip,rk3066b-pinctrl": for Rockchip RK3066b + "rockchip,rk3188-pinctrl": for Rockchip RK3188 + "rockchip,rk3228-pinctrl": for Rockchip RK3228 + "rockchip,rk3288-pinctrl": for Rockchip RK3288 + "rockchip,rk3368-pinctrl": for Rockchip RK3368 + "rockchip,rk3399-pinctrl": for Rockchip RK3399 + - rockchip,grf: phandle referencing a syscon providing the "general register files"
Rockchip finally named the SOC as RV1108, so change it. Also move the compatible list to one compatible per line. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> --- .../devicetree/bindings/pinctrl/rockchip,pinctrl.txt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)