Skip to content

ARM: dts: meson8m2: mxiii: Support Minix X8-H Plus #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

ARM: dts: meson8m2: mxiii: Support Minix X8-H Plus #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c35d03b
ARM: dts: meson8m2: mxiii: Support Minix X8-H Plus
amondit Aug 18, 2020
6ffd0d0
ARM: dts: meson8m2: Minix X8HP: Fix bluetooth
amondit Sep 2, 2020
0efbe43
dt-bindings: arm: amlogic: add support for the Minix Neo X8-H Plus
amondit Sep 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm/boot/dts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ dtb-$(CONFIG_MACH_MESON8) += \
meson8b-odroidc1.dtb \
meson8m2-mxiii.dtb \
meson8m2-mxiii-plus.dtb \
meson8m2-minix-neo-x8-h-plus.dts \
Copy link
Author

@amondit amondit Aug 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo in the extension, should be dtb

meson8m2-m8s.dtb
dtb-$(CONFIG_ARCH_MMP) += \
pxa168-aspenite.dtb \
Expand Down
98 changes: 98 additions & 0 deletions arch/arm/boot/dts/meson8m2-minix-neo-x8-h-plus.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Copyright (c) 2018 Oleg Ivanov <[email protected]>
* Copyright (c) 2018 Martin Blumenstingl <[email protected]>
* Copyright (c) 2020 Arnaud Mondit <[email protected]>
Copy link
Owner

@xdarklight xdarklight Aug 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this I prefer a copyright style similar to what we have in arch/arm64/boot/dts/amlogic/meson-gxl-s905w-tx3-mini.dts to make it clear that not all of us worked on that file

Copy link
Author

@amondit amondit Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed that on the last commit, I hope it's better?

*/

/dts-v1/;

#include "meson8m2-mxiii.dtsi"

/ {
model = "Minix X8-H Plus";
compatible = "minix,x8-h-plus", "amlogic,meson8m2";

aliases {
serial1 = &uart_A;
Copy link
Owner

@xdarklight xdarklight Aug 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this shouldn't be necessary because we're not using this as user-exposed serial port but for communication with the Bluetooth module (so the serial port is handled on the kernel side and doesn't need this alias).

I probably have to clean up some of the existing .dts files which have this though

Copy link
Author

@amondit amondit Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, it was leftover from copypaste from mxiii-plus dts. Removed in last commit

};
};

&ethmac {
status = "okay";

pinctrl-0 = <&eth_rgmii_pins>;
pinctrl-names = "default";

phy-handle = <&eth_phy0>;
phy-mode = "rgmii-id";

mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;

eth_phy0: ethernet-phy@0 {
/* Realtek RTL8211F (0x001cc916) */
reg = <0>;

reset-assert-us = <10000>;
reset-deassert-us = <30000>;
reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;
};
};
};

&sdhc {
status = "okay";

pinctrl-0 = <&sdxc_b_pins>;
pinctrl-names = "default";

bus-width = <4>;
max-frequency = <50000000>;

no-mmc;
no-sdio;
cap-sd-highspeed;
disable-wp;

cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;

vmmc-supply = <&vcc_3v3>;
vqmmc-supply = <&vcc_3v3>;
};

&sdio {
status = "okay";

pinctrl-0 = <&sd_a_pins>;
pinctrl-names = "default";

sdio_wireless_slot: slot@0 {
compatible = "mmc-slot";
reg = <0>;

bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
non-removable;
disable-wp;

mmc-pwrseq = <&sdio_pwrseq>;

vmmc-supply = <&vcc_3v3>;
};
};

&uart_A {
status = "okay";
pinctrl-0 = <&uart_a1_pins>, <&uart_a1_cts_rts_pins>;
pinctrl-names = "default";
uart-has-rtscts;

bluetooth {
Copy link
Owner

@xdarklight xdarklight Aug 23, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the indentation here seems wrong

Copy link
Author

@amondit amondit Sep 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 spaces vs tab. Fixed

compatible = "brcm,bcm43438-bt";
device-wakeup-gpios = <&gpio GPIOX_20 GPIO_ACTIVE_HIGH>;
};
};