Skip to content

Commit bbab253

Browse files
torvaldstorvalds
committed
Merge tag 'arm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "There are a number of updates for devicetree files for Qualcomm, Rockchips, and NXP i.MX platforms, addressing mistakes in the DT contents: - Wrong GPIO polarity on some boards - Lower SD card interface speed for better stability - Incorrect power supply, clock, pmic, cache properties - Disable broken hbr3 on sc7280-herobrine - Devicetree warning fixes The only other changes are: - A regression fix for the Amlogic performance monitoring unit driver, along with two related DT changes. - imx_v6_v7_defconfig enables PCI support again. - Trivial fixes for tee, optee and psci firmware drivers, addressing compiler warning and error output" * tag 'arm-fixes-6.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits) firmware/psci: demote suspend-mode warning to info level arm64: dts: qcom: sc7280: remove hbr3 support on herobrine boards ARM: imx_v6_v7_defconfig: Fix unintentional disablement of PCI arm64: dts: rockchip: correct panel supplies on some rk3326 boards arm64: dts: rockchip: use just "port" in panel on RockPro64 arm64: dts: rockchip: use just "port" in panel on Pinebook Pro ARM: dts: imx6ull-colibri: Remove unnecessary #address-cells/#size-cells ARM: dts: imx7d-remarkable2: Remove unnecessary #address-cells/#size-cells arm64: dts: imx8mp-verdin: correct off-on-delay arm64: dts: imx8mm-verdin: correct off-on-delay arm64: dts: imx8mm-evk: correct pmic clock source arm64: dts: qcom: sc8280xp-pmics: fix pon compatible and registers arm64: dts: rockchip: Remove non-existing pwm-delay-us property arm64: dts: rockchip: Add clk_rtc_32k to Anbernic xx3 Devices tee: Pass a pointer to virt_to_page() perf/amlogic: adjust register offsets arm64: dts: meson-g12-common: resolve conflict between canvas & pmu arm64: dts: meson-g12-common: specify full DMC range arm64: dts: imx8mp: fix address length for LCDIF2 riscv: dts: canaan: drop invalid spi-max-frequency ...
2 parents 6a8f57a + d75eecc commit bbab253

37 files changed

+88
-98
lines changed

‎arch/arm/boot/dts/imx6ull-colibri.dtsi

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,9 @@
3333
self-powered;
3434
type = "micro";
3535

36-
ports {
37-
#address-cells = <1>;
38-
#size-cells = <0>;
39-
40-
port@0 {
41-
reg = <0>;
42-
usb_dr_connector: endpoint {
43-
remote-endpoint = <&usb1_drd_sw>;
44-
};
36+
port {
37+
usb_dr_connector: endpoint {
38+
remote-endpoint = <&usb1_drd_sw>;
4539
};
4640
};
4741
};

‎arch/arm/boot/dts/imx7d-remarkable2.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@
118118
reg = <0x62>;
119119
pinctrl-names = "default";
120120
pinctrl-0 = <&pinctrl_epdpmic>;
121-
#address-cells = <1>;
122-
#size-cells = <0>;
123121
#thermal-sensor-cells = <0>;
124122
epd-pwr-good-gpios = <&gpio6 21 GPIO_ACTIVE_HIGH>;
125123

‎arch/arm/boot/dts/rk3288.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -942,7 +942,7 @@
942942
status = "disabled";
943943
};
944944

945-
spdif: sound@ff88b0000 {
945+
spdif: sound@ff8b0000 {
946946
compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
947947
reg = <0x0 0xff8b0000 0x0 0x10000>;
948948
#sound-dai-cells = <0>;

‎arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CONFIG_RFKILL=y
7676
CONFIG_RFKILL_INPUT=y
7777
CONFIG_PCI=y
7878
CONFIG_PCI_MSI=y
79-
CONFIG_PCI_IMX6=y
79+
CONFIG_PCI_IMX6_HOST=y
8080
CONFIG_DEVTMPFS=y
8181
CONFIG_DEVTMPFS_MOUNT=y
8282
# CONFIG_STANDALONE is not set

‎arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,15 +1571,20 @@
15711571

15721572
dmc: bus@38000 {
15731573
compatible = "simple-bus";
1574-
reg = <0x0 0x38000 0x0 0x400>;
15751574
#address-cells = <2>;
15761575
#size-cells = <2>;
1577-
ranges = <0x0 0x0 0x0 0x38000 0x0 0x400>;
1576+
ranges = <0x0 0x0 0x0 0x38000 0x0 0x2000>;
15781577

15791578
canvas: video-lut@48 {
15801579
compatible = "amlogic,canvas";
15811580
reg = <0x0 0x48 0x0 0x14>;
15821581
};
1582+
1583+
pmu: pmu@80 {
1584+
reg = <0x0 0x80 0x0 0x40>,
1585+
<0x0 0xc00 0x0 0x40>;
1586+
interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
1587+
};
15831588
};
15841589

15851590
usb2_phy1: phy@3a000 {
@@ -1705,12 +1710,6 @@
17051710
};
17061711
};
17071712

1708-
pmu: pmu@ff638000 {
1709-
reg = <0x0 0xff638000 0x0 0x100>,
1710-
<0x0 0xff638c00 0x0 0x100>;
1711-
interrupts = <GIC_SPI 52 IRQ_TYPE_EDGE_RISING>;
1712-
};
1713-
17141713
aobus: bus@ff800000 {
17151714
compatible = "simple-bus";
17161715
reg = <0x0 0xff800000 0x0 0x100000>;

‎arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
rohm,reset-snvs-powered;
195195

196196
#clock-cells = <0>;
197-
clocks = <&osc_32k 0>;
197+
clocks = <&osc_32k>;
198198
clock-output-names = "clk-32k-out";
199199

200200
regulators {

‎arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
compatible = "regulator-fixed";
100100
enable-active-high;
101101
gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
102-
off-on-delay = <500000>;
102+
off-on-delay-us = <500000>;
103103
pinctrl-names = "default";
104104
pinctrl-0 = <&pinctrl_reg_eth>;
105105
regulator-always-on;
@@ -139,7 +139,7 @@
139139
enable-active-high;
140140
/* Verdin SD_1_PWR_EN (SODIMM 76) */
141141
gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
142-
off-on-delay = <100000>;
142+
off-on-delay-us = <100000>;
143143
pinctrl-names = "default";
144144
pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
145145
regulator-max-microvolt = <3300000>;

‎arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
compatible = "regulator-fixed";
1111
enable-active-high;
1212
gpio = <&gpio_expander_21 4 GPIO_ACTIVE_HIGH>; /* ETH_PWR_EN */
13-
off-on-delay = <500000>;
13+
off-on-delay-us = <500000>;
1414
regulator-max-microvolt = <3300000>;
1515
regulator-min-microvolt = <3300000>;
1616
regulator-name = "+V3.3_ETH";

‎arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
compatible = "regulator-fixed";
8888
enable-active-high;
8989
gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
90-
off-on-delay = <500000>;
90+
off-on-delay-us = <500000>;
9191
pinctrl-names = "default";
9292
pinctrl-0 = <&pinctrl_reg_eth>;
9393
regulator-always-on;
@@ -128,7 +128,7 @@
128128
enable-active-high;
129129
/* Verdin SD_1_PWR_EN (SODIMM 76) */
130130
gpio = <&gpio4 22 GPIO_ACTIVE_HIGH>;
131-
off-on-delay = <100000>;
131+
off-on-delay-us = <100000>;
132132
pinctrl-names = "default";
133133
pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
134134
regulator-max-microvolt = <3300000>;

‎arch/arm64/boot/dts/freescale/imx8mp.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@
11281128

11291129
lcdif2: display-controller@32e90000 {
11301130
compatible = "fsl,imx8mp-lcdif";
1131-
reg = <0x32e90000 0x238>;
1131+
reg = <0x32e90000 0x10000>;
11321132
interrupts = <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH>;
11331133
clocks = <&clk IMX8MP_CLK_MEDIA_DISP2_PIX_ROOT>,
11341134
<&clk IMX8MP_CLK_MEDIA_APB_ROOT>,

0 commit comments

Comments
 (0)