shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

DTS: partitions: change axg partitions for bringup android O

Browse Source 
PD#158937: A113 Android O trunk bring up.

Change-Id: Ibdb605b5c17abe8165270621e6893ea1d2ab88ef
Signed-off-by: Yu Fang <yu.fang@amlogic.com>
Signed-off-by: yuehu mi <yuehu.mi@amlogic.com>
This commit is contained in:
yu.fang
2018-03-21 13:26:32 +08:00
committed by Jianxin Pan
parent ffa4aa65ca
commit ae1d0b86a4
3 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm64/boot/dts/amlogic/axg_s400emmc.dts
View File

@@ -19,6 +19,7 @@
#include "mesonaxg.dtsi"
#include "mesonaxg_s400-panel.dtsi"
#include "partition_mbox_normal.dtsi"
/ {
model = "Amlogic";
amlogic-dt-id = "axg_s400_1g";
@@ -709,7 +710,7 @@
};
partitions: partitions{
parts = <12>;
parts = <14>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
@@ -718,10 +719,12 @@
part-5 = <&misc>;
part-6 = <&instaboot>;
part-7 = <&boot>;
part-8 = <&system>;
part-9 = <&cache>;
part-10 = <&udisk>;
part-11 = <&data>;
part-8 = <&vendor>;
part-9 = <&odm>;
part-10 = <&system>;
part-11 = <&cache>;
part-12 = <&udisk>;
part-13 = <&data>;
logo:logo{
pname = "logo";
@@ -764,6 +767,18 @@
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";

24
arch/arm64/boot/dts/amlogic/axg_s400emmc_v03.dts
View File

@@ -710,7 +710,7 @@
};
partitions: partitions{
parts = <12>;
parts = <14>;
part-0 = <&logo>;
part-1 = <&recovery>;
part-2 = <&rsv>;
@@ -719,10 +719,12 @@
part-5 = <&misc>;
part-6 = <&instaboot>;
part-7 = <&boot>;
part-8 = <&system>;
part-9 = <&cache>;
part-10 = <&udisk>;
part-11 = <&data>;
part-8 = <&vendor>;
part-9 = <&odm>;
part-10 = <&system>;
part-11 = <&cache>;
part-12 = <&udisk>;
part-13 = <&data>;
logo:logo{
pname = "logo";
@@ -765,6 +767,18 @@
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";

2
drivers/amlogic/media/common/arch/registers/register_ops_m8.c
View File

@@ -28,6 +28,7 @@
MESON_CPU_MAJOR_ID_GXM, \
MESON_CPU_MAJOR_ID_TXL, \
MESON_CPU_MAJOR_ID_TXLX, \
MESON_CPU_MAJOR_ID_AXG, \
MESON_CPU_MAJOR_ID_G12A, \
0}
#define REGISTER_FOR_GXCPU {\
@@ -37,6 +38,7 @@
MESON_CPU_MAJOR_ID_GXM, \
MESON_CPU_MAJOR_ID_TXL, \
MESON_CPU_MAJOR_ID_TXLX, \
MESON_CPU_MAJOR_ID_AXG, \
MESON_CPU_MAJOR_ID_G12A, \
0}
int codec_apb_read(unsigned int reg)