arm64: dts: txl: add 4g emmc support

PD#170439: arm64: dts: txl: add 4g emmc support

arm64: dts: txl: add 4g emmc config for txl board

Change-Id: I452efa07da038d8d8316c8afadf121522122afeb
Signed-off-by: jiaming.huang <jiaming.huang@amlogic.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index c7ae63fee9d7f3b969a0cfc676378683d2304dc3..8c9ceb7d7a81bb4441319b8a7c7fb6d7494683fe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14539,3 +14539,7 @@ F:      arch/arm64/boot/dts/amlogic/mesontxl_p321-panel.dtsi
 AMLOGIC REBOOT
 M:     Jian Hu <jian.hu@amlogic.com>
 F:     Documentation/devicetree/bindings/amlogic/reboot-meson.txt
+
+AMLOGIC PARTITION DTSI
+M: Jiaming Huang <jiaming.huang@amlogic.com>
+F: arch/arm64/boot/dts/amlogic/partition_tv_4G.dtsi
\ No newline at end of file

diff --git a/arch/arm64/boot/dts/amlogic/partition_tv_4G.dtsi b/arch/arm64/boot/dts/amlogic/partition_tv_4G.dtsi
new file mode 100644 (file)
index 0000000..9368933
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/partition_tv_4G.dtsi
@@ -0,0 +1,141 @@
+/*
+ * Amlogic partition set for normal
+ *
+ * Copyright (c) 2017-2017 Amlogic Ltd
+ *
+ * This file is licensed under a dual GPLv2 or BSD license.
+ *
+ */
+/ {
+    partitions: partitions{
+               parts = <14>;
+               part-0 = <&logo>;
+               part-1 = <&recovery>;
+               part-2 = <&misc>;
+               part-3 = <&dto>;
+               part-4 = <&cri_data>;
+               part-5 = <&param>;
+               part-6 = <&boot>;
+               part-7 = <&rsv>;
+               part-8 = <&tee>;
+               part-9 = <&vendor>;
+               part-10 = <&odm>;
+               part-11 = <&system>;
+               part-12 = <&cache>;
+               part-13 = <&data>;
+
+               logo:logo{
+                       pname = "logo";
+                       size = <0x0 0x800000>;
+                       mask = <1>;
+               };
+               recovery:recovery{
+                       pname = "recovery";
+                       size = <0x0 0x1800000>;
+                       mask = <1>;
+               };
+               misc:misc{
+                       pname = "misc";
+                       size = <0x0 0x800000>;
+                       mask = <1>;
+               };
+               dto:dto{
+                       pname = "dto";
+                       size = <0x0 0x800000>;
+                       mask = <1>;
+               };
+               cri_data:cri_data
+               {
+                       pname = "cri_data";
+                       size = <0x0 0x800000>;
+                       mask = <2>;
+               };
+               rsv:rsv{
+                       pname = "rsv";
+                       size = <0x0 0x1000000>;
+                       mask = <1>;
+               };
+               param:param{
+                       pname = "param";
+                       size = <0x0 0x1000000>;
+                       mask = <2>;
+               };
+               boot:boot
+               {
+                       pname = "boot";
+                       size = <0x0 0x1000000>;
+                       mask = <1>;
+               };
+               tee:tee{
+                       pname = "tee";
+                       size = <0x0 0x2000000>;
+                       mask = <1>;
+               };
+               vendor:vendor
+               {
+                       pname = "vendor";
+                       size = <0x0 0x10000000>;
+                       mask = <1>;
+               };
+               odm:odm
+               {
+                       pname = "odm";
+                       size = <0x0 0x10000000>;
+                       mask = <1>;
+               };
+               system:system
+               {
+                       pname = "system";
+                       size = <0x0 0x46000000>;
+                       mask = <1>;
+               };
+               cache:cache
+               {
+                       pname = "cache";
+                       size = <0x0 0x25000000>;
+                       mask = <2>;
+               };
+               data:data
+               {
+                       pname = "data";
+                       size = <0xffffffff 0xffffffff>;
+                       mask = <4>;
+               };
+       };
+
+       firmware {
+               android {
+                       compatible = "android,firmware";
+                       vbmeta {
+                               compatible = "android,vbmeta";
+                               parts = "boot,system,vendor";
+                               by_name_prefix="/dev/block";
+                       };
+               fstab {
+                       compatible = "android,fstab";
+                       system {
+                               compatible = "android,system";
+                               dev = "/dev/block/system";
+                               type = "ext4";
+                               mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+                               fsmgr_flags = "wait";
+                               };
+
+                       vendor {
+                               compatible = "android,vendor";
+                               dev = "/dev/block/vendor";
+                               type = "ext4";
+                               mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+                               fsmgr_flags = "wait";
+                               };
+                       odm {
+                               compatible = "android,odm";
+                               dev = "/dev/block/odm";
+                               type = "ext4";
+                               mnt_flags = "ro,barrier=1,inode_readahead_blks=8";
+                               fsmgr_flags = "wait";
+                               };
+                       };
+               };
+       };
+};/* end of / */

diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
index 8cee2b17e0a56c395e9ca8cbe1a68a9ccc00280c..b3520c23b1d8aa055ce278eb83ac416dc42c52fa 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
+++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts
@@ -18,7 +18,7 @@
 /dts-v1/;
 
 #include "mesontxl.dtsi"
-#include "partition_mbox_normal.dtsi"
+#include "partition_tv_4G.dtsi"
 #include "mesontxl_p321-panel.dtsi"
 
 / {