tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'arm-fixes-6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

Pull ARM SoC fixes from Arnd Bergmann:
"Most of these changes are Qualcomm SoC specific and came in just after
I sent out the last set of fixes. This includes two regression fixes
for SoC drivers, a defconfig change to ensure the Lenovo X13s is
usable and 11 changes to DT files to fix regressions and minor
platform specific issues.

Tony and Chunyan step back from their respective maintainership roles
on the omap and unisoc platforms, and Christophe in turn takes over
maintaining some of the Freescale SoC drivers that he has been taking
care of in practice already.

Lastly, there are two trivial fixes for the davinci and sunxi
platforms"

* tag 'arm-fixes-6.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
MAINTAINERS: Update FREESCALE SOC DRIVERS and QUICC ENGINE LIBRARY
MAINTAINERS: Add more maintainers for omaps
ARM: davinci: Convert comma to semicolon
MAINTAINERS: Move myself from SPRD Maintainer to Reviewer
Revert "dt-bindings: cache: qcom,llcc: correct QDU1000 reg entries"
arm64: dts: qcom: qdu1000: Fix LLCC reg property
arm64: dts: qcom: sm6115: add iommu for sdhc_1
arm64: dts: qcom: x1e80100-crd: fix DAI used for headset recording
arm64: dts: qcom: x1e80100-crd: fix WCD audio codec TX port mapping
soc: qcom: pmic_glink: disable UCSI on sc8280xp
arm64: defconfig: enable Elan i2c-hid driver
arm64: dts: qcom: sc8280xp-crd: use external pull up for touch reset
arm64: dts: qcom: sc8280xp-x13s: fix touchscreen power on
arm64: dts: qcom: x1e80100: Fix PCIe 6a reg offsets and add MHI
arm64: dts: qcom: sa8775p: Correct IRQ number of EL2 non-secure physical timer
arm64: dts: allwinner: Fix PMIC interrupt number
arm64: dts: qcom: sc8280xp: Set status = "reserved" on PSHOLD
arm64: dts: qcom: x1e80100-*: Allocate some CMA buffers
arm64: dts: qcom: sc8180x: Fix LLCC reg property again

Linus Torvalds e091caf9 f469cf96

+78 -28
+1 -1
Documentation/devicetree/bindings/cache/qcom,llcc.yaml
··· 66 66 compatible: 67 67 contains: 68 68 enum: 69 - - qcom,qdu1000-llcc 70 69 - qcom,sc7180-llcc 71 70 - qcom,sm6350-llcc 72 71 then: ··· 103 104 compatible: 104 105 contains: 105 106 enum: 107 + - qcom,qdu1000-llcc 106 108 - qcom,sc8180x-llcc 107 109 - qcom,sc8280xp-llcc 108 110 - qcom,x1e80100-llcc
+9 -4
MAINTAINERS
··· 2892 2892 ARM/SPREADTRUM SoC SUPPORT 2893 2893 M: Orson Zhai <orsonzhai@gmail.com> 2894 2894 M: Baolin Wang <baolin.wang7@gmail.com> 2895 - M: Chunyan Zhang <zhang.lyra@gmail.com> 2895 + R: Chunyan Zhang <zhang.lyra@gmail.com> 2896 2896 S: Maintained 2897 2897 F: arch/arm64/boot/dts/sprd 2898 2898 N: sprd ··· 8832 8832 8833 8833 FREESCALE QUICC ENGINE LIBRARY 8834 8834 M: Qiang Zhao <qiang.zhao@nxp.com> 8835 + M: Christophe Leroy <christophe.leroy@csgroup.eu> 8835 8836 L: linuxppc-dev@lists.ozlabs.org 8836 8837 S: Maintained 8837 8838 F: drivers/soc/fsl/qe/ ··· 8882 8881 F: drivers/tty/serial/ucc_uart.c 8883 8882 8884 8883 FREESCALE SOC DRIVERS 8884 + M: Christophe Leroy <christophe.leroy@csgroup.eu> 8885 8885 L: linuxppc-dev@lists.ozlabs.org 8886 8886 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 8887 - S: Orphan 8887 + S: Maintained 8888 8888 F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml 8889 8889 F: Documentation/devicetree/bindings/soc/fsl/ 8890 8890 F: drivers/soc/fsl/ ··· 16447 16445 OMAP1 SUPPORT 16448 16446 M: Aaro Koskinen <aaro.koskinen@iki.fi> 16449 16447 M: Janusz Krzysztofik <jmkrzyszt@gmail.com> 16450 - M: Tony Lindgren <tony@atomide.com> 16448 + R: Tony Lindgren <tony@atomide.com> 16451 16449 L: linux-omap@vger.kernel.org 16452 16450 S: Maintained 16453 16451 Q: http://patchwork.kernel.org/project/linux-omap/list/ ··· 16459 16457 F: include/linux/platform_data/i2c-omap.h 16460 16458 16461 16459 OMAP2+ SUPPORT 16460 + M: Aaro Koskinen <aaro.koskinen@iki.fi> 16461 + M: Andreas Kemnade <andreas@kemnade.info> 16462 + M: Kevin Hilman <khilman@baylibre.com> 16463 + M: Roger Quadros <rogerq@kernel.org> 16462 16464 M: Tony Lindgren <tony@atomide.com> 16463 16465 L: linux-omap@vger.kernel.org 16464 16466 S: Maintained 16465 - W: http://www.muru.com/linux/omap/ 16466 16467 W: http://linux.omap.com/ 16467 16468 Q: http://patchwork.kernel.org/project/linux-omap/list/ 16468 16469 T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
+1 -1
arch/arm/mach-davinci/pm.c
··· 61 61 62 62 /* Configure sleep count in deep sleep register */ 63 63 val = __raw_readl(pm_config.deepsleep_reg); 64 - val &= ~DEEPSLEEP_SLEEPCOUNT_MASK, 64 + val &= ~DEEPSLEEP_SLEEPCOUNT_MASK; 65 65 val |= pm_config.sleepcount; 66 66 __raw_writel(val, pm_config.deepsleep_reg); 67 67
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h64-remix-mini-pc.dts
··· 191 191 compatible = "x-powers,axp803"; 192 192 reg = <0x3a3>; 193 193 interrupt-parent = <&r_intc>; 194 - interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_LOW>; 194 + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_LOW>; 195 195 x-powers,drive-vbus-en; 196 196 197 197 vin1-supply = <&reg_vcc5v>;
+15 -1
arch/arm64/boot/dts/qcom/qdu1000.dtsi
··· 1459 1459 1460 1460 system-cache-controller@19200000 { 1461 1461 compatible = "qcom,qdu1000-llcc"; 1462 - reg = <0 0x19200000 0 0xd80000>, 1462 + reg = <0 0x19200000 0 0x80000>, 1463 + <0 0x19300000 0 0x80000>, 1464 + <0 0x19600000 0 0x80000>, 1465 + <0 0x19700000 0 0x80000>, 1466 + <0 0x19a00000 0 0x80000>, 1467 + <0 0x19b00000 0 0x80000>, 1468 + <0 0x19e00000 0 0x80000>, 1469 + <0 0x19f00000 0 0x80000>, 1463 1470 <0 0x1a200000 0 0x80000>; 1464 1471 reg-names = "llcc0_base", 1472 + "llcc1_base", 1473 + "llcc2_base", 1474 + "llcc3_base", 1475 + "llcc4_base", 1476 + "llcc5_base", 1477 + "llcc6_base", 1478 + "llcc7_base", 1465 1479 "llcc_broadcast_base"; 1466 1480 interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>; 1467 1481 };
+1 -1
arch/arm64/boot/dts/qcom/sa8775p.dtsi
··· 3605 3605 interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>, 3606 3606 <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>, 3607 3607 <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>, 3608 - <GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>; 3608 + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>; 3609 3609 }; 3610 3610 3611 3611 pcie0: pcie@1c00000 {
+7 -4
arch/arm64/boot/dts/qcom/sc8180x.dtsi
··· 2647 2647 2648 2648 system-cache-controller@9200000 { 2649 2649 compatible = "qcom,sc8180x-llcc"; 2650 - reg = <0 0x09200000 0 0x50000>, <0 0x09280000 0 0x50000>, 2651 - <0 0x09300000 0 0x50000>, <0 0x09380000 0 0x50000>, 2652 - <0 0x09600000 0 0x50000>; 2650 + reg = <0 0x09200000 0 0x58000>, <0 0x09280000 0 0x58000>, 2651 + <0 0x09300000 0 0x58000>, <0 0x09380000 0 0x58000>, 2652 + <0 0x09400000 0 0x58000>, <0 0x09480000 0 0x58000>, 2653 + <0 0x09500000 0 0x58000>, <0 0x09580000 0 0x58000>, 2654 + <0 0x09600000 0 0x58000>; 2653 2655 reg-names = "llcc0_base", "llcc1_base", "llcc2_base", 2654 - "llcc3_base", "llcc_broadcast_base"; 2656 + "llcc3_base", "llcc4_base", "llcc5_base", 2657 + "llcc6_base", "llcc7_base", "llcc_broadcast_base"; 2655 2658 interrupts = <GIC_SPI 582 IRQ_TYPE_LEVEL_HIGH>; 2656 2659 }; 2657 2660
+1 -2
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
··· 977 977 reset-n-pins { 978 978 pins = "gpio99"; 979 979 function = "gpio"; 980 - output-high; 981 - drive-strength = <16>; 980 + bias-disable; 982 981 }; 983 982 }; 984 983
+8 -7
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
··· 655 655 656 656 status = "okay"; 657 657 658 - /* FIXME: verify */ 659 658 touchscreen@10 { 660 - compatible = "hid-over-i2c"; 659 + compatible = "elan,ekth5015m", "elan,ekth6915"; 661 660 reg = <0x10>; 662 661 663 - hid-descr-addr = <0x1>; 664 662 interrupts-extended = <&tlmm 175 IRQ_TYPE_LEVEL_LOW>; 665 - vdd-supply = <&vreg_misc_3p3>; 666 - vddl-supply = <&vreg_s10b>; 663 + reset-gpios = <&tlmm 99 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; 664 + no-reset-on-power-off; 665 + 666 + vcc33-supply = <&vreg_misc_3p3>; 667 + vccio-supply = <&vreg_misc_3p3>; 667 668 668 669 pinctrl-names = "default"; 669 670 pinctrl-0 = <&ts0_default>; ··· 1497 1496 reset-n-pins { 1498 1497 pins = "gpio99"; 1499 1498 function = "gpio"; 1500 - output-high; 1501 - drive-strength = <16>; 1499 + drive-strength = <2>; 1500 + bias-disable; 1502 1501 }; 1503 1502 }; 1504 1503
+2
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
··· 4623 4623 restart@c264000 { 4624 4624 compatible = "qcom,pshold"; 4625 4625 reg = <0 0x0c264000 0 0x4>; 4626 + /* TZ seems to block access */ 4627 + status = "reserved"; 4626 4628 }; 4627 4629 4628 4630 tsens1: thermal-sensor@c265000 {
+1
arch/arm64/boot/dts/qcom/sm6115.dtsi
··· 1090 1090 1091 1091 power-domains = <&rpmpd SM6115_VDDCX>; 1092 1092 operating-points-v2 = <&sdhc1_opp_table>; 1093 + iommus = <&apps_smmu 0x00c0 0x0>; 1093 1094 interconnects = <&system_noc MASTER_SDCC_1 RPM_ALWAYS_TAG 1094 1095 &bimc SLAVE_EBI_CH0 RPM_ALWAYS_TAG>, 1095 1096 <&bimc MASTER_AMPSS_M0 RPM_ALWAYS_TAG
+11 -2
arch/arm64/boot/dts/qcom/x1e80100-crd.dts
··· 49 49 stdout-path = "serial0:115200n8"; 50 50 }; 51 51 52 + reserved-memory { 53 + linux,cma { 54 + compatible = "shared-dma-pool"; 55 + size = <0x0 0x8000000>; 56 + reusable; 57 + linux,cma-default; 58 + }; 59 + }; 60 + 52 61 sound { 53 62 compatible = "qcom,x1e80100-sndcard"; 54 63 model = "X1E80100-CRD"; ··· 102 93 }; 103 94 104 95 codec { 105 - sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>; 96 + sound-dai = <&wcd938x 1>, <&swr2 1>, <&lpass_txmacro 0>; 106 97 }; 107 98 108 99 platform { ··· 753 744 wcd_tx: codec@0,3 { 754 745 compatible = "sdw20217010d00"; 755 746 reg = <0 3>; 756 - qcom,tx-port-mapping = <1 1 2 3>; 747 + qcom,tx-port-mapping = <2 2 3 4>; 757 748 }; 758 749 }; 759 750
+9
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
··· 23 23 stdout-path = "serial0:115200n8"; 24 24 }; 25 25 26 + reserved-memory { 27 + linux,cma { 28 + compatible = "shared-dma-pool"; 29 + size = <0x0 0x8000000>; 30 + reusable; 31 + linux,cma-default; 32 + }; 33 + }; 34 + 26 35 vph_pwr: vph-pwr-regulator { 27 36 compatible = "regulator-fixed"; 28 37
+6 -4
arch/arm64/boot/dts/qcom/x1e80100.dtsi
··· 2737 2737 device_type = "pci"; 2738 2738 compatible = "qcom,pcie-x1e80100"; 2739 2739 reg = <0 0x01bf8000 0 0x3000>, 2740 - <0 0x70000000 0 0xf1d>, 2741 - <0 0x70000f20 0 0xa8>, 2740 + <0 0x70000000 0 0xf20>, 2741 + <0 0x70000f40 0 0xa8>, 2742 2742 <0 0x70001000 0 0x1000>, 2743 - <0 0x70100000 0 0x100000>; 2743 + <0 0x70100000 0 0x100000>, 2744 + <0 0x01bfb000 0 0x1000>; 2744 2745 reg-names = "parf", 2745 2746 "dbi", 2746 2747 "elbi", 2747 2748 "atu", 2748 - "config"; 2749 + "config", 2750 + "mhi"; 2749 2751 #address-cells = <3>; 2750 2752 #size-cells = <2>; 2751 2753 ranges = <0x01000000 0 0x00000000 0 0x70200000 0 0x100000>,
+1
arch/arm64/configs/defconfig
··· 1036 1036 CONFIG_HID_MULTITOUCH=m 1037 1037 CONFIG_I2C_HID_ACPI=m 1038 1038 CONFIG_I2C_HID_OF=m 1039 + CONFIG_I2C_HID_OF_ELAN=m 1039 1040 CONFIG_USB=y 1040 1041 CONFIG_USB_OTG=y 1041 1042 CONFIG_USB_XHCI_HCD=y
+4
drivers/soc/qcom/pmic_glink.c
··· 348 348 mutex_unlock(&__pmic_glink_lock); 349 349 } 350 350 351 + static const unsigned long pmic_glink_sc8280xp_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | 352 + BIT(PMIC_GLINK_CLIENT_ALTMODE); 353 + 351 354 static const unsigned long pmic_glink_sm8450_client_mask = BIT(PMIC_GLINK_CLIENT_BATT) | 352 355 BIT(PMIC_GLINK_CLIENT_ALTMODE) | 353 356 BIT(PMIC_GLINK_CLIENT_UCSI); 354 357 355 358 static const struct of_device_id pmic_glink_of_match[] = { 359 + { .compatible = "qcom,sc8280xp-pmic-glink", .data = &pmic_glink_sc8280xp_client_mask }, 356 360 { .compatible = "qcom,pmic-glink", .data = &pmic_glink_sm8450_client_mask }, 357 361 {} 358 362 };