This is a bunch of fixes against the current applied and reviewed bindings.
More DT fixes will be needed when full dt-schema conversion is done.
Signed-off-by: Neil Armstrong <[email protected]>
---
Neil Armstrong (8):
arm64: dts: amlogic: meson-sm1-bananapi: correct usb-hub hog node name
arm64: dts: amlogic: meson-gxm-s912-libretech-pc: add simple connector node in fusb302 node
arm64: dts: amlogic: meson-axg-jethome-jethub-j1xx: remove invalid #gpio-cells in onewire node
arm64: dts: amlogic: meson-g12b-radxa-zero2: fix pwm clock names
arm64: dts: amlogic: meson-g12b-odroid-go-ultra: rename keypad-gpio pinctrl node
arm64: dts: amlogic: meson-s4: fix apb4 bus node name
arm64: dts: amlogic: meson-sm1: use correct enable-gpios
arm64: dts: amlogic: meson-gxm-s912-libretech-pc: remove unused pinctrl-names from phy node
arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 1 -
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +-
arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 6 +++---
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 -
arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts | 4 ++++
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 4 ++--
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +-
8 files changed, 12 insertions(+), 10 deletions(-)
---
base-commit: 49a8133221c71b935f36a7c340c0271c2a9ee2db
change-id: 20230207-b4-amlogic-bindings-fixups-v2-ef23d2726c35
Best regards,
--
Neil Armstrong <[email protected]>
Fixes the following bindings check error:
fusb302@22: 'connector' is a required property
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
index 444c249863cb..4eda9f634c42 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-s912-libretech-pc.dts
@@ -54,6 +54,10 @@ fusb302@22 {
vbus-supply = <&typec2_vbus>;
status = "okay";
+
+ connector {
+ compatible = "usb-c-connector";
+ };
};
};
--
2.34.1
Fixes the following bindings check error:
usb-hub: $nodename:0: 'usb-hub' does not match '^(hog-[0-9]+|.+-hog(-[0-9]+)?)$'
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
index bb492581f1b7..e1683e0630b0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
@@ -316,7 +316,7 @@ &gpio {
* be handled by a USB specific power sequence to reset the Hub
* when the USB bus is powered down.
*/
- usb-hub {
+ usb-hub-hog {
gpio-hog;
gpios = <GPIOH_4 GPIO_ACTIVE_HIGH>;
output-high;
--
2.34.1
Fixes the following bindings check errors:
- #gpio-cells: [[1]] is not of type 'object'
- 'gpio-controller' is a dependency of '#gpio-cells'
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
index e1605a9b0a13..db605f3a22b4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
@@ -159,7 +159,6 @@ map1 {
onewire {
compatible = "w1-gpio";
gpios = <&gpio GPIOA_14 GPIO_ACTIVE_HIGH>;
- #gpio-cells = <1>;
};
};
--
2.34.1
Fixes the following bindings check error:
pinctrl@40: keypad-gpio: {...} is not of type 'array'
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
index c8e5a0a42b89..29d642e746d4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-go-ultra.dts
@@ -620,7 +620,7 @@ &frddr_a {
};
&periphs_pinctrl {
- keypad_gpio_pins: keypad-gpio {
+ keypad_gpio_pins: keypad-gpio-state {
mux {
groups = "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3",
"GPIOX_4", "GPIOX_5", "GPIOX_6", "GPIOX_7",
--
2.34.1
Fixes the following bindings check error:
- pwm@2000: clock-names: 'oneOf' conditional failed, one must be fixed:
['clkin4'] is too short
'clkin4' is not one of ['clkin0', 'clkin1']
'clkin0' was expected
- pwm@7000: clock-names: 'oneOf' conditional failed, one must be fixed:
['clkin3'] is too short
'clkin3' is not one of ['clkin0', 'clkin1']
'clkin0' was expected
- pwm@19000: clock-names: 'oneOf' conditional failed, one must be fixed:
['clkin2'] is too short
'clkin2' is not one of ['clkin0', 'clkin1']
'clkin0' was expected
Fixes: d747e7f76a5f ("arm64: dts: meson: add support for Radxa Zero2")
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
index 9a60c5ec2072..890f5bfebb03 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
@@ -360,7 +360,7 @@ &pwm_ef {
pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default";
clocks = <&xtal>;
- clock-names = "clkin2";
+ clock-names = "clkin0";
status = "okay";
};
@@ -368,7 +368,7 @@ &pwm_AO_ab {
pinctrl-0 = <&pwm_ao_a_pins>;
pinctrl-names = "default";
clocks = <&xtal>;
- clock-names = "clkin3";
+ clock-names = "clkin0";
status = "okay";
};
@@ -376,7 +376,7 @@ &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default";
clocks = <&xtal>;
- clock-names = "clkin4";
+ clock-names = "clkin1";
status = "okay";
};
--
2.34.1
Fixes the following bindings check error:
apb4@fe000000: $nodename:0: 'apb4@fe000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index ad50cba42d19..f24460186d3d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -85,7 +85,7 @@ gic: interrupt-controller@fff01000 {
interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
};
- apb4: apb4@fe000000 {
+ apb4: bus@fe000000 {
compatible = "simple-bus";
reg = <0x0 0xfe000000 0x0 0x480000>;
#address-cells = <2>;
--
2.34.1
Replace enable-gpio by enable-gpios to match the bindings.
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 2 +-
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
index e1683e0630b0..17045ff81c69 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
@@ -105,7 +105,7 @@ vddio_c: regulator-vddio_c {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
- enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
+ enable-gpios = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
enable-active-high;
regulator-always-on;
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
index ddb1b345397f..2fce44939f45 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
@@ -48,7 +48,7 @@ tf_io: gpio-regulator-tf_io {
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc_5v>;
- enable-gpio = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
+ enable-gpios = <&gpio_ao GPIOE_2 GPIO_OPEN_DRAIN>;
enable-active-high;
regulator-always-on;
--
2.34.1
Fixes the following bindings check error:
phy@78000: 'pinctrl-0' is a dependency of 'pinctrl-names'
Signed-off-by: Neil Armstrong <[email protected]>
---
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
index 874f91c348ec..6c4e68e0e625 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts
@@ -305,7 +305,6 @@ &usb {
};
&usb2_phy0 {
- pinctrl-names = "default";
phy-supply = <&vcc5v>;
};
--
2.34.1
Thanks.
On 07/02/2023 18.07, Neil Armstrong wrote:
> Fixes the following bindings check errors:
> - #gpio-cells: [[1]] is not of type 'object'
> - 'gpio-controller' is a dependency of '#gpio-cells'
>
> Signed-off-by: Neil Armstrong <[email protected]>
> ---
> arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
> index e1605a9b0a13..db605f3a22b4 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi
> @@ -159,7 +159,6 @@ map1 {
> onewire {
> compatible = "w1-gpio";
> gpios = <&gpio GPIOA_14 GPIO_ACTIVE_HIGH>;
> - #gpio-cells = <1>;
> };
> };
>
>
Acked-by: Vyacheslav Bocharov <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check error:
> usb-hub: $nodename:0: 'usb-hub' does not match '^(hog-[0-9]+|.+-hog(-[0-9]+)?)$'
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check error:
> fusb302@22: 'connector' is a required property
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check error:
> - pwm@2000: clock-names: 'oneOf' conditional failed, one must be fixed:
> ['clkin4'] is too short
> 'clkin4' is not one of ['clkin0', 'clkin1']
> 'clkin0' was expected
> - pwm@7000: clock-names: 'oneOf' conditional failed, one must be fixed:
> ['clkin3'] is too short
> 'clkin3' is not one of ['clkin0', 'clkin1']
> 'clkin0' was expected
> - pwm@19000: clock-names: 'oneOf' conditional failed, one must be fixed:
> ['clkin2'] is too short
> 'clkin2' is not one of ['clkin0', 'clkin1']
> 'clkin0' was expected
>
> Fixes: d747e7f76a5f ("arm64: dts: meson: add support for Radxa Zero2")
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check error:
> pinctrl@40: keypad-gpio: {...} is not of type 'array'
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
[...]
> &periphs_pinctrl {
> - keypad_gpio_pins: keypad-gpio {
> + keypad_gpio_pins: keypad-gpio-state {
> mux {
> groups = "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3",
> "GPIOX_4", "GPIOX_5", "GPIOX_6", "GPIOX_7",
I'm wondering whether we make the keys work without having to specify
a pinmux configuration for them separately.
Our pinctrl driver already sets:
pc->chip.set_config = gpiochip_generic_config;
So you should be able to use the GPIO_PULL_UP flag for these GPIOs in
device-tree instead of specifying bias-pull-up here, for example:
gpios = <&gpio GPIOX_0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
output-disable is managed by the direction of the GPIO anyways.
pinmux_ops.gpio_request_enable is also implemented by our pinctrl driver.
This is not urgent - I am just curious as always :-)
Best regards,
Martin
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check error:
> apb4@fe000000: $nodename:0: 'apb4@fe000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|localbus|soc|axi|ahb|apb)(@.+)?$'
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Replace enable-gpio by enable-gpios to match the bindings.
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check error:
> phy@78000: 'pinctrl-0' is a dependency of 'pinctrl-names'
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>
> Fixes the following bindings check errors:
> - #gpio-cells: [[1]] is not of type 'object'
> - 'gpio-controller' is a dependency of '#gpio-cells'
>
> Signed-off-by: Neil Armstrong <[email protected]>
Reviewed-by: Martin Blumenstingl <[email protected]>
On 11/02/2023 21:04, Martin Blumenstingl wrote:
> On Tue, Feb 7, 2023 at 4:08 PM Neil Armstrong <[email protected]> wrote:
>>
>> Fixes the following bindings check error:
>> pinctrl@40: keypad-gpio: {...} is not of type 'array'
>>
>> Signed-off-by: Neil Armstrong <[email protected]>
> Reviewed-by: Martin Blumenstingl <[email protected]>
>
> [...]
>> &periphs_pinctrl {
>> - keypad_gpio_pins: keypad-gpio {
>> + keypad_gpio_pins: keypad-gpio-state {
>> mux {
>> groups = "GPIOX_0", "GPIOX_1", "GPIOX_2", "GPIOX_3",
>> "GPIOX_4", "GPIOX_5", "GPIOX_6", "GPIOX_7",
> I'm wondering whether we make the keys work without having to specify
> a pinmux configuration for them separately.
> Our pinctrl driver already sets:
> pc->chip.set_config = gpiochip_generic_config;
> So you should be able to use the GPIO_PULL_UP flag for these GPIOs in
> device-tree instead of specifying bias-pull-up here, for example:
> gpios = <&gpio GPIOX_0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
>
> output-disable is managed by the direction of the GPIO anyways.
> pinmux_ops.gpio_request_enable is also implemented by our pinctrl driver.
>
> This is not urgent - I am just curious as always :-)
I didn't know we supported this, this is only a bindings check fix, but yeah at
some point this should be moved to (GPIO_ACTIVE_LOW | GPIO_PULL_UP).
Neil
>
>
> Best regards,
> Martin
Hi,
On Tue, 07 Feb 2023 16:07:53 +0100, Neil Armstrong wrote:
> This is a bunch of fixes against the current applied and reviewed bindings.
>
> More DT fixes will be needed when full dt-schema conversion is done.
>
>
Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.4/arm64-dt)
[1/8] arm64: dts: amlogic: meson-sm1-bananapi: correct usb-hub hog node name
https://git.kernel.org/amlogic/c/f88f3dcbb145a0133292d5c9d8da5935a36c8914
[2/8] arm64: dts: amlogic: meson-gxm-s912-libretech-pc: add simple connector node in fusb302 node
https://git.kernel.org/amlogic/c/d7ff22a6ec9dd154d027d6bc6b4f172c22f8c00d
[3/8] arm64: dts: amlogic: meson-axg-jethome-jethub-j1xx: remove invalid #gpio-cells in onewire node
https://git.kernel.org/amlogic/c/bd47319f999e6055124a2b4d2a0da495d52759c3
[4/8] arm64: dts: amlogic: meson-g12b-radxa-zero2: fix pwm clock names
https://git.kernel.org/amlogic/c/db217e84d0a3f4183ea5b6d5929e55b73128fcb2
[5/8] arm64: dts: amlogic: meson-g12b-odroid-go-ultra: rename keypad-gpio pinctrl node
https://git.kernel.org/amlogic/c/50e7d712144e7246f4ad5ce0f8577aa09cd09bc6
[6/8] arm64: dts: amlogic: meson-s4: fix apb4 bus node name
https://git.kernel.org/amlogic/c/d1e336eef1f4834bae0a54f203e9f74aa040726d
[7/8] arm64: dts: amlogic: meson-sm1: use correct enable-gpios
https://git.kernel.org/amlogic/c/4bddf79acdc7ef15f8b913e8ef7861461b235df2
[8/8] arm64: dts: amlogic: meson-gxm-s912-libretech-pc: remove unused pinctrl-names from phy node
https://git.kernel.org/amlogic/c/739e93e254e4797a29bdf397c10111a50a970734
These changes has been applied on the intermediate git tree [1].
The v6.4/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers
for inclusion in their intermediate git branches in order to be sent to Linus during
the next merge window, or sooner if it's a set of fixes.
In the cases of fixes, those will be merged in the current release candidate
kernel and as soon they appear on the Linux master branch they will be
backported to the previous Stable and Long-Stable kernels [2].
The intermediate git branches are merged daily in the linux-next tree [3],
people are encouraged testing these pre-release kernels and report issues on the
relevant mailing-lists.
If problems are discovered on those changes, please submit a signed-off-by revert
patch followed by a corrective changeset.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
[3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
--
Neil