ARM: dts: gemini: rename mdio to the right name
Subsystems (13)
Sasha Levin
maintainerPATCH 1/102 ARM: dts: gemini: rename mdio to the right name
From: Corentin Labbe <[email protected]>
[ Upstream commit fc5b59b945b546e27977e99a5ca6fe61179ff0d2 ]
ethernet-phy is not the right name for mdio, fix it.
--- arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 +- arch/arm/boot/dts/gemini-nas4220b.dts | 2 +- arch/arm/boot/dts/gemini-rut1xx.dts | 2 +- arch/arm/boot/dts/gemini-wbd111.dts | 2 +- arch/arm/boot/dts/gemini-wbd222.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/gemini-dlink-dns-313.dts +1 -1
@@ -140,7 +140,7 @@ map1 { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; /* Uses MDC and MDIO */ gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
arch/arm/boot/dts/gemini-nas4220b.dts +1 -1
@@ -62,7 +62,7 @@ led-green-os { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini-rut1xx.dts +1 -1
@@ -56,7 +56,7 @@ led-power { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini-wbd111.dts +1 -1
@@ -68,7 +68,7 @@ led-greeb-l3 { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
arch/arm/boot/dts/gemini-wbd222.dts +1 -1
@@ -67,7 +67,7 @@ led-green-l3 { }; }; - mdio0: ethernet-phy { + mdio0: mdio { compatible = "virtual,mdio-gpio"; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */ <&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 2/102 ARM: dts: gemini: add device_type on pci
From: Corentin Labbe <[email protected]>
[ Upstream commit 483f3645b3f7acfd1c78a19d51b80c0656161974 ]
Fixes DT warning on pci node by adding the missing device_type.
--- arch/arm/boot/dts/gemini.dtsi | 1 + 1 file changed, 1 insertion(+)
arch/arm/boot/dts/gemini.dtsi +1 -0
@@ -286,6 +286,7 @@ pci@50000000 { clock-names = "PCLK", "PCICLK"; pinctrl-names = "default"; pinctrl-0 = <&pci_default_pins>; + device_type = "pci"; #address-cells = <3>; #size-cells = <2>; #interrupt-cells = <1>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 3/102 ARM: dts: rockchip: Fix thermal sensor cells o rk322x
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit d5c24e20daf09587cbc221d40be1ba92673e8d94 ]
The number of cells to be used with a thermal sensor specifier must be "1". Fix this.
--- arch/arm/boot/dts/rk322x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/rk322x.dtsi +1 -1
@@ -520,7 +520,7 @@ tsadc: tsadc@11150000 { pinctrl-0 = <&otp_pin>; pinctrl-1 = <&otp_out>; pinctrl-2 = <&otp_pin>; - #thermal-sensor-cells = <0>; + #thermal-sensor-cells = <1>; rockchip,hw-tshut-temp = <95000>; status = "disabled"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 4/102 ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288
In reply to Sasha LevinFrom: Johan Jonker <[email protected]>
[ Upstream commit dfbfb86a43f9a5bbd166d88bca9e07ee4e1bff31 ]
A test with the command below aimed at powerpc generates notifications in the Rockchip ARM tree.
Fix pinctrl "sleep" nodename by renaming it to "suspend" for rk3036-kylin and rk3288
make ARCH=arm dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml
--- arch/arm/boot/dts/rk3036-kylin.dts | 2 +- arch/arm/boot/dts/rk3288.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/rk3036-kylin.dts +1 -1
@@ -390,7 +390,7 @@ sdmmc_pwr: sdmmc-pwr { }; }; - sleep { + suspend { global_pwroff: global-pwroff { rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>; };
arch/arm/boot/dts/rk3288.dtsi +1 -1
@@ -1586,7 +1586,7 @@ pcfg_pull_none_12ma: pcfg-pull-none-12ma { drive-strength = <12>; }; - sleep { + suspend { global_pwroff: global-pwroff { rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 5/102 arm64: dts: rockchip: Use only supported PCIe link speed on rk3399
In reply to Sasha LevinFrom: Peter Robinson <[email protected]>
[ Upstream commit 954d5986afa50c178ea7554e6abdd611d08f5ade ]
The max link speed supported by the rk3399 is already set in the rk3399.dtsi file so don't set unsupported link speeds in device specific DTs. This is the same fix as 642fb27.
--- arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 1 - arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 1 - 3 files changed, 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi +0 -1
@@ -504,7 +504,6 @@ &pcie_phy { }; &pcie0 { - max-link-speed = <2>; num-lanes = <2>; vpcie0v9-supply = <&vcca0v9_s3>; vpcie1v8-supply = <&vcca1v8_s3>;
arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +0 -1
@@ -469,7 +469,6 @@ &pcie_phy { &pcie0 { ep-gpios = <&gpio4 RK_PD3 GPIO_ACTIVE_HIGH>; - max-link-speed = <2>; num-lanes = <4>; pinctrl-0 = <&pcie_clkreqnb_cpm>; pinctrl-names = "default";
arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +0 -1
@@ -324,7 +324,6 @@ &pcie_phy { &pcie0 { ep-gpios = <&gpio0 RK_PB4 GPIO_ACTIVE_HIGH>; - max-link-speed = <2>; num-lanes = <4>; pinctrl-0 = <&pcie_clkreqnb_cpm>; pinctrl-names = "default";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 6/102 arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi
In reply to Sasha LevinFrom: Johan Jonker <[email protected]>
[ Upstream commit a7ecfad495f8af63a5cb332c91f60ab2018897f5 ]
A test with the command below aimed at powerpc generates notifications in the Rockchip arm64 tree.
Fix pinctrl "sleep" nodename by renaming it to "suspend" for rk3399.dtsi
make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/powerpc/sleep.yaml
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -2361,7 +2361,7 @@ sdmmc_wp: sdmmc-wp { }; }; - sleep { + suspend { ap_pwroff: ap-pwroff { rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 7/102 ARM: dts: rockchip: Fix the timer clocks order
In reply to Sasha LevinFrom: Ezequiel Garcia <[email protected]>
[ Upstream commit 7b46d674ac000b101fdad92cf16cc11d90b72f86 ]
Fixed order is the device-tree convention. The timer driver currently gets clocks by name, so no changes are needed there.
--- arch/arm/boot/dts/rk3188.dtsi | 8 ++++---- arch/arm/boot/dts/rk3288.dtsi | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/rk3188.dtsi +4 -4
@@ -150,16 +150,16 @@ timer3: timer@2000e000 { compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; reg = <0x2000e000 0x20>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_TIMER3>, <&cru PCLK_TIMER3>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER3>, <&cru SCLK_TIMER3>; + clock-names = "pclk", "timer"; }; timer6: timer@200380a0 { compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer"; reg = <0x200380a0 0x20>; interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru SCLK_TIMER6>, <&cru PCLK_TIMER0>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER6>; + clock-names = "pclk", "timer"; }; i2s0: i2s@1011a000 {
arch/arm/boot/dts/rk3288.dtsi +2 -2
@@ -196,8 +196,8 @@ timer: timer@ff810000 { compatible = "rockchip,rk3288-timer"; reg = <0x0 0xff810000 0x0 0x20>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&xin24m>, <&cru PCLK_TIMER>; - clock-names = "timer", "pclk"; + clocks = <&cru PCLK_TIMER>, <&xin24m>; + clock-names = "pclk", "timer"; }; display-subsystem {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 8/102 ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x
In reply to Sasha LevinFrom: Benjamin Gaignard <[email protected]>
[ Upstream commit 6b023929666f0be5df75f5e0278d1b70effadf42 ]
Add '#" to iommu-cells properties.
Remove useless interrupt-names properties
--- arch/arm/boot/dts/rk322x.dtsi | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
arch/arm/boot/dts/rk322x.dtsi +3 -7
@@ -561,10 +561,9 @@ vpu_mmu: iommu@20020800 { compatible = "rockchip,iommu"; reg = <0x20020800 0x100>; interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vpu_mmu"; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; clock-names = "aclk", "iface"; - iommu-cells = <0>; + #iommu-cells = <0>; status = "disabled"; };
@@ -572,10 +571,9 @@ vdec_mmu: iommu@20030480 { compatible = "rockchip,iommu"; reg = <0x20030480 0x40>, <0x200304c0 0x40>; interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vdec_mmu"; clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>; clock-names = "aclk", "iface"; - iommu-cells = <0>; + #iommu-cells = <0>; status = "disabled"; };
@@ -605,7 +603,6 @@ vop_mmu: iommu@20053f00 { compatible = "rockchip,iommu"; reg = <0x20053f00 0x100>; interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "vop_mmu"; clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>; clock-names = "aclk", "iface"; #iommu-cells = <0>;
@@ -626,10 +623,9 @@ iep_mmu: iommu@20070800 { compatible = "rockchip,iommu"; reg = <0x20070800 0x100>; interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "iep_mmu"; clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>; clock-names = "aclk", "iface"; - iommu-cells = <0>; + #iommu-cells = <0>; status = "disabled"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 9/102 ARM: dts: rockchip: Fix power-controller node names for rk3066a
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit f2948781a72f0d8cf2adf31758c357f2f35e6c79 ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm/boot/dts/rk3066a.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk3066a.dtsi +3 -3
@@ -755,7 +755,7 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_vio@RK3066_PD_VIO { + power-domain@RK3066_PD_VIO { reg = <RK3066_PD_VIO>; clocks = <&cru ACLK_LCDC0>, <&cru ACLK_LCDC1>,
@@ -782,7 +782,7 @@ pd_vio@RK3066_PD_VIO { <&qos_rga>; }; - pd_video@RK3066_PD_VIDEO { + power-domain@RK3066_PD_VIDEO { reg = <RK3066_PD_VIDEO>; clocks = <&cru ACLK_VDPU>, <&cru ACLK_VEPU>,
@@ -791,7 +791,7 @@ pd_video@RK3066_PD_VIDEO { pm_qos = <&qos_vpu>; }; - pd_gpu@RK3066_PD_GPU { + power-domain@RK3066_PD_GPU { reg = <RK3066_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 10/102 ARM: dts: rockchip: Fix power-controller node names for rk3188
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit d3bcbcd396175ac26aa54919c0b31c7d2878fc24 ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm/boot/dts/rk3188.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk3188.dtsi +3 -3
@@ -699,7 +699,7 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_vio@RK3188_PD_VIO { + power-domain@RK3188_PD_VIO { reg = <RK3188_PD_VIO>; clocks = <&cru ACLK_LCDC0>, <&cru ACLK_LCDC1>,
@@ -721,7 +721,7 @@ pd_vio@RK3188_PD_VIO { <&qos_rga>; }; - pd_video@RK3188_PD_VIDEO { + power-domain@RK3188_PD_VIDEO { reg = <RK3188_PD_VIDEO>; clocks = <&cru ACLK_VDPU>, <&cru ACLK_VEPU>,
@@ -730,7 +730,7 @@ pd_video@RK3188_PD_VIDEO { pm_qos = <&qos_vpu>; }; - pd_gpu@RK3188_PD_GPU { + power-domain@RK3188_PD_GPU { reg = <RK3188_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 11/102 ARM: dts: rockchip: Fix power-controller node names for rk3288
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit 970cdc53cb1afa73602028c103dbfb6a230080be ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm/boot/dts/rk3288.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +4 -4
@@ -769,7 +769,7 @@ power: power-controller { * *_HDMI HDMI * *_MIPI_* MIPI */ - pd_vio@RK3288_PD_VIO { + power-domain@RK3288_PD_VIO { reg = <RK3288_PD_VIO>; clocks = <&cru ACLK_IEP>, <&cru ACLK_ISP>,
@@ -811,7 +811,7 @@ pd_vio@RK3288_PD_VIO { * Note: The following 3 are HEVC(H.265) clocks, * and on the ACLK_HEVC_NIU (NOC). */ - pd_hevc@RK3288_PD_HEVC { + power-domain@RK3288_PD_HEVC { reg = <RK3288_PD_HEVC>; clocks = <&cru ACLK_HEVC>, <&cru SCLK_HEVC_CABAC>,
@@ -825,7 +825,7 @@ pd_hevc@RK3288_PD_HEVC { * (video endecoder & decoder) clocks that on the * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC). */ - pd_video@RK3288_PD_VIDEO { + power-domain@RK3288_PD_VIDEO { reg = <RK3288_PD_VIDEO>; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
@@ -836,7 +836,7 @@ pd_video@RK3288_PD_VIDEO { * Note: ACLK_GPU is the GPU clock, * and on the ACLK_GPU_NIU (NOC). */ - pd_gpu@RK3288_PD_GPU { + power-domain@RK3288_PD_GPU { reg = <RK3288_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu_r>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 12/102 arm64: dts: rockchip: Fix power-controller node names for px30
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit d5de0d688ac6e0202674577b05d0726b8a6af401 ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm64/boot/dts/rockchip/px30.dtsi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
arch/arm64/boot/dts/rockchip/px30.dtsi +8 -8
@@ -247,20 +247,20 @@ power: power-controller { #size-cells = <0>; /* These power domains are grouped by VD_LOGIC */ - pd_usb@PX30_PD_USB { + power-domain@PX30_PD_USB { reg = <PX30_PD_USB>; clocks = <&cru HCLK_HOST>, <&cru HCLK_OTG>, <&cru SCLK_OTG_ADP>; pm_qos = <&qos_usb_host>, <&qos_usb_otg>; }; - pd_sdcard@PX30_PD_SDCARD { + power-domain@PX30_PD_SDCARD { reg = <PX30_PD_SDCARD>; clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; pm_qos = <&qos_sdmmc>; }; - pd_gmac@PX30_PD_GMAC { + power-domain@PX30_PD_GMAC { reg = <PX30_PD_GMAC>; clocks = <&cru ACLK_GMAC>, <&cru PCLK_GMAC>,
@@ -268,7 +268,7 @@ pd_gmac@PX30_PD_GMAC { <&cru SCLK_GMAC_RX_TX>; pm_qos = <&qos_gmac>; }; - pd_mmc_nand@PX30_PD_MMC_NAND { + power-domain@PX30_PD_MMC_NAND { reg = <PX30_PD_MMC_NAND>; clocks = <&cru HCLK_NANDC>, <&cru HCLK_EMMC>,
@@ -281,14 +281,14 @@ pd_mmc_nand@PX30_PD_MMC_NAND { pm_qos = <&qos_emmc>, <&qos_nand>, <&qos_sdio>, <&qos_sfc>; }; - pd_vpu@PX30_PD_VPU { + power-domain@PX30_PD_VPU { reg = <PX30_PD_VPU>; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>, <&cru SCLK_CORE_VPU>; pm_qos = <&qos_vpu>, <&qos_vpu_r128>; }; - pd_vo@PX30_PD_VO { + power-domain@PX30_PD_VO { reg = <PX30_PD_VO>; clocks = <&cru ACLK_RGA>, <&cru ACLK_VOPB>,
@@ -304,7 +304,7 @@ pd_vo@PX30_PD_VO { pm_qos = <&qos_rga_rd>, <&qos_rga_wr>, <&qos_vop_m0>, <&qos_vop_m1>; }; - pd_vi@PX30_PD_VI { + power-domain@PX30_PD_VI { reg = <PX30_PD_VI>; clocks = <&cru ACLK_CIF>, <&cru ACLK_ISP>,
@@ -315,7 +315,7 @@ pd_vi@PX30_PD_VI { <&qos_isp_wr>, <&qos_isp_m1>, <&qos_vip>; }; - pd_gpu@PX30_PD_GPU { + power-domain@PX30_PD_GPU { reg = <PX30_PD_GPU>; clocks = <&cru SCLK_GPU>; pm_qos = <&qos_gpu>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 13/102 arm64: dts: rockchip: Fix power-controller node names for rk3328
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit 6e6a282b49c6db408d27231e3c709fbdf25e3c1b ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm64/boot/dts/rockchip/rk3328.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3328.dtsi +3 -3
@@ -303,13 +303,13 @@ power: power-controller { #address-cells = <1>; #size-cells = <0>; - pd_hevc@RK3328_PD_HEVC { + power-domain@RK3328_PD_HEVC { reg = <RK3328_PD_HEVC>; }; - pd_video@RK3328_PD_VIDEO { + power-domain@RK3328_PD_VIDEO { reg = <RK3328_PD_VIDEO>; }; - pd_vpu@RK3328_PD_VPU { + power-domain@RK3328_PD_VPU { reg = <RK3328_PD_VPU>; clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 14/102 arm64: dts: rockchip: Fix power-controller node names for rk3399
In reply to Sasha LevinFrom: Elaine Zhang <[email protected]>
[ Upstream commit 148bbe29f9108812c6fedd8a228f9e1ed6b422f7 ]
Use more generic names (as recommended in the device tree specification or the binding documentation)
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 40 ++++++++++++------------ 1 file changed, 20 insertions(+), 20 deletions(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +20 -20
@@ -971,26 +971,26 @@ power: power-controller { #size-cells = <0>; /* These power domains are grouped by VD_CENTER */ - pd_iep@RK3399_PD_IEP { + power-domain@RK3399_PD_IEP { reg = <RK3399_PD_IEP>; clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>; pm_qos = <&qos_iep>; }; - pd_rga@RK3399_PD_RGA { + power-domain@RK3399_PD_RGA { reg = <RK3399_PD_RGA>; clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>; pm_qos = <&qos_rga_r>, <&qos_rga_w>; }; - pd_vcodec@RK3399_PD_VCODEC { + power-domain@RK3399_PD_VCODEC { reg = <RK3399_PD_VCODEC>; clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>; pm_qos = <&qos_video_m0>; }; - pd_vdu@RK3399_PD_VDU { + power-domain@RK3399_PD_VDU { reg = <RK3399_PD_VDU>; clocks = <&cru ACLK_VDU>, <&cru HCLK_VDU>;
@@ -999,94 +999,94 @@ pd_vdu@RK3399_PD_VDU { }; /* These power domains are grouped by VD_GPU */ - pd_gpu@RK3399_PD_GPU { + power-domain@RK3399_PD_GPU { reg = <RK3399_PD_GPU>; clocks = <&cru ACLK_GPU>; pm_qos = <&qos_gpu>; }; /* These power domains are grouped by VD_LOGIC */ - pd_edp@RK3399_PD_EDP { + power-domain@RK3399_PD_EDP { reg = <RK3399_PD_EDP>; clocks = <&cru PCLK_EDP_CTRL>; }; - pd_emmc@RK3399_PD_EMMC { + power-domain@RK3399_PD_EMMC { reg = <RK3399_PD_EMMC>; clocks = <&cru ACLK_EMMC>; pm_qos = <&qos_emmc>; }; - pd_gmac@RK3399_PD_GMAC { + power-domain@RK3399_PD_GMAC { reg = <RK3399_PD_GMAC>; clocks = <&cru ACLK_GMAC>, <&cru PCLK_GMAC>; pm_qos = <&qos_gmac>; }; - pd_sd@RK3399_PD_SD { + power-domain@RK3399_PD_SD { reg = <RK3399_PD_SD>; clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>; pm_qos = <&qos_sd>; }; - pd_sdioaudio@RK3399_PD_SDIOAUDIO { + power-domain@RK3399_PD_SDIOAUDIO { reg = <RK3399_PD_SDIOAUDIO>; clocks = <&cru HCLK_SDIO>; pm_qos = <&qos_sdioaudio>; }; - pd_tcpc0@RK3399_PD_TCPD0 { + power-domain@RK3399_PD_TCPD0 { reg = <RK3399_PD_TCPD0>; clocks = <&cru SCLK_UPHY0_TCPDCORE>, <&cru SCLK_UPHY0_TCPDPHY_REF>; }; - pd_tcpc1@RK3399_PD_TCPD1 { + power-domain@RK3399_PD_TCPD1 { reg = <RK3399_PD_TCPD1>; clocks = <&cru SCLK_UPHY1_TCPDCORE>, <&cru SCLK_UPHY1_TCPDPHY_REF>; }; - pd_usb3@RK3399_PD_USB3 { + power-domain@RK3399_PD_USB3 { reg = <RK3399_PD_USB3>; clocks = <&cru ACLK_USB3>; pm_qos = <&qos_usb_otg0>, <&qos_usb_otg1>; }; - pd_vio@RK3399_PD_VIO { + power-domain@RK3399_PD_VIO { reg = <RK3399_PD_VIO>; #address-cells = <1>; #size-cells = <0>; - pd_hdcp@RK3399_PD_HDCP { + power-domain@RK3399_PD_HDCP { reg = <RK3399_PD_HDCP>; clocks = <&cru ACLK_HDCP>, <&cru HCLK_HDCP>, <&cru PCLK_HDCP>; pm_qos = <&qos_hdcp>; }; - pd_isp0@RK3399_PD_ISP0 { + power-domain@RK3399_PD_ISP0 { reg = <RK3399_PD_ISP0>; clocks = <&cru ACLK_ISP0>, <&cru HCLK_ISP0>; pm_qos = <&qos_isp0_m0>, <&qos_isp0_m1>; }; - pd_isp1@RK3399_PD_ISP1 { + power-domain@RK3399_PD_ISP1 { reg = <RK3399_PD_ISP1>; clocks = <&cru ACLK_ISP1>, <&cru HCLK_ISP1>; pm_qos = <&qos_isp1_m0>, <&qos_isp1_m1>; }; - pd_vo@RK3399_PD_VO { + power-domain@RK3399_PD_VO { reg = <RK3399_PD_VO>; #address-cells = <1>; #size-cells = <0>; - pd_vopb@RK3399_PD_VOPB { + power-domain@RK3399_PD_VOPB { reg = <RK3399_PD_VOPB>; clocks = <&cru ACLK_VOP0>, <&cru HCLK_VOP0>; pm_qos = <&qos_vop_big_r>, <&qos_vop_big_w>; }; - pd_vopl@RK3399_PD_VOPL { + power-domain@RK3399_PD_VOPL { reg = <RK3399_PD_VOPL>; clocks = <&cru ACLK_VOP1>, <&cru HCLK_VOP1>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 15/102 reset: ti-syscon: fix to_ti_syscon_reset_data macro
In reply to Sasha LevinFrom: Philipp Zabel <[email protected]>
[ Upstream commit 05cf8fffcdeb47aef1203c08cbec5224fd3a0e1c ]
The to_ti_syscon_reset_data macro currently only works if the parameter passed into it is called 'rcdev'.
Fixes a checkpatch --strict issue:
CHECK: Macro argument reuse 'rcdev' - possible side-effects? #53: FILE: drivers/reset/reset-ti-syscon.c:53:
+#define to_ti_syscon_reset_data(rcdev) \
+ container_of(rcdev, struct ti_syscon_reset_data, rcdev)
--- drivers/reset/reset-ti-syscon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/reset/reset-ti-syscon.c +2 -2
@@ -58,8 +58,8 @@ struct ti_syscon_reset_data {unsigned int nr_controls; }; -#define to_ti_syscon_reset_data (rcdev) \ - container_of(rcdev, struct ti_syscon_reset_data, rcdev) +#define to_ti_syscon_reset_data (_rcdev) \ + container_of(_rcdev, struct ti_syscon_reset_data, rcdev)/** * ti_syscon_reset_assert() - assert device reset
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 16/102 ARM: dts: BCM5301X: Fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit b660269cba748dfd07eb5551a88ff34d5ea0b86e ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 4 ++-- arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 4 ++-- arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 4 ++-- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- arch/arm/boot/dts/bcm953012k.dts | 4 ++-- arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +2 -2
@@ -24,8 +24,8 @@ memory@0 { reg = <0x00000000 0x08000000>; }; - nand: nand@18028000 { - nandcs@0 { + nand_controller: nand-controller@18028000 { + nand@0 { partitions { compatible = "fixed-partitions"; #address-cells = <1>;
arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts +2 -2
@@ -25,8 +25,8 @@ memory@0 { <0x88000000 0x08000000>; }; - nand: nand@18028000 { - nandcs@0 { + nand_controller: nand-controller@18028000 { + nand@0 { partitions { compatible = "fixed-partitions"; #address-cells = <1>;
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi +2 -2
@@ -6,8 +6,8 @@ */ / { - nand@18028000 { - nandcs: nandcs@0 { + nand-controller@18028000 { + nandcs: nand@0 { compatible = "brcm,nandcs"; reg = <0>; #address-cells = <1>;
arch/arm/boot/dts/bcm5301x.dtsi +1 -1
@@ -501,7 +501,7 @@ rng: rng@18004000 { reg = <0x18004000 0x14>; }; - nand: nand@18028000 { + nand_controller: nand-controller@18028000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1", "brcm,brcmnand"; reg = <0x18028000 0x600>, <0x1811a408 0x600>, <0x18028f00 0x20>; reg-names = "nand", "iproc-idm", "iproc-ext";
arch/arm/boot/dts/bcm953012k.dts +2 -2
@@ -49,8 +49,8 @@ memory@80000000 { }; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi +1 -1
@@ -269,7 +269,7 @@ nand@1800 { interrupt-names = "nand"; status = "okay"; - nandcs: nandcs@0 { + nandcs: nand@0 { compatible = "brcm,nandcs"; reg = <0>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 17/102 ARM: brcmstb: dts: fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 9a800ce1aada6e0f56b78e4713f4858c8990c1f7 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm7445-bcm97445svmb.dts | 4 ++-- arch/arm/boot/dts/bcm7445.dtsi | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm7445-bcm97445svmb.dts +2 -2
@@ -14,10 +14,10 @@ memory@0 { }; }; -&nand { +&nand_controller { status = "okay"; - nandcs@1 { + nand@1 { compatible = "brcm,nandcs"; reg = <1>; nand-ecc-step-size = <512>;
arch/arm/boot/dts/bcm7445.dtsi +1 -1
@@ -148,7 +148,7 @@ aon-ctrl@410000 { reg-names = "aon-ctrl", "aon-sram"; }; - nand: nand@3e2800 { + nand_controller: nand-controller@3e2800 { status = "disabled"; #address-cells = <1>; #size-cells = <0>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 18/102 ARM: Cygnus: dts: fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit e256b48a3b07ee1ae4bfa60abbf509ba8e386862 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm-cygnus.dtsi | 2 +- arch/arm/boot/dts/bcm911360_entphn.dts | 4 ++-- arch/arm/boot/dts/bcm958300k.dts | 4 ++-- arch/arm/boot/dts/bcm958305k.dts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/bcm-cygnus.dtsi +1 -1
@@ -460,7 +460,7 @@ sdhci1: sdhci@18043000 { status = "disabled"; }; - nand: nand@18046000 { + nand_controller: nand-controller@18046000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x18046000 0x600>, <0xf8105408 0x600>, <0x18046f00 0x20>;
arch/arm/boot/dts/bcm911360_entphn.dts +2 -2
@@ -82,8 +82,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958300k.dts +2 -2
@@ -60,8 +60,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958305k.dts +2 -2
@@ -68,8 +68,8 @@ &uart3 { status = "okay"; }; -&nand { - nandcs@1 { +&nand_controller { + nand@1 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 19/102 ARM: NSP: dts: fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 0484594be733d5cdf976f55a2d4e8d887f351b69 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm958522er.dts | 4 ++-- arch/arm/boot/dts/bcm958525er.dts | 4 ++-- arch/arm/boot/dts/bcm958525xmc.dts | 4 ++-- arch/arm/boot/dts/bcm958622hr.dts | 4 ++-- arch/arm/boot/dts/bcm958623hr.dts | 4 ++-- arch/arm/boot/dts/bcm958625hr.dts | 4 ++-- arch/arm/boot/dts/bcm958625k.dts | 4 ++-- arch/arm/boot/dts/bcm988312hr.dts | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -269,7 +269,7 @@ mailbox: mailbox@25c00 { dma-coherent; }; - nand: nand@26000 { + nand_controller: nand-controller@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x026000 0x600>, <0x11b408 0x600>,
arch/arm/boot/dts/bcm958522er.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958525er.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958525xmc.dts +2 -2
@@ -90,8 +90,8 @@ rtc@68 { }; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958622hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958623hr.dts +2 -2
@@ -78,8 +78,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958625hr.dts +2 -2
@@ -89,8 +89,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm958625k.dts +2 -2
@@ -68,8 +68,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
arch/arm/boot/dts/bcm988312hr.dts +2 -2
@@ -74,8 +74,8 @@ &ehci0 { status = "okay"; }; -&nand { - nandcs@0 { +&nand_controller { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-on-flash-bbt;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 20/102 ARM: dts: BCM63xx: Fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit 75e2f012f6e34b93124d1d86eaa8f27df48e9ea0 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm63138.dtsi | 2 +- arch/arm/boot/dts/bcm963138dvt.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm63138.dtsi +1 -1
@@ -203,7 +203,7 @@ serial1: serial@620 { status = "disabled"; }; - nand: nand@2000 { + nand_controller: nand-controller@2000 { #address-cells = <1>; #size-cells = <0>; compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
arch/arm/boot/dts/bcm963138dvt.dts +2 -2
@@ -31,10 +31,10 @@ &serial1 { status = "okay"; }; -&nand { +&nand_controller { status = "okay"; - nandcs@0 { + nand@0 { compatible = "brcm,nandcs"; reg = <0>; nand-ecc-strength = <4>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 21/102 ARM: dts: Hurricane 2: Fix NAND nodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit a4528d9029e2eda16e4fc9b9da1de1fbec10ab26 ]
This matches nand-controller.yaml requirements.
--- arch/arm/boot/dts/bcm-hr2.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm-hr2.dtsi +1 -1
@@ -179,7 +179,7 @@ amac0: ethernet@22000 { status = "disabled"; }; - nand: nand@26000 { + nand_controller: nand-controller@26000 { compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1"; reg = <0x26000 0x600>, <0x11b408 0x600>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 22/102 ARM: dts: BCM5301X: Fix pinmux subnodes names
In reply to Sasha LevinFrom: Rafał Miłecki <[email protected]>
[ Upstream commit bb95d7d440fefd104c593d9cb20da6d34a474e97 ]
This matches pinmux-node.yaml requirements.
--- arch/arm/boot/dts/bcm47094.dtsi | 2 +- arch/arm/boot/dts/bcm5301x.dtsi | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/bcm47094.dtsi +1 -1
@@ -11,7 +11,7 @@ / { &pinctrl { compatible = "brcm,bcm4709-pinmux"; - pinmux_mdio: mdio { + pinmux_mdio: mdio-pins { groups = "mdio_grp"; function = "mdio"; };
arch/arm/boot/dts/bcm5301x.dtsi +3 -3
@@ -458,18 +458,18 @@ spi-pins { function = "spi"; }; - pinmux_i2c: i2c { + pinmux_i2c: i2c-pins { groups = "i2c_grp"; function = "i2c"; }; - pinmux_pwm: pwm { + pinmux_pwm: pwm-pins { groups = "pwm0_grp", "pwm1_grp", "pwm2_grp", "pwm3_grp"; function = "pwm"; }; - pinmux_uart1: uart1 { + pinmux_uart1: uart1-pins { groups = "uart1_grp"; function = "uart1"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 23/102 soc: bcm: brcmstb: remove unused variable 'brcmstb_machine_match'
In reply to Sasha LevinFrom: Jiapeng Chong <[email protected]>
[ Upstream commit c1f512182c54dc87efd2f7ac19f16a49ff8bb19e ]
Fix the following clang warning:
drivers/soc/bcm/brcmstb/common.c:17:34: warning: unused variable 'brcmstb_machine_match' [-Wunused-const-variable].
--- drivers/soc/bcm/brcmstb/common.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/soc/bcm/brcmstb/common.c +0 -5
@@ -14,11 +14,6 @@static u32 family_id;static u32 product_id; -static const struct of_device_id brcmstb_machine_match[] = { - { .compatible ="brcm,brcmstb" , }, - { } -}; -u32 brcmstb_get_family_id (void ) {return family_id;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 24/102 ARM: dts: imx25-pinfunc: Fix gpio function name for pads GPIO_[A-F]
In reply to Sasha LevinFrom: Uwe Kleine-König <[email protected]>
[ Upstream commit e0cdd26af8eb9001689a4cde4f72c61c1c4b06be ]
The pinfunc definitions used GPIO_A as function instead of GPIO_1_0 as done for all the other pins with GPIO functionality. Fix for consistency.
There are no mainline users that needs adaption.
--- arch/arm/boot/dts/imx25-pinfunc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/imx25-pinfunc.h +6 -6
@@ -563,15 +563,15 @@#define MX25_PAD_DE_B__DE_B 0x1f0 0x3ec 0x000 0x00 0x000#define MX25_PAD_DE_B__GPIO_2_20 0x1f0 0x3ec 0x000 0x05 0x000 -#define MX25_PAD_GPIO_A__GPIO_A 0x1f4 0x3f0 0x000 0x00 0x000 +#define MX25_PAD_GPIO_A__GPIO_1_0 0x1f4 0x3f0 0x000 0x00 0x000#define MX25_PAD_GPIO_A__CAN1_TX 0x1f4 0x3f0 0x000 0x06 0x000#define MX25_PAD_GPIO_A__USBOTG_PWR 0x1f4 0x3f0 0x000 0x02 0x000 -#define MX25_PAD_GPIO_B__GPIO_B 0x1f8 0x3f4 0x000 0x00 0x000 +#define MX25_PAD_GPIO_B__GPIO_1_1 0x1f8 0x3f4 0x000 0x00 0x000#define MX25_PAD_GPIO_B__USBOTG_OC 0x1f8 0x3f4 0x57c 0x02 0x001#define MX25_PAD_GPIO_B__CAN1_RX 0x1f8 0x3f4 0x480 0x06 0x001 -#define MX25_PAD_GPIO_C__GPIO_C 0x1fc 0x3f8 0x000 0x00 0x000 +#define MX25_PAD_GPIO_C__GPIO_1_2 0x1fc 0x3f8 0x000 0x00 0x000#define MX25_PAD_GPIO_C__PWM4_PWMO 0x1fc 0x3f8 0x000 0x01 0x000#define MX25_PAD_GPIO_C__I2C2_SCL 0x1fc 0x3f8 0x51c 0x02 0x001#define MX25_PAD_GPIO_C__KPP_COL4 0x1fc 0x3f8 0x52c 0x03 0x001
@@ -580,18 +580,18 @@#define MX25_PAD_GPIO_C__CAN2_TX 0x1fc 0x3f8 0x000 0x06 0x000#define MX25_PAD_GPIO_C__CSPI2_SS2 0x1fc 0x3f8 0x000 0x07 0x000 -#define MX25_PAD_GPIO_D__GPIO_D 0x200 0x3fc 0x000 0x00 0x000 +#define MX25_PAD_GPIO_D__GPIO_1_3 0x200 0x3fc 0x000 0x00 0x000#define MX25_PAD_GPIO_D__I2C2_SDA 0x200 0x3fc 0x520 0x02 0x001#define MX25_PAD_GPIO_D__CAN2_RX 0x200 0x3fc 0x484 0x06 0x001#define MX25_PAD_GPIO_D__CSPI3_SS2 0x200 0x3fc 0x4c4 0x07 0x001 -#define MX25_PAD_GPIO_E__GPIO_E 0x204 0x400 0x000 0x00 0x000 +#define MX25_PAD_GPIO_E__GPIO_1_4 0x204 0x400 0x000 0x00 0x000#define MX25_PAD_GPIO_E__I2C3_CLK 0x204 0x400 0x524 0x01 0x002#define MX25_PAD_GPIO_E__LD16 0x204 0x400 0x000 0x02 0x000#define MX25_PAD_GPIO_E__AUD7_TXD 0x204 0x400 0x000 0x04 0x000#define MX25_PAD_GPIO_E__UART4_RXD 0x204 0x400 0x570 0x06 0x002 -#define MX25_PAD_GPIO_F__GPIO_F 0x208 0x404 0x000 0x00 0x000 +#define MX25_PAD_GPIO_F__GPIO_1_5 0x208 0x404 0x000 0x00 0x000#define MX25_PAD_GPIO_F__LD17 0x208 0x404 0x000 0x02 0x000#define MX25_PAD_GPIO_F__AUD7_TXC 0x208 0x404 0x000 0x04 0x000#define MX25_PAD_GPIO_F__UART4_TXD 0x208 0x404 0x000 0x06 0x000
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 25/102 ARM: dts: exynos: align Broadcom WiFi with dtschema
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit cc29e39412b9a78b43f7dfa09d739f8ba9fa7984 ]
The Broadcom BCM4329 family dtschema expects devices to be compatible also with brcm,bcm4329-fmac:
arch/arm/boot/dts/exynos3250-rinato.dt.yaml: wifi@1: compatible: 'oneOf' conditional failed, one must be fixed:
['brcm,bcm4334-fmac'] is too short
'brcm,bcm4329-fmac' was expected
--- arch/arm/boot/dts/exynos3250-rinato.dts | 2 +- arch/arm/boot/dts/exynos4210-i9100.dts | 2 +- arch/arm/boot/dts/exynos4210-trats.dts | 2 +- arch/arm/boot/dts/exynos4210-universal_c210.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos3250-rinato.dts +1 -1
@@ -653,7 +653,7 @@ &mshc_1 { mmc-pwrseq = <&wlan_pwrseq>; brcmf: wifi@1 { - compatible = "brcm,bcm4334-fmac"; + compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx1>;
arch/arm/boot/dts/exynos4210-i9100.dts +1 -1
@@ -752,7 +752,7 @@ &sdhci_3 { pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>; brcmf: wifi@1 { - compatible = "brcm,bcm4330-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx2>;
arch/arm/boot/dts/exynos4210-trats.dts +1 -1
@@ -521,7 +521,7 @@ &sdhci_3 { pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>; brcmf: wifi@1 { - compatible = "brcm,bcm4330-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx2>;
arch/arm/boot/dts/exynos4210-universal_c210.dts +1 -1
@@ -614,7 +614,7 @@ &sdhci_3 { pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>; brcmf: wifi@1 { - compatible = "brcm,bcm4330-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; interrupt-parent = <&gpx2>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 26/102 soc: mediatek: add missing MODULE_DEVICE_TABLE
In reply to Sasha LevinFrom: Zou Wei <[email protected]>
[ Upstream commit ba96de3ae5a7e2121cac80053b277eb2ab51a0ae ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/soc/mediatek/mtk-devapc.c | 1 + 1 file changed, 1 insertion(+)
drivers/soc/mediatek/mtk-devapc.c +1 -0
@@ -234,6 +234,7 @@ static const struct of_device_id mtk_devapc_dt_match[] = { }, { }, }; +MODULE_DEVICE_TABLE (of, mtk_devapc_dt_match);static int mtk_devapc_probe (struct platform_device *pdev) {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 27/102 ARM: dts: imx6: phyFLEX: Fix UART hardware flow control
In reply to Sasha LevinFrom: Primoz Fiser <[email protected]>
[ Upstream commit 14cdc1f243d79e0b46be150502b7dba9c5a6bdfd ]
Serial interface uart3 on phyFLEX board is capable of 5-wire connection including signals RTS and CTS for hardware flow control.
Fix signals UART3_CTS_B and UART3_RTS_B padmux assignments and add missing property "uart-has-rtscts" to allow serial interface to be configured and used with the hardware flow control.
--- arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +3 -2
@@ -316,8 +316,8 @@ pinctrl_uart3: uart3grp { fsl,pins = < MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1 MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1 - MX6QDL_PAD_EIM_D30__UART3_RTS_B 0x1b0b1 - MX6QDL_PAD_EIM_D31__UART3_CTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D31__UART3_RTS_B 0x1b0b1 + MX6QDL_PAD_EIM_D30__UART3_CTS_B 0x1b0b1 >; };
@@ -404,6 +404,7 @@ ®_soc { &uart3 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart3>; + uart-has-rtscts; status = "disabled"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 28/102 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info
In reply to Sasha LevinFrom: Jonathan Neuschäfer <[email protected]>
[ Upstream commit 89b759469d525f4d5f9c29cd3b1f490311c67f85 ]
The name of the struct, as defined in arch/arm/mach-imx/pm-imx5.c, is imx5_cpu_suspend_info.
--- arch/arm/mach-imx/suspend-imx53.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-imx/suspend-imx53.S +2 -2
@@ -28,11 +28,11 @@ * ^ * ^ * imx53_suspend code - * PM_INFO structure(imx53_suspend_info) + * PM_INFO structure(imx5_cpu_suspend_info) * ======================== low address ======================= */ -/* Offsets of members of struct imx53_suspend_info */ +/* Offsets of members of struct imx5_cpu_suspend_info */ #define SUSPEND_INFO_MX53_M4IF_V_OFFSET 0x0 #define SUSPEND_INFO_MX53_IOMUXC_V_OFFSET 0x4 #define SUSPEND_INFO_MX53_IO_COUNT_OFFSET 0x8
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 29/102 arm64: dts: rockchip: fix regulator-gpio states array
In reply to Sasha LevinFrom: Johan Jonker <[email protected]>
[ Upstream commit b82f8e2992534aab0fa762a37376be30df263701 ]
A test with the command below gives this error:
/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dt.yaml:
sdmmcio-regulator: states:0:
[1800000, 1, 3300000, 0] is too long
dtbs_check expects regulator-gpio states in a format of 2 per item, so fix them all.
make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/ regulator/gpio-regulator.yaml
--- arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 4 ++-- arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm64/boot/dts/rockchip/rk3308-roc-cc.dts +2 -2
@@ -78,8 +78,8 @@ vcc_sdmmc: vcc-sdmmc { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>; - states = <1800000 0x0 - 3300000 0x1>; + states = <1800000 0x0>, + <3300000 0x1>; vin-supply = <&vcc5v0_sys>; };
arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +2 -2
@@ -72,8 +72,8 @@ vcc_io_sdio: sdmmcio-regulator { regulator-settling-time-us = <5000>; regulator-type = "voltage"; startup-delay-us = <2000>; - states = <1800000 0x1 - 3300000 0x0>; + states = <1800000 0x1>, + <3300000 0x0>; vin-supply = <&vcc_io_33>; };
arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +2 -2
@@ -45,8 +45,8 @@ vcc_sd: sdmmc-regulator { vcc_sdio: sdmmcio-regulator { compatible = "regulator-gpio"; gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>; - states = <1800000 0x1 - 3300000 0x0>; + states = <1800000 0x1>, + <3300000 0x0>; regulator-name = "vcc_sdio"; regulator-type = "voltage"; regulator-min-microvolt = <1800000>;
arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +1 -1
@@ -245,7 +245,7 @@ &ppvar_gpu_pwm { }; &ppvar_sd_card_io { - states = <1800000 0x0 3300000 0x1>; + states = <1800000 0x0>, <3300000 0x1>; regulator-max-microvolt = <3300000>; };
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +2 -2
@@ -247,8 +247,8 @@ ppvar_sd_card_io: ppvar-sd-card-io { enable-active-high; enable-gpio = <&gpio2 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>; - states = <1800000 0x1 - 3000000 0x0>; + states = <1800000 0x1>, + <3000000 0x0>; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3000000>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 30/102 ARM: dts: ux500: Fix interrupt cells
In reply to Sasha LevinFrom: Sebastian Reichel <[email protected]>
[ Upstream commit e4ff0112a03c2e353c8457cd33c88feb89dfec41 ]
Fix interrupt cells in DT AB8500/AB8505 source files. The compiled DTB files will stay the same.
--- arch/arm/boot/dts/ste-ab8500.dtsi | 26 +++++++++++++------------- arch/arm/boot/dts/ste-ab8505.dtsi | 22 +++++++++++----------- 2 files changed, 24 insertions(+), 24 deletions(-)
arch/arm/boot/dts/ste-ab8500.dtsi +13 -13
@@ -42,15 +42,15 @@ ab8500_gpio: ab8500-gpio { ab8500-rtc { compatible = "stericsson,ab8500-rtc"; - interrupts = <17 IRQ_TYPE_LEVEL_HIGH - 18 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, + <18 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "60S", "ALARM"; }; gpadc: ab8500-gpadc { compatible = "stericsson,ab8500-gpadc"; - interrupts = <32 IRQ_TYPE_LEVEL_HIGH - 39 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <32 IRQ_TYPE_LEVEL_HIGH>, + <39 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "HW_CONV_END", "SW_CONV_END"; vddadc-supply = <&ab8500_ldo_tvout_reg>; #address-cells = <1>;
@@ -219,13 +219,13 @@ ab8500_chargalg { ab8500_usb { compatible = "stericsson,ab8500-usb"; - interrupts = < 90 IRQ_TYPE_LEVEL_HIGH - 96 IRQ_TYPE_LEVEL_HIGH - 14 IRQ_TYPE_LEVEL_HIGH - 15 IRQ_TYPE_LEVEL_HIGH - 79 IRQ_TYPE_LEVEL_HIGH - 74 IRQ_TYPE_LEVEL_HIGH - 75 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, + <96 IRQ_TYPE_LEVEL_HIGH>, + <14 IRQ_TYPE_LEVEL_HIGH>, + <15 IRQ_TYPE_LEVEL_HIGH>, + <79 IRQ_TYPE_LEVEL_HIGH>, + <74 IRQ_TYPE_LEVEL_HIGH>, + <75 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ID_WAKEUP_R", "ID_WAKEUP_F", "VBUS_DET_F",
@@ -242,8 +242,8 @@ ab8500_usb { ab8500-ponkey { compatible = "stericsson,ab8500-poweron-key"; - interrupts = <6 IRQ_TYPE_LEVEL_HIGH - 7 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>, + <7 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; };
arch/arm/boot/dts/ste-ab8505.dtsi +11 -11
@@ -39,8 +39,8 @@ ab8505_gpio: ab8505-gpio { ab8500-rtc { compatible = "stericsson,ab8500-rtc"; - interrupts = <17 IRQ_TYPE_LEVEL_HIGH - 18 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <17 IRQ_TYPE_LEVEL_HIGH>, + <18 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "60S", "ALARM"; };
@@ -182,13 +182,13 @@ ab8500_chargalg { ab8500_usb: ab8500_usb { compatible = "stericsson,ab8500-usb"; - interrupts = < 90 IRQ_TYPE_LEVEL_HIGH - 96 IRQ_TYPE_LEVEL_HIGH - 14 IRQ_TYPE_LEVEL_HIGH - 15 IRQ_TYPE_LEVEL_HIGH - 79 IRQ_TYPE_LEVEL_HIGH - 74 IRQ_TYPE_LEVEL_HIGH - 75 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <90 IRQ_TYPE_LEVEL_HIGH>, + <96 IRQ_TYPE_LEVEL_HIGH>, + <14 IRQ_TYPE_LEVEL_HIGH>, + <15 IRQ_TYPE_LEVEL_HIGH>, + <79 IRQ_TYPE_LEVEL_HIGH>, + <74 IRQ_TYPE_LEVEL_HIGH>, + <75 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ID_WAKEUP_R", "ID_WAKEUP_F", "VBUS_DET_F",
@@ -205,8 +205,8 @@ ab8500_usb: ab8500_usb { ab8500-ponkey { compatible = "stericsson,ab8500-poweron-key"; - interrupts = <6 IRQ_TYPE_LEVEL_HIGH - 7 IRQ_TYPE_LEVEL_HIGH>; + interrupts = <6 IRQ_TYPE_LEVEL_HIGH>, + <7 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 31/102 ARM: dts: ux500: Rename gpio-controller node
In reply to Sasha LevinFrom: Sebastian Reichel <[email protected]>
[ Upstream commit 4917b702818872fdf2a9973705af3aa7d3d1f19e ]
Rename the AB8500 gpio controller node from ab8500-gpio to ab8500-gpiocontroller, since -gpio is a common suffix for gpio consumers.
--- arch/arm/boot/dts/ste-ab8500.dtsi | 2 +- arch/arm/boot/dts/ste-ab8505.dtsi | 2 +- arch/arm/boot/dts/ste-href-ab8500.dtsi | 2 +- arch/arm/boot/dts/ste-href.dtsi | 2 +- arch/arm/boot/dts/ste-snowball.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/ste-ab8500.dtsi +1 -1
@@ -34,7 +34,7 @@ ab8500_clock: clock-controller { #clock-cells = <1>; }; - ab8500_gpio: ab8500-gpio { + ab8500_gpio: ab8500-gpiocontroller { compatible = "stericsson,ab8500-gpio"; gpio-controller; #gpio-cells = <2>;
arch/arm/boot/dts/ste-ab8505.dtsi +1 -1
@@ -31,7 +31,7 @@ ab8500_clock: clock-controller { #clock-cells = <1>; }; - ab8505_gpio: ab8505-gpio { + ab8505_gpio: ab8505-gpiocontroller { compatible = "stericsson,ab8505-gpio"; gpio-controller; #gpio-cells = <2>;
arch/arm/boot/dts/ste-href-ab8500.dtsi +1 -1
@@ -9,7 +9,7 @@ / { soc { prcmu@80157000 { ab8500 { - ab8500-gpio { + ab8500-gpiocontroller { /* Hog a few default settings */ pinctrl-names = "default"; pinctrl-0 = <&gpio2_default_mode>,
arch/arm/boot/dts/ste-href.dtsi +1 -1
@@ -202,7 +202,7 @@ msp3: msp@80125000 { prcmu@80157000 { ab8500 { - ab8500-gpio { + ab8500-gpiocontroller { }; ab8500_usb {
arch/arm/boot/dts/ste-snowball.dts +1 -1
@@ -376,7 +376,7 @@ spi@80002000 { prcmu@80157000 { ab8500 { - ab8500-gpio { + ab8500-gpiocontroller { /* * AB8500 GPIOs are numbered starting from 1, so the first * index 0 is what in the datasheet is called "GPIO1", and
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 32/102 ARM: dts: ux500: Fix orientation of accelerometer
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 4beba4011995a2c44ee27e1d358dc32e6b9211b3 ]
This adds a mounting matrix to the accelerometer
on the TVK1281618 R3.
--- arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/boot/dts/ste-href-tvk1281618-r3.dtsi +3 -0
@@ -19,6 +19,9 @@ accelerometer@19 { <19 IRQ_TYPE_EDGE_RISING>; pinctrl-names = "default"; pinctrl-0 = <&accel_tvk_mode>; + mount-matrix = "0", "-1", "0", + "-1", "0", "0", + "0", "0", "-1"; }; magnetometer@1e { compatible = "st,lsm303dlm-magn";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 33/102 ARM: dts: ux500: Fix some compatible strings
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit 59ba546d1662c4beb738725965041f350afe24b4 ]
The Golden and Skomer phones have BCM4334 WLAN+BT chips, so make the compatible strings reflect the new available bindings for these.
--- arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 3 ++- arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 4 ++-- arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/boot/dts/ste-ux500-samsung-golden.dts +2 -1
@@ -121,7 +121,7 @@ mmc@80118000 { #size-cells = <0>; wifi@1 { - compatible = "brcm,bcm4329-fmac"; + compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac"; reg = <1>; /* GPIO216 (WLAN_HOST_WAKE) */
@@ -162,6 +162,7 @@ uart@80120000 { pinctrl-1 = <&u0_a_1_sleep>; bluetooth { + /* BCM4334B0 actually */ compatible = "brcm,bcm4330-bt"; /* GPIO222 (BT_VREG_ON) */ shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/ste-ux500-samsung-janice.dts +2 -2
@@ -401,8 +401,7 @@ mmc@80118000 { status = "okay"; wifi@1 { - /* Actually BRCM4330 */ - compatible = "brcm,bcm4329-fmac"; + compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac"; reg = <1>; /* GPIO216 WL_HOST_WAKE */ interrupt-parent = <&gpio6>;
@@ -439,6 +438,7 @@ uart@80120000 { status = "okay"; bluetooth { + /* BCM4330B1 actually */ compatible = "brcm,bcm4330-bt"; /* * We actually have shutdown-gpios, BT_VREG_EN on GPIO222,
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts +2 -1
@@ -211,7 +211,7 @@ mmc@80118000 { #size-cells = <0>; wifi@1 { - compatible = "brcm,bcm4329-fmac"; + compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac"; reg = <1>; /* GPIO216 WL_HOST_WAKE */ interrupt-parent = <&gpio6>;
@@ -247,6 +247,7 @@ uart@80120000 { /* FIXME: not quite working yet, probably needs regulators */ bluetooth { + /* BCM4334B0 actually */ compatible = "brcm,bcm4330-bt"; shutdown-gpios = <&gpio6 30 GPIO_ACTIVE_HIGH>; device-wakeup-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 34/102 ARM: dts: imx6dl-riotboard: configure PHY clock and set proper EEE value
In reply to Sasha LevinFrom: Oleksij Rempel <[email protected]>
[ Upstream commit 723de6a4126b2474a8106e943749e1554012dad6 ]
Without SoC specific PHY fixups the network interface on this board will fail to work. Provide missing DT properties to make it work again.
--- arch/arm/boot/dts/imx6dl-riotboard.dts | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx6dl-riotboard.dts +2 -0
@@ -106,6 +106,8 @@ rgmii_phy: ethernet-phy@4 { reset-gpios = <&gpio3 31 GPIO_ACTIVE_LOW>; reset-assert-us = <10000>; reset-deassert-us = <1000>; + qca,smarteee-tw-us-1g = <24>; + qca,clk-out-frequency = <125000000>; }; }; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 35/102 ARM: dts: ux500: Fix orientation of Janice accelerometer
In reply to Sasha LevinFrom: Linus Walleij <[email protected]>
[ Upstream commit e409c1e1d5cb164361229e3a3f084e4a32544fb6 ]
This fixes up the axis on the Janice accelerometer to give the right orientation according to tests.
--- arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
arch/arm/boot/dts/ste-ux500-samsung-janice.dts +3 -4
@@ -593,10 +593,9 @@ i2c-gate { accelerometer@08 { compatible = "bosch,bma222"; reg = <0x08>; - /* FIXME: no idea about this */ - mount-matrix = "1", "0", "0", - "0", "1", "0", - "0", "0", "1"; + mount-matrix = "0", "1", "0", + "-1", "0", "0", + "0", "0", "-1"; vddio-supply = <&ab8500_ldo_aux2_reg>; // 1.8V vdd-supply = <&ab8500_ldo_aux1_reg>; // 3V };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 36/102 rtc: mxc_v2: add missing MODULE_DEVICE_TABLE
In reply to Sasha LevinFrom: Bixuan Cui <[email protected]>
[ Upstream commit 206e04ec7539e7bfdde9aa79a7cde656c9eb308e ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as an external module.
--- drivers/rtc/rtc-mxc_v2.c | 1 + 1 file changed, 1 insertion(+)
drivers/rtc/rtc-mxc_v2.c +1 -0
@@ -372,6 +372,7 @@ static const struct of_device_id mxc_ids[] = { { .compatible = "fsl,imx53-rtc", }, {} }; +MODULE_DEVICE_TABLE (of, mxc_ids);static struct platform_driver mxc_rtc_driver = { .driver = {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 37/102 arm64: dts: renesas: beacon: Fix USB extal reference
In reply to Sasha LevinFrom: Adam Ford <[email protected]>
[ Upstream commit 56bc54496f5d6bc638127bfc9df3742cbf0039e7 ]
The USB extal clock reference isn't associated to a crystal, it's associated to a programmable clock, so remove the extal reference, add the usb2_clksel. Since usb_extal is referenced by the versaclock, reference it here so the usb2_clksel can get the proper clock speed of 50MHz.
--- arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/beacon-renesom-som.dtsi +4 -2
@@ -319,8 +319,10 @@ &sdhi3 { status = "okay"; }; -&usb_extal_clk { - clock-frequency = <50000000>; +&usb2_clksel { + clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>, + <&versaclock5 3>, <&usb3s0_clk>; + status = "okay"; }; &usb3s0_clk {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 38/102 arm64: dts: renesas: beacon: Fix USB ref clock references
In reply to Sasha LevinFrom: Adam Ford <[email protected]>
[ Upstream commit ebc666f39ff67a01e748c34d670ddf05a9e45220 ]
The RZ/G2 boards expect there to be an external clock reference for USB2 EHCI controllers. For the Beacon boards, this reference clock is controlled by a programmable versaclock. Because the RZ/G2 family has a special clock driver when using an external clock, the third clock reference in the EHCI node needs to point to this special clock, called usb2_clksel.
Since the usb2_clksel does not keep the usb_extal clock enabled, the 4th clock entry for the EHCI nodes needs to reference it to keep the clock running and make USB functional.
--- arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/beacon-renesom-baseboard.dtsi +2 -2
@@ -271,12 +271,12 @@ &du_out_rgb { &ehci0 { dr_mode = "otg"; status = "okay"; - clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>; + clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>, <&usb2_clksel>, <&versaclock5 3>; }; &ehci1 { status = "okay"; - clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>; + clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>, <&usb2_clksel>, <&versaclock5 3>; }; &hdmi0 {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 39/102 kbuild: sink stdout from cmd for silent build
In reply to Sasha LevinFrom: Masahiro Yamada <[email protected]>
[ Upstream commit 174a1dcc96429efce4ef7eb2f5c4506480da2182 ]
When building with 'make -s', no output to stdout should be printed.
As Arnd Bergmann reported [1], mkimage shows the detailed information of the generated images.
I think this should be suppressed by the 'cmd' macro instead of by individual scripts.
Insert 'exec >/dev/null;' in order to redirect stdout to /dev/null for silent builds.
[Note about this implementation]
'exec >/dev/null;' may look somewhat tricky, but this has a reason.
Appending '>/dev/null' at the end of command line is a common way for redirection, so I first tried this:
cmd = @set -e; $(echo-cmd) $(cmd_$(1)) >/dev/null
... but it would not work if $(cmd_$(1)) itself contains a redirection.
For example, cmd_wrap in scripts/Makefile.asm-generic redirects the output from the 'echo' command into the target file.
It would be expanded into:
echo "#include <asm-generic/$*.h>" > $@ >/dev/null
Then, the target file gets empty because the string will go to /dev/null instead of $@.
Next, I tried this:
cmd = @set -e; $(echo-cmd) { $(cmd_$(1)); } >/dev/nullThe form above would be expanded into:
{ echo "#include <asm-generic/$*.h>" > $@; } >/dev/null
This works as expected. However, it would be a syntax error if $(cmd_$(1)) is empty.
When CONFIG_TRIM_UNUSED_KSYMS is disabled, $(call cmd,gen_ksymdeps) in scripts/Makefile.build would be expanded into:
set -e; { ; } >/dev/null
..., which causes an syntax error.
I also tried this:
cmd = @set -e; $(echo-cmd) ( $(cmd_$(1)) ) >/dev/null
... but this causes a syntax error for the same reason.
So, finally I adopted:
cmd = @set -e; $(echo-cmd) exec >/dev/null; $(cmd_$(1))
[1]: https://lore.kernel.org/lkml/[email protected]/
--- scripts/Kbuild.include | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/Kbuild.include +6 -1
@@ -170,8 +170,13 @@ clean := -f $(srctree)/scripts/Makefile.clean obj echo-cmd = $(if $($(quiet)cmd_$(1)),\ echo ' $(call escsq,$($(quiet)cmd_$(1)))$(echo-why)';) +# sink stdout for 'make -s' + redirect := + quiet_redirect := +silent_redirect := exec >/dev/null; + # printing commands -cmd = @set -e; $(echo-cmd) $(cmd_$(1)) +cmd = @set -e; $(echo-cmd) $($(quiet)redirect) $(cmd_$(1)) ### # if_changed - execute command if any prerequisite is newer than
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 40/102 ARM: dts: am335x: align GPIO hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit fb97f63106f3174992a22fe5e42dda96a0810750 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/am335x-boneblack-wireless.dts | 2 +- arch/arm/boot/dts/am335x-boneblue.dts | 2 +- arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 4 ++-- arch/arm/boot/dts/am335x-icev2.dts | 4 ++-- arch/arm/boot/dts/am335x-shc.dts | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-)
arch/arm/boot/dts/am335x-boneblack-wireless.dts +1 -1
@@ -101,7 +101,7 @@ bluetooth { }; &gpio3 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high;
arch/arm/boot/dts/am335x-boneblue.dts +1 -1
@@ -436,7 +436,7 @@ &dcan1 { }; &gpio3 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high;
arch/arm/boot/dts/am335x-bonegreen-wireless.dts +2 -2
@@ -101,7 +101,7 @@ bluetooth { }; &gpio1 { - ls_buf_en { + ls-buf-en-hog { gpio-hog; gpios = <29 GPIO_ACTIVE_HIGH>; output-high;
@@ -118,7 +118,7 @@ ls_buf_en { /* an external pulldown on U21 pin 4. */ &gpio3 { - bt_aud_in { + bt-aud-in-hog { gpio-hog; gpios = <16 GPIO_ACTIVE_HIGH>; output-low;
arch/arm/boot/dts/am335x-icev2.dts +2 -2
@@ -458,14 +458,14 @@ &uart3 { }; &gpio3 { - p4 { + pr1-mii-ctl-hog { gpio-hog; gpios = <4 GPIO_ACTIVE_HIGH>; output-high; line-name = "PR1_MII_CTRL"; }; - p10 { + mux-mii-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; /* ETH1 mux: Low for MII-PRU, high for RMII-CPSW */
arch/arm/boot/dts/am335x-shc.dts +4 -4
@@ -140,14 +140,14 @@ ehrpwm1: pwm@200 { }; &gpio1 { - hmtc_rst { + hmtc-rst-hog { gpio-hog; gpios = <24 GPIO_ACTIVE_LOW>; output-high; line-name = "homematic_reset"; }; - hmtc_prog { + hmtc-prog-hog { gpio-hog; gpios = <27 GPIO_ACTIVE_LOW>; output-high;
@@ -156,14 +156,14 @@ hmtc_prog { }; &gpio3 { - zgb_rst { + zgb-rst-hog { gpio-hog; gpios = <18 GPIO_ACTIVE_LOW>; output-low; line-name = "zigbee_reset"; }; - zgb_boot { + zgb-boot-hog { gpio-hog; gpios = <19 GPIO_ACTIVE_HIGH>; output-high;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 41/102 ARM: dts: am437x: align gpio hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit bd551acdde3ad40da1a97391abd6e0db7852bf66 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/am437x-gp-evm.dts | 4 ++-- arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/am437x-gp-evm.dts +2 -2
@@ -786,7 +786,7 @@ &gpio0 { pinctrl-0 = <&gpio0_pins>; status = "okay"; - p23 { + sel-emmc-nand-hog { gpio-hog; gpios = <23 GPIO_ACTIVE_HIGH>; /* SelEMMCorNAND selects between eMMC and NAND:
@@ -819,7 +819,7 @@ &gpio5 { status = "okay"; ti,no-reset-on-init; - p8 { + sel-lcd-hdmi-hog { /* * SelLCDorHDMI selects between display and audio paths: * Low: HDMI display with audio via HDMI
arch/arm/boot/dts/am43x-epos-evm.dts +1 -1
@@ -725,7 +725,7 @@ &gpio2 { pinctrl-0 = <&display_mux_pins>; status = "okay"; - p1 { + sel-lcd-hdmi-hog { /* * SelLCDorHDMI selects between display and audio paths: * Low: HDMI display with audio via HDMI
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 42/102 ARM: dts: omap3: align gpio hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit cfb4ab3b5df86c6001127346d8331f5e87012f91 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 2 +- arch/arm/boot/dts/omap3-gta04a5.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/omap3-evm-processor-common.dtsi +1 -1
@@ -195,7 +195,7 @@ &uart3 { * for bus switch SN74CB3Q3384A, level-shifter SN74AVC16T245DGGR, and 1.8V. */ &gpio2 { - en_usb2_port { + en-usb2-port-hog { gpio-hog; gpios = <29 GPIO_ACTIVE_HIGH>; /* gpio_61 */ output-low;
arch/arm/boot/dts/omap3-gta04a5.dts +1 -1
@@ -37,7 +37,7 @@ pps { }; &gpio5 { - irda_en { + irda-en-hog { gpio-hog; gpios = <(175-160) GPIO_ACTIVE_HIGH>; output-high; /* activate gpio_175 to disable IrDA receiver */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 43/102 ARM: dts: omap5-board-common: align gpio hog names with dt-schema
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 4823117cb80eedf31ddbc126b9bd92e707bd9a26 ]
The GPIO Hog dt-schema node naming convention expect GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap5-board-common.dtsi +1 -1
@@ -149,7 +149,7 @@ sound: sound { &gpio8 { /* TI trees use GPIO instead of msecure, see also muxing */ - p234 { + msecure-hog { gpio-hog; gpios = <10 GPIO_ACTIVE_HIGH>; output-high;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 44/102 ARM: dts: dra7x-evm: Align GPIO hog names with dt-schema
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0c149400c2f676e7b4cc68e517db29005a7a38c7 ]
The dt-schema for nxp,pcf8575 expects GPIO hogs node names to end with a 'hog' suffix.
--- arch/arm/boot/dts/dra7-evm.dts | 2 +- arch/arm/boot/dts/dra71-evm.dts | 2 +- arch/arm/boot/dts/dra72-evm-common.dtsi | 2 +- arch/arm/boot/dts/dra76-evm.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/dra7-evm.dts +1 -1
@@ -366,7 +366,7 @@ pcf_hdmi: gpio@26 { reg = <0x26>; gpio-controller; #gpio-cells = <2>; - p1 { + hdmi-audio-hog { /* vin6_sel_s0: high: VIN6, low: audio */ gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/dra71-evm.dts +1 -1
@@ -187,7 +187,7 @@ &pcf_gpio_21 { }; &pcf_hdmi { - p0 { + hdmi-i2c-disable-hog { /* * PM_OEn to High: Disable routing I2C3 to PM_I2C * With this PM_SEL(p3) should not matter
arch/arm/boot/dts/dra72-evm-common.dtsi +1 -1
@@ -268,7 +268,7 @@ pcf_hdmi: pcf8575@26 { */ lines-initial-states = <0x0f2b>; - p1 { + hdmi-audio-hog { /* vin6_sel_s0: high: VIN6, low: audio */ gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/dra76-evm.dts +1 -1
@@ -381,7 +381,7 @@ pcf_hdmi: pcf8575@26 { reg = <0x26>; gpio-controller; #gpio-cells = <2>; - p1 { + hdmi-audio-hog { /* vin6_sel_s0: high: VIN6, low: audio */ gpio-hog; gpios = <1 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 45/102 ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit b644c5e01c870056e13a096e14b9a92075c8f682 ]
The ti,no-reset-on-init flag need to be at the interconnect target module level for the modules that have it defined.
The ti-sysc driver handles this case, but produces warning, not a critical issue.
--- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 5 ++--- arch/arm/boot/dts/dra7-l4.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/boot/dts/am57xx-cl-som-am57x.dts +2 -3
@@ -610,12 +610,11 @@ &mcasp3 { >; }; -&gpio3 { - status = "okay"; +&gpio3_target { ti,no-reset-on-init; }; -&gpio2 { +&gpio2_target { status = "okay"; ti,no-reset-on-init; };
arch/arm/boot/dts/dra7-l4.dtsi +2 -2
@@ -1315,7 +1315,7 @@ gpio8: gpio@0 { }; }; - target-module@55000 { /* 0x48055000, ap 13 0e.0 */ + gpio2_target: target-module@55000 { /* 0x48055000, ap 13 0e.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x55000 0x4>, <0x55010 0x4>,
@@ -1348,7 +1348,7 @@ gpio2: gpio@0 { }; }; - target-module@57000 { /* 0x48057000, ap 15 06.0 */ + gpio3_target: target-module@57000 { /* 0x48057000, ap 15 06.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x57000 0x4>, <0x57010 0x4>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 46/102 ARM: dts: am437x-gp-evm: fix ti,no-reset-on-init flag for gpios
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 2566d5b8c1670f7d7a44cc1426d254147ec5c421 ]
The ti,no-reset-on-init flag need to be at the interconnect target module level for the modules that have it defined.
The ti-sysc driver handles this case, but produces warning, not a critical issue.
--- arch/arm/boot/dts/am437x-gp-evm.dts | 5 ++++- arch/arm/boot/dts/am437x-l4.dtsi | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
arch/arm/boot/dts/am437x-gp-evm.dts +4 -1
@@ -813,11 +813,14 @@ &gpio4 { status = "okay"; }; +&gpio5_target { + ti,no-reset-on-init; +}; + &gpio5 { pinctrl-names = "default"; pinctrl-0 = <&display_mux_pins>; status = "okay"; - ti,no-reset-on-init; sel-lcd-hdmi-hog { /*
arch/arm/boot/dts/am437x-l4.dtsi +1 -1
@@ -2070,7 +2070,7 @@ gpio4: gpio@0 { }; }; - target-module@22000 { /* 0x48322000, ap 116 64.0 */ + gpio5_target: target-module@22000 { /* 0x48322000, ap 116 64.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0x22000 0x4>, <0x22010 0x4>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 47/102 ARM: dts: am335x: fix ti,no-reset-on-init flag for gpios
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit d7d30b8fcd111e9feb171023c0e0c8d855582dcb ]
The ti,no-reset-on-init flag need to be at the interconnect target module level for the modules that have it defined.
The ti-sysc driver handles this case, but produces warning, not a critical issue.
--- arch/arm/boot/dts/am335x-baltos.dtsi | 4 ++-- arch/arm/boot/dts/am335x-evmsk.dts | 2 +- arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 2 +- arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi | 2 +- arch/arm/boot/dts/am33xx-l4.dtsi | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/am335x-baltos.dtsi +2 -2
@@ -393,10 +393,10 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; }; -&gpio3 { +&gpio3_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am335x-evmsk.dts +1 -1
@@ -646,7 +646,7 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi +1 -1
@@ -150,7 +150,7 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi +1 -1
@@ -353,7 +353,7 @@ &aes { status = "okay"; }; -&gpio0 { +&gpio0_target { ti,no-reset-on-init; };
arch/arm/boot/dts/am33xx-l4.dtsi +1 -1
@@ -1789,7 +1789,7 @@ gpio2: gpio@0 { }; }; - target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */ + gpio3_target: target-module@ae000 { /* 0x481ae000, ap 56 3a.0 */ compatible = "ti,sysc-omap2", "ti,sysc"; reg = <0xae000 0x4>, <0xae010 0x4>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 48/102 ARM: dts: OMAP2+: Replace underscores in sub-mailbox node names
In reply to Sasha LevinFrom: Suman Anna <[email protected]>
[ Upstream commit 9e7f5ee1137397def6580461e27e5efcb68183ee ]
A number of sub-mailbox node names in various OMAP2+ dts files are currently using underscores. This is not adhering to the node name convention, fix all of these to use hiphens.
These nodes are already using the prefix mbox, so they will be in compliance with the sub-mailbox node name convention being added in the OMAP Mailbox YAML binding as well.
--- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 8 ++++---- arch/arm/boot/dts/dm816x.dtsi | 2 +- arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi | 6 +++--- arch/arm/boot/dts/dra72x.dtsi | 6 +++--- arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi | 2 +- arch/arm/boot/dts/dra74x.dtsi | 8 ++++---- arch/arm/boot/dts/omap4-l4.dtsi | 4 ++-- arch/arm/boot/dts/omap5-l4.dtsi | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-)
arch/arm/boot/dts/am57xx-cl-som-am57x.dts +4 -4
@@ -454,20 +454,20 @@ &sata { &mailbox5 { status = "okay"; - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { status = "okay"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { status = "okay"; }; }; &mailbox6 { status = "okay"; - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { status = "okay"; }; - mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { + mbox_dsp2_ipc3x: mbox-dsp2-ipc3x { status = "okay"; }; };
arch/arm/boot/dts/dm816x.dtsi +1 -1
@@ -351,7 +351,7 @@ mailbox: mailbox@480c8000 { #mbox-cells = <1>; ti,mbox-num-users = <4>; ti,mbox-num-fifos = <12>; - mbox_dsp: mbox_dsp { + mbox_dsp: mbox-dsp { ti,mbox-tx = <3 0 0>; ti,mbox-rx = <0 0 0>; };
arch/arm/boot/dts/dra7-ipu-dsp-common.dtsi +3 -3
@@ -5,17 +5,17 @@ &mailbox5 { status = "okay"; - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { status = "okay"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { status = "okay"; }; }; &mailbox6 { status = "okay"; - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { status = "okay"; }; };
arch/arm/boot/dts/dra72x.dtsi +3 -3
@@ -77,12 +77,12 @@ &dss { }; &mailbox5 { - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { ti,mbox-tx = <5 2 2>; ti,mbox-rx = <1 2 2>; status = "disabled";
@@ -90,7 +90,7 @@ mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { }; &mailbox6 { - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled";
arch/arm/boot/dts/dra74-ipu-dsp-common.dtsi +1 -1
@@ -6,7 +6,7 @@ #include "dra7-ipu-dsp-common.dtsi" &mailbox6 { - mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { + mbox_dsp2_ipc3x: mbox-dsp2-ipc3x { status = "okay"; }; };
arch/arm/boot/dts/dra74x.dtsi +4 -4
@@ -188,12 +188,12 @@ &dss { }; &mailbox5 { - mbox_ipu1_ipc3x: mbox_ipu1_ipc3x { + mbox_ipu1_ipc3x: mbox-ipu1-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled"; }; - mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { + mbox_dsp1_ipc3x: mbox-dsp1-ipc3x { ti,mbox-tx = <5 2 2>; ti,mbox-rx = <1 2 2>; status = "disabled";
@@ -201,12 +201,12 @@ mbox_dsp1_ipc3x: mbox_dsp1_ipc3x { }; &mailbox6 { - mbox_ipu2_ipc3x: mbox_ipu2_ipc3x { + mbox_ipu2_ipc3x: mbox-ipu2-ipc3x { ti,mbox-tx = <6 2 2>; ti,mbox-rx = <4 2 2>; status = "disabled"; }; - mbox_dsp2_ipc3x: mbox_dsp2_ipc3x { + mbox_dsp2_ipc3x: mbox-dsp2-ipc3x { ti,mbox-tx = <5 2 2>; ti,mbox-rx = <1 2 2>; status = "disabled";
arch/arm/boot/dts/omap4-l4.dtsi +2 -2
@@ -598,11 +598,11 @@ mailbox: mailbox@0 { #mbox-cells = <1>; ti,mbox-num-users = <3>; ti,mbox-num-fifos = <8>; - mbox_ipu: mbox_ipu { + mbox_ipu: mbox-ipu { ti,mbox-tx = <0 0 0>; ti,mbox-rx = <1 0 0>; }; - mbox_dsp: mbox_dsp { + mbox_dsp: mbox-dsp { ti,mbox-tx = <3 0 0>; ti,mbox-rx = <2 0 0>; };
arch/arm/boot/dts/omap5-l4.dtsi +2 -2
@@ -613,11 +613,11 @@ mailbox: mailbox@0 { #mbox-cells = <1>; ti,mbox-num-users = <3>; ti,mbox-num-fifos = <8>; - mbox_ipu: mbox_ipu { + mbox_ipu: mbox-ipu { ti,mbox-tx = <0 0 0>; ti,mbox-rx = <1 0 0>; }; - mbox_dsp: mbox_dsp { + mbox_dsp: mbox-dsp { ti,mbox-tx = <3 0 0>; ti,mbox-rx = <2 0 0>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 49/102 arm64: tegra: Add PMU node for Tegra194
In reply to Sasha LevinFrom: Jon Hunter <[email protected]>
[ Upstream commit 9e79e58f330ea4860f2ced65a8a35dfb05fc03c1 ]
Populate the device-tree node for the PMU device on Tegra194. This also fixes the following warning that is observed on booting Tegra194.
ERR KERN kvm: pmu event creation failed -2
--- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm64/boot/dts/nvidia/tegra194.dtsi +14 -0
@@ -2345,6 +2345,20 @@ l3c: l3-cache { }; }; + pmu { + compatible = "arm,armv8-pmuv3"; + interrupts = <GIC_SPI 384 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 385 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 386 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 387 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 388 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 389 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>; + interrupt-affinity = <&cpu0_0 &cpu0_1 &cpu1_0 &cpu1_1 + &cpu2_0 &cpu2_1 &cpu3_0 &cpu3_1>; + }; + psci { compatible = "arm,psci-1.0"; status = "okay";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 50/102 arm64: dts: ti: k3-am654x/j721e/j7200-common-proc-board: Fix MCU_RGMII1_TXC direction
In reply to Sasha LevinFrom: Grygorii Strashko <[email protected]>
[ Upstream commit 69db725cdb2b803af67897a08ea54467d11f6020 ]
The MCU RGMII MCU_RGMII1_TXC pin is defined as input by mistake, although this does not make any difference functionality wise it's better to update to avoid confusion.
Hence fix MCU RGMII MCU_RGMII1_TXC pin pinmux definitions to be an output in K3 am654x/j721e/j7200 board files.
--- arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 2 +- arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +- arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +1 -1
@@ -142,7 +142,7 @@ AM65X_WKUP_IOPAD(0x0078, PIN_INPUT, 0) /* (L2) MCU_RGMII1_RD3 */ AM65X_WKUP_IOPAD(0x007c, PIN_INPUT, 0) /* (L5) MCU_RGMII1_RD2 */ AM65X_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* (M6) MCU_RGMII1_RD1 */ AM65X_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* (L6) MCU_RGMII1_RD0 */ - AM65X_WKUP_IOPAD(0x0070, PIN_INPUT, 0) /* (N1) MCU_RGMII1_TXC */ + AM65X_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* (N1) MCU_RGMII1_TXC */ AM65X_WKUP_IOPAD(0x0074, PIN_INPUT, 0) /* (M1) MCU_RGMII1_RXC */ >; };
arch/arm64/boot/dts/ti/k3-j7200-common-proc-board.dts +1 -1
@@ -31,7 +31,7 @@ J721E_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ J721E_WKUP_IOPAD(0x008c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ J721E_WKUP_IOPAD(0x0090, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ J721E_WKUP_IOPAD(0x0094, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x0080, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; };
arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts +1 -1
@@ -237,7 +237,7 @@ J721E_WKUP_IOPAD(0x0078, PIN_INPUT, 0) /* MCU_RGMII1_RD3 */ J721E_WKUP_IOPAD(0x007c, PIN_INPUT, 0) /* MCU_RGMII1_RD2 */ J721E_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* MCU_RGMII1_RD1 */ J721E_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* MCU_RGMII1_RD0 */ - J721E_WKUP_IOPAD(0x0070, PIN_INPUT, 0) /* MCU_RGMII1_TXC */ + J721E_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* MCU_RGMII1_TXC */ J721E_WKUP_IOPAD(0x0074, PIN_INPUT, 0) /* MCU_RGMII1_RXC */ >; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 51/102 ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 5f45da704de425d74abd75feaa928fc8a3df03ba ]
All Tegra boards which use WM8903 audio codec are specifying a wrong polarity for the headphones detection GPIO. The kernel driver hardcodes the polarity to active-low, which is the correct polarity, so we can fix the device-trees safely.
--- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- arch/arm/boot/dts/tegra20-harmony.dts | 2 +- arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +- arch/arm/boot/dts/tegra20-plutux.dts | 2 +- arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- arch/arm/boot/dts/tegra20-tec.dts | 2 +- arch/arm/boot/dts/tegra20-ventana.dts | 2 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +1 -1
@@ -1027,7 +1027,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; nvidia,int-mic-en-gpios = <&wm8903 1 GPIO_ACTIVE_HIGH>; nvidia,headset;
arch/arm/boot/dts/tegra20-harmony.dts +1 -1
@@ -748,7 +748,7 @@ sound { nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) - GPIO_ACTIVE_HIGH>; + GPIO_ACTIVE_LOW>; nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0) GPIO_ACTIVE_HIGH>; nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
arch/arm/boot/dts/tegra20-medcom-wide.dts +1 -1
@@ -84,7 +84,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-plutux.dts +1 -1
@@ -52,7 +52,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-seaboard.dts +1 -1
@@ -911,7 +911,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-tec.dts +1 -1
@@ -61,7 +61,7 @@ sound { nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) - GPIO_ACTIVE_HIGH>; + GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA20_CLK_PLL_A>, <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
arch/arm/boot/dts/tegra20-ventana.dts +1 -1
@@ -686,7 +686,7 @@ sound { nvidia,audio-codec = <&wm8903>; nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>; nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0) GPIO_ACTIVE_HIGH>; nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -1
@@ -589,7 +589,7 @@ sound { nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>; nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) - GPIO_ACTIVE_HIGH>; + GPIO_ACTIVE_LOW>; clocks = <&tegra_car TEGRA30_CLK_PLL_A>, <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 52/102 ARM: tegra: nexus7: Correct 3v3 regulator GPIO of PM269 variant
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit c4dd6066bc304649e3159f1c7a08ece25d537e00 ]
The 3v3 regulator GPIO is GP6 and not GP7, which is the DDR regulator. Both regulators are always-on, nevertheless the DT model needs to be corrected, fix it.
--- arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-ti-pmic.dtsi +1 -1
@@ -143,7 +143,7 @@ vdd_core: core-regulator@60 { }; vdd_3v3_sys: regulator@1 { - gpio = <&pmic 7 GPIO_ACTIVE_HIGH>; + gpio = <&pmic 6 GPIO_ACTIVE_HIGH>; enable-active-high; }; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 53/102 arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work)
In reply to Sasha LevinFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 0a275a35ceab07cb622ff212c54d6866e246ac53 ]
Fix the compatible to make the driver probe and tell the driver where to look for the "xo" clock to make sure everything works.
Then we get a happy (eh, happier) 8996:
somainline-sdcard:/home/konrad# cat /sys/kernel/debug/clk/pwrcl_pll/clk_rate 1152000000
Don't backport without "arm64: dts: qcom: msm8996: Add CPU opps", as the system fails to boot without consumers for these clocks.
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +6 -1
@@ -1745,9 +1745,14 @@ apss_merge_funnel_out: endpoint { }; }; }; + kryocc: clock-controller@6400000 { - compatible = "qcom,apcc-msm8996"; + compatible = "qcom,msm8996-apcc"; reg = <0x06400000 0x90000>; + + clock-names = "xo"; + clocks = <&xo_board>; + #clock-cells = <1>; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 54/102 arm64: dts: qcom: sc7180: Move rmtfs memory region
In reply to Sasha LevinFrom: Sujit Kautkar <[email protected]>
[ Upstream commit d4282fb4f8f9683711ae6c076da16aa8e675fdbd ]
Move rmtfs memory region so that it does not overlap with system RAM (kernel data) when KAsan is enabled. This puts rmtfs right after mba_mem which is not supposed to increase beyond 0x94600000
--- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sc7180-idp.dts +1 -1
@@ -45,7 +45,7 @@ chosen { /* Increase the size from 2MB to 8MB */ &rmtfs_mem { - reg = <0x0 0x84400000 0x0 0x800000>; + reg = <0x0 0x94600000 0x0 0x800000>; }; / {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 55/102 ARM: dts: stm32: Remove extra size-cells on dhcom-pdk2
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit 28b9a4679d8074512f12967497c161b992eb3b75 ]
Fix make dtbs_check warning:arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dt.yaml: gpio-keys-polled: '#address-cells' is a dependency of '#size-cells' arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dt.yaml: gpio-keys: '#address-cells' is a dependency of '#size-cells'
--- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 2 -- 1 file changed, 2 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +0 -2
@@ -34,7 +34,6 @@ display_bl: display-bl { gpio-keys-polled { compatible = "gpio-keys-polled"; - #size-cells = <0>; poll-interval = <20>; /*
@@ -60,7 +59,6 @@ button-2 { gpio-keys { compatible = "gpio-keys"; - #size-cells = <0>; button-1 { label = "TA2-GPIO-B";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 56/102 ARM: dts: stm32: Fix touchscreen node on dhcom-pdk2
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit 4b5fadef3fc2ab8863ffdf31eed6a745b1bf6e61 ]
Fix make dtbs_check warning:arch/arm/boot/dts/stm32mp157c-dhcom-pdk2.dt.yaml:0:0: /soc/i2c@40015000/polytouch@38: failed to match any schema with compatible: ['edt,edt-ft5x06']
--- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +2 -2
@@ -182,8 +182,8 @@ sgtl5000_rx_endpoint: endpoint@1 { }; - polytouch@38 { - compatible = "edt,edt-ft5x06"; + touchscreen@38 { + compatible = "edt,edt-ft5406"; reg = <0x38>; interrupt-parent = <&gpiog>; interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 57/102 ARM: dts: stm32: fix stm32mp157c-odyssey card detect pin
In reply to Sasha LevinFrom: Grzegorz Szymaszek <[email protected]>
[ Upstream commit 0171b07373cc8c2815ca5fa79a7308fdefa54ca4 ]
The microSD card detect pin is physically connected to the MPU pin PI3. The Device Tree configuration of the card detect pin was wrong—it was set to pin PB7 instead. If such configuration was used, the kernel would hang on “Waiting for root device” when booting from a microSD card.
--- arch/arm/boot/dts/stm32mp157c-odyssey.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp157c-odyssey.dts +1 -1
@@ -64,7 +64,7 @@ &sdmmc1 { pinctrl-0 = <&sdmmc1_b4_pins_a>; pinctrl-1 = <&sdmmc1_b4_od_pins_a>; pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>; - cd-gpios = <&gpiob 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + cd-gpios = <&gpioi 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; disable-wp; st,neg-edge; bus-width = <4>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 58/102 ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit bf24b91f4baf7e421c770a1d9c7d381b10206ac9 ]
Fix following warning observed with "make dtbs_check W=1" command. It concerns f429 eval and disco boards, f769 disco board.
Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg or ranges property
--- arch/arm/boot/dts/stm32429i-eval.dts | 8 +++----- arch/arm/boot/dts/stm32746g-eval.dts | 6 ++---- arch/arm/boot/dts/stm32f429-disco.dts | 6 ++---- arch/arm/boot/dts/stm32f469-disco.dts | 6 ++---- arch/arm/boot/dts/stm32f769-disco.dts | 6 ++---- 5 files changed, 11 insertions(+), 21 deletions(-)
arch/arm/boot/dts/stm32429i-eval.dts +3 -5
@@ -119,17 +119,15 @@ led-blue { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = <KEY_WAKEUP>; gpios = <&gpioa 0 0>; }; - button@1 { + button-1 { label = "Tamper"; linux,code = <KEY_RESTART>; gpios = <&gpioc 13 0>;
arch/arm/boot/dts/stm32746g-eval.dts +2 -4
@@ -81,12 +81,10 @@ led-blue { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = <KEY_WAKEUP>; gpios = <&gpioc 13 0>;
arch/arm/boot/dts/stm32f429-disco.dts +2 -4
@@ -81,12 +81,10 @@ led-green { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "User"; linux,code = <KEY_HOME>; gpios = <&gpioa 0 0>;
arch/arm/boot/dts/stm32f469-disco.dts +2 -4
@@ -104,12 +104,10 @@ led-blue { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "User"; linux,code = <KEY_WAKEUP>; gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
arch/arm/boot/dts/stm32f769-disco.dts +2 -4
@@ -75,12 +75,10 @@ led-red { }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "User"; linux,code = <KEY_HOME>; gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 59/102 ARM: dts: stm32: fix RCC node name on stm32f429 MCU
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit e4b948415a89a219d13e454011cdcf9e63ecc529 ]
This prevent warning observed with "make dtbs_check W=1"
Warning (simple_bus_reg): /soc/rcc@40023810: simple-bus unit address format error, expected "40023800"
--- arch/arm/boot/dts/stm32f429.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32f429.dtsi +1 -1
@@ -709,7 +709,7 @@ crc: crc@40023000 { status = "disabled"; }; - rcc: rcc@40023810 { + rcc: rcc@40023800 { #reset-cells = <1>; #clock-cells = <2>; compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 60/102 ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit 2388f14d8747f8304e26ee870790e188c9431efd ]
Prevent warning seen with "make dtbs_check W=1" command:
Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary address-cells/size-cells without "ranges" or child "reg" property
--- arch/arm/boot/dts/stm32f429.dtsi | 8 -------- arch/arm/boot/dts/stm32f746.dtsi | 8 -------- arch/arm/boot/dts/stm32h743.dtsi | 4 ---- 3 files changed, 20 deletions(-)
arch/arm/boot/dts/stm32f429.dtsi +0 -8
@@ -283,8 +283,6 @@ timer@11 { }; timers13: timers@40001c00 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40001C00 0x400>; clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM13)>;
@@ -299,8 +297,6 @@ pwm { }; timers14: timers@40002000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40002000 0x400>; clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM14)>;
@@ -633,8 +629,6 @@ timer@8 { }; timers10: timers@40014400 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014400 0x400>; clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM10)>;
@@ -649,8 +643,6 @@ pwm { }; timers11: timers@40014800 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014800 0x400>; clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM11)>;
arch/arm/boot/dts/stm32f746.dtsi +0 -8
@@ -265,8 +265,6 @@ timer@11 { }; timers13: timers@40001c00 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40001C00 0x400>; clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM13)>;
@@ -281,8 +279,6 @@ pwm { }; timers14: timers@40002000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40002000 0x400>; clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM14)>;
@@ -531,8 +527,6 @@ timer@8 { }; timers10: timers@40014400 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014400 0x400>; clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM10)>;
@@ -547,8 +541,6 @@ pwm { }; timers11: timers@40014800 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-timers"; reg = <0x40014800 0x400>; clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM11)>;
arch/arm/boot/dts/stm32h743.dtsi +0 -4
@@ -454,8 +454,6 @@ trigger@2 { }; lptimer4: timer@58002c00 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58002c00 0x400>; clocks = <&rcc LPTIM4_CK>;
@@ -470,8 +468,6 @@ pwm { }; lptimer5: timer@58003000 { - #address-cells = <1>; - #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58003000 0x400>; clocks = <&rcc LPTIM5_CK>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 61/102 memory: tegra: Fix compilation warnings on 64bit platforms
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit e0740fb869730110b36a4afcf05ad1b9d6f5fb6d ]
Fix compilation warning on 64bit platforms caused by implicit promotion of 32bit signed integer to a 64bit unsigned value which happens after enabling compile-testing of the EMC drivers.
--- drivers/memory/tegra/tegra124-emc.c | 4 ++-- drivers/memory/tegra/tegra30-emc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/memory/tegra/tegra124-emc.c +2 -2
@@ -272,8 +272,8 @@#define EMC_PUTERM_ADJ 0x574#define DRAM_DEV_SEL_ALL 0 -#define DRAM_DEV_SEL_0 (2 << 30) -#define DRAM_DEV_SEL_1 (1 << 30) +#define DRAM_DEV_SEL_0 BIT(31) +#define DRAM_DEV_SEL_1 BIT(30)#define EMC_CFG_POWER_FEATURES_MASK \ (EMC_CFG_DYN_SREF | EMC_CFG_DRAM_ACPD | EMC_CFG_DRAM_CLKSTOP_SR | \
drivers/memory/tegra/tegra30-emc.c +2 -2
@@ -150,8 +150,8 @@#define EMC_SELF_REF_CMD_ENABLED BIT(0)#define DRAM_DEV_SEL_ALL (0 << 30) -#define DRAM_DEV_SEL_0 (2 << 30) -#define DRAM_DEV_SEL_1 (1 << 30) +#define DRAM_DEV_SEL_0 BIT(31) +#define DRAM_DEV_SEL_1 BIT(30)#define DRAM_BROADCAST (num) \ ((num) > 1 ? DRAM_DEV_SEL_ALL : DRAM_DEV_SEL_0)
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 62/102 firmware: arm_scmi: Add SMCCC discovery dependency in Kconfig
In reply to Sasha LevinFrom: Etienne Carriere <[email protected]>
[ Upstream commit c05b07963e965ae34e75ee8c33af1095350cd87e ]
ARM_SCMI_PROTOCOL depends on either MAILBOX or HAVE_ARM_SMCCC_DISCOVERY, not MAILBOX alone. Fix the depedency in Kconfig file and driver to reflect the same.
--- drivers/firmware/Kconfig | 2 +- drivers/firmware/arm_scmi/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/Kconfig +1 -1
@@ -9,7 +9,7 @@ menu "Firmware Drivers" config ARM_SCMI_PROTOCOL tristate "ARM System Control and Management Interface (SCMI) Message Protocol" depends on ARM || ARM64 || COMPILE_TEST - depends on MAILBOX + depends on MAILBOX || HAVE_ARM_SMCCC_DISCOVERY help ARM System Control and Management Interface (SCMI) protocol is a set of operating system-independent software interfaces that are
drivers/firmware/arm_scmi/common.h +1 -1
@@ -244,7 +244,7 @@ struct scmi_desc { };extern const struct scmi_desc scmi_mailbox_desc; -#ifdef CONFIG_HAVE_ARM_SMCCC +#ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY extern const struct scmi_desc scmi_smc_desc;#endif
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 63/102 firmware: arm_scmi: Fix the build when CONFIG_MAILBOX is not selected
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit ab7766b72855e6a68109b915d071181b93086e29 ]
0day CI kernel test robot reported following build error with randconfig
aarch64-linux-ld: drivers/firmware/arm_scmi/driver.o:(.rodata+0x1e0):
undefined reference to `scmi_mailbox_desc'
Fix the error by adding CONFIG_MAILBOX dependency for scmi_mailbox_desc.
--- drivers/firmware/arm_scmi/driver.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/firmware/arm_scmi/driver.c +2 -0
@@ -919,7 +919,9 @@ ATTRIBUTE_GROUPS(versions);/* Each compatible listed below must have descriptor associated with it */ static const struct of_device_id scmi_of_match[] = { +#ifdef CONFIG_MAILBOX { .compatible ="arm,scmi" , .data = &scmi_mailbox_desc }, +#endif #ifdef CONFIG_HAVE_ARM_SMCCC_DISCOVERY { .compatible ="arm,scmi-smc" , .data = &scmi_smc_desc}, #endif
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 64/102 ARM: dts: bcm283x: Fix up MMC node names
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit f230c32349eb0a43a012a81c08a7f13859b86cbb ]
Fix the node names for the MMC/SD card controller to conform to the standard node name mmc@..
--- arch/arm/boot/dts/bcm2711.dtsi | 2 +- arch/arm/boot/dts/bcm283x.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm2711.dtsi +1 -1
@@ -413,7 +413,7 @@ emmc2bus: emmc2bus { ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>; dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>; - emmc2: emmc2@7e340000 { + emmc2: mmc@7e340000 { compatible = "brcm,bcm2711-emmc2"; reg = <0x0 0x7e340000 0x100>; interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
arch/arm/boot/dts/bcm283x.dtsi +1 -1
@@ -420,7 +420,7 @@ pwm: pwm@7e20c000 { status = "disabled"; }; - sdhci: sdhci@7e300000 { + sdhci: mmc@7e300000 { compatible = "brcm,bcm2835-sdhci"; reg = <0x7e300000 0x100>; interrupts = <2 30>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 65/102 ARM: dts: bcm283x: Fix up GPIO LED node names
In reply to Sasha LevinFrom: Stefan Wahren <[email protected]>
[ Upstream commit 5f30dacf37bc93308e91e4d0fc94681ca73f0f91 ]
Fix the node names for the GPIO LEDs to conform to the standard node name led-..
--- arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi | 2 +- arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi-zero.dts | 2 +- arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 ++-- arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 4 ++-- arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +- 15 files changed, 21 insertions(+), 21 deletions(-)
arch/arm/boot/dts/bcm2711-rpi-4-b.dts +2 -2
@@ -29,11 +29,11 @@ aliases { }; leds { - act { + led-act { gpios = <&gpio 42 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; default-state = "keep";
arch/arm/boot/dts/bcm2835-rpi-a-plus.dts +2 -2
@@ -14,11 +14,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; default-state = "keep";
arch/arm/boot/dts/bcm2835-rpi-a.dts +1 -1
@@ -14,7 +14,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts +2 -2
@@ -15,11 +15,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; default-state = "keep";
arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts +1 -1
@@ -15,7 +15,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-b.dts +1 -1
@@ -15,7 +15,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-cm1.dtsi +1 -1
@@ -5,7 +5,7 @@ / { leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-zero-w.dts +1 -1
@@ -23,7 +23,7 @@ chosen { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/bcm2835-rpi-zero.dts +1 -1
@@ -18,7 +18,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; };
arch/arm/boot/dts/bcm2835-rpi.dtsi +1 -1
@@ -4,7 +4,7 @@ / { leds { compatible = "gpio-leds"; - act { + led-act { label = "ACT"; default-state = "keep"; linux,default-trigger = "heartbeat";
arch/arm/boot/dts/bcm2836-rpi-2-b.dts +2 -2
@@ -15,11 +15,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 47 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; default-state = "keep";
arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts +2 -2
@@ -19,11 +19,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; default-state = "keep";
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts +2 -2
@@ -20,11 +20,11 @@ memory@0 { }; leds { - act { + led-act { gpios = <&gpio 29 GPIO_ACTIVE_HIGH>; }; - pwr { + led-pwr { label = "PWR"; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; default-state = "keep";
arch/arm/boot/dts/bcm2837-rpi-3-b.dts +1 -1
@@ -20,7 +20,7 @@ memory@0 { }; leds { - act { + led-act { gpios = <&expgpio 2 GPIO_ACTIVE_HIGH>; }; };
arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi +1 -1
@@ -14,7 +14,7 @@ leds { * Since there is no upstream GPIO driver yet, * remove the incomplete node. */ - /delete-node/ act; + /delete-node/ led-act; }; reg_3v3: fixed-regulator {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 66/102 i3c: master: svc: drop free_irq of devm_request_irq allocated irq
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit 59a61e69c4252b4e8ecd15e752b0d2337f0121b7 ]
irq allocated with devm_request_irq() will be freed in devm_irq_release(), using free_irq() in ->remove() will causes a dangling pointer, and a subsequent double free. So remove the free_irq() in svc_i3c_master_remove().
--- drivers/i3c/master/svc-i3c-master.c | 1 - 1 file changed, 1 deletion(-)
drivers/i3c/master/svc-i3c-master.c +0 -1
@@ -1449,7 +1449,6 @@ static int svc_i3c_master_remove(struct platform_device *pdev)if (ret)return ret; -free_irq (master->irq, master);clk_disable_unprepare (master->pclk);clk_disable_unprepare (master->fclk);clk_disable_unprepare (master->sclk);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 67/102 arm64: dts: juno: Update SCPI nodes as per the YAML schema
In reply to Sasha LevinFrom: Sudeep Holla <[email protected]>
[ Upstream commit 70010556b158a0fefe43415fb0c58347dcce7da0 ]
The SCPI YAML schema expects standard node names for clocks and power domain controllers. Fix those as per the schema for Juno platforms.
--- arch/arm64/boot/dts/arm/juno-base.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/arm/juno-base.dtsi +3 -3
@@ -564,13 +564,13 @@ scpi { clocks { compatible = "arm,scpi-clocks"; - scpi_dvfs: scpi-dvfs { + scpi_dvfs: clocks-0 { compatible = "arm,scpi-dvfs-clocks"; #clock-cells = <1>; clock-indices = <0>, <1>, <2>; clock-output-names = "atlclk", "aplclk","gpuclk"; }; - scpi_clk: scpi-clk { + scpi_clk: clocks-1 { compatible = "arm,scpi-variable-clocks"; #clock-cells = <1>; clock-indices = <3>;
@@ -578,7 +578,7 @@ scpi_clk: scpi-clk { }; }; - scpi_devpd: scpi-power-domains { + scpi_devpd: power-controller { compatible = "arm,scpi-power-domains"; num-domains = <2>; #power-domain-cells = <1>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 68/102 ARM: dts: rockchip: fix supply properties in io-domains nodes
In reply to Sasha LevinFrom: Johan Jonker <[email protected]>
[ Upstream commit f07edc41220b14ce057a4e6d7161b30688ddb8a2 ]
A test with rockchip-io-domain.yaml gives notifications for supply properties in io-domains nodes.
Fix them all into ".*-supply$" format.
--- arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- arch/arm/boot/dts/rk3288-vyasa.dts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/rk3288-rock2-som.dtsi +1 -1
@@ -218,7 +218,7 @@ &io_domains { flash0-supply = <&vcc_flash>; flash1-supply = <&vccio_pmu>; gpio30-supply = <&vccio_pmu>; - gpio1830 = <&vcc_io>; + gpio1830-supply = <&vcc_io>; lcdc-supply = <&vcc_io>; sdcard-supply = <&vccio_sd>; wifi-supply = <&vcc_18>;
arch/arm/boot/dts/rk3288-vyasa.dts +2 -2
@@ -379,10 +379,10 @@ &io_domains { audio-supply = <&vcc_18>; bb-supply = <&vcc_io>; dvp-supply = <&vcc_io>; - flash0-suuply = <&vcc_18>; + flash0-supply = <&vcc_18>; flash1-supply = <&vcc_lan>; gpio30-supply = <&vcc_io>; - gpio1830 = <&vcc_io>; + gpio1830-supply = <&vcc_io>; lcdc-supply = <&vcc_io>; sdcard-supply = <&vccio_sd>; wifi-supply = <&vcc_18>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 69/102 ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit ad0ed10ba5792064fc3accbf8f0341152a57eecb ]
Replace upper case by lower case in i2c nodes name.
--- arch/arm/boot/dts/stm32f746.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32f746.dtsi +2 -2
@@ -360,9 +360,9 @@ i2c2: i2c@40005800 { status = "disabled"; }; - i2c3: i2c@40005C00 { + i2c3: i2c@40005c00 { compatible = "st,stm32f7-i2c"; - reg = <0x40005C00 0x400>; + reg = <0x40005c00 0x400>; interrupts = <72>, <73>; resets = <&rcc STM32F7_APB1_RESET(I2C3)>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 70/102 ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit fb1406335c067be074eab38206cf9abfdce2fb0b ]
It fixes the following warning seen running "make dtbs_check W=1"
Warning (simple_bus_reg): /soc/stmmac-axi-config: missing or empty reg/ranges property
--- arch/arm/boot/dts/stm32mp151.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/stm32mp151.dtsi +6 -6
@@ -1405,12 +1405,6 @@ crc1: crc@58009000 { status = "disabled"; }; - stmmac_axi_config_0: stmmac-axi-config { - snps,wr_osr_lmt = <0x7>; - snps,rd_osr_lmt = <0x7>; - snps,blen = <0 0 0 0 16 8 4>; - }; - ethernet0: ethernet@5800a000 { compatible = "st,stm32mp1-dwmac", "snps,dwmac-4.20a"; reg = <0x5800a000 0x2000>;
@@ -1434,6 +1428,12 @@ ethernet0: ethernet@5800a000 { snps,axi-config = <&stmmac_axi_config_0>; snps,tso; status = "disabled"; + + stmmac_axi_config_0: stmmac-axi-config { + snps,wr_osr_lmt = <0x7>; + snps,rd_osr_lmt = <0x7>; + snps,blen = <0 0 0 0 16 8 4>; + }; }; usbh_ohci: usb@5800c000 {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 71/102 ARM: dts: stm32: fix the Odyssey SoM eMMC VQMMC supply
In reply to Sasha LevinFrom: Grzegorz Szymaszek <[email protected]>
[ Upstream commit f493162319788802b6a49634f7268e691b4c10ec ]
The Seeed SoM-STM32MP157C device tree had the eMMC’s (SDMMC2) VQMMC supply set to v3v3 (buck4), the same as the VMMC supply. That was incorrect, as on the SoM, the VQMMC supply is provided from vdd (buck3) instead.
--- arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi +1 -1
@@ -269,7 +269,7 @@ &sdmmc2 { st,neg-edge; bus-width = <8>; vmmc-supply = <&v3v3>; - vqmmc-supply = <&v3v3>; + vqmmc-supply = <&vdd>; mmc-ddr-3_3v; status = "okay"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 72/102 ARM: dts: stm32: Drop unused linux,wakeup from touchscreen node on DHCOM SoM
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit 5247a50c8b53ca214a488da648e1bb35c35c2597 ]
Fix the following dtbs_check warning:
touchscreen@38: 'linux,wakeup' does not match any of the regexes: 'pinctrl-[0-9]+'
--- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi +0 -1
@@ -187,7 +187,6 @@ touchscreen@38 { reg = <0x38>; interrupt-parent = <&gpiog>; interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */ - linux,wakeup; }; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 73/102 ARM: dts: stm32: Rename eth@N to ethernet@N on DHCOM SoM
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit b586250df24226f8a257e11e1f5953054c54fd35 ]
Fix the following dtbs_check warning:
eth@1,0: $nodename:0: 'eth@1,0' does not match '^ethernet(@.*)?$'
--- arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi +1 -1
@@ -140,7 +140,7 @@ &fmc { pinctrl-1 = <&fmc_sleep_pins_b>; status = "okay"; - ksz8851: ks8851mll@1,0 { + ksz8851: ethernet@1,0 { compatible = "micrel,ks8851-mll"; reg = <1 0x0 0x2>, <1 0x2 0x20000>; interrupt-parent = <&gpioc>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 74/102 ARM: dts: stm32: Rename spi-flash/mx66l51235l@N to flash@N on DHCOM SoM
In reply to Sasha LevinFrom: Marek Vasut <[email protected]>
[ Upstream commit 9b8a9b389d8464e1ca5a4e92c6a4422844ad4ef3 ]
Fix the following dtbs_check warning:
spi-flash@0: $nodename:0: 'spi-flash@0' does not match '^flash(@.*)?$'
--- arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 2 +- arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi +1 -1
@@ -367,7 +367,7 @@ &qspi { #size-cells = <0>; status = "okay"; - flash0: mx66l51235l@0 { + flash0: flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>;
arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi +1 -1
@@ -194,7 +194,7 @@ &qspi { #size-cells = <0>; status = "okay"; - flash0: spi-flash@0 { + flash0: flash@0 { compatible = "jedec,spi-nor"; reg = <0>; spi-rx-bus-width = <4>;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 75/102 ARM: dts: stm32: fix stpmic node for stm32mp1 boards
In reply to Sasha LevinFrom: Alexandre Torgue <[email protected]>
[ Upstream commit 4bf4abe19089245b7b12f35e5cafb5477b3e2c48 ]
On some STM32 MP15 boards, stpmic node is not correct which generates warnings running "make dtbs_check W=1" command. Issues are:
-"regulator-active-discharge" is not a boolean but an uint32. -"regulator-over-current-protection" is not a valid entry for vref_ddr. -LDO4 has a fixed voltage (3v3) so min/max entries are not allowed.
--- arch/arm/boot/dts/stm32mp157a-stinger96.dtsi | 7 ++----- arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi | 5 +---- arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 5 +---- arch/arm/boot/dts/stm32mp15xx-osd32.dtsi | 7 ++----- 4 files changed, 6 insertions(+), 18 deletions(-)
arch/arm/boot/dts/stm32mp157a-stinger96.dtsi +2 -5
@@ -184,8 +184,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -208,7 +206,6 @@ v1v8: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -219,13 +216,13 @@ bst_out: boost { vbus_otg: pwr_sw1 { regulator-name = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
arch/arm/boot/dts/stm32mp157c-odyssey-som.dtsi +1 -4
@@ -173,8 +173,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -197,7 +195,6 @@ v1v2_hdmi: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -213,7 +210,7 @@ vbus_otg: pwr_sw1 { vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi +1 -4
@@ -263,8 +263,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -286,7 +284,6 @@ v1v8: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -302,7 +299,7 @@ vbus_otg: pwr_sw1 { vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
arch/arm/boot/dts/stm32mp15xx-osd32.dtsi +2 -5
@@ -146,8 +146,6 @@ vtt_ddr: ldo3 { vdd_usb: ldo4 { regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; interrupts = <IT_CURLIM_LDO4 0>; };
@@ -171,7 +169,6 @@ v1v2_hdmi: ldo6 { vref_ddr: vref_ddr { regulator-name = "vref_ddr"; regulator-always-on; - regulator-over-current-protection; }; bst_out: boost {
@@ -182,13 +179,13 @@ bst_out: boost { vbus_otg: pwr_sw1 { regulator-name = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 76/102 ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured
In reply to Sasha LevinFrom: Tony Lindgren <[email protected]>
[ Upstream commit 093a474ce10d8ea3db3ef2922aca5a38f34bab1b ]
If the PM related modules are not loaded and PM firmware not configured, the system suspend fails to resume. Let's fix this by adding initial platform_suspend_ops to block suspend and warn about missing modules.
When pm33xx and wkup_m3_ipc have been loaded and m3 coprocessor booted with it's firmware, pm33xx sets up working platform_suspend_ops. Note that we need to configure at least PM_SUSPEND_STANDBY to have suspend_set_ops().
--- arch/arm/mach-omap2/pm33xx-core.c | 40 +++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)
arch/arm/mach-omap2/pm33xx-core.c +40 -0
@@ -8,6 +8,7 @@#include <linux/cpuidle.h> #include <linux/platform_data/pm33xx.h> +#include <linux/suspend.h> #include <asm/cpuidle.h> #include <asm/smp_scu.h> #include <asm/suspend.h>
@@ -324,6 +325,44 @@ static struct am33xx_pm_platform_data *am33xx_pm_get_pdata(void)return NULL ; } +#ifdef CONFIG_SUSPEND +/* +* Block system suspend initially. Later on pm33xx sets up it's own +* platform_suspend_ops after probe. That depends also on loaded +* wkup_m3_ipc and booted am335x-pm-firmware.elf. +*/ +static int amx3_suspend_block (suspend_state_t state) +{ +pr_warn ("PM not initialized for pm33xx, wkup_m3_ipc, or am335x-pm-firmware.elf\n" ); + +return -EINVAL ; +} + +static int amx3_pm_valid (suspend_state_t state) +{ +switch (state) { +case PM_SUSPEND_STANDBY : +return 1 ; +default : +return 0 ; + } +} + +static const struct platform_suspend_ops amx3_blocked_pm_ops = { + .begin = amx3_suspend_block, + .valid = amx3_pm_valid, +}; + +static void __init amx3_block_suspend (void ) +{ +suspend_set_ops (&amx3_blocked_pm_ops); +} +#else +static inline void amx3_block_suspend (void ) +{ +} +#endif /* CONFIG_SUSPEND */ +int __init amx3_common_pm_init (void ) {struct am33xx_pm_platform_data *pdata;
@@ -337,6 +376,7 @@ int __init amx3_common_pm_init(void) devinfo.size_data =sizeof (*pdata); devinfo.id =-1 ;platform_device_register_full (&devinfo); +amx3_block_suspend ();return 0 ; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 77/102 soc/tegra: fuse: Fix Tegra234-only builds
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit e2d0ee225e49a5553986f3138dd2803852a31fd5 ]
The tegra30_fuse_read() symbol is used on Tegra234, so make sure it's available.
--- drivers/soc/tegra/fuse/fuse-tegra30.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/soc/tegra/fuse/fuse-tegra30.c +2 -1
@@ -37,7 +37,8 @@defined (CONFIG_ARCH_TEGRA_132_SOC ) || \defined (CONFIG_ARCH_TEGRA_210_SOC ) || \defined (CONFIG_ARCH_TEGRA_186_SOC ) || \ - defined(CONFIG_ARCH_TEGRA_194_SOC) +defined (CONFIG_ARCH_TEGRA_194_SOC ) || \ + defined(CONFIG_ARCH_TEGRA_234_SOC)static u32 tegra30_fuse_read_early (struct tegra_fuse *fuse,unsigned int offset) {if (WARN_ON (!fuse->base))
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 78/102 firmware: tegra: bpmp: Fix Tegra234-only builds
In reply to Sasha LevinFrom: Thierry Reding <[email protected]>
[ Upstream commit bd778b893963d67d7eb01f49d84ffcd3eaf229dd ]
The tegra186_bpmp_ops symbol is used on Tegra234, so make sure it's available.
--- drivers/firmware/tegra/Makefile | 1 + drivers/firmware/tegra/bpmp-private.h | 3 ++- drivers/firmware/tegra/bpmp.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/firmware/tegra/Makefile +1 -0
@@ -3,6 +3,7 @@ tegra-bpmp-y = bpmp.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_210_SOC) += bpmp-tegra210.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_186_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_ARCH_TEGRA_194_SOC) += bpmp-tegra186.o +tegra-bpmp-$(CONFIG_ARCH_TEGRA_234_SOC) += bpmp-tegra186.o tegra-bpmp-$(CONFIG_DEBUG_FS) += bpmp-debugfs.o obj-$(CONFIG_TEGRA_BPMP) += tegra-bpmp.o obj-$(CONFIG_TEGRA_IVC) += ivc.o
drivers/firmware/tegra/bpmp-private.h +2 -1
@@ -24,7 +24,8 @@ struct tegra_bpmp_ops { };#if IS_ENABLED (CONFIG_ARCH_TEGRA_186_SOC ) || \ -IS_ENABLED (CONFIG_ARCH_TEGRA_194_SOC ) +IS_ENABLED (CONFIG_ARCH_TEGRA_194_SOC ) || \ +IS_ENABLED (CONFIG_ARCH_TEGRA_234_SOC )extern const struct tegra_bpmp_ops tegra186_bpmp_ops;#endif #if IS_ENABLED (CONFIG_ARCH_TEGRA_210_SOC )
drivers/firmware/tegra/bpmp.c +2 -1
@@ -809,7 +809,8 @@ static const struct dev_pm_ops tegra_bpmp_pm_ops = { }; #if IS_ENABLED(CONFIG_ARCH_TEGRA_186_SOC) || \ - IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) + IS_ENABLED(CONFIG_ARCH_TEGRA_194_SOC) || \ + IS_ENABLED(CONFIG_ARCH_TEGRA_234_SOC) static const struct tegra_bpmp_soc tegra186_soc = { .channels = { .cpu_tx = {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 79/102 arm64: dts: rockchip: Update RK3399 PCI host bridge window to 32-bit address memory
In reply to Sasha LevinFrom: Punit Agrawal <[email protected]>
[ Upstream commit 8efe01b4386ab38a36b99cfdc1dc02c38a8898c3 ]
The PCIe host bridge on RK3399 advertises a single 64-bit memory address range even though it lies entirely below 4GB.
Previously the OF PCI range parser treated 64-bit ranges more leniently (i.e., as 32-bit), but since commit 9d57e61bf723 ("of/pci:
Add IORESOURCE_MEM_64 to resource flags for 64-bit memory addresses") the code takes a stricter view and treats the ranges as advertised in the device tree (i.e, as 64-bit).
The change in behaviour causes failure when allocating bus addresses to devices connected behind a PCI-to-PCI bridge that require non-prefetchable memory ranges. The allocation failure was observed for certain Samsung NVMe drives connected to RockPro64 boards.
Update the host bridge window attributes to treat it as 32-bit address memory. This fixes the allocation failure observed since commit 9d57e61bf723.
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/rockchip/rk3399.dtsi +1 -1
@@ -230,7 +230,7 @@ pcie0: pcie@f8000000 { <&pcie_phy 2>, <&pcie_phy 3>; phy-names = "pcie-phy-0", "pcie-phy-1", "pcie-phy-2", "pcie-phy-3"; - ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, + ranges = <0x82000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>; resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>,
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 80/102 arm64: dts: ls208xa: remove bus-num from dspi node
In reply to Sasha LevinFrom: Mian Yousaf Kaukab <[email protected]>
[ Upstream commit 8240c972c1798ea013cbb407722295fc826b3584 ]
On LS2088A-RDB board, if the spi-fsl-dspi driver is built as module then its probe fails with the following warning:
[ 10.471363] couldn't get idr [ 10.471381] WARNING: CPU: 4 PID: 488 at drivers/spi/spi.c:2689 spi_register_controller+0x73c/0x8d0 ... [ 10.471651] fsl-dspi 2100000.spi: Problem registering DSPI ctlr [ 10.471708] fsl-dspi: probe of 2100000.spi failed with error -16
Reason for the failure is that bus-num property is set for dspi node. However, bus-num property is not set for the qspi node. If probe for spi-fsl-qspi happens first then id 0 is dynamically allocated to it. Call to spi_register_controller() from spi-fsl-dspi driver then fails. Since commit 29d2daf2c33c ("spi: spi-fsl-dspi: Make bus-num property optional") bus-num property is optional. Remove bus-num property from dspi node to fix the issue.
--- arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +0 -1
@@ -929,7 +929,6 @@ dspi: spi@2100000 { QORIQ_CLK_PLL_DIV(4)>; clock-names = "dspi"; spi-num-chipselects = <5>; - bus-num = <0>; }; esdhc: esdhc@2140000 {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 81/102 arm64: dts: imx8mn-beacon-som: Assign PMIC clock
In reply to Sasha LevinFrom: Adam Ford <[email protected]>
[ Upstream commit 1de3aa8611d21d6be546ca1cd13ee05bdd650018 ]
The PMIC throws an errors because the clock isn't assigned to it. Fix this by assigning the clocks info.
--- arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi | 3 +++ 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/freescale/imx8mn-beacon-som.dtsi +3 -0
@@ -120,6 +120,9 @@ pmic@4b { interrupt-parent = <&gpio1>; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; rohm,reset-snvs-powered; + #clock-cells = <0>; + clocks = <&osc_32k 0>; + clock-output-names = "clk-32k-out"; regulators { buck1_reg: BUCK1 {
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 82/102 arm64: dts: imx8mq: assign PCIe clocks
In reply to Sasha LevinFrom: Lucas Stach <[email protected]>
[ Upstream commit 15a5261e4d052bf85c7fba24dbe0e9a7c8c05925 ]
This fixes multiple issues with the current non-existent PCIe clock setup:
The controller can run at up to 250MHz, so use a parent that provides this clock.
The PHY needs an exact 100MHz reference clock to function if the PCIe refclock is not fed in via the refclock pads. While this mode is not supported (yet) in the driver it doesn't hurt to make sure we are providing a clock with the right rate.
The AUX clock is specified to have a maximum clock rate of 10MHz. So the current setup, which drives it straight from the 25MHz oscillator is actually overclocking the AUX input.
--- arch/arm64/boot/dts/freescale/imx8mq.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/freescale/imx8mq.dtsi +16 -0
@@ -1383,6 +1383,14 @@ pcie0: pcie@33800000 { <&src IMX8MQ_RESET_PCIE_CTRL_APPS_EN>, <&src IMX8MQ_RESET_PCIE_CTRL_APPS_TURNOFF>; reset-names = "pciephy", "apps", "turnoff"; + assigned-clocks = <&clk IMX8MQ_CLK_PCIE1_CTRL>, + <&clk IMX8MQ_CLK_PCIE1_PHY>, + <&clk IMX8MQ_CLK_PCIE1_AUX>; + assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>, + <&clk IMX8MQ_SYS2_PLL_100M>, + <&clk IMX8MQ_SYS1_PLL_80M>; + assigned-clock-rates = <250000000>, <100000000>, + <10000000>; status = "disabled"; };
@@ -1413,6 +1421,14 @@ pcie1: pcie@33c00000 { <&src IMX8MQ_RESET_PCIE2_CTRL_APPS_EN>, <&src IMX8MQ_RESET_PCIE2_CTRL_APPS_TURNOFF>; reset-names = "pciephy", "apps", "turnoff"; + assigned-clocks = <&clk IMX8MQ_CLK_PCIE2_CTRL>, + <&clk IMX8MQ_CLK_PCIE2_PHY>, + <&clk IMX8MQ_CLK_PCIE2_AUX>; + assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>, + <&clk IMX8MQ_SYS2_PLL_100M>, + <&clk IMX8MQ_SYS1_PLL_80M>; + assigned-clock-rates = <250000000>, <100000000>, + <10000000>; status = "disabled"; };
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 83/102 thermal/core: Correct function name thermal_zone_device_unregister()
In reply to Sasha LevinFrom: Yang Yingliang <[email protected]>
[ Upstream commit a052b5118f13febac1bd901fe0b7a807b9d6b51c ]
Fix the following make W=1 kernel build warning:
drivers/thermal/thermal_core.c:1376: warning: expecting prototype for thermal_device_unregister(). Prototype was for thermal_zone_device_unregister() instead
--- drivers/thermal/thermal_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -1
@@ -1380,7 +1380,7 @@ thermal_zone_device_register(const char *type, int trips, int mask,EXPORT_SYMBOL_GPL (thermal_zone_device_register);/** -* thermal_device_unregister - removes the registered thermal zone device +* thermal_zone_device_unregister - removes the registered thermal zone device * @tz: the thermal zone device to remove */ void thermal_zone_device_unregister (struct thermal_zone_device *tz)
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 84/102 thermal/drivers/rcar_gen3_thermal: Do not shadow rcar_gen3_ths_tj_1
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 3ae5950db617d1cc3eb4eb55750fa9d138529b49 ]
With -Wshadow:
drivers/thermal/rcar_gen3_thermal.c: In function ‘rcar_gen3_thermal_probe’:
drivers/thermal/rcar_gen3_thermal.c:310:13: warning: declaration of ‘rcar_gen3_ths_tj_1’ shadows a global declaration [-Wshadow]
310 | const int *rcar_gen3_ths_tj_1 = of_device_get_match_data(dev);
| ^~~~~~~~~~~~~~~~~~
drivers/thermal/rcar_gen3_thermal.c:246:18: note: shadowed declaration is here
246 | static const int rcar_gen3_ths_tj_1 = 126;
| ^~~~~~~~~~~~~~~~~~To add to the confusion, the local variable has a different type.
Fix the shadowing by renaming the local variable to ths_tj_1.
--- drivers/thermal/rcar_gen3_thermal.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/thermal/rcar_gen3_thermal.c +2 -3
@@ -306,7 +306,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) {struct rcar_gen3_thermal_priv *priv;struct device *dev = &pdev->dev; -const int *rcar_gen3_ths_tj_1 =of_device_get_match_data (dev); +const int *ths_tj_1 =of_device_get_match_data (dev);struct resource *res;struct thermal_zone_device *zone;int ret, i;
@@ -351,8 +351,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) priv->tscs[i] = tsc; priv->thermal_init (tsc); -rcar_gen3_thermal_calc_coefs (tsc, ptat, thcodes[i], - *rcar_gen3_ths_tj_1); +rcar_gen3_thermal_calc_coefs (tsc, ptat, thcodes[i], *ths_tj_1); zone =devm_thermal_zone_of_sensor_register (dev, i, tsc, &rcar_gen3_tz_of_ops);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 85/102 thermal/drivers/imx_sc: Add missing of_node_put for loop iteration
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 3da97620e8d60da4a7eaae46e03e0a494780642d ]
Early exits from for_each_available_child_of_node() should decrement the node reference counter. Reported by Coccinelle:
drivers/thermal/imx_sc_thermal.c:93:1-33: WARNING:
Function "for_each_available_child_of_node" should have of_node_put() before return around line 97.
--- drivers/thermal/imx_sc_thermal.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/thermal/imx_sc_thermal.c +3 -0
@@ -93,6 +93,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)for_each_available_child_of_node (np, child) { sensor =devm_kzalloc (&pdev->dev,sizeof (*sensor),GFP_KERNEL );if (!sensor) { +of_node_put (child);of_node_put (sensor_np);return -ENOMEM ; }
@@ -104,6 +105,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)dev_err (&pdev->dev,"failed to get valid sensor resource id: %d\n" , ret); +of_node_put (child);break ; }
@@ -114,6 +116,7 @@ static int imx_sc_thermal_probe(struct platform_device *pdev)if (IS_ERR (sensor->tzd)) {dev_err (&pdev->dev,"failed to register thermal zone\n" ); ret =PTR_ERR (sensor->tzd); +of_node_put (child);break ; }
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 86/102 thermal/drivers/sprd: Add missing of_node_put for loop iteration
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit d8ac5bb4ae653e092d7429a7587b73f1662d6ad7 ]
Early exits from for_each_available_child_of_node() should decrement the node reference counter. Reported by Coccinelle:
drivers/thermal/sprd_thermal.c:387:1-23: WARNING:
Function "for_each_child_of_node" should have of_node_put() before goto around lines 391.
--- drivers/thermal/sprd_thermal.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/thermal/sprd_thermal.c +9 -6
@@ -388,7 +388,7 @@ static int sprd_thm_probe(struct platform_device *pdev) sen =devm_kzalloc (&pdev->dev,sizeof (*sen),GFP_KERNEL );if (!sen) { ret = -ENOMEM ; - goto disable_clk; + goto of_put; } sen->data = thm;
@@ -397,13 +397,13 @@ static int sprd_thm_probe(struct platform_device *pdev) ret =of_property_read_u32 (sen_child,"reg" , &sen->id);if (ret) {dev_err (&pdev->dev,"get sensor reg failed" ); - goto disable_clk; + goto of_put; } ret =sprd_thm_sensor_calibration (sen_child, thm, sen);if (ret) {dev_err (&pdev->dev,"efuse cal analysis failed" ); - goto disable_clk; + goto of_put; }sprd_thm_sensor_init (thm, sen);
@@ -416,19 +416,20 @@ static int sprd_thm_probe(struct platform_device *pdev)dev_err (&pdev->dev,"register thermal zone failed %d\n" , sen->id); ret =PTR_ERR (sen->tzd); - goto disable_clk; + goto of_put; } thm->sensor[sen->id] = sen; } +/* sen_child set to NULL at this point */ ret =sprd_thm_set_ready (thm);if (ret) - goto disable_clk; + goto of_put; ret =sprd_thm_wait_temp_ready (thm);if (ret) - goto disable_clk; + goto of_put;for (i =0 ; i < thm->nr_sensors; i++)sprd_thm_toggle_sensor (thm->sensor[i], true);
@@ -436,6 +437,8 @@ static int sprd_thm_probe(struct platform_device *pdev)platform_set_drvdata (pdev, thm);return 0 ; +of_put: +of_node_put (sen_child); disable_clk:clk_disable_unprepare (thm->clk);return ret;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 87/102 arm64: dts: qcom: sm8250: Fix pcie2_lane unit address
In reply to Sasha LevinFrom: Konrad Dybcio <[email protected]>
[ Upstream commit dc2f86369b157dfe4dccd31497d2e3c541e7239d ]
The previous one was likely a mistaken copy from pcie1_lane.
--- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sm8250.dtsi +1 -1
@@ -1509,7 +1509,7 @@ pcie2_phy: phy@1c16000 { status = "disabled"; - pcie2_lane: lanes@1c0e200 { + pcie2_lane: lanes@1c16200 { reg = <0 0x1c16200 0 0x170>, /* tx0 */ <0 0x1c16400 0 0x200>, /* rx0 */ <0 0x1c16a00 0 0x1f0>, /* pcs */
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 88/102 arm64: dts: qcom: sm8150: Disable Adreno and modem by default
In reply to Sasha LevinFrom: Konrad Dybcio <[email protected]>
[ Upstream commit b1dc3c6b3dabbedaf896a3c1a998da191c311c70 ]
Components that rely on proprietary (not to mention signed!) firmware should not be enabled by default, as lack of the aforementioned firmware could cause various issues, from random errors to straight-up failing to boot.
Not enabling modem back on the HDK, as it uses a sa8150.
Also fixed a sorting mistake in both boards' dt while at it.
--- arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 10 +++++++++- arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 10 +++++++++- arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 ++++++ 3 files changed, 24 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sm8150-hdk.dts +9 -1
@@ -354,7 +354,11 @@ vreg_l6f_2p85: ldo6 { }; }; -&qupv3_id_1 { +&gmu { + status = "okay"; +}; + +&gpu { status = "okay"; };
@@ -372,6 +376,10 @@ resin { }; }; +&qupv3_id_1 { + status = "okay"; +}; + &remoteproc_adsp { status = "okay";
arch/arm64/boot/dts/qcom/sm8150-mtp.dts +9 -1
@@ -349,7 +349,11 @@ vreg_l6f_2p85: ldo6 { }; }; -&qupv3_id_1 { +&gmu { + status = "okay"; +}; + +&gpu { status = "okay"; };
@@ -367,6 +371,10 @@ resin { }; }; +&qupv3_id_1 { + status = "okay"; +}; + &remoteproc_adsp { status = "okay"; firmware-name = "qcom/sm8150/adsp.mdt";
arch/arm64/boot/dts/qcom/sm8150.dtsi +6 -0
@@ -793,6 +793,8 @@ gpu: gpu@2c00000 { qcom,gmu = <&gmu>; + status = "disabled"; + zap-shader { memory-region = <&gpu_mem>; };
@@ -860,6 +862,8 @@ gmu: gmu@2c6a000 { operating-points-v2 = <&gmu_opp_table>; + status = "disabled"; + gmu_opp_table: opp-table { compatible = "operating-points-v2";
@@ -947,6 +951,8 @@ remoteproc_mpss: remoteproc@4080000 { qcom,smem-states = <&modem_smp2p_out 0>; qcom,smem-state-names = "stop"; + status = "disabled"; + glink-edge { interrupts = <GIC_SPI 449 IRQ_TYPE_EDGE_RISING>; label = "modem";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 89/102 kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set
In reply to Sasha LevinFrom: Matthias Maennich <[email protected]>
[ Upstream commit a979522a1a88556e42a22ce61bccc58e304cb361 ]
To avoid unnecessary recompilations, mkcompile_h does not regenerate compile.h if just the timestamp changed.
Though, if KBUILD_BUILD_TIMESTAMP is set, an explicit timestamp for the build was requested, in which case we should not ignore it.
If a user follows the documentation for reproducible builds [1] and defines KBUILD_BUILD_TIMESTAMP as the git commit timestamp, a clean build will have the correct timestamp. A subsequent cherry-pick (or amend) changes the commit timestamp and if an incremental build is done with a different KBUILD_BUILD_TIMESTAMP now, that new value is not taken into consideration. But it should for reproducibility.
Hence, whenever KBUILD_BUILD_TIMESTAMP is explicitly set, do not ignore UTS_VERSION when making a decision about whether the regenerated version of compile.h should be moved into place.
[1] https://www.kernel.org/doc/html/latest/kbuild/reproducible-builds.html
--- scripts/mkcompile_h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
scripts/mkcompile_h +11 -3
@@ -70,15 +70,23 @@ UTS_VERSION="$(echo $UTS_VERSION $CONFIG_FLAGS $TIMESTAMP | cut -b -$UTS_LEN)" # Only replace the real compile.h if the new one is different, # in order to preserve the timestamp and avoid unnecessary # recompilations. -# We don't consider the file changed if only the date/time changed. +# We don't consider the file changed if only the date/time changed, +# unless KBUILD_BUILD_TIMESTAMP was explicitly set (e.g. for +# reproducible builds with that value referring to a commit timestamp). # A kernel config change will increase the generation number, thus # causing compile.h to be updated (including date/time) due to the # changed comment in the # first line. +if [ -z "$KBUILD_BUILD_TIMESTAMP" ]; then + IGNORE_PATTERN="UTS_VERSION" +else + IGNORE_PATTERN="NOT_A_PATTERN_TO_BE_MATCHED" +fi + if [ -r $TARGET ] && \ - grep -v 'UTS_VERSION' $TARGET > .tmpver.1 && \ - grep -v 'UTS_VERSION' .tmpcompile > .tmpver.2 && \ + grep -v $IGNORE_PATTERN $TARGET > .tmpver.1 && \ + grep -v $IGNORE_PATTERN .tmpcompile > .tmpver.2 && \ cmp -s .tmpver.1 .tmpver.2; then rm -f .tmpcompile else
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 90/102 arch/arm64/boot/dts/marvell: fix NAND partitioning scheme
In reply to Sasha LevinFrom: Konstantin Porotchkin <[email protected]>
[ Upstream commit e3850467bf8c82de4a052619136839fe8054b774 ]
Eliminate 1MB gap between Linux and filesystem partitions.
--- arch/arm64/boot/dts/marvell/cn9130-db.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/marvell/cn9130-db.dts +1 -1
@@ -260,7 +260,7 @@ partition@0 { }; partition@200000 { label = "Linux"; - reg = <0x200000 0xd00000>; + reg = <0x200000 0xe00000>; }; partition@1000000 { label = "Filesystem";
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 91/102 rtc: max77686: Do not enforce (incorrect) interrupt trigger type
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 742b0d7e15c333303daad4856de0764f4bc83601 ]
Interrupt line can be configured on different hardware in different way, even inverted. Therefore driver should not enforce specific trigger type - edge falling - but instead rely on Devicetree to configure it.
The Maxim 77686 datasheet describes the interrupt line as active low with a requirement of acknowledge from the CPU therefore the edge falling is not correct.
The interrupt line is shared between PMIC and RTC driver, so using level sensitive interrupt is here especially important to avoid races. With an edge configuration in case if first PMIC signals interrupt followed shortly after by the RTC, the interrupt might not be yet cleared/acked thus the second one would not be noticed.
--- drivers/rtc/rtc-max77686.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/rtc/rtc-max77686.c +2 -2
@@ -717,8 +717,8 @@ static int max77686_init_rtc_regmap(struct max77686_rtc_info *info) add_rtc_irq: ret =regmap_add_irq_chip (info->rtc_regmap, info->rtc_irq, -IRQF_TRIGGER_FALLING |IRQF_ONESHOT | -IRQF_SHARED ,0 , info->drv_data->rtc_irq_chip, +IRQF_ONESHOT |IRQF_SHARED , +0 , info->drv_data->rtc_irq_chip, &info->rtc_irq_data);if (ret <0 ) {dev_err (info->dev,"Failed to add RTC irq chip: %d\n" , ret);
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 92/102 scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8
In reply to Sasha LevinFrom: Colin Ian King <[email protected]>
[ Upstream commit 332a9dd1d86f1e7203fc7f0fd7e82f0b304200fe ]
The shifting of the u8 integer returned fom ahc_inb(ahc, port+3) by 24 bits to the left will be promoted to a 32 bit signed int and then sign-extended to a u64. In the event that the top bit of the u8 is set then all then all the upper 32 bits of the u64 end up as also being set because of the sign-extension. Fix this by casting the u8 values to a u64 before the 24 bit left shift.
[ This dates back to 2002, I found the offending commit from the git history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git,
commit f58eb66c0b0a ("Update aic7xxx driver to 6.2.10...") ]
Addresses-Coverity: ("Unintended sign extension")
--- drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/aic7xxx/aic7xxx_core.c +1 -1
@@ -493,7 +493,7 @@ ahc_inq(struct ahc_softc *ahc, u_int port)return ((ahc_inb (ahc, port)) | (ahc_inb (ahc, port+1 ) <<8 ) | (ahc_inb (ahc, port+2 ) <<16 ) - | (ahc_inb (ahc, port+3 ) <<24 ) + | (((uint64_t )ahc_inb (ahc, port+3 )) <<24 ) | (((uint64_t )ahc_inb (ahc, port+4 )) <<32 ) | (((uint64_t )ahc_inb (ahc, port+5 )) <<40 ) | (((uint64_t)ahc_inb(ahc, port+6)) << 48)
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 93/102 scsi: libsas: Add LUN number check in .slave_alloc callback
In reply to Sasha LevinFrom: Yufen Yu <[email protected]>
[ Upstream commit 49da96d77938db21864dae6b7736b71e96c1d203 ]
Offlining a SATA device connected to a hisi SAS controller and then scanning the host will result in detecting 255 non-existent devices:
# lsscsi [2:0:0:0] disk ATA Samsung SSD 860 2B6Q /dev/sda [2:0:1:0] disk ATA WDC WD2003FYYS-3 1D01 /dev/sdb [2:0:2:0] disk SEAGATE ST600MM0006 B001 /dev/sdc # echo "offline" > /sys/block/sdb/device/state # echo "- - -" > /sys/class/scsi_host/host2/scan # lsscsi [2:0:0:0] disk ATA Samsung SSD 860 2B6Q /dev/sda [2:0:1:0] disk ATA WDC WD2003FYYS-3 1D01 /dev/sdb [2:0:1:1] disk ATA WDC WD2003FYYS-3 1D01 /dev/sdh ... [2:0:1:255] disk ATA WDC WD2003FYYS-3 1D01 /dev/sdjb
After a REPORT LUN command issued to the offline device fails, the SCSI midlayer tries to do a sequential scan of all devices whose LUN number is not 0. However, SATA does not support LUN numbers at all.
Introduce a generic sas_slave_alloc() handler which will return -ENXIO for SATA devices if the requested LUN number is larger than 0 and make libsas drivers use this function as their .slave_alloc callback.
--- drivers/scsi/aic94xx/aic94xx_init.c | 1 + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1 + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 1 + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 1 + drivers/scsi/isci/init.c | 1 + drivers/scsi/libsas/sas_scsi_host.c | 9 +++++++++ drivers/scsi/mvsas/mv_init.c | 1 + drivers/scsi/pm8001/pm8001_init.c | 1 + 8 files changed, 16 insertions(+)
drivers/scsi/aic94xx/aic94xx_init.c +1 -0
@@ -53,6 +53,7 @@ static struct scsi_host_template aic94xx_sht = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +1 -0
@@ -1771,6 +1771,7 @@ static struct scsi_host_template sht_v1_hw = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c +1 -0
@@ -3584,6 +3584,7 @@ static struct scsi_host_template sht_v2_hw = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +1 -0
@@ -3147,6 +3147,7 @@ static struct scsi_host_template sht_v3_hw = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/isci/init.c +1 -0
@@ -167,6 +167,7 @@ static struct scsi_host_template isci_sht = { .eh_abort_handler = sas_eh_abort_handler, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl, #ifdef CONFIG_COMPAT
drivers/scsi/libsas/sas_scsi_host.c +9 -0
@@ -911,6 +911,14 @@ void sas_task_abort(struct sas_task *task)blk_abort_request (sc->request); } +int sas_slave_alloc (struct scsi_device *sdev) +{ +if (dev_is_sata (sdev_to_domain_dev (sdev)) && sdev->lun) +return -ENXIO ; + +return 0 ; +} +void sas_target_destroy (struct scsi_target *starget) {struct domain_device *found_dev = starget->hostdata;
@@ -957,5 +965,6 @@ EXPORT_SYMBOL_GPL(sas_task_abort);EXPORT_SYMBOL_GPL (sas_phy_reset);EXPORT_SYMBOL_GPL (sas_eh_device_reset_handler);EXPORT_SYMBOL_GPL (sas_eh_target_reset_handler); +EXPORT_SYMBOL_GPL (sas_slave_alloc);EXPORT_SYMBOL_GPL (sas_target_destroy);EXPORT_SYMBOL_GPL (sas_ioctl);
drivers/scsi/mvsas/mv_init.c +1 -0
@@ -46,6 +46,7 @@ static struct scsi_host_template mvs_sht = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
drivers/scsi/pm8001/pm8001_init.c +1 -0
@@ -101,6 +101,7 @@ static struct scsi_host_template pm8001_sht = { .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .eh_device_reset_handler = sas_eh_device_reset_handler, .eh_target_reset_handler = sas_eh_target_reset_handler, + .slave_alloc = sas_slave_alloc, .target_destroy = sas_target_destroy, .ioctl = sas_ioctl,#ifdef CONFIG_COMPAT
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 94/102 scsi: be2iscsi: Fix some missing space in some messages
In reply to Sasha LevinFrom: Christophe JAILLET <[email protected]>
[ Upstream commit c7fa2c855e892721bafafdf6393342c000e0ef77 ]
Fix a few style issues reported by checkpatch.pl:
- Avoid duplicated word in comment.
- Add missing space in messages.
- Unneeded continuation line character.
- Unneeded extra spaces.
- Unneeded log message after memory allocation failure.
--- drivers/scsi/be2iscsi/be_main.c | 102 ++++++++++++-------------------- 1 file changed, 38 insertions(+), 64 deletions(-)
drivers/scsi/be2iscsi/be_main.c +38 -64
@@ -143,8 +143,7 @@ DEVICE_ATTR(beiscsi_##_name, S_IRUGO | S_IWUSR,\ beiscsi_##_name##_disp, beiscsi_##_name##_store) /* - * When new log level added update the - * the MAX allowed value for log_enable + * When new log level added update MAX allowed value for log_enable */ BEISCSI_RW_ATTR(log_enable, 0x00, 0xFF, 0x00, "Enable logging Bit Mask\n"
@@ -825,9 +824,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) &phwi_context->be_eq[i]);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_init_irqs-Failed to" -"register msix for i = %d\n" , - i); +"BM_%d : %s-Failed to register msix for i = %d\n" , + __func__, i);kfree (phba->msi_name[i]); goto free_msix_irqs; }
@@ -841,9 +839,9 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) ret =request_irq (pci_irq_vector (pcidev, i), be_isr_mcc,0 , phba->msi_name[i], &phwi_context->be_eq[i]);if (ret) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_init_irqs-" -"Failed to register beiscsi_msix_mcc\n" ); +beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , +"BM_%d : %s-Failed to register beiscsi_msix_mcc\n" , + __func__);kfree (phba->msi_name[i]); goto free_msix_irqs; }
@@ -853,8 +851,8 @@ static int beiscsi_init_irqs(struct beiscsi_hba *phba) "beiscsi", phba);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_init_irqs-" -"Failed to register irq\\n" ); +"BM_%d : %s-Failed to register irq\n" , + __func__);return ret; } }
@@ -1030,7 +1028,7 @@ free_wrb_handle(struct beiscsi_hba *phba, struct hwi_wrb_context *pwrb_context, phba->params.wrbs_per_cxn);beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : FREE WRB: pwrb_handle=%p free_index=0x%x" +"BM_%d : FREE WRB: pwrb_handle=%p free_index=0x%x " "wrb_handles_available=%d\n" , pwrb_handle, pwrb_context->free_index, pwrb_context->wrb_handles_available);
@@ -1374,7 +1372,7 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_CONFIG |BEISCSI_LOG_IO ,"BM_%d :\t\t No HWH_TYPE_LOGIN Expected in" -" hwi_complete_cmd- Solicited path\n" ); +" %s- Solicited path\n" , __func__);break ;case HWH_TYPE_NOP :
@@ -1384,8 +1382,8 @@ static void hwi_complete_cmd(struct beiscsi_conn *beiscsi_conn,default :beiscsi_log (phba,KERN_WARNING ,BEISCSI_LOG_CONFIG |BEISCSI_LOG_IO , -"BM_%d : In hwi_complete_cmd, unknown type = %d" -"wrb_index 0x%x CID 0x%x\n" , type, +"BM_%d : In %s, unknown type = %d " +"wrb_index 0x%x CID 0x%x\n" , __func__, type, csol_cqe.wrb_index, csol_cqe.cid);break ;
@@ -1883,9 +1881,9 @@ unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq, int budget) cid =AMAP_GET_BITS ( struct amap_i_t_dpdu_cqe_v2, cid, sol); - else - cid = AMAP_GET_BITS(struct amap_sol_cqe_v2, - cid, sol); + else + cid = AMAP_GET_BITS(struct amap_sol_cqe_v2, + cid, sol); } cri_index =BE_GET_CRI_FROM_CID (cid);
@@ -2010,8 +2008,7 @@ unsigned int beiscsi_process_cq(struct be_eq_obj *pbe_eq, int budget)default :beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Invalid CQE Event Received Code : %d" -"CID 0x%x...\n" , +"BM_%d : Invalid CQE Event Received Code : %d CID 0x%x...\n" , code, cid);break ; }
@@ -3001,7 +2998,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba,void *eq_vaddress;dma_addr_t paddr; - num_eq_pages =PAGES_REQUIRED (phba->params.num_eq_entries * \ + num_eq_pages =PAGES_REQUIRED (phba->params.num_eq_entries *sizeof (struct be_eq_entry ));if (phba->pcidev->msix_enabled)
@@ -3034,8 +3031,7 @@ static int beiscsi_create_eqs(struct beiscsi_hba *phba, BEISCSI_EQ_DELAY_DEF);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_cmd_eq_create" -"Failed for EQ\n" ); +"BM_%d : beiscsi_cmd_eq_create Failed for EQ\n" ); goto create_eq_error; }
@@ -3068,7 +3064,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba,int ret = -ENOMEM ;dma_addr_t paddr; - num_cq_pages =PAGES_REQUIRED (phba->params.num_cq_entries * \ + num_cq_pages =PAGES_REQUIRED (phba->params.num_cq_entries *sizeof (struct sol_cqe ));for (i =0 ; i < phba->num_cpus; i++) {
@@ -3090,8 +3086,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, sizeof(struct sol_cqe), cq_vaddress);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : be_fill_queue Failed " -"for ISCSI CQ\n" ); +"BM_%d : be_fill_queue Failed for ISCSI CQ\n" ); goto create_cq_error; }
@@ -3100,8 +3095,7 @@ static int beiscsi_create_cqs(struct beiscsi_hba *phba, false, 0);if (ret) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : beiscsi_cmd_eq_create" -"Failed for ISCSI CQ\n" ); +"BM_%d : beiscsi_cmd_eq_create Failed for ISCSI CQ\n" ); goto create_cq_error; } beiscsi_log(phba, KERN_INFO, BEISCSI_LOG_INIT,
@@ -3226,8 +3220,8 @@ beiscsi_create_def_data(struct beiscsi_hba *phba, phwi_context->be_def_dataq[ulp_num].id);beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_INIT , -"BM_%d : DEFAULT PDU DATA RING CREATED" -"on ULP : %d\n" , ulp_num); +"BM_%d : DEFAULT PDU DATA RING CREATED on ULP : %d\n" , + ulp_num);return 0 ; }
@@ -3253,13 +3247,13 @@ beiscsi_post_template_hdr(struct beiscsi_hba *phba)if (status !=0 ) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Post Template HDR Failed for" +"BM_%d : Post Template HDR Failed for " "ULP_%d\n" , ulp_num);return status; }beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_INIT , -"BM_%d : Template HDR Pages Posted for" +"BM_%d : Template HDR Pages Posted for " "ULP_%d\n" , ulp_num); } }
@@ -3374,18 +3368,17 @@ beiscsi_create_wrb_rings(struct beiscsi_hba *phba, }else { idx++; wrb_vaddr = mem_descr->mem_array[idx].virtual_address; - pa_addr_lo = mem_descr->mem_array[idx].\ + pa_addr_lo = mem_descr->mem_array[idx]. bus_address.u.a64.address; num_wrb_rings = mem_descr->mem_array[idx].size / (phba->params.wrbs_per_cxn *sizeof (struct iscsi_wrb )); pwrb_arr[num].virtual_address = wrb_vaddr; - pwrb_arr[num].bus_address.u.a64.address\ - = pa_addr_lo; + pwrb_arr[num].bus_address.u.a64.address = pa_addr_lo; pwrb_arr[num].size = phba->params.wrbs_per_cxn *sizeof (struct iscsi_wrb ); wrb_vaddr += pwrb_arr[num].size; - pa_addr_lo += pwrb_arr[num].size; + pa_addr_lo += pwrb_arr[num].size; num_wrb_rings--; } }
@@ -3939,7 +3932,7 @@ static int beiscsi_init_sgl_handle(struct beiscsi_hba *phba) idx++; }beiscsi_log (phba,KERN_INFO ,BEISCSI_LOG_INIT , -"BM_%d : phba->io_sgl_hndl_avbl=%d" +"BM_%d : phba->io_sgl_hndl_avbl=%d " "phba->eh_sgl_hndl_avbl=%d\n" , phba->io_sgl_hndl_avbl, phba->eh_sgl_hndl_avbl);
@@ -3997,13 +3990,8 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba) GFP_KERNEL);if (!ptr_cid_info) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory" -"for ULP_CID_INFO for ULP : %d\n" , - ulp_num); ret = -ENOMEM ; goto free_memory; - }/* Allocate memory for CID array */
@@ -4012,10 +4000,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)sizeof (*ptr_cid_info->cid_array), GFP_KERNEL);if (!ptr_cid_info->cid_array) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory" -"for CID_ARRAY for ULP : %d\n" , - ulp_num);kfree (ptr_cid_info); ptr_cid_info =NULL ; ret = -ENOMEM ;
@@ -4033,9 +4017,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)sizeof (struct iscsi_endpoint *), GFP_KERNEL);if (!phba->ep_array) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory in " -"hba_setup_cid_tbls\n" ); ret = -ENOMEM ; goto free_memory;
@@ -4045,10 +4026,6 @@ static int hba_setup_cid_tbls(struct beiscsi_hba *phba)sizeof (struct beiscsi_conn *), GFP_KERNEL);if (!phba->conn_table) { -beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_INIT , -"BM_%d : Failed to allocate memory in" -"hba_setup_cid_tbls\n" ); -kfree (phba->ep_array); phba->ep_array =NULL ; ret = -ENOMEM ;
@@ -4401,7 +4378,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)if (!io_task->psgl_handle) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of IO_SGL_ICD Failed" +"BM_%d : Alloc of IO_SGL_ICD Failed " "for the CID : %d\n" , beiscsi_conn->beiscsi_conn_cid); goto free_hndls;
@@ -4412,7 +4389,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)if (!io_task->pwrb_handle) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of WRB_HANDLE Failed" +"BM_%d : Alloc of WRB_HANDLE Failed " "for the CID : %d\n" , beiscsi_conn->beiscsi_conn_cid); goto free_io_hndls;
@@ -4428,10 +4405,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of MGMT_SGL_ICD Failed" +"BM_%d : Alloc of MGMT_SGL_ICD Failed " "for the CID : %d\n" , - beiscsi_conn-> - beiscsi_conn_cid); + beiscsi_conn->beiscsi_conn_cid); goto free_hndls; }
@@ -4446,10 +4422,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of WRB_HANDLE Failed" +"BM_%d : Alloc of WRB_HANDLE Failed " "for the CID : %d\n" , - beiscsi_conn-> - beiscsi_conn_cid); + beiscsi_conn->beiscsi_conn_cid); goto free_mgmt_hndls; } beiscsi_conn->plogin_wrb_handle =
@@ -4467,10 +4442,9 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of MGMT_SGL_ICD Failed" +"BM_%d : Alloc of MGMT_SGL_ICD Failed " "for the CID : %d\n" , - beiscsi_conn-> - beiscsi_conn_cid); + beiscsi_conn->beiscsi_conn_cid); goto free_hndls; } io_task->pwrb_handle =
@@ -4480,7 +4454,7 @@ static int beiscsi_alloc_pdu(struct iscsi_task *task, uint8_t opcode)if (!io_task->pwrb_handle) {beiscsi_log (phba,KERN_ERR ,BEISCSI_LOG_IO |BEISCSI_LOG_CONFIG , -"BM_%d : Alloc of WRB_HANDLE Failed" +"BM_%d : Alloc of WRB_HANDLE Failed " "for the CID : %d\n" , beiscsi_conn->beiscsi_conn_cid); goto free_mgmt_hndls;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 95/102 scsi: libfc: Fix array index out of bound exception
In reply to Sasha LevinFrom: Javed Hasan <[email protected]>
[ Upstream commit b27c4577557045f1ab3cdfeabfc7f3cd24aca1fe ]
Fix array index out of bound exception in fc_rport_prli_resp().
--- drivers/scsi/libfc/fc_rport.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
drivers/scsi/libfc/fc_rport.c +8 -5
@@ -1162,6 +1162,7 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, resp_code = (pp->spp.spp_flags &FC_SPP_RESP_MASK );FC_RPORT_DBG (rdata,"PRLI spp_flags = 0x%x spp_type 0x%x\n" , pp->spp.spp_flags, pp->spp.spp_type); + rdata->spp_type = pp->spp.spp_type;if (resp_code !=FC_SPP_RESP_ACK ) {if (resp_code ==FC_SPP_RESP_CONF )
@@ -1184,11 +1185,13 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,/* * Call prli provider if we should act as a target */ - prov = fc_passive_prov[rdata->spp_type]; -if (prov) { -memset (&temp_spp,0 ,sizeof (temp_spp)); - prov->prli (rdata, pp->prli.prli_spp_len, - &pp->spp, &temp_spp); +if (rdata->spp_type <FC_FC4_PROV_SIZE ) { + prov = fc_passive_prov[rdata->spp_type]; +if (prov) { +memset (&temp_spp,0 ,sizeof (temp_spp)); + prov->prli (rdata, pp->prli.prli_spp_len, + &pp->spp, &temp_spp); + } }/* * Check if the image pair could be established
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 96/102 scsi: qedf: Add check to synchronize abort and flush
In reply to Sasha LevinFrom: Javed Hasan <[email protected]>
[ Upstream commit df99446d5c2a63dc6e6920c8090da0e9da6539d5 ]
A race condition was observed between qedf_cleanup_fcport() and qedf_process_error_detect()->qedf_initiate_abts():
[2069091.203145] BUG: unable to handle kernel NULL pointer dereference at 0000000000000030 [2069091.213100] IP: [<ffffffffc0666cc6>] qedf_process_error_detect+0x96/0x130 [qedf] [2069091.223391] PGD 1943049067 PUD 194304e067 PMD 0 [2069091.233420] Oops: 0000 [#1] SMP [2069091.361820] CPU: 1 PID: 14751 Comm: kworker/1:46 Kdump: loaded Tainted: P OE ------------ 3.10.0-1160.25.1.el7.x86_64 #1 [2069091.388474] Hardware name: HPE Synergy 480 Gen10/Synergy 480 Gen10 Compute Module, BIOS I42 04/08/2020 [2069091.402148] Workqueue: qedf_io_wq qedf_fp_io_handler [qedf] [2069091.415780] task: ffff9bb9f5190000 ti: ffff9bacaef9c000 task.ti: ffff9bacaef9c000 [2069091.429590] RIP: 0010:[<ffffffffc0666cc6>] [<ffffffffc0666cc6>] qedf_process_error_detect+0x96/0x130 [qedf] [2069091.443666] RSP: 0018:ffff9bacaef9fdb8 EFLAGS: 00010246 [2069091.457692] RAX: 0000000000000000 RBX: ffff9bbbbbfb18a0 RCX: ffffffffc0672310 [2069091.471997] RDX: 00000000000005de RSI: ffffffffc066e7f0 RDI: ffff9beb3f4538d8 [2069091.486130] RBP: ffff9bacaef9fdd8 R08: 0000000000006000 R09: 0000000000006000 [2069091.500321] R10: 0000000000001551 R11: ffffb582996ffff8 R12: ffffb5829b39cc18 [2069091.514779] R13: ffff9badab380c28 R14: ffffd5827f643900 R15: 0000000000000040 [2069091.529472] FS: 0000000000000000(0000) GS:ffff9beb3f440000(0000) knlGS:0000000000000000 [2069091.543926] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [2069091.558942] CR2: 0000000000000030 CR3: 000000193b9a2000 CR4: 00000000007607e0 [2069091.573424] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [2069091.587876] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [2069091.602007] PKRU: 00000000 [2069091.616010] Call Trace: [2069091.629902] [<ffffffffc0663969>] qedf_process_cqe+0x109/0x2e0 [qedf] [2069091.643941] [<ffffffffc0663b66>] qedf_fp_io_handler+0x26/0x60 [qedf] [2069091.657948] [<ffffffff85ebddcf>] process_one_work+0x17f/0x440 [2069091.672111] [<ffffffff85ebeee6>] worker_thread+0x126/0x3c0 [2069091.686057] [<ffffffff85ebedc0>] ? manage_workers.isra.26+0x2a0/0x2a0 [2069091.700033] [<ffffffff85ec5da1>] kthread+0xd1/0xe0 [2069091.713891] [<ffffffff85ec5cd0>] ? insert_kthread_work+0x40/0x40
Add check in qedf_process_error_detect(). When flush is active, let the cmds be completed from the cleanup contex.
--- drivers/scsi/qedf/qedf_io.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/scsi/qedf/qedf_io.c +21 -1
@@ -1520,9 +1520,19 @@ void qedf_process_error_detect(struct qedf_ctx *qedf, struct fcoe_cqe *cqe, {int rval; +if (io_req ==NULL ) { +QEDF_INFO (NULL ,QEDF_LOG_IO ,"io_req is NULL.\n" ); +return ; + } + +if (io_req->fcport ==NULL ) { +QEDF_INFO (NULL ,QEDF_LOG_IO ,"fcport is NULL.\n" ); +return ; + } +if (!cqe) {QEDF_INFO (&qedf->dbg_ctx,QEDF_LOG_IO , -"cqe is NULL for io_req %p\n" , io_req); +"cqe is NULL for io_req %p\n" , io_req);return ; }
@@ -1538,6 +1548,16 @@ void qedf_process_error_detect(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,le32_to_cpu (cqe->cqe_info.err_info.rx_buf_off), le32_to_cpu(cqe->cqe_info.err_info.rx_id)); +/* When flush is active, let the cmds be flushed out from the cleanup context */ +if (test_bit (QEDF_RPORT_IN_TARGET_RESET , &io_req->fcport->flags) || + (test_bit (QEDF_RPORT_IN_LUN_RESET , &io_req->fcport->flags) && + io_req->sc_cmd->device->lun == (u64 )io_req->fcport->lun_reset_lun)) { +QEDF_ERR (&qedf->dbg_ctx, +"Dropping EQE for xid=0x%x as fcport is flushing" , + io_req->xid); +return ; + } +if (qedf->stop_io_on_error) {qedf_stop_all_io (qedf);return ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 97/102 sched/fair: Fix CFS bandwidth hrtimer expiry type
In reply to Sasha LevinFrom: Odin Ugedal <[email protected]>
[ Upstream commit 72d0ad7cb5bad265adb2014dbe46c4ccb11afaba ]
The time remaining until expiry of the refresh_timer can be negative. Casting the type to an unsigned 64-bit value will cause integer underflow, making the runtime_refresh_within return false instead of true. These situations are rare, but they do happen.
This does not cause user-facing issues or errors; other than possibly unthrottling cfs_rq's using runtime from the previous period(s), making the CFS bandwidth enforcement less strict in those (special) situations.
--- kernel/sched/fair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/fair.c +2 -2
@@ -5052,7 +5052,7 @@ static const u64 cfs_bandwidth_slack_period = 5 * NSEC_PER_MSEC;static int runtime_refresh_within (struct cfs_bandwidth *cfs_b,u64 min_expire) {struct hrtimer *refresh_timer = &cfs_b->period_timer; -u64 remaining; +s64 remaining;/* if the call-back is running a quota refresh is already occurring */ if (hrtimer_callback_running (refresh_timer))
@@ -5060,7 +5060,7 @@ static int runtime_refresh_within(struct cfs_bandwidth *cfs_b, u64 min_expire)/* is a quota refresh about to occur? */ remaining =ktime_to_ns (hrtimer_expires_remaining (refresh_timer)); -if (remaining < min_expire) +if (remaining < (s64 )min_expire)return 1 ;return 0 ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 98/102 perf/x86/intel/uncore: Clean up error handling path of iio mapping
In reply to Sasha LevinFrom: Kan Liang <[email protected]>
[ Upstream commit d4ba0b06306a70c99a43f9d452886a86e2d3bd26 ]
The error handling path of iio mapping looks fragile. We already fixed one issue caused by it, commit f797f05d917f ("perf/x86/intel/uncore:
Fix for iio mapping on Skylake Server"). Clean up the error handling path and make the code robust.
--- arch/x86/events/intel/uncore_snbep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/events/intel/uncore_snbep.c +4 -2
@@ -3795,11 +3795,11 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)/* One more for NULL. */ attrs =kcalloc ((uncore_max_dies () +1 ),sizeof (*attrs),GFP_KERNEL );if (!attrs) - goto err; + goto clear_topology; eas =kcalloc (uncore_max_dies (),sizeof (*eas),GFP_KERNEL );if (!eas) - goto err; + goto clear_attrs;for (die =0 ; die <uncore_max_dies (); die++) {sprintf (buf,"die%ld" , die);
@@ -3820,7 +3820,9 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)for (; die >=0 ; die--)kfree (eas[die].attr.attr.name);kfree (eas); +clear_attrs:kfree (attrs); +clear_topology:kfree (type->topology); clear_attr_update: type->attr_update =NULL ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 99/102 thermal/core/thermal_of: Stop zone device before unregistering it
In reply to Sasha LevinFrom: Dmitry Osipenko <[email protected]>
[ Upstream commit 5e5c9f9a75fc4532980c2e699caf8a36070a3a2e ]
Zone device is enabled after thermal_zone_of_sensor_register() completion, but it's not disabled before senor is unregistered, leaving temperature polling active. This results in accessing a disabled zone device and produces a warning about this problem. Stop zone device before unregistering it in order to fix this "use-after-free" problem.
--- drivers/thermal/thermal_of.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/thermal/thermal_of.c +3 -0
@@ -559,6 +559,9 @@ void thermal_zone_of_sensor_unregister(struct device *dev,if (!tz)return ; +/* stop temperature polling */ +thermal_zone_device_disable (tzd); +mutex_lock (&tzd->lock); tzd->ops->get_temp =NULL ; tzd->ops->get_trend =NULL ;
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 100/102 s390/traps: do not test MONITOR CALL without CONFIG_BUG
In reply to Sasha LevinFrom: Ilya Leoshkevich <[email protected]>
[ Upstream commit b8e9cc20b808e26329090c19ff80b7f5098e98ff ]
tinyconfig fails to boot, because without CONFIG_BUG report_bug() always returns BUG_TRAP_TYPE_BUG, which causes mc 0,0 in test_monitor_call() to panic. Fix by skipping the test without CONFIG_BUG.
--- arch/s390/kernel/traps.c | 2 ++ 1 file changed, 2 insertions(+)
arch/s390/kernel/traps.c +2 -0
@@ -276,6 +276,8 @@ static void __init test_monitor_call(void) {int val =1 ; +if (!IS_ENABLED (CONFIG_BUG )) +return ; asmvolatile (" mc 0,0\n" "0: xgr %0,%0\n"
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 101/102 s390: introduce proper type handling call_on_stack() macro
In reply to Sasha LevinFrom: Heiko Carstens <[email protected]>
[ Upstream commit 41d71fe59cce41237f24f3b7bdc1b414069a34ed ]
The existing CALL_ON_STACK() macro allows for subtle bugs:
- There is no type checking of the function that is being called. That
is: missing or too many arguments do not cause any compile error or warning. The same is true if the return type of the called function changes. This can lead to quite random bugs.
- Sign and zero extension of arguments is missing. Given that the s390 C ABI requires that the caller of a function performs proper sign and zero extension this can also lead to subtle bugs.
- If arguments to the CALL_ON_STACK() macros contain functions calls register corruption can happen due to register asm constructs being used.
Therefore introduce a new call_on_stack() macro which is supposed to fix all these problems.
--- arch/s390/include/asm/stacktrace.h | 97 ++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+)
arch/s390/include/asm/stacktrace.h +97 -0
@@ -129,6 +129,103 @@ struct stack_frame { r2; \ }) +#define CALL_LARGS_0 (...) \ + long dummy = 0 +#define CALL_LARGS_1 (t1, a1) \ + long arg1 = (long)(t1)(a1) +#define CALL_LARGS_2 (t1, a1, t2, a2) \ + CALL_LARGS_1(t1, a1); \ + long arg2 = (long)(t2)(a2) +#define CALL_LARGS_3 (t1, a1, t2, a2, t3, a3) \ + CALL_LARGS_2(t1, a1, t2, a2); \ + long arg3 = (long)(t3)(a3) +#define CALL_LARGS_4 (t1, a1, t2, a2, t3, a3, t4, a4) \ + CALL_LARGS_3(t1, a1, t2, a2, t3, a3); \ + long arg4 = (long)(t4)(a4) +#define CALL_LARGS_5 (t1, a1, t2, a2, t3, a3, t4, a4, t5, a5) \ + CALL_LARGS_4(t1, a1, t2, a2, t3, a3, t4, a4); \ + long arg5 = (long)(t5)(a5) + +#define CALL_REGS_0 \ + register long r2 asm("2") = dummy +#define CALL_REGS_1 \ + register long r2 asm("2") = arg1 +#define CALL_REGS_2 \ + CALL_REGS_1; \ + register long r3 asm("3") = arg2 +#define CALL_REGS_3 \ + CALL_REGS_2; \ + register long r4 asm("4") = arg3 +#define CALL_REGS_4 \ + CALL_REGS_3; \ + register long r5 asm("5") = arg4 +#define CALL_REGS_5 \ + CALL_REGS_4; \ + register long r6 asm("6") = arg5 + +#define CALL_TYPECHECK_0 (...) +#define CALL_TYPECHECK_1 (t, a, ...) \ + typecheck(t, a) +#define CALL_TYPECHECK_2 (t, a, ...) \ + CALL_TYPECHECK_1(__VA_ARGS__); \ + typecheck(t, a) +#define CALL_TYPECHECK_3 (t, a, ...) \ + CALL_TYPECHECK_2(__VA_ARGS__); \ + typecheck(t, a) +#define CALL_TYPECHECK_4 (t, a, ...) \ + CALL_TYPECHECK_3(__VA_ARGS__); \ + typecheck(t, a) +#define CALL_TYPECHECK_5 (t, a, ...) \ + CALL_TYPECHECK_4(__VA_ARGS__); \ + typecheck(t, a) + +#define CALL_PARM_0 (...) void +#define CALL_PARM_1 (t, a, ...) t +#define CALL_PARM_2 (t, a, ...) t, CALL_PARM_1(__VA_ARGS__) +#define CALL_PARM_3 (t, a, ...) t, CALL_PARM_2(__VA_ARGS__) +#define CALL_PARM_4 (t, a, ...) t, CALL_PARM_3(__VA_ARGS__) +#define CALL_PARM_5 (t, a, ...) t, CALL_PARM_4(__VA_ARGS__) +#define CALL_PARM_6 (t, a, ...) t, CALL_PARM_5(__VA_ARGS__) + +/* +* Use call_on_stack() to call a function switching to a specified +* stack. Proper sign and zero extension of function arguments is +* done. Usage: +* +* rc = call_on_stack(nr, stack, rettype, fn, t1, a1, t2, a2, ...) +* +* - nr specifies the number of function arguments of fn. +* - stack specifies the stack to be used. +* - fn is the function to be called. +* - rettype is the return type of fn. +* - t1, a1, ... are pairs, where t1 must match the type of the first +* argument of fn, t2 the second, etc. a1 is the corresponding +* first function argument (not name), etc. +*/ +#define call_on_stack (nr, stack, rettype, fn, ...) \ +({ \ + rettype (*__fn)(CALL_PARM_##nr(__VA_ARGS__)) = fn; \ + unsigned long frame = current_frame_address(); \ + unsigned long __stack = stack; \ + unsigned long prev; \ + CALL_LARGS_##nr(__VA_ARGS__); \ + CALL_REGS_##nr; \ + \ + CALL_TYPECHECK_##nr(__VA_ARGS__); \ + asm volatile( \ + " lgr %[_prev],15\n" \ + " lg 15,%[_stack]\n" \ + " stg %[_frame],%[_bc](15)\n" \ + " brasl 14,%[_fn]\n" \ + " lgr 15,%[_prev]\n" \ + : [_prev] "=&d" (prev), CALL_FMT_##nr \ + : [_stack] "R" (__stack), \ + [_bc] "i" (offsetof(struct stack_frame, back_chain)), \ + [_frame] "d" (frame), \ + [_fn] "X" (__fn) : CALL_CLOBBER_##nr); \ + (rettype)r2; \ +}) +#define CALL_ON_STACK_NORETURN (fn, stack) \ ({ \ asm volatile( \
Signature · 1 line
2.30.2
Sasha Levin
maintainerPATCH 102/102 cifs: prevent NULL deref in cifs_compose_mount_options()
In reply to Sasha LevinFrom: Paulo Alcantara <[email protected]>
[ Upstream commit 03313d1c3a2f086bb60920607ab79ac8f8578306 ]
The optional @ref parameter might contain an NULL node_name, so prevent dereferencing it in cifs_compose_mount_options().
Addresses-Coverity: 1476408 ("Explicit null dereferenced")
--- fs/cifs/cifs_dfs_ref.c | 3 +++ 1 file changed, 3 insertions(+)
fs/cifs/cifs_dfs_ref.c +3 -0
@@ -151,6 +151,9 @@ char *cifs_compose_mount_options(const char *sb_mountdata,return ERR_PTR (-EINVAL );if (ref) { +if (WARN_ON_ONCE (!ref->node_name || ref->path_consumed <0 )) +return ERR_PTR (-EINVAL ); +if (strlen (fullpath) - ref->path_consumed) { prepath = fullpath + ref->path_consumed;/* skip initial delimiter */
Signature · 1 line
2.30.2