From 1204a1b1e55a3d1e0ff7b0309c414fb0a1f38eda Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 17 Jan 2016 19:55:04 +0000 Subject: [PATCH] lantiq: Use the new pinctrl compatible strings These were introduced in upstream commit be14811c03cf "pinctrl/lantiq: introduce new dedicated devicetree bindings" and finally allow us to use the individual pins within our dts (for example spi_clk, etc.). Please note that this changes the number of GPIOs which are available for some SoCs. VRX200 SoCs for example only have 50 pins, but previously 56 pins were exposed. This means that all places which are using hardcoded GPIO numbers (which are not passed via device-tree) need to be adjusted (because the first GPIO number is now 462, instead of 456). Signed-off-by: Martin Blumenstingl SVN-Revision: 48284 --- target/linux/lantiq/dts/amazonse.dtsi | 2 +- target/linux/lantiq/dts/ar9.dtsi | 2 +- target/linux/lantiq/dts/danube.dtsi | 2 +- target/linux/lantiq/dts/vr9.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/lantiq/dts/amazonse.dtsi b/target/linux/lantiq/dts/amazonse.dtsi index 13d3e73860..5389446eba 100644 --- a/target/linux/lantiq/dts/amazonse.dtsi +++ b/target/linux/lantiq/dts/amazonse.dtsi @@ -90,7 +90,7 @@ }; gpio: pinmux@E100B10 { - compatible = "lantiq,pinctrl-ase"; + compatible = "lantiq,ase-pinctrl"; #gpio-cells = <2>; gpio-controller; reg = <0xE100B10 0xA0>; diff --git a/target/linux/lantiq/dts/ar9.dtsi b/target/linux/lantiq/dts/ar9.dtsi index ee4e374ca4..f69a7aea9d 100644 --- a/target/linux/lantiq/dts/ar9.dtsi +++ b/target/linux/lantiq/dts/ar9.dtsi @@ -101,7 +101,7 @@ }; gpio: pinmux@E100B10 { - compatible = "lantiq,pinctrl-xr9"; + compatible = "lantiq,xrx100-pinctrl"; #gpio-cells = <2>; gpio-controller; reg = <0xE100B10 0xA0>; diff --git a/target/linux/lantiq/dts/danube.dtsi b/target/linux/lantiq/dts/danube.dtsi index 698196d9ee..0a75fd9d45 100644 --- a/target/linux/lantiq/dts/danube.dtsi +++ b/target/linux/lantiq/dts/danube.dtsi @@ -123,7 +123,7 @@ }; gpio: pinmux@E100B10 { - compatible = "lantiq,pinctrl-xway"; + compatible = "lantiq,danube-pinctrl"; #gpio-cells = <2>; gpio-controller; reg = <0xE100B10 0xA0>; diff --git a/target/linux/lantiq/dts/vr9.dtsi b/target/linux/lantiq/dts/vr9.dtsi index df63ce7240..8f9635807e 100644 --- a/target/linux/lantiq/dts/vr9.dtsi +++ b/target/linux/lantiq/dts/vr9.dtsi @@ -113,7 +113,7 @@ }; gpio: pinmux@E100B10 { - compatible = "lantiq,pinctrl-xr9"; + compatible = "lantiq,xrx200-pinctrl"; #gpio-cells = <2>; gpio-controller; reg = <0xE100B10 0xA0>; -- 2.30.2