* [PATCH 1/7] ARM: dts: meson8: remove gpio offset
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
@ 2017-09-21 17:14 ` Jerome Brunet
2017-09-21 17:14 ` [PATCH 2/7] ARM64: dts: meson-gx: " Jerome Brunet
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jerome Brunet @ 2017-09-21 17:14 UTC (permalink / raw)
To: linux-arm-kernel
Remove pin offset on the AO controller. meson pinctrl no longer has
this quirk
Tested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
arch/arm/boot/dts/meson8.dtsi | 2 +-
arch/arm/boot/dts/meson8b.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index b98d44fde6b6..aff0243ea7d5 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -132,7 +132,7 @@
reg-names = "mux", "pull", "gpio";
gpio-controller;
#gpio-cells = <2>;
- gpio-ranges = <&pinctrl_aobus 0 120 16>;
+ gpio-ranges = <&pinctrl_aobus 0 0 16>;
};
uart_ao_a_pins: uart_ao_a {
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi
index bc278da7df0d..09ceec93b4c8 100644
--- a/arch/arm/boot/dts/meson8b.dtsi
+++ b/arch/arm/boot/dts/meson8b.dtsi
@@ -104,7 +104,7 @@
reg-names = "mux", "pull", "gpio";
gpio-controller;
#gpio-cells = <2>;
- gpio-ranges = <&pinctrl_aobus 0 130 16>;
+ gpio-ranges = <&pinctrl_aobus 0 0 16>;
};
uart_ao_a_pins: uart_ao_a {
--
2.13.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/7] ARM64: dts: meson-gx: remove gpio offset
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
2017-09-21 17:14 ` [PATCH 1/7] ARM: dts: meson8: remove gpio offset Jerome Brunet
@ 2017-09-21 17:14 ` Jerome Brunet
2017-09-21 17:14 ` [PATCH 3/7] ARM64: dts: meson-gx: adjust gpio-ranges for TEST_N Jerome Brunet
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jerome Brunet @ 2017-09-21 17:14 UTC (permalink / raw)
To: linux-arm-kernel
Remove pin offset on the EE controller. Meson pinctrl no longer has
this quirk
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 52f1687e7a09..fb4baed97a01 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -379,7 +379,7 @@
reg-names = "mux", "pull", "pull-enable", "gpio";
gpio-controller;
#gpio-cells = <2>;
- gpio-ranges = <&pinctrl_periphs 0 14 120>;
+ gpio-ranges = <&pinctrl_periphs 0 0 120>;
};
emmc_pins: emmc {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index d6876e64979e..f3fca26c9658 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -268,7 +268,7 @@
reg-names = "mux", "pull", "pull-enable", "gpio";
gpio-controller;
#gpio-cells = <2>;
- gpio-ranges = <&pinctrl_periphs 0 10 101>;
+ gpio-ranges = <&pinctrl_periphs 0 0 101>;
};
emmc_pins: emmc {
--
2.13.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/7] ARM64: dts: meson-gx: adjust gpio-ranges for TEST_N
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
2017-09-21 17:14 ` [PATCH 1/7] ARM: dts: meson8: remove gpio offset Jerome Brunet
2017-09-21 17:14 ` [PATCH 2/7] ARM64: dts: meson-gx: " Jerome Brunet
@ 2017-09-21 17:14 ` Jerome Brunet
2017-09-21 17:14 ` [PATCH 4/7] ARM64: dts: meson-gxbb: adjust nanopi-k2 gpio-line-names Jerome Brunet
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jerome Brunet @ 2017-09-21 17:14 UTC (permalink / raw)
To: linux-arm-kernel
TEST_N has moved from the EE controller to the AO controller so
the gpio-ranges need to adjusted for it
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index fb4baed97a01..e5a7bdead275 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -379,7 +379,7 @@
reg-names = "mux", "pull", "pull-enable", "gpio";
gpio-controller;
#gpio-cells = <2>;
- gpio-ranges = <&pinctrl_periphs 0 0 120>;
+ gpio-ranges = <&pinctrl_periphs 0 0 119>;
};
emmc_pins: emmc {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index f3fca26c9658..084cef1842e7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -268,7 +268,7 @@
reg-names = "mux", "pull", "pull-enable", "gpio";
gpio-controller;
#gpio-cells = <2>;
- gpio-ranges = <&pinctrl_periphs 0 0 101>;
+ gpio-ranges = <&pinctrl_periphs 0 0 100>;
};
emmc_pins: emmc {
--
2.13.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/7] ARM64: dts: meson-gxbb: adjust nanopi-k2 gpio-line-names
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
` (2 preceding siblings ...)
2017-09-21 17:14 ` [PATCH 3/7] ARM64: dts: meson-gx: adjust gpio-ranges for TEST_N Jerome Brunet
@ 2017-09-21 17:14 ` Jerome Brunet
2017-09-21 17:14 ` [PATCH 5/7] ARM64: dts: meson-gxbb: adjust odroid-c2 gpio-line-names Jerome Brunet
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Jerome Brunet @ 2017-09-21 17:14 UTC (permalink / raw)
To: linux-arm-kernel
GPIOX22 is now declared properly and TEST_N has been moved so
the gpio-line-names of the nanopi-k2 must be adjusted accordingly
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
index 9697a7a79464..3c445030ed52 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts
@@ -180,7 +180,9 @@
"VCCK En", "CON1 Header Pin31",
"I2S Header Pin6", "IR In", "I2S Header Pin7",
"I2S Header Pin3", "I2S Header Pin4",
- "I2S Header Pin5", "HDMI CEC", "SYS LED";
+ "I2S Header Pin5", "HDMI CEC", "SYS LED",
+ /* GPIO_TEST_N */
+ "";
};
&pinctrl_periphs {
@@ -226,11 +228,9 @@
"Bluetooth UART TX", "Bluetooth UART RX",
"Bluetooth UART CTS", "Bluetooth UART RTS",
"", "", "", "WIFI 32K", "Bluetooth Enable",
- "Bluetooth WAKE HOST",
+ "Bluetooth WAKE HOST", "",
/* Bank GPIOCLK */
- "", "CON1 Header Pin35", "", "",
- /* GPIO_TEST_N */
- "";
+ "", "CON1 Header Pin35", "", "";
};
&pwm_ef {
--
2.13.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/7] ARM64: dts: meson-gxbb: adjust odroid-c2 gpio-line-names
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
` (3 preceding siblings ...)
2017-09-21 17:14 ` [PATCH 4/7] ARM64: dts: meson-gxbb: adjust nanopi-k2 gpio-line-names Jerome Brunet
@ 2017-09-21 17:14 ` Jerome Brunet
2017-09-21 17:14 ` [PATCH 6/7] ARM64: dts: meson-gxl: adjust kvim gpio-line-names Jerome Brunet
2017-10-06 22:30 ` [PATCH 0/7] ARM: dts: meson: clean pin offsets Kevin Hilman
6 siblings, 0 replies; 8+ messages in thread
From: Jerome Brunet @ 2017-09-21 17:14 UTC (permalink / raw)
To: linux-arm-kernel
GPIOX22 is now declared properly and TEST_N has been moved so
the gpio-line-names of the odroid-c2 must be adjusted accordingly
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index d147c853ab05..9fc50bc5f9f4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -194,7 +194,9 @@
"USB HUB nRESET", "USB OTG Power En",
"J7 Header Pin2", "IR In", "J7 Header Pin4",
"J7 Header Pin6", "J7 Header Pin5", "J7 Header Pin7",
- "HDMI CEC", "SYS LED";
+ "HDMI CEC", "SYS LED",
+ /* GPIO_TEST_N */
+ "";
};
&pinctrl_periphs {
@@ -233,11 +235,9 @@
"J2 Header Pin12", "J2 Header Pin13",
"J2 Header Pin8", "J2 Header Pin10",
"", "", "", "", "",
- "J2 Header Pin11", "", "J2 Header Pin7",
+ "J2 Header Pin11", "", "J2 Header Pin7", "",
/* Bank GPIOCLK */
- "", "", "", "",
- /* GPIO_TEST_N */
- "";
+ "", "", "", "";
};
&saradc {
--
2.13.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/7] ARM64: dts: meson-gxl: adjust kvim gpio-line-names
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
` (4 preceding siblings ...)
2017-09-21 17:14 ` [PATCH 5/7] ARM64: dts: meson-gxbb: adjust odroid-c2 gpio-line-names Jerome Brunet
@ 2017-09-21 17:14 ` Jerome Brunet
2017-10-06 22:30 ` [PATCH 0/7] ARM: dts: meson: clean pin offsets Kevin Hilman
6 siblings, 0 replies; 8+ messages in thread
From: Jerome Brunet @ 2017-09-21 17:14 UTC (permalink / raw)
To: linux-arm-kernel
TEST_N gpio has been moved so the gpio-line-names of the kvim
must be adjusted accordingly
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index edc512ad0bac..71a6e1ce7ad5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -122,7 +122,9 @@
"J9 Header Pin33",
"IR In",
"HDMI CEC",
- "SYS LED";
+ "SYS LED",
+ /* GPIO_TEST_N */
+ "";
};
&pinctrl_periphs {
@@ -163,9 +165,7 @@
"WIFI 32K", "Bluetooth Enable",
"Bluetooth WAKE HOST",
/* Bank GPIOCLK */
- "", "J9 Header Pin39",
- /* GPIO_TEST_N */
- "";
+ "", "J9 Header Pin39";
};
&pwm_AO_ab {
--
2.13.5
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 0/7] ARM: dts: meson: clean pin offsets
2017-09-21 17:14 [PATCH 0/7] ARM: dts: meson: clean pin offsets Jerome Brunet
` (5 preceding siblings ...)
2017-09-21 17:14 ` [PATCH 6/7] ARM64: dts: meson-gxl: adjust kvim gpio-line-names Jerome Brunet
@ 2017-10-06 22:30 ` Kevin Hilman
6 siblings, 0 replies; 8+ messages in thread
From: Kevin Hilman @ 2017-10-06 22:30 UTC (permalink / raw)
To: linux-arm-kernel
Jerome Brunet <jbrunet@baylibre.com> writes:
> The series is the device-tree part of the series sent to pinctrl [0]
> The present patchset depends on the pinctrl part.
>
> The purpose of this series is to:
> 1) remove the hardcoded gpio offset
> 2) adjust gpio-ranges with respect to the new pin number of each
> controller
> 3) adjust gpio-line-names accordingly for the boards having this property.
>
> [0]: https://lkml.kernel.org/r/20170918134610.17743-1-jbrunet at baylibre.com
Seeing the driver part is now merged, applying to v4.15/dt64,
Thanks,
Kevin
^ permalink raw reply [flat|nested] 8+ messages in thread