Skip to content

Commit 67d84ad

Browse files
authored
Merge branch 'msm8916-mainline:main' into msm8996-samsung
2 parents acedb40 + 45534d5 commit 67d84ad

File tree

3 files changed

+26
-2
lines changed

3 files changed

+26
-2
lines changed

Documentation/boot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Following commands are supported:
3333
- `initrd <initramfs>` - Path to the initramfs file.
3434
- `fdt <devicetree>` - Path to the devicetree.
3535
- `fdtdir <directory>` - Path to automatically find the DT in.
36-
- `append <cmdlie>` - Cmdline to boot the kernel with.
36+
- `append <cmdline>` - Cmdline to boot the kernel with.
3737

3838
> [!NOTE]
3939
> lk2nd includes only a very rudimentary extlinux support at this time.

Documentation/devices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
- Motorola Moto G 2014 LTE - thea
149149
- Samsung Galaxy Grand 2 - SM-G7102
150150
- Samsung Galaxy Tab 4 10.1 (2014) - SM-T530, SM-T535
151-
- Samsung Galaxy Tab 4 8.0 (2014) - SM-T330, SM-T330NU
151+
- Samsung Galaxy Tab 4 8.0 (2014) - SM-T330, SM-T330NU, SM-T331
152152

153153
### lk2nd-msm8994
154154

lk2nd/device/dts/msm8226/msm8226-samsung.dts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,29 @@
3030
};
3131
};
3232
};
33+
34+
millet3g {
35+
model = "Samsung Galaxy Tab 4 8.0 3G (SM-T331)";
36+
compatible = "samsung,millet3g", "samsung,millet";
37+
lk2nd,match-bootloader = "T331*";
38+
39+
lk2nd,dtb-files = "msm8226-samsung-millet3g", "msm8226-samsung-milletwifi";
40+
41+
gpio-keys {
42+
compatible = "gpio-keys";
43+
home {
44+
lk2nd,code = <KEY_HOME>;
45+
gpios = <&tlmm 108 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
46+
};
47+
down {
48+
lk2nd,code = <KEY_VOLUMEDOWN>;
49+
gpios = <&tlmm 107 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
50+
};
51+
up {
52+
lk2nd,code = <KEY_VOLUMEUP>;
53+
gpios = <&tlmm 106 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
54+
};
55+
};
56+
};
3357
};
3458

0 commit comments

Comments
 (0)