Skip to content

Commit

Permalink
arm64: dts: r3mini: some changes for upstreaming
Browse files Browse the repository at this point in the history
dts-errors left (crypto and thermal are inherited from mt7986a.dtsi):

  UPD     include/config/kernel.release
  DTC_CHK arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: soc: t-phy: {'compatible': ['mediatek,mt7986-tphy', 'mediatek,generic-tphy-v2'], 'ranges': True, '#address-cells': [[2]], '#size-cells': [[2]], 'status': ['okay'], 'pcie-phy@11c00000': {'reg': [[0, 297795584, 0, 131072]], 'clocks': [[23]], 'clock-names': ['ref'], '#phy-cells': [[1]], 'phandle': [[20]]}} should not be valid under {'type': 'object'}
	from schema $id: http://devicetree.org/schemas/simple-bus.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: crypto@10320000: interrupts: [[0, 116, 4], [0, 117, 4], [0, 118, 4], [0, 119, 4]] is too short
	from schema $id: http://devicetree.org/schemas/crypto/inside-secure,safexcel.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: crypto@10320000: interrupt-names: ['ring0', 'ring1', 'ring2', 'ring3'] is too short
	from schema $id: http://devicetree.org/schemas/crypto/inside-secure,safexcel.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: thermal@1100c800: clocks: [[4, 27], [4, 44], [4, 45]] is too long
	from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: thermal@1100c800: clock-names: ['therm', 'auxadc', 'adc_32k'] is too long
	from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: thermal@1100c800: Unevaluated properties are not allowed ('clock-names', 'clocks' were unexpected)
	from schema $id: http://devicetree.org/schemas/thermal/mediatek,thermal.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: syscon@15000000: '#address-cells', '#size-cells' do not match any of the regexes: 'pinctrl-[0-9]+'
	from schema $id: http://devicetree.org/schemas/clock/mediatek,ethsys.yaml#
/media/data_ext/git/kernel/BPI-R2-4.14/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dtb: ethernet@15100000: Unevaluated properties are not allowed ('#reset-cells' was unexpected)
	from schema $id: http://devicetree.org/schemas/net/mediatek,net.yaml#
  • Loading branch information
frank-w committed May 5, 2024
1 parent 66b1870 commit ae819b4
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright (C) 2021 MediaTek Inc.
* Authors: Frank Wunderlich <frank-w@public-files.de>
* Eric Woudstra <ericwouds@gmail.com>
* Tianling Shen <cnsztl@immortalwrt.org>
*/

/dts-v1/;
Expand Down Expand Up @@ -43,7 +44,7 @@
#cooling-cells = <2>;
/* cooling level (0, 1, 2) - pwm inverted */
cooling-levels = <255 96 0>;
pwms = <&pwm 0 10000 0>;
pwms = <&pwm 0 10000>;
status = "okay";
};

Expand Down Expand Up @@ -82,7 +83,7 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&pio 16 GPIO_ACTIVE_LOW>;
enable-active-low;
// enable-active-low;
regulator-always-on;
};

Expand All @@ -92,7 +93,7 @@
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&pio 17 GPIO_ACTIVE_LOW>;
enable-active-low;
// enable-active-low;
regulator-always-on;
};

Expand Down Expand Up @@ -121,19 +122,19 @@

&cpu_thermal {
cooling-maps {
cpu-active-high {
map0 {
/* active: set fan to cooling level 2 */
cooling-device = <&fan 2 2>;
trip = <&cpu_trip_active_high>;
};

cpu-active-med {
map1 {
/* active: set fan to cooling level 1 */
cooling-device = <&fan 1 1>;
trip = <&cpu_trip_active_med>;
};

cpu-active-low {
map2 {
/* active: set fan to cooling level 0 */
cooling-device = <&fan 0 0>;
trip = <&cpu_trip_active_low>;
Expand Down Expand Up @@ -187,8 +188,8 @@
compatible = "atmel,24c02";
reg = <0x50>;

address-bits = <8>;
page-size = <8>;
address-width = <8>;
pagesize = <8>;
size = <256>;
};
};
Expand Down Expand Up @@ -266,7 +267,7 @@
};
};

&pcie { /* untested */
&pcie {
pinctrl-names = "default";
pinctrl-0 = <&pcie_pins>;
status = "okay";
Expand Down Expand Up @@ -438,7 +439,7 @@
};
};

&pwm { /* untested */
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm_pins>;
status = "okay";
Expand Down

0 comments on commit ae819b4

Please sign in to comment.