| author | zhiqiang liang <zhiqiang.liang@amlogic.com> | 2019-03-13 03:14:11 (GMT) |
|---|---|---|
| committer | Jianxin Pan <jianxin.pan@amlogic.com> | 2019-03-29 11:41:59 (GMT) |
| commit | 2eef77a202afd8754a907563792abd9bbe4952e3 (patch) | |
| tree | a91edccae15c249b7c5626871b53349ae07a21b2 | |
| parent | 5d5ca50e2731db7e3dc1cb93275fc4c8ada42bb5 (diff) | |
| download | common-2eef77a202afd8754a907563792abd9bbe4952e3.zip common-2eef77a202afd8754a907563792abd9bbe4952e3.tar.gz common-2eef77a202afd8754a907563792abd9bbe4952e3.tar.bz2 | |
dts: modify dts for SM1 bringup with SMP [1/1]
PD#SWPL-5865
Problem:
SM1 bring up
Solution:
modify dts for SM1 bringup with smp
Verify:
PxP
Change-Id: Ie83ad7434acfb8c6232a8e373dfc63ef0ba9b87e
Signed-off-by: zhiqiang liang <zhiqiang.liang@amlogic.com>
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesonsm1.dtsi | 10 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/sm1_pxp.dts | 2 | ||||
| -rw-r--r-- | drivers/amlogic/media/deinterlace/deinterlace.c | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | scripts/amlogic/mk_dtb_gx.sh | 0 |
4 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi index 3d53f8b..91d55eb 100644 --- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi @@ -55,7 +55,7 @@ compatible = "arm,cortex-a53","arm,armv8"; reg = <0x0 0x0>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; +// cpu-idle-states = <&CPU_SLEEP_0>; clocks = <&clkc CLKID_CPU_CLK>, <&clkc CLKID_CPU_FCLK_P>, <&clkc CLKID_SYS_PLL>; @@ -73,7 +73,7 @@ compatible = "arm,cortex-a53","arm,armv8"; reg = <0x0 0x1>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; +// cpu-idle-states = <&CPU_SLEEP_0>; clocks = <&clkc CLKID_CPU_CLK>, <&clkc CLKID_CPU_FCLK_P>, <&clkc CLKID_SYS_PLL>; @@ -91,7 +91,7 @@ compatible = "arm,cortex-a53","arm,armv8"; reg = <0x0 0x2>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; +// cpu-idle-states = <&CPU_SLEEP_0>; clocks = <&clkc CLKID_CPU_CLK>, <&clkc CLKID_CPU_FCLK_P>, <&clkc CLKID_SYS_PLL>; @@ -109,7 +109,7 @@ compatible = "arm,cortex-a53","arm,armv8"; reg = <0x0 0x3>; enable-method = "psci"; - cpu-idle-states = <&CPU_SLEEP_0>; +// cpu-idle-states = <&CPU_SLEEP_0>; clocks = <&clkc CLKID_CPU_CLK>, <&clkc CLKID_CPU_FCLK_P>, <&clkc CLKID_SYS_PLL>; @@ -732,7 +732,7 @@ fifosize = < 64 >; pinctrl-names = "default"; /*pinctrl-0 = <&ao_uart_pins>;*/ - support-sysrq = <0>; /* 0 not support*/ + support-sysrq = <1>; /* 0 not support*/ }; uart_AO_B: serial@4000 { diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts index 2235dfd..f094515 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts @@ -436,7 +436,7 @@ compatible = "amlogic, cpufreq-meson"; pinctrl-names = "default"; pinctrl-0 = <&pwm_ao_d_pins3>; - status = "okay"; + status = "disabled"; }; diff --git a/drivers/amlogic/media/deinterlace/deinterlace.c b/drivers/amlogic/media/deinterlace/deinterlace.c index 83a2c14..ad47b79 100644 --- a/drivers/amlogic/media/deinterlace/deinterlace.c +++ b/drivers/amlogic/media/deinterlace/deinterlace.c @@ -7821,13 +7821,14 @@ static int di_probe(struct platform_device *pdev) vf_reg_receiver(&di_vf_recv); vf_provider_init(&di_vf_prov, VFM_NAME, &deinterlace_vf_provider, NULL); active_flag = 1; + sema_init(&di_sema, 1); ret = request_irq(di_devp->pre_irq, &de_irq, IRQF_SHARED, "pre_di", (void *)"pre_di"); if (di_devp->post_wr_support) { ret = request_irq(di_devp->post_irq, &post_irq, IRQF_SHARED, "post_di", (void *)"post_di"); } - sema_init(&di_sema, 1); + //sema_init(&di_sema, 1); di_sema_init_flag = 1; di_hw_init(pulldown_enable, mcpre_en); set_di_flag(); diff --git a/scripts/amlogic/mk_dtb_gx.sh b/scripts/amlogic/mk_dtb_gx.sh index 1fc3549..1fc3549 100644..100755 --- a/scripts/amlogic/mk_dtb_gx.sh +++ b/scripts/amlogic/mk_dtb_gx.sh |