Merge branch 'odroidn2-4.9.y-android-upstream' of ssh://git.linuxfactory.or.kr:29418/linux into odroidn2-4.9.y-android-upstream

This commit is contained in:
Chris KIM
2019-03-06 13:53:10 +09:00
347 changed files with 33270 additions and 2663 deletions

View File

@@ -0,0 +1,18 @@
Texas Instruments TAS5805 Audio amplifier
The TAS5805 serial control bus communicates through the I2C protocol only. The
serial bus is also used for periodic codec fault checking/reporting during
audio playback. For more product information please see the links below:
Required properties:
- compatible : "ti, tas5805"
- reg : I2C slave address
Example:
tas5805: tas5805@7c {
status = "okay";
compatible = "ti,tas5805";
reg = <0x2d>;
};

View File

@@ -13525,6 +13525,8 @@ AMLOGIC driver for memory extend
M: Tao Zeng <tao.zeng@amlogic.com>
F: drivers/amlogic/memory_ext/*
F: include/linux/amlogic/ramdump.h
F: include/linux/amlogic/vmap_stack.h
F: drivers/amlogic/memory_ext/vmap_stack.c
AMLOGIC driver for memory extend
M: Tao Zeng <tao.zeng@amlogic.com>
@@ -13979,6 +13981,14 @@ F: sound/soc/codecs/amlogic/Makefile
F: sound/soc/codecs/amlogic/tas5707.c
F: sound/soc/codecs/amlogic/tas5707.h
AMLOGIC Audio codec driver
M: Yonghao Jiao <yonghao.jiao@amogic.com>
F: arch/arm/configs/meson32_deconfig
F: sound/soc/codecs/amlogic/Kconfig
F: sound/soc/codecs/amlogic/Makefile
F: sound/soc/codecs/amlogic/tas5805.c
F: sound/soc/codecs/amlogic/tas5805.h
AMLOGIC AXG ADD DTS FOR A113D SOCKET AND DEVELOPMENT BOARDS
M: Yun Cai <yun.cai@amlogic.com>
F: arch/arm64/boot/dts/amlogic/axg_a113d_skt.dts
@@ -14482,15 +14492,19 @@ F: drivers/amlogic/media/vout/backlight/aml_ldim/iw7027_bl.c
F: drivers/amlogic/media/vout/backlight/aml_ldim/iw7027_bl.h
AMLOGIC DTV DEMOD DRIVER
M: Jihong Sui <jihong.sui@amlogic.com>
F: include/uapi/linux/dvb/aml_demod.h
F: drivers/amlogic/media/amldemod/*
M: Jihong Sui <jihong.sui@amlogic.com>
F: include/uapi/linux/dvb/aml_demod.h
F: drivers/amlogic/media/amldemod/*
AMLOGIC DTV DEMOD DRIVER
M: Jihong Sui <jihong.sui@amlogic.com>
F: drivers/amlogic/media/amldemod/*
F: drivers/amlogic/media/dtv_demod/*
AMLOGIC DTV DEMOD DRIVER
M: Zhiwei Yuan <zhiwei.yuan@amlogic.com>
F: drivers/amlogic/media/dtv_demod/include/addr_atsc*.h
AMLOGIC DEFENDKEY DRIVER
M: Zhongfu Luo <zhongfu.luo@amlogic.com>
F: drivers/amlogic/defendkey/*
@@ -14662,15 +14676,15 @@ M: Luan Yuan <luan.yuan@amlogic.com>
F: arch/arm/boot/dts/amlogic/partition_mbox_p241_P.dtsi
AMLOGIC TL1 SOUND CARD
M: Xing Wang <xing.wang@amlogic.com
F: include/dt-bindings/clock/amlogic,tl1-audio-clk.h
F: sound/soc/amlogic/auge/*
AMLOGIC TL1 AUDIO EXTERANL INPUT/OUTPUT DRIVERS
AMLOGIC TL1 NEW EQDRC
AMLOGIC TL1 MIXER CONTROLS
AMLOGIC TL1 VAD DRIVER
M: Xing Wang <xing.wang@amlogic.com
F: sound/soc/amlogic/auge/extn.c
F: sound/soc/amlogic/auge/frhdmirx_hw.c
F: sound/soc/amlogic/auge/frhdmirx_hw.h
F: arch/arm/boot/dts/amlogic/tl1_pxp.dts
F: include/dt-bindings/clock/amlogic,tl1-audio-clk.h
F: include/linux/amlogic/media/sound/misc.h
F: include/linux/amlogic/major.h
F: sound/soc/amlogic/auge/*
AMLOGIC LCD DRIVERS
@@ -14718,6 +14732,19 @@ AMLOGIC BACKLIGHT LDIM DRIVER
M: Evoke Zhang <evoke.zhang@amlogic.com>
F: drivers/amlogic/media/vout/backlight/aml_ldim/ldim_spi.c
AMLOGIC CAMERA DRIVER
M: Guosong Zhou <guosong.zhou@amlogic.com>
F: arch/arm64/boot/dts/amlogic/g12a_s905d2_u200.dts
F: arch/arm/boot/dts/amlogic/g12a_s905d2_u200.dts
F: arch/arm64/configs/meson64_defconfig
F: arch/arm/configs/meson64_a32_defconfig
F: drivers/amlogic/media/Kconfig
F: drivers/amlogic/media/Makefile
F: drivers/amlogic/media/camera/*
F: drivers/amlogic/media/common/canvas/canvas_mgr.c
F: drivers/amlogic/media/common/vfm/vfm.c
F: include/linux/amlogic/media/camera/*
HARDKERNEL S922D odroidn2
M: Joy Cho <joy.cho@hardkernel.com>
F: arch/arm64/configs/odroidn2_defconfig

View File

@@ -666,13 +666,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -452,13 +452,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -631,13 +631,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -612,13 +612,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -616,13 +616,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -640,13 +640,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -466,13 +466,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -458,13 +458,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -470,13 +470,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -475,13 +475,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -215,13 +215,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -273,7 +273,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -289,6 +289,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -368,6 +369,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -202,13 +202,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -260,7 +260,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -276,6 +276,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -355,6 +356,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x100000 0x7ff00000>;
linux,usable-memory = <0x000000 0x80000000>;
};
reserved-memory {
@@ -151,6 +151,12 @@
size = <0x04000000>;
alignment = <0x400000>;
};
vm0_cma_reserved:linux,vm0_cma {
compatible = "shared-dma-pool";
reusable;
size = <0x2000000>;
alignment = <0x400000>;
};
};
gpioleds {
@@ -230,13 +236,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -284,6 +290,54 @@
dev_name = "ionvideo";
status = "okay";
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;
dev_name = "vm0";
status = "disabled";
vm_id = <0>;
};
amvdec_656in {
/*bt656 gpio conflict with i2c0*/
compatible = "amlogic, amvdec_656in";
dev_name = "amvdec_656in";
status = "disabled";
reg = <0xffe02000 0x7c>;
clocks = <&clkc CLKID_BT656_COMP>,
<&clkc CLKID_BT656>;
clock-names = "cts_bt656_clk1",
"clk_gate_bt656";
/* bt656in1, bt656in2 */
bt656in1 {
bt656_id = <1>;
status = "disabled";
};
};
aml_cams {
compatible = "amlogic, cams_prober";
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&cam_dvp_pins &gen_clk_ee_z>;
clocks = <&clkc CLKID_GEN_CLK>;
clock-names = "g12a_24m";
cam_0{
cam_name = "gc2145";
front_back = <0>;
/*u200 i2c2 gpio conflict with ethmac*/
camera-i2c-bus = <&i2c2>;
gpio_pwdn-gpios = <&gpio GPIOZ_2 GPIO_ACTIVE_HIGH>;
gpio_rst-gpios = <&gpio GPIOZ_12 GPIO_ACTIVE_HIGH>;
mirror_flip = <1>;
vertical_flip = <1>;
spread_spectrum = <0>;
bt_path = "gpio";
bt_path_count = <1>;
vdin_path = <0>;
status = "okay";
};
};
gpio_keypad{
compatible = "amlogic, gpio_keypad";
@@ -312,7 +366,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -329,6 +383,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -413,6 +468,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -783,6 +843,13 @@
};
};
&i2c2 {
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&i2c2_master_pins2>;
clock-frequency = <100000>;
};
&i2c3 {
status = "okay";
pinctrl-names="default";
@@ -1118,6 +1185,32 @@
};
};
clk12_24_z_pins:clk12_24_z_pins {
mux {
groups = "clk12_24_z";
function = "clk12_24_ee";
drive-strength = <3>;
};
};
gen_clk_ee_z: gen_clk_ee_z {
mux {
groups="gen_clk_ee_z";
function="gen_clk_ee";
drive-strength = <3>;
};
};
cam_dvp_pins:cam_dvp_pins {
mux {
groups = "bt656_a_vs", "bt656_a_hs", "bt656_a_clk",
"bt656_a_din0", "bt656_a_din1", "bt656_a_din2",
"bt656_a_din3", "bt656_a_din4", "bt656_a_din5",
"bt656_a_din6", "bt656_a_din7";
function = "bt656";
};
};
}; /* end of pinctrl_periphs */
&pinctrl_aobus {

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x100000 0x3ff00000>;
linux,usable-memory = <0x000000 0x40000000>;
};
reserved-memory {
@@ -155,6 +155,12 @@
alignment = <0x400000>;
alloc-ranges = <0x0 0x30000000>;
};
vm0_cma_reserved:linux,vm0_cma {
compatible = "shared-dma-pool";
reusable;
size = <0x2000000>;
alignment = <0x400000>;
};
};
gpioleds {
@@ -234,13 +240,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -288,6 +294,54 @@
dev_name = "ionvideo";
status = "okay";
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;
dev_name = "vm0";
status = "disabled";
vm_id = <0>;
};
amvdec_656in {
/*bt656 gpio conflict with i2c0*/
compatible = "amlogic, amvdec_656in";
dev_name = "amvdec_656in";
status = "disabled";
reg = <0xffe02000 0x7c>;
clocks = <&clkc CLKID_BT656_COMP>,
<&clkc CLKID_BT656>;
clock-names = "cts_bt656_clk1",
"clk_gate_bt656";
/* bt656in1, bt656in2 */
bt656in1 {
bt656_id = <1>;
status = "disabled";
};
};
aml_cams {
compatible = "amlogic, cams_prober";
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&cam_dvp_pins &gen_clk_ee_z>;
clocks = <&clkc CLKID_GEN_CLK>;
clock-names = "g12a_24m";
cam_0{
cam_name = "gc2145";
front_back = <0>;
/*u200 i2c2 gpio conflict with ethmac*/
camera-i2c-bus = <&i2c2>;
gpio_pwdn-gpios = <&gpio GPIOZ_2 GPIO_ACTIVE_HIGH>;
gpio_rst-gpios = <&gpio GPIOZ_12 GPIO_ACTIVE_HIGH>;
mirror_flip = <1>;
vertical_flip = <1>;
spread_spectrum = <0>;
bt_path = "gpio";
bt_path_count = <1>;
vdin_path = <0>;
status = "okay";
};
};
gpio_keypad{
compatible = "amlogic, gpio_keypad";
@@ -316,7 +370,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -333,6 +387,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -417,6 +472,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -787,6 +847,13 @@
};
};
&i2c2 {
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&i2c2_master_pins2>;
clock-frequency = <100000>;
};
&i2c3 {
status = "okay";
pinctrl-names="default";
@@ -1122,6 +1189,32 @@
};
};
clk12_24_z_pins:clk12_24_z_pins {
mux {
groups = "clk12_24_z";
function = "clk12_24_ee";
drive-strength = <3>;
};
};
gen_clk_ee_z: gen_clk_ee_z {
mux {
groups="gen_clk_ee_z";
function="gen_clk_ee";
drive-strength = <3>;
};
};
cam_dvp_pins:cam_dvp_pins {
mux {
groups = "bt656_a_vs", "bt656_a_hs", "bt656_a_clk",
"bt656_a_din0", "bt656_a_din1", "bt656_a_din2",
"bt656_a_din3", "bt656_a_din4", "bt656_a_din5",
"bt656_a_din6", "bt656_a_din7";
function = "bt656";
};
};
}; /* end of pinctrl_periphs */
&pinctrl_aobus {

View File

@@ -213,13 +213,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -383,7 +383,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -398,6 +398,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -472,6 +473,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -214,13 +214,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -384,7 +384,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -399,6 +399,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -473,6 +474,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -214,13 +214,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -384,7 +384,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -399,6 +399,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -473,6 +474,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -252,13 +252,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -318,7 +318,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -334,6 +334,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -413,6 +414,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -246,13 +246,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -312,7 +312,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -328,6 +328,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -407,6 +408,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -241,13 +241,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -307,7 +307,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -323,6 +323,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -402,6 +403,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -225,13 +225,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -372,7 +372,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -388,6 +388,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -467,6 +468,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x100000 0x7ff00000>;
linux,usable-memory = <0x000000 0x80000000>;
};
reserved-memory {
@@ -252,13 +252,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -306,19 +306,47 @@
dev_name = "ionvideo";
status = "okay";
};
dvb{
compatible = "amlogic, dvb";
dev_name = "dvb";
status = "ok";
/*"parallel","serial","disable"*/
ts2 = "parallel";
ts2_control = <0>;
ts2_invert = <0>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
*
* fe0_mode = "external";
* fe0_demod = "Atbm8881";
* fe0_i2c_adap_id = <&i2c2>;
* fe0_demod_i2c_addr = <0xc0>;
* fe0_ts = <1>;
* fe0_reset_value = <0>;
* fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
*
* ts1 = "parallel";
* ts1_control = <0>;
* ts1_invert = <0>;
* interrupts = <0 23 1
* 0 5 1
* 0 21 1
* 0 19 1
* 0 25 1
* 0 18 1
* 0 24 1>;
* interrupt-names = "demux0_irq",
* "demux1_irq",
* "demux2_irq",
* "dvr0_irq",
* "dvr1_irq",
* "dvrfill0_fill",
* "dvrfill1_flush";
* pinctrl-names = "p_ts1";
* pinctrl-0 = <&dvb_p_ts1_pins>;
* clocks = <&clkc CLKID_DEMUX
* &clkc CLKID_AHB_ARB0
* &clkc CLKID_DOS_PARSER>;
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -334,7 +362,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
key-device = "normal";
@@ -413,6 +441,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -783,6 +816,19 @@
};
};
/*
*if use i2c2_master_pins2
*please disable internal_eth_pins
*in case pinmux conflict
*/
/*&i2c2 {
* status = "okay";
* pinctrl-names="default";
* pinctrl-0=<&i2c2_master_pins2>;
* clock-frequency = <300000>;
*};
*/
&i2c3 {
status = "disabled";
pinctrl-names="default";

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x100000 0x3ff00000>;
linux,usable-memory = <0x000000 0x40000000>;
};
@@ -250,13 +250,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -304,19 +304,47 @@
dev_name = "ionvideo";
status = "okay";
};
dvb{
compatible = "amlogic, dvb";
dev_name = "dvb";
status = "ok";
/*"parallel","serial","disable"*/
ts2 = "parallel";
ts2_control = <0>;
ts2_invert = <0>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
*
* fe0_mode = "external";
* fe0_demod = "Atbm8881";
* fe0_i2c_adap_id = <&i2c2>;
* fe0_demod_i2c_addr = <0xc0>;
* fe0_ts = <1>;
* fe0_reset_value = <0>;
* fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
*
* ts1 = "parallel";
* ts1_control = <0>;
* ts1_invert = <0>;
* interrupts = <0 23 1
* 0 5 1
* 0 21 1
* 0 19 1
* 0 25 1
* 0 18 1
* 0 24 1>;
* interrupt-names = "demux0_irq",
* "demux1_irq",
* "demux2_irq",
* "dvr0_irq",
* "dvr1_irq",
* "dvrfill0_fill",
* "dvrfill1_flush";
* pinctrl-names = "p_ts1";
* pinctrl-0 = <&dvb_p_ts1_pins>;
* clocks = <&clkc CLKID_DEMUX
* &clkc CLKID_AHB_ARB0
* &clkc CLKID_DOS_PARSER>;
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -332,6 +360,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -411,6 +440,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -778,6 +812,19 @@
};
};
/*
*if use i2c2_master_pins2
*please disable internal_eth_pins
*in case pinmux conflict
*/
/*&i2c2 {
* status = "okay";
* pinctrl-names="default";
* pinctrl-0=<&i2c2_master_pins2>;
* clock-frequency = <300000>;
*};
*/
&i2c3 {
status = "disabled";
pinctrl-names="default";

View File

@@ -225,13 +225,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -372,7 +372,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -388,6 +388,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -467,6 +468,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -209,13 +209,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -291,7 +291,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -307,6 +307,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -386,6 +387,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -44,7 +44,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x100000 0x7ff00000>;
linux,usable-memory = <0x000000 0x80000000>;
};
reserved-memory {
@@ -201,13 +201,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -259,7 +259,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -275,6 +275,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -354,6 +355,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -29,7 +29,7 @@
221 54
332 78
399 92
465 11
465 116
503 135
535 162
567 184

View File

@@ -239,13 +239,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -322,7 +322,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -338,6 +338,8 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -417,6 +419,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x100000 0x7ff00000>;
linux,usable-memory = <0x000000 0x80000000>;
};
reserved-memory {
@@ -148,6 +148,16 @@
};
};
gpioleds {
compatible = "gpio-leds";
status = "okay";
sys_led {
label="sys_led";
gpios=<&gpio_ao GPIOAO_11 GPIO_ACTIVE_HIGH>;
default-state ="on";
};
};
cvbsout {
compatible = "amlogic, cvbsout-g12b";
dev_name = "cvbsout";
@@ -206,13 +216,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -281,7 +291,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -297,6 +307,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -376,6 +387,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -497,7 +513,7 @@
aml-audio-card,dai-link@1 {
format = "i2s";
mclk-fs = <256>;
//continuous-clock;
continuous-clock;
//bitclock-inversion;
//frame-inversion;
bitclock-master = <&aml_tdmb>;
@@ -563,6 +579,7 @@
aml-audio-card,dai-link@4 {
mclk-fs = <128>;
continuous-clock;
/* suffix-name, sync with android audio hal
* what's the dai link used for
*/

View File

@@ -250,13 +250,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -422,7 +422,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -437,6 +437,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -511,6 +512,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
amlvecm {
@@ -604,7 +610,7 @@
aml-audio-card,dai-link@1 {
format = "i2s";
mclk-fs = <256>;
//continuous-clock;
continuous-clock;
//bitclock-inversion;
//frame-inversion;
bitclock-master = <&aml_tdmb>;
@@ -670,6 +676,7 @@
aml-audio-card,dai-link@4 {
mclk-fs = <128>;
continuous-clock;
/* suffix-name, sync with android audio hal
* what's the dai link used for
*/

View File

@@ -216,13 +216,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -388,7 +388,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -403,6 +403,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -477,6 +478,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
amlvecm {

View File

@@ -176,13 +176,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -426,7 +426,7 @@
#thermal-sensor-cells = <1>;
cooling_devices {
cpufreq_cool_cluster0 {
min_state = <1000000>;
min_state = <1200000>;
dyn_coeff = <140>;
cluster_id = <0>;
node_name = "cpufreq_cool0";
@@ -440,7 +440,7 @@
device_type = "cpucore";
};
gpufreq_cool {
min_state = <400>;
min_state = <500>;
dyn_coeff = <437>;
cluster_id = <0>;
node_name = "gpufreq_cool0";
@@ -477,17 +477,17 @@
trips {
switch_on: trip-point@0 {
temperature = <70000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <80000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <90000>;
hysteresis = <1000>;
type = "passive";
};
hot: trip-point@2 {
temperature = <85000>;
temperature = <100000>;
hysteresis = <5000>;
type = "hot";
};
@@ -1095,7 +1095,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1112,6 +1112,8 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1196,6 +1198,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -151,13 +151,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -401,7 +401,7 @@
#thermal-sensor-cells = <1>;
cooling_devices {
cpufreq_cool_cluster0 {
min_state = <1000000>;
min_state = <1200000>;
dyn_coeff = <140>;
cluster_id = <0>;
node_name = "cpufreq_cool0";
@@ -415,7 +415,7 @@
device_type = "cpucore";
};
gpufreq_cool {
min_state = <400>;
min_state = <500>;
dyn_coeff = <437>;
cluster_id = <0>;
node_name = "gpufreq_cool0";
@@ -452,17 +452,17 @@
trips {
switch_on: trip-point@0 {
temperature = <70000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <80000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <90000>;
hysteresis = <1000>;
type = "passive";
};
hot: trip-point@2 {
temperature = <85000>;
temperature = <100000>;
hysteresis = <5000>;
type = "hot";
};
@@ -1137,7 +1137,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1153,6 +1153,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1232,6 +1233,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -162,13 +162,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1081,7 +1081,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1097,6 +1097,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1176,6 +1177,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -182,13 +182,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -520,7 +520,7 @@
#thermal-sensor-cells = <1>;
cooling_devices {
cpufreq_cool_cluster0 {
min_state = <1000000>;
min_state = <1200000>;
dyn_coeff = <140>;
cluster_id = <0>;
node_name = "cpufreq_cool0";
@@ -534,7 +534,7 @@
device_type = "cpucore";
};
gpufreq_cool {
min_state = <400>;
min_state = <500>;
dyn_coeff = <437>;
cluster_id = <0>;
node_name = "gpufreq_cool0";
@@ -571,17 +571,17 @@
trips {
switch_on: trip-point@0 {
temperature = <70000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <80000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <90000>;
hysteresis = <1000>;
type = "passive";
};
hot: trip-point@2 {
temperature = <85000>;
temperature = <100000>;
hysteresis = <5000>;
type = "hot";
};
@@ -1102,7 +1102,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1119,6 +1119,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1203,6 +1204,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -152,13 +152,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -479,7 +479,7 @@
#thermal-sensor-cells = <1>;
cooling_devices {
cpufreq_cool_cluster0 {
min_state = <1000000>;
min_state = <1200000>;
dyn_coeff = <140>;
cluster_id = <0>;
node_name = "cpufreq_cool0";
@@ -493,7 +493,7 @@
device_type = "cpucore";
};
gpufreq_cool {
min_state = <400>;
min_state = <500>;
dyn_coeff = <437>;
cluster_id = <0>;
node_name = "gpufreq_cool0";
@@ -530,17 +530,17 @@
trips {
switch_on: trip-point@0 {
temperature = <70000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <80000>;
hysteresis = <1000>;
type = "passive";
};
control: trip-point@1 {
temperature = <90000>;
hysteresis = <1000>;
type = "passive";
};
hot: trip-point@2 {
temperature = <85000>;
temperature = <100000>;
hysteresis = <5000>;
type = "hot";
};
@@ -1137,7 +1137,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1153,6 +1153,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1232,6 +1233,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -171,13 +171,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1127,7 +1127,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1144,6 +1144,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1228,6 +1229,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
dvb {
compatible = "amlogic, dvb";

View File

@@ -169,13 +169,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1188,7 +1188,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1204,6 +1204,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1283,6 +1284,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -171,13 +171,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1016,7 +1016,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1032,6 +1032,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1111,6 +1112,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -170,13 +170,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1015,7 +1015,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1031,6 +1031,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1110,6 +1111,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -162,13 +162,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1084,7 +1084,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1100,6 +1100,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1179,6 +1180,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -110,7 +110,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x4C00000>;
size = <0x2400000>;
alignment = <0x400000>;
alloc-ranges = <0x0 0x30000000>;
};
@@ -257,13 +257,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1166,7 +1166,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1183,6 +1183,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1267,6 +1268,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -235,13 +235,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1224,7 +1224,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1240,6 +1240,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1319,6 +1320,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -111,7 +111,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x4C00000>;
size = <0x2400000>;
alignment = <0x400000>;
alloc-ranges = <0x0 0x30000000>;
};
@@ -257,13 +257,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1166,7 +1166,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1183,6 +1183,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1267,6 +1268,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -234,13 +234,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1223,7 +1223,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1239,6 +1239,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1318,6 +1319,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -91,13 +91,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -743,7 +743,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -759,6 +759,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -838,6 +839,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -91,13 +91,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -831,7 +831,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -847,6 +847,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -926,6 +927,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -162,13 +162,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1075,7 +1075,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1092,6 +1092,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1176,6 +1177,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -170,13 +170,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1085,7 +1085,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1102,6 +1102,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1186,6 +1187,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -172,13 +172,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1081,7 +1081,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1098,6 +1098,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1182,6 +1183,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};

View File

@@ -162,13 +162,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1110,7 +1110,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1126,6 +1126,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -1205,6 +1206,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -154,13 +154,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1182,7 +1182,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1197,6 +1197,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -1271,6 +1272,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -170,13 +170,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1112,7 +1112,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1129,6 +1129,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1213,6 +1214,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -170,13 +170,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <8>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -1115,7 +1115,7 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -1132,6 +1132,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -1216,6 +1217,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
};
&efuse {

View File

@@ -1240,6 +1240,7 @@
&clkc CLKID_DEMUX
&clkc CLKID_AHB_ARB0
&clkc CLKID_DOS
&clkc CLKID_CLK81
&clkc CLKID_VDEC_MUX
&clkc CLKID_HCODEC_MUX
&clkc CLKID_HEVC_MUX
@@ -1248,6 +1249,7 @@
"demux",
"ahbarb0",
"vdec",
"clk_81",
"clk_vdec_mux",
"clk_hcodec_mux",
"clk_hevc_mux",
@@ -2324,6 +2326,24 @@
};
};
/*dvb_p_ts1_pins: dvb_p_ts1_pins {
* tsin_b {
* groups = "tsin_b_sop_z",
* "tsin_b_valid_z",
* "tsin_b_clk_z",
* "tsin_b_din0_z",
* "tsin_b_din1",
* "tsin_b_din2",
* "tsin_b_din3",
* "tsin_b_din4",
* "tsin_b_din5",
* "tsin_b_din6",
* "tsin_b_din7";
* function = "tsin_b";
* };
*};
*/
pwm_a_pins: pwm_a {
mux {
groups = "pwm_a";

View File

@@ -1862,6 +1862,7 @@
reg-names = "ISP";
interrupts = <0 142 4>;
interrupt-names = "ISP";
temper-buf-size = <24>;
clocks = <&clkc CLKID_MIPI_ISP_CLK_COMP>,
<&clkc CLKID_MIPI_CSI_PHY_CLK0_COMP>;
clock-names = "cts_mipi_isp_clk_composite",

View File

@@ -1082,6 +1082,58 @@
compatible = "amlogic, vdac-tl1";
status = "okay";
};
dmc_monitor {
compatible = "amlogic, dmc_monitor";
status = "okay";
reg_base = <0xff638800>;
interrupts = <GIC_SPI 51 IRQ_TYPE_EDGE_RISING>;
};
efuse: efuse{
compatible = "amlogic, efuse";
read_cmd = <0x82000030>;
write_cmd = <0x82000031>;
get_max_cmd = <0x82000033>;
key = <&efusekey>;
clocks = <&clkc CLKID_EFUSE>;
clock-names = "efuse_clk";
status = "disabled";
};
efusekey:efusekey{
keynum = <4>;
key0 = <&key_0>;
key1 = <&key_1>;
key2 = <&key_2>;
key3 = <&key_3>;
key_0:key_0{
keyname = "mac";
offset = <0>;
size = <6>;
};
key_1:key_1{
keyname = "mac_bt";
offset = <6>;
size = <6>;
};
key_2:key_2{
keyname = "mac_wifi";
offset = <12>;
size = <6>;
};
key_3:key_3{
keyname = "usid";
offset = <18>;
size = <16>;
};
};
audio_data: audio_data {
compatible = "amlogic, audio_data";
query_licence_cmd = <0x82000050>;
status = "disabled";
};
}; /* end of / */
&pinctrl_aobus {

View File

@@ -144,6 +144,32 @@
status = "disabled";
reg = <0xff632000 0x1c>;
tdmout_index = <1>;
tdmin_index = <1>;
};
aml_dtv_demod {
compatible = "amlogic, ddemod-tl1";
dev_name = "aml_dtv_demod";
status = "okay";
//pinctrl-names="dtvdemod_agc";
//pinctrl-0=<&dtvdemod_agc>;
clocks = <&clkc CLKID_DAC_CLK>;
clock-names = "vdac_clk_gate";
reg = <0xff650000 0x4000 /*dtv demod base*/
0xff63c000 0x2000 /*hiu reg base*/
0xff800000 0x1000 /*io_aobus_base*/
0xffd01000 0x1000 /*reset*/
>;
/*move from dvbfe*/
dtv_demod0_mem = <0>; // need move to aml_dtv_demod ?
spectrum = <1>;
cma_flag = <1>;
cma_mem_size = <8>;
//memory-region = <&demod_cma_reserved>;//<&demod_reserved>;
};
auge_sound {
@@ -259,7 +285,7 @@
/* suffix-name, sync with android audio hal used for */
suffix-name = "alsaPORT-spdif";
cpu {
sound-dai = <&spdif_a>;
sound-dai = <&spdifa>;
system-clock-frequency = <6144000>;
};
codec {
@@ -270,7 +296,7 @@
aml-audio-card,dai-link@5 {
mclk-fs = <128>;
cpu {
sound-dai = <&spdif_b>;
sound-dai = <&spdifb>;
system-clock-frequency = <6144000>;
};
codec {
@@ -448,7 +474,7 @@
}; /* end of / */
&audiobus {
tdma:tdm {
tdma:tdm@0 {
compatible = "amlogic, tl1-snd-tdma";
#sound-dai-cells = <0>;
@@ -466,7 +492,7 @@
status = "okay";
};
tdmb:tdm {
tdmb:tdm@1 {
compatible = "amlogic, tl1-snd-tdmb";
#sound-dai-cells = <0>;
@@ -481,7 +507,7 @@
status = "okay";
};
tdmc:tdm {
tdmc:tdm@2 {
compatible = "amlogic, tl1-snd-tdmc";
#sound-dai-cells = <0>;
@@ -499,16 +525,16 @@
status = "okay";
};
spdif_a:spdif {
spdifa:spdif@0 {
compatible = "amlogic, tl1-snd-spdif-a";
#sound-dai-cells = <0>;
clocks = <&clkc CLKID_MPLL0
&clkc CLKID_FCLK_DIV4
&clkaudio CLKID_AUDIO_GATE_SPDIFIN
&clkaudio CLKID_AUDIO_GATE_SPDIFOUT_A
&clkaudio CLKID_AUDIO_SPDIFIN
&clkaudio CLKID_AUDIO_SPDIFOUT
&clkaudio CLKID_AUDIO_SPDIFIN_CTRL
&clkaudio CLKID_AUDIO_SPDIFOUT_CTRL>;
&clkaudio CLKID_AUDIO_SPDIFOUT_A>;
clock-names = "sysclk", "fixed_clk", "gate_spdifin",
"gate_spdifout", "clk_spdifin", "clk_spdifout";
@@ -519,16 +545,31 @@
pinctrl-names = "spdif_pins";
pinctrl-0 = <&spdifout_a &spdifin_a>;
/*
* whether do asrc for pcm and resample a or b
* if raw data, asrc is disabled automatically
* 0: "Disable",
* 1: "Enable:32K",
* 2: "Enable:44K",
* 3: "Enable:48K",
* 4: "Enable:88K",
* 5: "Enable:96K",
* 6: "Enable:176K",
* 7: "Enable:192K",
*/
asrc_id = <0>;
auto_asrc = <0>;
status = "okay";
};
spdif_b:spdif {
spdifb:spdif@1 {
compatible = "amlogic, tl1-snd-spdif-b";
#sound-dai-cells = <0>;
clocks = <&clkc CLKID_MPLL0 /*CLKID_HIFI_PLL*/
&clkaudio CLKID_AUDIO_SPDIFOUTB
&clkaudio CLKID_AUDIO_SPDIFOUTB_CTRL>;
&clkaudio CLKID_AUDIO_GATE_SPDIFOUT_B
&clkaudio CLKID_AUDIO_SPDIFOUT_B>;
clock-names = "sysclk",
"gate_spdifout", "clk_spdifout";
@@ -539,7 +580,7 @@
compatible = "amlogic, tl1-snd-pdm";
#sound-dai-cells = <0>;
clocks = <&clkaudio CLKID_AUDIO_PDM
clocks = <&clkaudio CLKID_AUDIO_GATE_PDM
&clkc CLKID_FCLK_DIV3
&clkc CLKID_MPLL3
&clkaudio CLKID_AUDIO_PDMIN0
@@ -570,6 +611,78 @@
status = "okay";
};
aed:effect {
compatible = "amlogic, snd-effect-v2";
#sound-dai-cells = <0>;
clocks = <&clkaudio CLKID_AUDIO_GATE_EQDRC
&clkc CLKID_FCLK_DIV5
&clkaudio CLKID_AUDIO_EQDRC>;
clock-names = "gate", "clk_srcpll", "eqdrc";
eq_enable = <1>;
multiband_drc_enable = <0>;
fullband_drc_enable = <0>;
/*
* 0:tdmout_a
* 1:tdmout_b
* 2:tdmout_c
* 3:spdifout
* 4:spdifout_b
*/
eqdrc_module = <1>;
/* max 0xf, each bit for one lane, usually one lane */
lane_mask = <0x1>;
/* max 0xff, each bit for one channel */
channel_mask = <0x3>;
status = "disabled";
};
asrca: resample@0 {
compatible = "amlogic, tl1-resample-a";
clocks = <&clkc CLKID_MPLL3
&clkaudio CLKID_AUDIO_MCLK_F
&clkaudio CLKID_AUDIO_RESAMPLE_A>;
clock-names = "resample_pll", "resample_src", "resample_clk";
/*same with toddr_src
* TDMIN_A, 0
* TDMIN_B, 1
* TDMIN_C, 2
* SPDIFIN, 3
* PDMIN, 4
* NONE,
* TDMIN_LB, 6
* LOOPBACK, 7
*/
resample_module = <3>;
status = "disabled";
};
asrcb: resample@1 {
compatible = "amlogic, tl1-resample-b";
clocks = <&clkc CLKID_MPLL3
&clkaudio CLKID_AUDIO_MCLK_F
&clkaudio CLKID_AUDIO_RESAMPLE_B>;
clock-names = "resample_pll", "resample_src", "resample_clk";
/*same with toddr_src
* TDMIN_A, 0
* TDMIN_B, 1
* TDMIN_C, 2
* SPDIFIN, 3
* PDMIN, 4
* NONE,
* TDMIN_LB, 6
* LOOPBACK, 7
*/
resample_module = <3>;
status = "disabled";
};
}; /* end of audiobus */
&pinctrl_periphs {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -97,7 +97,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x4C00000>;
size = <0x2400000>;
alignment = <0x400000>;
/* alloc by self */
alloc-ranges = <0x0 0x30000000>;

View File

@@ -682,13 +682,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -726,13 +726,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -692,13 +692,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -689,13 +689,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -95,7 +95,7 @@
ion_reserved:linux,ion-dev {
compatible = "shared-dma-pool";
reusable;
size = <0x4C00000>;
size = <0x2400000>;
alignment = <0x400000>;
alloc-ranges = <0x0 0x30000000>;
};
@@ -685,13 +685,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -692,13 +692,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -325,6 +325,9 @@ CONFIG_AMLOGIC_MEDIA_ENHANCEMENT=y
CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y
CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION=y
CONFIG_AMLOGIC_MEDIA_GDC=y
CONFIG_AMLOGIC_VIDEO_CAPTURE=y
CONFIG_AMLOGIC_VM_DISABLE_VIDEOLAYER=y
CONFIG_AMLOGIC_VIDEO_CAPTURE_GC2145=y
CONFIG_AMLOGIC_DTV_DEMOD=y
CONFIG_AMLOGIC_MMC=y
CONFIG_AMLOGIC_NAND=y
@@ -482,6 +485,7 @@ CONFIG_AMLOGIC_SND_CODEC_AMLT9015S=y
CONFIG_AMLOGIC_SND_CODEC_TXLX_ACODEC=y
CONFIG_AMLOGIC_SND_CODEC_TL1_ACODEC=y
CONFIG_AMLOGIC_SND_SOC_TAS5707=y
CONFIG_AMLOGIC_SND_SOC_TAS5805=y
CONFIG_AMLOGIC_SND_SOC_TLV320ADC3101=y
CONFIG_AMLOGIC_SND_SOC_PCM186X=y
CONFIG_AMLOGIC_SND_SOC_SSM3525=y

View File

@@ -238,21 +238,41 @@ static inline unsigned long __phys_to_virt(phys_addr_t x)
#define PHYS_OFFSET PLAT_PHYS_OFFSET
#define PHYS_PFN_OFFSET ((unsigned long)(PHYS_OFFSET >> PAGE_SHIFT))
#ifdef CONFIG_AMLOGIC_MODIFY
extern unsigned long phys_check(phys_addr_t x);
extern unsigned long virt_check(unsigned long x);
extern int scheduler_running;
#endif
static inline phys_addr_t __virt_to_phys(unsigned long x)
{
#ifdef CONFIG_AMLOGIC_MODIFY
return virt_check(x);
#else
return (phys_addr_t)x - PAGE_OFFSET + PHYS_OFFSET;
#endif
}
static inline unsigned long __phys_to_virt(phys_addr_t x)
{
#ifdef CONFIG_AMLOGIC_MODIFY
return phys_check(x);
#else
return x - PHYS_OFFSET + PAGE_OFFSET;
#endif
}
#endif
#ifdef CONFIG_AMLOGIC_MODIFY
#define virt_to_pfn(kaddr) \
({virt_check((unsigned long)kaddr); \
((((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT) + \
PHYS_PFN_OFFSET); })
#else
#define virt_to_pfn(kaddr) \
((((unsigned long)(kaddr) - PAGE_OFFSET) >> PAGE_SHIFT) + \
PHYS_PFN_OFFSET)
#endif
/*
* These are *only* valid on the kernel direct mapped RAM memory.

View File

@@ -25,6 +25,9 @@
#include <asm/cputype.h>
#include <asm/topology.h>
#ifdef CONFIG_AMLOGIC_MODIFY
#include <linux/sched_energy.h>
#endif
/*
* cpu capacity scale management
*/
@@ -281,6 +284,7 @@ void store_cpu_topology(unsigned int cpuid)
cpu_topology[cpuid].socket_id, mpidr);
}
#ifndef CONFIG_AMLOGIC_MODIFY
/*
* ARM TC2 specific energy cost model data. There are no unit requirements for
* the data. Data can be normalized to any reference point, but the
@@ -386,7 +390,66 @@ static struct sched_group_energy energy_core_a15 = {
.nr_cap_states = ARRAY_SIZE(cap_states_core_a15),
.cap_states = cap_states_core_a15,
};
#endif /* CONFIG_AMLOGIC_MODIFY */
#ifdef CONFIG_AMLOGIC_MODIFY
/* sd energy functions */
static inline
const struct sched_group_energy * const cpu_cluster_energy(int cpu)
{
struct sched_group_energy *sge = sge_array[cpu][SD_LEVEL1];
if (!sge) {
pr_debug("Invalid sched_group_energy for Cluster%d\n", cpu);
return NULL;
}
return sge;
}
static inline
const struct sched_group_energy * const cpu_core_energy(int cpu)
{
struct sched_group_energy *sge = sge_array[cpu][SD_LEVEL0];
if (!sge) {
pr_debug("Invalid sched_group_energy for Cluster%d\n", cpu);
return NULL;
}
return sge;
}
static int cpu_cpu_flags(void)
{
return SD_ASYM_CPUCAPACITY;
}
static inline int cpu_corepower_flags(void)
{
return SD_SHARE_PKG_RESOURCES | SD_SHARE_POWERDOMAIN |
SD_SHARE_CAP_STATES;
}
static struct sched_domain_topology_level arm_topology[] = {
#ifdef CONFIG_SCHED_MC
{
cpu_coregroup_mask,
cpu_corepower_flags,
cpu_core_energy,
SD_INIT_NAME(MC)
},
#endif
{
cpu_cpu_mask,
cpu_cpu_flags,
cpu_cluster_energy,
SD_INIT_NAME(DIE)
},
{ NULL, },
};
#else
/* sd energy functions */
static inline
const struct sched_group_energy * const cpu_cluster_energy(int cpu)
@@ -415,6 +478,7 @@ static struct sched_domain_topology_level arm_topology[] = {
{ cpu_cpu_mask, NULL, cpu_cluster_energy, SD_INIT_NAME(DIE) },
{ NULL, },
};
#endif /* CONFIG_AMLOGIC_MODIFY */
/*
* init_cpu_topology is called at boot when only one cpu is running
@@ -440,4 +504,8 @@ void __init init_cpu_topology(void)
/* Set scheduler topology descriptor */
set_sched_topology(arm_topology);
#ifdef CONFIG_AMLOGIC_MODIFY
init_sched_energy_costs();
#endif
}

View File

@@ -491,6 +491,10 @@ die_sig:
if (user_debug & UDBG_UNDEFINED) {
pr_info("%s (%d): undefined instruction: pc=%p\n",
current->comm, task_pid_nr(current), pc);
#ifdef CONFIG_AMLOGIC_USER_FAULT
if (user_fault_debug_ratelimited())
show_all_pfn(current, regs);
#endif
__show_regs(regs);
dump_instr(KERN_INFO, regs);
}

View File

@@ -24,6 +24,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@ -45,7 +47,7 @@
#define TZDBG(fmt, ...)
#endif
#define MESON_SECURE_FLAG_REG 0xC11081F0
#define MESON_SECURE_FLAG_REG_OFFS 0x81F0
#define MESON_SECURE_FLAG_VALUE_DISABLED 0x0
#define MESON_SECURE_FLAG_VALUE_ENABLED 0x1
#define MESON_SECURE_FLAG_VALUE_INVALID 0xFFFFFFFF
@@ -62,14 +64,23 @@ static void __iomem *secure_flag_base;
bool meson_secure_enabled(void)
{
bool ret = false;
struct device_node *np;
if (secure_flag == MESON_SECURE_FLAG_VALUE_INVALID) {
secure_flag_base = ioremap(MESON_SECURE_FLAG_REG, 4);
if (!secure_flag_base) {
TZDBG("iomap(0x%x) error.", MESON_SECURE_FLAG_REG);
np = of_find_compatible_node(NULL, NULL, "amlogic, iomap");
if (!np) {
TZDBG("find iomap node fail.");
return false;
}
secure_flag = readl_relaxed(secure_flag_base);
secure_flag_base = of_iomap(np, 0);
if (!secure_flag_base) {
TZDBG("of_iomap error.");
return false;
}
secure_flag = readl_relaxed(secure_flag_base +
MESON_SECURE_FLAG_REG_OFFS);
}
TZDBG("secure_flag: 0x%x\n", secure_flag);

View File

@@ -1640,3 +1640,39 @@ void __init paging_init(const struct machine_desc *mdesc)
empty_zero_page = virt_to_page(zero_page);
__flush_dcache_page(NULL, empty_zero_page);
}
#ifdef CONFIG_AMLOGIC_MODIFY
unsigned long notrace phys_check(phys_addr_t x)
{
unsigned long addr;
struct page *page;
addr = x - PHYS_OFFSET + PAGE_OFFSET;
if (scheduler_running) {
page = phys_to_page(x);
/*
* if physical address is not in linear mapping range,
* then this will cause BUG
*/
if (is_vmalloc_or_module_addr((const void *)addr) ||
PageHighMem(page)) {
pr_err("BAD USING of phys_to_virt, addr:%x, page:%lx\n",
x, page_to_pfn(page));
dump_stack();
}
}
return addr;
}
EXPORT_SYMBOL(phys_check);
unsigned long notrace virt_check(unsigned long x)
{
if (scheduler_running && (x >= VMALLOC_START || x < PAGE_OFFSET)) {
pr_err("bad input of virt:%lx\n", x);
dump_stack();
}
return (phys_addr_t)x - PAGE_OFFSET + PHYS_OFFSET;
}
EXPORT_SYMBOL(virt_check);
#endif

View File

@@ -665,13 +665,13 @@
wifi_pwm_conf: wifi_pwm_conf {
pwm_channel1_conf {
pwms = <&pwm_cd MESON_PWM_1 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_cd MESON_PWM_1 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_cd MESON_PWM_3 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_cd MESON_PWM_3 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -452,13 +452,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -631,13 +631,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -612,13 +612,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -616,13 +616,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -854,6 +854,7 @@
unifykey-index-3 = <&keysn_3>;
unifykey-index-4 = <&keysn_4>;
unifykey-index-5 = <&keysn_5>;
unifykey-index-6 = <&keysn_6>;
keysn_0: key_0{
key-name = "usid";
@@ -887,6 +888,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_6:key_6{
key-name = "gva_certs";
key-device = "normal";
key-permit = "read","write","del";
};
};//End unifykey
audio_data: audio_data {
compatible = "amlogic, audio_data";
@@ -1111,7 +1117,7 @@
#sound-dai-cells = <0>;
clocks = <&clkaudio CLKID_AUDIO_PDM
&clkc CLKID_FCLK_DIV3
&clkc CLKID_MPLL3
&clkc CLKID_MPLL2
&clkaudio CLKID_AUDIO_PDMIN0
&clkaudio CLKID_AUDIO_PDMIN1>;
clock-names = "gate",

View File

@@ -640,13 +640,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -467,13 +467,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -458,13 +458,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -470,13 +470,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};

View File

@@ -475,13 +475,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ab MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ab MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ab MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ab MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -668,13 +668,14 @@
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <6>;
unifykey-num = <7>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
unifykey-index-3 = <&keysn_3>;
unifykey-index-4 = <&keysn_4>;
unifykey-index-5 = <&keysn_5>;
unifykey-index-6 = <&keysn_6>;
keysn_0: key_0{
key-name = "usid";
@@ -708,6 +709,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_6:key_6{
key-name = "gva_certs";
key-device = "normal";
key-permit = "read","write","del";
};
};//End unifykey
audio_data: audio_data {
compatible = "amlogic, audio_data";
@@ -934,7 +940,7 @@
#sound-dai-cells = <0>;
clocks = <&clkaudio CLKID_AUDIO_PDM
&clkc CLKID_FCLK_DIV3
&clkc CLKID_MPLL3
&clkc CLKID_MPLL2
&clkaudio CLKID_AUDIO_PDMIN0
&clkaudio CLKID_AUDIO_PDMIN1>;
clock-names = "gate",
@@ -992,6 +998,26 @@
status = "okay";
};
audioresample: resample {
compatible = "amlogic, axg-resample";
clocks = <&clkc CLKID_MPLL3
&clkaudio CLKID_AUDIO_MCLK_F
&clkaudio CLKID_AUDIO_RESAMPLE_CTRL>;
clock-names = "resample_pll", "resample_src", "resample_clk";
/*same with toddr_src
* TDMIN_A,
* TDMIN_B,
* TDMIN_C,
* SPDIFIN,
* PDMIN,
* NONE,
* TDMIN_LB,
* LOOPBACK,
*/
resample_module = <3>;
status = "okay";
};
}; /* end of audiobus */
&pinctrl_periphs {

View File

@@ -215,13 +215,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -273,7 +273,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -289,6 +289,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -368,6 +369,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -202,13 +202,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -260,7 +260,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -276,6 +276,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -355,6 +356,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x7ff00000>;
linux,usable-memory = <0x0 0x000000 0x0 0x80000000>;
};
reserved-memory {
@@ -149,6 +149,12 @@
size = <0x0 0x04000000>;
alignment = <0x0 0x400000>;
};
vm0_cma_reserved:linux,vm0_cma {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
};
gpioleds {
@@ -228,13 +234,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -282,6 +288,54 @@
dev_name = "ionvideo";
status = "okay";
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;
dev_name = "vm0";
status = "disabled";
vm_id = <0>;
};
amvdec_656in {
/*bt656 gpio conflict with i2c0*/
compatible = "amlogic, amvdec_656in";
dev_name = "amvdec_656in";
status = "disabled";
reg = <0x0 0xffe02000 0x0 0x7c>;
clocks = <&clkc CLKID_BT656_COMP>,
<&clkc CLKID_BT656>;
clock-names = "cts_bt656_clk1",
"clk_gate_bt656";
/* bt656in1, bt656in2 */
bt656in1 {
bt656_id = <1>;
status = "disabled";
};
};
aml_cams {
compatible = "amlogic, cams_prober";
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&cam_dvp_pins &gen_clk_ee_z>;
clocks = <&clkc CLKID_GEN_CLK>;
clock-names = "g12a_24m";
cam_0{
cam_name = "gc2145";
front_back = <0>;
/*u200 i2c2 gpio conflict with ethmac*/
camera-i2c-bus = <&i2c2>;
gpio_pwdn-gpios = <&gpio GPIOZ_2 GPIO_ACTIVE_HIGH>;
gpio_rst-gpios = <&gpio GPIOZ_12 GPIO_ACTIVE_HIGH>;
mirror_flip = <1>;
vertical_flip = <1>;
spread_spectrum = <0>;
bt_path = "gpio";
bt_path_count = <1>;
vdin_path = <0>;
status = "okay";
};
};
gpio_keypad{
compatible = "amlogic, gpio_keypad";
@@ -310,7 +364,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -327,6 +381,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -411,6 +466,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -781,6 +841,13 @@
};
};
&i2c2 {
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&i2c2_master_pins2>;
clock-frequency = <100000>;
};
&i2c3 {
status = "okay";
pinctrl-names="default";
@@ -1116,6 +1183,32 @@
};
};
clk12_24_z_pins:clk12_24_z_pins {
mux {
groups = "clk12_24_z";
function = "clk12_24_ee";
drive-strength = <3>;
};
};
gen_clk_ee_z: gen_clk_ee_z {
mux {
groups="gen_clk_ee_z";
function="gen_clk_ee";
drive-strength = <3>;
};
};
cam_dvp_pins:cam_dvp_pins {
mux {
groups = "bt656_a_vs", "bt656_a_hs", "bt656_a_clk",
"bt656_a_din0", "bt656_a_din1", "bt656_a_din2",
"bt656_a_din3", "bt656_a_din4", "bt656_a_din5",
"bt656_a_din6", "bt656_a_din7";
function = "bt656";
};
};
}; /* end of pinctrl_periphs */
&pinctrl_aobus {

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x3ff00000>;
linux,usable-memory = <0x0 0x000000 0x0 0x40000000>;
};
reserved-memory {
@@ -149,6 +149,12 @@
size = <0x0 0x04000000>;
alignment = <0x0 0x400000>;
};
vm0_cma_reserved:linux,vm0_cma {
compatible = "shared-dma-pool";
reusable;
size = <0x0 0x2000000>;
alignment = <0x0 0x400000>;
};
};
gpioleds {
@@ -228,13 +234,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -282,6 +288,54 @@
dev_name = "ionvideo";
status = "okay";
};
vm0 {
compatible = "amlogic, vm";
memory-region = <&vm0_cma_reserved>;
dev_name = "vm0";
status = "disabled";
vm_id = <0>;
};
amvdec_656in {
/*bt656 gpio conflict with i2c0*/
compatible = "amlogic, amvdec_656in";
dev_name = "amvdec_656in";
status = "disabled";
reg = <0x0 0xffe02000 0x0 0x7c>;
clocks = <&clkc CLKID_BT656_COMP>,
<&clkc CLKID_BT656>;
clock-names = "cts_bt656_clk1",
"clk_gate_bt656";
/* bt656in1, bt656in2 */
bt656in1 {
bt656_id = <1>;
status = "disabled";
};
};
aml_cams {
compatible = "amlogic, cams_prober";
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&cam_dvp_pins &gen_clk_ee_z>;
clocks = <&clkc CLKID_GEN_CLK>;
clock-names = "g12a_24m";
cam_0{
cam_name = "gc2145";
front_back = <0>;
/*u200 i2c2 gpio conflict with ethmac*/
camera-i2c-bus = <&i2c2>;
gpio_pwdn-gpios = <&gpio GPIOZ_2 GPIO_ACTIVE_HIGH>;
gpio_rst-gpios = <&gpio GPIOZ_12 GPIO_ACTIVE_HIGH>;
mirror_flip = <1>;
vertical_flip = <1>;
spread_spectrum = <0>;
bt_path = "gpio";
bt_path_count = <1>;
vdin_path = <0>;
status = "okay";
};
};
gpio_keypad{
compatible = "amlogic, gpio_keypad";
@@ -310,7 +364,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <16>;
unifykey-num = <17>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -327,6 +381,7 @@
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
unifykey-index-16= <&keysn_16>;
keysn_0: key_0{
key-name = "usid";
@@ -411,6 +466,11 @@
key-device = "normal";
key-permit = "read","write","del";
};
keysn_16:key_16{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -781,6 +841,13 @@
};
};
&i2c2 {
status = "disabled";
pinctrl-names="default";
pinctrl-0=<&i2c2_master_pins2>;
clock-frequency = <100000>;
};
&i2c3 {
status = "okay";
pinctrl-names="default";
@@ -1116,6 +1183,32 @@
};
};
clk12_24_z_pins:clk12_24_z_pins {
mux {
groups = "clk12_24_z";
function = "clk12_24_ee";
drive-strength = <3>;
};
};
gen_clk_ee_z: gen_clk_ee_z {
mux {
groups="gen_clk_ee_z";
function="gen_clk_ee";
drive-strength = <3>;
};
};
cam_dvp_pins:cam_dvp_pins {
mux {
groups = "bt656_a_vs", "bt656_a_hs", "bt656_a_clk",
"bt656_a_din0", "bt656_a_din1", "bt656_a_din2",
"bt656_a_din3", "bt656_a_din4", "bt656_a_din5",
"bt656_a_din6", "bt656_a_din7";
function = "bt656";
};
};
}; /* end of pinctrl_periphs */
&pinctrl_aobus {

View File

@@ -213,13 +213,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -383,7 +383,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -398,6 +398,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -472,6 +473,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -214,13 +214,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -384,7 +384,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -399,6 +399,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -473,6 +474,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -214,13 +214,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -384,7 +384,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <14>;
unifykey-num = <15>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -399,6 +399,7 @@
unifykey-index-11= <&keysn_11>;
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
keysn_0: key_0{
key-name = "usid";
@@ -473,6 +474,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_14:key_14{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -252,13 +252,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -318,7 +318,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -334,6 +334,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -413,6 +414,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -246,13 +246,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -312,7 +312,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -328,6 +328,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -407,6 +408,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -241,13 +241,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -307,7 +307,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -323,6 +323,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -402,6 +403,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -225,13 +225,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -372,7 +372,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -388,6 +388,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -467,6 +468,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x7ff00000>;
linux,usable-memory = <0x0 0x000000 0x0 0x80000000>;
};
reserved-memory {
@@ -252,13 +252,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -306,19 +306,47 @@
dev_name = "ionvideo";
status = "okay";
};
dvb{
compatible = "amlogic, dvb";
dev_name = "dvb";
status = "ok";
/*"parallel","serial","disable"*/
ts2 = "parallel";
ts2_control = <0>;
ts2_invert = <0>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
*
* fe0_mode = "external";
* fe0_demod = "Atbm8881";
* fe0_i2c_adap_id = <&i2c2>;
* fe0_demod_i2c_addr = <0xc0>;
* fe0_ts = <1>;
* fe0_reset_value = <0>;
* fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
*
* ts1 = "parallel";
* ts1_control = <0>;
* ts1_invert = <0>;
* interrupts = <0 23 1
* 0 5 1
* 0 21 1
* 0 19 1
* 0 25 1
* 0 18 1
* 0 24 1>;
* interrupt-names = "demux0_irq",
* "demux1_irq",
* "demux2_irq",
* "dvr0_irq",
* "dvr1_irq",
* "dvrfill0_fill",
* "dvrfill1_flush";
* pinctrl-names = "p_ts1";
* pinctrl-0 = <&dvb_p_ts1_pins>;
* clocks = <&clkc CLKID_DEMUX
* &clkc CLKID_AHB_ARB0
* &clkc CLKID_DOS_PARSER>;
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -334,7 +362,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
key-device = "normal";
@@ -413,6 +441,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -783,6 +816,19 @@
};
};
/*
*if use i2c2_master_pins2
*please disable internal_eth_pins
*in case pinmux conflict
*/
/*&i2c2 {
* status = "okay";
* pinctrl-names="default";
* pinctrl-0=<&i2c2_master_pins2>;
* clock-frequency = <300000>;
*};
*/
&i2c3 {
status = "disabled";
pinctrl-names="default";

View File

@@ -45,7 +45,7 @@
memory@00000000 {
device_type = "memory";
linux,usable-memory = <0x0 0x100000 0x0 0x3ff00000>;
linux,usable-memory = <0x0 0x000000 0x0 0x40000000>;
};
@@ -246,13 +246,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -300,19 +300,47 @@
dev_name = "ionvideo";
status = "okay";
};
dvb{
compatible = "amlogic, dvb";
dev_name = "dvb";
status = "ok";
/*"parallel","serial","disable"*/
ts2 = "parallel";
ts2_control = <0>;
ts2_invert = <0>;
};
/*dvb {
* compatible = "amlogic, dvb";
* dev_name = "dvb";
*
* fe0_mode = "external";
* fe0_demod = "Atbm8881";
* fe0_i2c_adap_id = <&i2c2>;
* fe0_demod_i2c_addr = <0xc0>;
* fe0_ts = <1>;
* fe0_reset_value = <0>;
* fe0_reset_gpio = <&gpio GPIOZ_1 GPIO_ACTIVE_HIGH>;
*
* ts1 = "parallel";
* ts1_control = <0>;
* ts1_invert = <0>;
* interrupts = <0 23 1
* 0 5 1
* 0 21 1
* 0 19 1
* 0 25 1
* 0 18 1
* 0 24 1>;
* interrupt-names = "demux0_irq",
* "demux1_irq",
* "demux2_irq",
* "dvr0_irq",
* "dvr1_irq",
* "dvrfill0_fill",
* "dvrfill1_flush";
* pinctrl-names = "p_ts1";
* pinctrl-0 = <&dvb_p_ts1_pins>;
* clocks = <&clkc CLKID_DEMUX
* &clkc CLKID_AHB_ARB0
* &clkc CLKID_DOS_PARSER>;
* clock-names = "demux", "ahbarb0", "parser_top";
*};
*/
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -328,6 +356,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -407,6 +436,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{
@@ -774,6 +808,19 @@
};
};
/*
*if use i2c2_master_pins2
*please disable internal_eth_pins
*in case pinmux conflict
*/
/*&i2c2 {
* status = "okay";
* pinctrl-names="default";
* pinctrl-0=<&i2c2_master_pins2>;
* clock-frequency = <300000>;
*};
*/
&i2c3 {
status = "disabled";
pinctrl-names="default";

View File

@@ -225,13 +225,13 @@
wifi_pwm_conf:wifi_pwm_conf{
pwm_channel1_conf {
pwms = <&pwm_ef MESON_PWM_0 30040 0>;
duty-cycle = <15020>;
pwms = <&pwm_ef MESON_PWM_0 30541 0>;
duty-cycle = <15270>;
times = <10>;
};
pwm_channel2_conf {
pwms = <&pwm_ef MESON_PWM_2 30030 0>;
duty-cycle = <15015>;
pwms = <&pwm_ef MESON_PWM_2 30500 0>;
duty-cycle = <15250>;
times = <12>;
};
};
@@ -372,7 +372,7 @@
unifykey{
compatible = "amlogic, unifykey";
status = "ok";
unifykey-num = <15>;
unifykey-num = <16>;
unifykey-index-0 = <&keysn_0>;
unifykey-index-1 = <&keysn_1>;
unifykey-index-2 = <&keysn_2>;
@@ -388,6 +388,7 @@
unifykey-index-12= <&keysn_12>;
unifykey-index-13= <&keysn_13>;
unifykey-index-14= <&keysn_14>;
unifykey-index-15= <&keysn_15>;
keysn_0: key_0{
key-name = "usid";
@@ -467,6 +468,11 @@
key-device = "secure";
key-permit = "read","write","del";
};
keysn_15:key_15{
key-name = "netflix_mgkid";
key-device = "secure";
key-permit = "read","write","del";
};
};//End unifykey
efusekey:efusekey{

Some files were not shown because too many files have changed in this diff Show More