admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'qcom-arm32-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/dt

Browse Source 
Qualcomm Arm32 DeviceTree updates for v6.19

In addition to a variety of cleanups and reordering of nodes, four GSBIs
are added to the MSM8960 platform.
On the MSM8226-based Samsung Galaxy Grand 2, a simple framebuffer is
defined.

* tag 'qcom-arm32-for-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  ARM: dts: qcom: msm8226-samsung-ms013g: add simple-framebuffer
  ARM: dts: qcom: msm8960: rename msmgpio node to tlmm
  ARM: dts: qcom: msm8960: add I2C nodes for gsbi1 and gsbi8
  ARM: dts: qcom: msm8960: add I2C nodes for gsbi10 and gsbi12
  ARM: dts: qcom: msm8960: inline qcom-msm8960-pins.dtsi
  ARM: dts: qcom: msm8960: reorder nodes and properties

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2025-11-21 17:21:11 +01:00
parent 2ddb010a9e 84df51667a
commit c02dce25bc
6 changed files with 702 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/boot/dts/qcom/qcom-msm8226-samsung-ms013g.dts
View File

@@ -13,13 +13,37 @@
chassis-type = "handset";
aliases {
display0 = &framebuffer0;
mmc0 = &sdhc_1; /* SDC1 eMMC slot */
mmc1 = &sdhc_2; /* SDC2 SD card slot */
serial0 = &blsp1_uart3;
};
chosen {
stdout-path = "serial0:115200n8";
#address-cells = <1>;
#size-cells = <1>;
ranges;
stdout-path = "display0";
framebuffer0: framebuffer@3200000 {
compatible = "simple-framebuffer";
reg = <0x03200000 0x800000>;
memory-region = <&cont_splash_region>;
width = <720>;
height = <1280>;
stride = <(720 * 3)>;
format = "r8g8b8";
clocks = <&mmcc MDSS_AHB_CLK>,
<&mmcc MDSS_AXI_CLK>,
<&mmcc MDSS_BYTE0_CLK>,
<&mmcc MDSS_MDP_CLK>,
<&mmcc MDSS_PCLK0_CLK>,
<&mmcc MDSS_VSYNC_CLK>;
power-domains = <&mmcc MDSS_GDSC>;
};
};
gpio-hall-sensor {
@@ -93,6 +117,11 @@
};
reserved-memory {
cont_splash_region: cont-splash@3200000 {
reg = <0x03200000 0x800000>;
no-map;
};
smem_region: smem@fa00000 {
reg = <0x0fa00000 0x100000>;
no-map;

10
arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts
View File

@@ -19,7 +19,7 @@
ext_l2: gpio-regulator {
compatible = "regulator-fixed";
regulator-name = "ext_l2";
gpio = <&msmgpio 91 0>;
gpio = <&tlmm 91 0>;
startup-delay-us = <10000>;
enable-active-high;
};
@@ -38,12 +38,12 @@
ethernet@0 {
compatible = "micrel,ks8851";
reg = <0>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <90 IRQ_TYPE_LEVEL_LOW>;
spi-max-frequency = <5400000>;
vdd-supply = <&ext_l2>;
vdd-io-supply = <&pm8921_lvs6>;
reset-gpios = <&msmgpio 89 0>;
reset-gpios = <&tlmm 89 0>;
};
};
@@ -56,7 +56,7 @@
status = "okay";
};
&msmgpio {
&tlmm {
spi1_default: spi1-default-state {
mosi-pins {
pins = "gpio6";
@@ -90,7 +90,7 @@
};
&pm8921 {
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
};
&pm8921_keypad {

61
arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi
View File

@@ -1,61 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-only
&msmgpio {
i2c3_default_state: i2c3-default-state {
i2c3-pins {
pins = "gpio16", "gpio17";
function = "gsbi3";
drive-strength = <8>;
bias-disable;
};
};
i2c3_sleep_state: i2c3-sleep-state {
i2c3-pins {
pins = "gpio16", "gpio17";
function = "gpio";
drive-strength = <2>;
bias-bus-hold;
};
};
sdcc3_default_state: sdcc3-default-state {
clk-pins {
pins = "sdc3_clk";
drive-strength = <8>;
bias-disable;
};
cmd-pins {
pins = "sdc3_cmd";
drive-strength = <8>;
bias-pull-up;
};
data-pins {
pins = "sdc3_data";
drive-strength = <8>;
bias-pull-up;
};
};
sdcc3_sleep_state: sdcc3-sleep-state {
clk-pins {
pins = "sdc3_clk";
drive-strength = <2>;
bias-disable;
};
cmd-pins {
pins = "sdc3_cmd";
drive-strength = <2>;
bias-pull-up;
};
data-pins {
pins = "sdc3_data";
drive-strength = <2>;
bias-pull-up;
};
};
};

12
arch/arm/boot/dts/qcom/qcom-msm8960-samsung-expressatt.dts
View File

@@ -31,7 +31,7 @@
key-home {
label = "Home";
gpios = <&msmgpio 40 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 40 GPIO_ACTIVE_LOW>;
debounce-interval = <5>;
linux,code = <KEY_HOMEPAGE>;
wakeup-event-action = <EV_ACT_ASSERTED>;
@@ -40,14 +40,14 @@
key-volume-up {
label = "Volume Up";
gpios = <&msmgpio 50 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
debounce-interval = <5>;
linux,code = <KEY_VOLUMEUP>;
};
key-volume-down {
label = "Volume Down";
gpios = <&msmgpio 81 GPIO_ACTIVE_LOW>;
gpios = <&tlmm 81 GPIO_ACTIVE_LOW>;
debounce-interval = <5>;
linux,code = <KEY_VOLUMEDOWN>;
};
@@ -102,7 +102,7 @@
touchscreen@4a {
compatible = "atmel,maxtouch";
reg = <0x4a>;
interrupt-parent = <&msmgpio>;
interrupt-parent = <&tlmm>;
interrupts = <11 IRQ_TYPE_EDGE_FALLING>;
vdda-supply = <&pm8921_lvs6>;
vdd-supply = <&pm8921_l17>;
@@ -111,7 +111,7 @@
};
};
&msmgpio {
&tlmm {
spi1_default: spi1-default-state {
mosi-pins {
pins = "gpio6";
@@ -160,7 +160,7 @@
};
&pm8921 {
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
};
&rpm {

2
arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts
View File

@@ -54,7 +54,7 @@
};
&pm8921 {
interrupts-extended = <&msmgpio 104 IRQ_TYPE_LEVEL_LOW>;
interrupts-extended = <&tlmm 104 IRQ_TYPE_LEVEL_LOW>;
};
&pm8921_gpio {

1082
arch/arm/boot/dts/qcom/qcom-msm8960.dtsi
View File

File diff suppressed because it is too large Load Diff