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

dvb: ci mcu: control CAM throw mcu and used api to control mcu. [2/9]

Browse Source 
PD#SWPL-10659

Problem:
tsin and tsout pin not config.
ci mcu dts not add config.

Solution:
1 add tsin and tsout pinmux config.
2 add ci mcu dts config.

Verify:
verified on t962x3-t312 box.

Change-Id: Id8c271e41736e337c12141f879e97bc9673bb99e
Signed-off-by: hualing chen <hualing.chen@amlogic.com>
This commit is contained in:
hualing chen
2019-07-03 14:21:20 +08:00
committed by Tao Zeng
parent 627335e792
commit 63db46f23d
7 changed files with 2301 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@@ -15081,3 +15081,8 @@ F: arch/arm64/boot/dts/amlogic/mesonsm1_drm.dtsi
F: arch/arm/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
F: arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200_drm_buildroot.dts
F: drivers/amlogic/drm/meson_vpu.c
AMLOGIC ADD DTS FOR T312 PLATFORM
M: hualing chen <hualing.chen@amlogic.com>
F: arch/arm64/boot/dts/amlogic/mesontm2_t962x3_t312-panel.dtsi
F: arch/arm/boot/dts/amlogic/mesontm2_t962x3_t312-panel.dtsi

39
arch/arm/boot/dts/amlogic/mesontm2.dtsi
View File

@@ -2425,6 +2425,45 @@
input-enable;
};
};
dvb_s_ts0_pins: dvb_s_ts0_pins {
mux_1 {
groups = "tsin_a_din0",
"tsin_a_clk",
"tsin_a_sop",
"tsin_a_valid";
function = "tsin_a";
};
mux_2 {
groups = "tsout_dout0",
"tsout_dout1",
"tsout_dout2",
"tsout_dout3",
"tsout_dout4",
"tsout_dout5",
"tsout_dout6",
"tsout_dout7",
"tsout_clk",
"tsout_sop",
"tsout_valid";
function = "tsout";
};
mux_3 {
groups = "tsin_c_din0_z",
"tsin_c_din1_z",
"tsin_c_din2_z",
"tsin_c_din3_z",
"tsin_c_din4_z",
"tsin_c_din5_z",
"tsin_c_din6_z",
"tsin_c_din7_z",
"tsin_c_clk_z",
"tsin_c_sop_z",
"tsin_c_valid_z";
function = "tsin_c";
};
};
};
&gpu{

1066
arch/arm/boot/dts/amlogic/mesontm2_t962x3_t312-panel.dtsi Normal file
View File

File diff suppressed because it is too large Load Diff

47
arch/arm/boot/dts/amlogic/tm2_t962x3_t312.dts
View File

@@ -19,7 +19,7 @@
#include "mesontm2.dtsi"
#include "partition_mbox_normal.dtsi"
#include "mesontm2_t962x3_ab301-panel.dtsi"
#include "mesontm2_t962x3_t312-panel.dtsi"
/ {
model = "Amlogic TM2 T962X3 T312";
@@ -41,7 +41,7 @@
i2c3 = &i2c3;
i2c4 = &i2c_AO;
spi0 = &spicc0;
spi1 = &spicc1;
spi1 = &spicc_b;
};
memory@00000000 {
@@ -459,9 +459,12 @@
fe0_reset_value = <0>;
fe0_reset_gpio = <&gpio GPIODV_11 GPIO_ACTIVE_HIGH>;
/*"parallel","serial","disable"*/
ts0 = "serial";
ts0_control = <0x800>;
ts0_invert = <0>;
ts_out_invert = <1>;
interrupts = <0 23 1
0 5 1
0 53 1
@@ -474,6 +477,7 @@
"demux2_irq",
"dvr0_irq",
"dvr1_irq",
"dvr2_irq",
"dvrfill0_fill",
"dvrfill1_flush";
pinctrl-names = "s_ts0";
@@ -485,6 +489,24 @@
clock-names = "demux", "asyncfifo", "ahbarb0", "uparsertop";
};
dvbci {
compatible = "amlogic, dvbci";
dev_name = "dvbci";
io_type = <3>; /* 0=iobus,1=spi,2=cimax,3=spi-t312*/
dvbci_io {
/*mcu irq pin*/
mcu_irq_pin = <&gpio GPIOH_9 GPIO_ACTIVE_HIGH>;
/*below is spi config*/
/*if use iobus you need add iobus config below */
spi_bus_num = <1>;
spi_chip_select = <0>;
spi_max_frequency = <300000>; /* unit: hz */
spi_mode = <3>; /* mode: 0, 1, 2, 3 */
spi_cs_delay = <10 100>; /*h delay, cs delay(unit:us)*/
spi_write_check = <0>; /* 0=disable, 1=enable */
};
};
tvafe_avin_detect {
compatible = "amlogic, tm2_tvafe_avin_detect";
status = "okay";
@@ -1196,7 +1218,7 @@
wifi{
compatible = "amlogic, aml_wifi";
status = "okay";
status = "disabled";
interrupt_pin = <&gpio GPIOC_12 GPIO_ACTIVE_HIGH>;
irq_trigger_type = "GPIO_IRQ_LOW";
dhd_static_buf; //dhd_static_buf support
@@ -1220,7 +1242,7 @@
};
sd_emmc_b: sdio@ffe05000 {
status = "okay";
status = "disabled";
compatible = "amlogic, meson-mmc-tm2";
reg = <0x0 0xffe05000 0x0 0x800>;
interrupts = <0 190 4>;
@@ -1388,8 +1410,8 @@
&clkc CLKID_MPLL2>;
clock-names = "mclk", "clk_srcpll";
//pinctrl-names = "tdm_pins";
//pinctrl-0 = <&tdmout_c &tdmin_c>;
pinctrl-names = "tdm_pins";
pinctrl-0 = </*&tdmout_c &tdmin_c*/>;
status = "okay";
};
@@ -1459,7 +1481,7 @@
"pdm_sysclk";
pinctrl-names = "pdm_pins";
pinctrl-0 = <&pdmin>;
pinctrl-0 = </*&pdmin*/>;
/* mode 0~4, defalut:1 */
filter_mode = <1>;
@@ -2063,14 +2085,21 @@
};
&spicc0 {
status = "okay";
status = "disable";
pinctrl-names = "default";
pinctrl-0 = <&spicc0_pins_h>;
cs-gpios = <&gpio GPIOH_20 0>;
};
&spicc1 {
status = "disable";
pinctrl-names = "default";
pinctrl-0 = <&spicc1_pins_h>;
cs-gpios = <&gpio GPIOH_0 0>;
};
&spicc_b {
status = "disabled";
status = "okay";
pinctrl-names= "default";
pinctrl-0=<&spicc1_pins_h>;
num_chipselect = <1>;

39
arch/arm64/boot/dts/amlogic/mesontm2.dtsi
View File

@@ -2424,6 +2424,45 @@
input-enable;
};
};
dvb_s_ts0_pins: dvb_s_ts0_pins {
mux_1 {
groups = "tsin_a_din0",
"tsin_a_clk",
"tsin_a_sop",
"tsin_a_valid";
function = "tsin_a";
};
mux_2 {
groups = "tsout_dout0",
"tsout_dout1",
"tsout_dout2",
"tsout_dout3",
"tsout_dout4",
"tsout_dout5",
"tsout_dout6",
"tsout_dout7",
"tsout_clk",
"tsout_sop",
"tsout_valid";
function = "tsout";
};
mux_3 {
groups = "tsin_c_din0_z",
"tsin_c_din1_z",
"tsin_c_din2_z",
"tsin_c_din3_z",
"tsin_c_din4_z",
"tsin_c_din5_z",
"tsin_c_din6_z",
"tsin_c_din7_z",
"tsin_c_clk_z",
"tsin_c_sop_z",
"tsin_c_valid_z";
function = "tsin_c";
};
};
};
&gpu{

1066
arch/arm64/boot/dts/amlogic/mesontm2_t962x3_t312-panel.dtsi Normal file
View File

File diff suppressed because it is too large Load Diff

62
arch/arm64/boot/dts/amlogic/tm2_t962x3_t312.dts
View File

@@ -19,7 +19,7 @@
#include "mesontm2.dtsi"
#include "partition_mbox_normal_P_32.dtsi"
#include "mesontm2_t962x3_ab301-panel.dtsi"
#include "mesontm2_t962x3_t312-panel.dtsi"
/ {
model = "Amlogic TM2 T962X3 T312";
@@ -40,6 +40,8 @@
i2c2 = &i2c2;
i2c3 = &i2c3;
i2c4 = &i2c_AO;
spi0 = &spicc0;
spi1 = &spicc_b;
};
memory@00000000 {
@@ -449,6 +451,7 @@
compatible = "amlogic, dvb";
dev_name = "dvb";
status = "okay";
fe0_mode = "external";
fe0_demod = "Si2168";
fe0_i2c_adap_id = <&i2c0>;
@@ -457,9 +460,12 @@
fe0_reset_value = <0>;
fe0_reset_gpio = <&gpio GPIODV_11 GPIO_ACTIVE_HIGH>;
/*"parallel","serial","disable"*/
ts0 = "serial";
ts0_control = <0x800>;
ts0_invert = <0>;
ts_out_invert = <1>;
interrupts = <0 23 1
0 5 1
0 53 1
@@ -468,14 +474,17 @@
0 18 1
0 24 1>;
interrupt-names = "demux0_irq",
"demux1_irq",
"demux2_irq",
"dvr0_irq",
"dvr1_irq",
"dvrfill0_fill",
"dvrfill1_flush";
"demux1_irq",
"demux2_irq",
"dvr0_irq",
"dvr1_irq",
"dvr2_irq",
"dvrfill0_fill",
"dvrfill1_flush";
pinctrl-names = "s_ts0";
pinctrl-0 = <&dvb_s_ts0_pins>;
clocks = <&clkc CLKID_DEMUX
&clkc CLKID_ASYNC_FIFO
&clkc CLKID_AHB_ARB0
@@ -483,6 +492,24 @@
clock-names = "demux", "asyncfifo", "ahbarb0", "uparsertop";
};
dvbci {
compatible = "amlogic, dvbci";
dev_name = "dvbci";
io_type = <3>; /* 0=iobus,1=spi,2=cimax,3=spi-t312*/
dvbci_io {
/*mcu irq pin*/
mcu_irq_pin = <&gpio GPIOH_9 GPIO_ACTIVE_HIGH>;
/*below is spi config*/
/*if use iobus you need add iobus config below */
spi_bus_num = <1>;
spi_chip_select = <0>;
spi_max_frequency = <300000>; /* unit: hz */
spi_mode = <3>; /* mode: 0, 1, 2, 3 */
spi_cs_delay = <10 100>; /*h delay, cs delay(unit:us)*/
spi_write_check = <0>; /* 0=disable, 1=enable */
};
};
tvafe_avin_detect {
compatible = "amlogic, tm2_tvafe_avin_detect";
status = "okay";
@@ -1194,7 +1221,7 @@
wifi{
compatible = "amlogic, aml_wifi";
status = "okay";
status = "disabled";
interrupt_pin = <&gpio GPIOC_12 GPIO_ACTIVE_HIGH>;
irq_trigger_type = "GPIO_IRQ_LOW";
dhd_static_buf; //dhd_static_buf support
@@ -1218,7 +1245,7 @@
};
sd_emmc_b: sdio@ffe05000 {
status = "okay";
status = "disabled";
compatible = "amlogic, meson-mmc-tm2";
reg = <0x0 0xffe05000 0x0 0x800>;
interrupts = <0 190 4>;
@@ -1385,8 +1412,8 @@
&clkc CLKID_MPLL2>;
clock-names = "mclk", "clk_srcpll";
//pinctrl-names = "tdm_pins";
//pinctrl-0 = <&tdmout_c &tdmin_c>;
pinctrl-names = "tdm_pins";
pinctrl-0 = </*&tdmout_c &tdmin_c*/>;
status = "okay";
};
@@ -1456,7 +1483,7 @@
"pdm_sysclk";
pinctrl-names = "pdm_pins";
pinctrl-0 = <&pdmin>;
pinctrl-0 = </*&pdmin*/>;
/* mode 0~4, defalut:1 */
filter_mode = <1>;
@@ -2053,14 +2080,21 @@
};
&spicc0 {
status = "okay";
status = "disable";
pinctrl-names = "default";
pinctrl-0 = <&spicc0_pins_h>;
cs-gpios = <&gpio GPIOH_20 0>;
};
&spicc1 {
status = "disable";
pinctrl-names = "default";
pinctrl-0 = <&spicc1_pins_h>;
cs-gpios = <&gpio GPIOH_0 0>;
};
&spicc_b {
status = "disabled";
status = "okay";
pinctrl-names= "default";
pinctrl-0=<&spicc1_pins_h>;
num_chipselect = <1>;