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

hdmitx: fix hdmitx startup ioremap warning [1/1]

Browse Source 
PD#SWPL-189311

Problem:
there is ioremap warning during hdmitx driver startup process

Solution:
removed all-0 address segment ioremap operation

Verify:
SC2

Test:
DRM-TX-5

Change-Id: Iec472bac2c4373e7c77bf618c72e013d1018b023
Signed-off-by: ruofei.zhao <ruofei.zhao@amlogic.com>
This commit is contained in:
ruofei.zhao
2024-10-16 18:25:01 +08:00
committed by Wanwei Jiang
parent 5c4980155c
commit dd4188cef2
12 changed files with 174 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/amlogic/meson-s4.dtsi
+11 -15
View File
@@ -1611,28 +1611,24 @@
/* refer to hdmi_tx_module.h */
ic_type = <15>;
hdmi_rext = <1300>; /* HDMI Rext resistor uses 1.3k ohm, not 1.5k */
reg = <0x00000000 0x000>, /* reserved */
<0xff000000 0x40000>,
<0x00000000 0x000>, /* reserved */
<0xfe308000 0x8000>,
reg = <0xff000000 0x40000>,
<0xfe300000 0x8000>,
<0xfe308000 0x8000>,
<0xfe032000 0x100>,
<0xfe008000 0x400>,
<0xfe00c000 0x800>,
<0xfe002000 0x400>,
<0xfe010000 0x100>,
<0xfe000000 0x2000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
vend_data: vend_data{ /* Should modified by Customer */
vendor_name = "Amlogic"; /* Max Chars: 8 */
arch/arm/boot/dts/amlogic/meson-s4d.dtsi
+11 -15
View File
@@ -1644,28 +1644,24 @@
/* refer to hdmi_tx_module.h */
ic_type = <15>;
hdmi_rext = <1300>; /* HDMI Rext resistor uses 1.3k ohm, not 1.5k */
reg = <0x00000000 0x000>, /* reserved */
<0xff000000 0x40000>,
<0x00000000 0x000>, /* reserved */
<0xfe308000 0x8000>,
reg = <0xff000000 0x40000>,
<0xfe300000 0x8000>,
<0xfe308000 0x8000>,
<0xfe032000 0x100>,
<0xfe008000 0x400>,
<0xfe00c000 0x800>,
<0xfe002000 0x400>,
<0xfe010000 0x100>,
<0xfe000000 0x2000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
vend_data: vend_data{ /* Should modified by Customer */
vendor_name = "Amlogic"; /* Max Chars: 8 */
arch/arm/boot/dts/amlogic/meson-sc2.dtsi
+11 -15
View File
@@ -1687,28 +1687,24 @@
interrupt-names = "hdmitx_hpd", "viu1_vsync";
/* refer to hdmi_tx_module.h */
ic_type = <15>;
reg = <0x00000000 0x000>, /* reserved */
<0xff000000 0x40000>,
<0x00000000 0x000>, /* reserved */
<0xfe308000 0x8000>,
reg = <0xff000000 0x40000>,
<0xfe300000 0x8000>,
<0xfe308000 0x8000>,
<0xfe032000 0x100>,
<0xfe008000 0x400>,
<0xfe00c000 0x800>,
<0xfe002000 0x400>,
<0xfe010000 0x100>,
<0xfe000000 0x2000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
vend_data: vend_data{ /* Should modified by Customer */
vendor_name = "Amlogic"; /* Max Chars: 8 */
arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+11 -16
View File
@@ -1613,29 +1613,24 @@
/* refer to hdmi_tx_module.h */
ic_type = <15>;
hdmi_rext = <1300>; /* HDMI Rext resistor uses 1.3k ohm, not 1.5k */
reg = <0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xff000000 0x0 0x40000>,
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xfe308000 0x0 0x8000>,
reg = <0x0 0xff000000 0x0 0x40000>,
<0x0 0xfe300000 0x0 0x8000>,
<0x0 0xfe308000 0x0 0x8000>,
<0x0 0xfe032000 0x0 0x100>,
<0x0 0xfe008000 0x0 0x400>,
<0x0 0xfe00c000 0x0 0x800>,
<0x0 0xfe002000 0x0 0x400>,
<0x0 0xfe010000 0x0 0x100>,
<0x0 0xfe000000 0x0 0x2000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitx_dwc",
"hdmitx_top",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
reg-names = "vpu",
"hdmitx_dwc",
"hdmitx_top",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
vend_data: vend_data{ /* Should modified by Customer */
vendor_name = "Amlogic"; /* Max Chars: 8 */
product_desc = "MBox Meson Ref"; /* Max Chars: 16 */
arch/arm64/boot/dts/amlogic/meson-s4d.dtsi
+11 -16
View File
@@ -1447,29 +1447,24 @@
/* refer to hdmi_tx_module.h */
ic_type = <15>;
hdmi_rext = <1300>; /* HDMI Rext resistor uses 1.3k ohm, not 1.5k */
reg = <0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xff000000 0x0 0x40000>,
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xfe308000 0x0 0x8000>,
reg = <0x0 0xff000000 0x0 0x40000>,
<0x0 0xfe300000 0x0 0x8000>,
<0x0 0xfe308000 0x0 0x8000>,
<0x0 0xfe032000 0x0 0x100>,
<0x0 0xfe008000 0x0 0x400>,
<0x0 0xfe00c000 0x0 0x800>,
<0x0 0xfe002000 0x0 0x400>,
<0x0 0xfe010000 0x0 0x100>,
<0x0 0xfe000000 0x0 0x2000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
vend_data: vend_data{ /* Should modified by Customer */
vendor_name = "Amlogic"; /* Max Chars: 8 */
product_desc = "MBox Meson Ref"; /* Max Chars: 16 */
arch/arm64/boot/dts/amlogic/meson-sc2.dtsi
+11 -16
View File
@@ -1690,29 +1690,24 @@
interrupt-names = "hdmitx_hpd", "viu1_vsync";
/* refer to hdmi_tx_module.h */
ic_type = <15>;
reg = <0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xff000000 0x0 0x40000>,
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xfe308000 0x0 0x8000>,
reg = <0x0 0xff000000 0x0 0x40000>,
<0x0 0xfe300000 0x0 0x8000>,
<0x0 0xfe308000 0x0 0x8000>,
<0x0 0xfe032000 0x0 0x100>,
<0x0 0xfe008000 0x0 0x400>,
<0x0 0xfe00c000 0x0 0x800>,
<0x0 0xfe002000 0x0 0x400>,
<0x0 0xfe010000 0x0 0x100>,
<0x0 0xfe000000 0x0 0x2000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl";
vend_data: vend_data{ /* Should modified by Customer */
vendor_name = "Amlogic"; /* Max Chars: 8 */
product_desc = "MBox Meson Ref"; /* Max Chars: 16 */
arch/arm64/boot/dts/amlogic/mesong12a.dtsi
+12 -22
View File
@@ -1099,32 +1099,22 @@
* 10:G12A 11:G12B
*/
ic_type = <10>;
reg = <0x0 0xffd00000 0x0 0x100000>,
<0x0 0xff900000 0x0 0x40000>,
reg = <0x0 0xff900000 0x0 0x40000>,
<0x0 0xff600000 0x0 0x8000>,
<0x0 0xff608000 0x0 0x4000>,
<0x0 0xffe01000 0x0 0x100>,
<0x0 0xff63c000 0x0 0x2000>,
<0x0 0xff608000 0x0 0x4000>, //TOP
<0x0 0xff600000 0x0 0x8000>, //DWC reverse
<0x0 0xffe01000 0x0 0x100>, //ESM
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xffd00000 0x0 0x100000>,
<0x0 0xffd00000 0x0 0x1100>,
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0x00000000 0x0 0x0000>,/* reserved */
<0x0 0x00000000 0x0 0x0000>, /* reserved */
<0x0 0xff634400 0x0 0x2000>,
<0x0 0xff800000 0x0 0x100000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl",
"padctrl",
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"hiu",
"cbus",
"resetctrl",
"periphs",
"aobus";
vend_data: vend_data{ /* Should modified by Customer */
arch/arm64/boot/dts/amlogic/mesong12b.dtsi
+12 -22
View File
@@ -1175,32 +1175,22 @@
* 10:G12A 11:G12B
*/
ic_type = <11>;
reg = <0x0 0xffd00000 0x0 0x100000>,
<0x0 0xff900000 0x0 0x40000>,
reg = <0x0 0xff900000 0x0 0x40000>,
<0x0 0xff600000 0x0 0x8000>,
<0x0 0xff608000 0x0 0x4000>,
<0x0 0xffe01000 0x0 0x100>,
<0x0 0xff63c000 0x0 0x2000>,
<0x0 0xff608000 0x0 0x4000>, //TOP
<0x0 0xff600000 0x0 0x8000>, //DWC reverse
<0x0 0xffe01000 0x0 0x100>, //ESM
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xffd00000 0x0 0x100000>,
<0x0 0xffd00000 0x0 0x1100>,
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0x00000000 0x0 0x0000>,/* reserved */
<0x0 0x00000000 0x0 0x0000>, /* reserved */
<0x0 0xff634400 0x0 0x2000>,
<0x0 0xff800000 0x0 0x100000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl",
"padctrl",
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"hiu",
"cbus",
"resetctrl",
"periphs",
"aobus";
vend_data: vend_data{ /* Should modified by Customer */
arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+12 -22
View File
@@ -1378,32 +1378,22 @@
* 10:G12A 11:G12B 12:SM1
*/
ic_type = <12>;
reg = <0x0 0xffd00000 0x0 0x100000>,
<0x0 0xff900000 0x0 0x40000>,
reg = <0x0 0xff900000 0x0 0x40000>,
<0x0 0xff600000 0x0 0x8000>,
<0x0 0xff608000 0x0 0x4000>,
<0x0 0xffe01000 0x0 0x100>,
<0x0 0xff63c000 0x0 0x2000>,
<0x0 0xff608000 0x0 0x4000>, //TOP
<0x0 0xff600000 0x0 0x8000>, //DWC reverse
<0x0 0xffe01000 0x0 0x100>, //ESM
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0xffd00000 0x0 0x100000>,
<0x0 0xffd00000 0x0 0x1100>,
<0x0 0x00000000 0x0 0x000>, /* reserved */
<0x0 0x00000000 0x0 0x0000>,/* reserved */
<0x0 0x00000000 0x0 0x0000>, /* reserved */
<0x0 0xff634400 0x0 0x2000>,
<0x0 0xff800000 0x0 0x100000>;
reg-names = "cbus",
"vpu",
"hiu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"anactrl",
"pwrctrl",
"resetctrl",
"sysctrl",
"clkctrl",
"padctrl",
reg-names = "vpu",
"hdmitxdwc",
"hdmitxtop",
"esm",
"hiu",
"cbus",
"resetctrl",
"periphs",
"aobus";
vend_data: vend_data{ /* Should modified by Customer */
drivers/media/vout/hdmitx20/hw/hdmi_tx_dump.c
+38 -36
View File
@@ -33,16 +33,11 @@ static inline unsigned int get_msr_cts(void);
static int dump_regs_show(struct seq_file *s, void *p)
{
int i;
struct hdmitx_dev *hdev = get_hdmitx_device();
int chip_id = hdev->tx_hw.chip_data->chip_type;
if (reg_maps[HHI_REG_IDX].phy_addr) {
seq_puts(s, "\n--------HHI registers--------\n");
for (i = 0; i < 0x80; i++)
PR_BUS(HHI_REG_ADDR(i));
for (i = 0x80; i < 0x100; i++)
PR_BUS(HHI_REG_ADDR(i));
}
if (reg_maps[VCBUS_REG_IDX].phy_addr) {
if (reg_maps[VPU_REG_IDX].phy_addr) {
seq_puts(s, "\n--------ENCP registers--------\n");
for (i = 0x1b00; i < 0x1b80; i++)
PR_BUS(VCBUS_REG_ADDR(i));
@@ -58,36 +53,43 @@ static int dump_regs_show(struct seq_file *s, void *p)
PR_BUS(VCBUS_REG_ADDR(i));
}
if (reg_maps[CBUS_REG_IDX].phy_addr) {
seq_puts(s, "\n--------CBUS registers--------\n");
PR_BUS(P_AIU_HDMI_CLK_DATA_CTRL);
PR_BUS(P_ISA_DEBUG_REG0);
}
/* HHI and CBUS only exist on chips before SC2 */
if (chip_id < MESON_CPU_ID_SC2) {
if (reg_maps[HHI_REG_IDX].phy_addr) {
seq_puts(s, "\n--------HHI registers--------\n");
for (i = 0; i < 0x80; i++)
PR_BUS(HHI_REG_ADDR(i));
for (i = 0x80; i < 0x100; i++)
PR_BUS(HHI_REG_ADDR(i));
}
if (reg_maps[CBUS_REG_IDX].phy_addr) {
seq_puts(s, "\n--------CBUS registers--------\n");
PR_BUS(P_AIU_HDMI_CLK_DATA_CTRL);
PR_BUS(P_ISA_DEBUG_REG0);
}
if (reg_maps[ANACTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------ANACTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(ANACTRL_REG_ADDR(i));
} else {
if (reg_maps[ANACTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------ANACTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(ANACTRL_REG_ADDR(i));
}
if (reg_maps[PWRCTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------PWRCTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(PWRCTRL_REG_ADDR(i));
}
if (reg_maps[SYSCTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------SYSCTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(SYSCTRL_REG_ADDR(i));
}
if (reg_maps[CLKCTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------CLKCTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(CLKCTRL_REG_ADDR(i));
}
}
if (reg_maps[PWRCTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------PWRCTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(PWRCTRL_REG_ADDR(i));
}
if (reg_maps[SYSCTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------SYSCTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(SYSCTRL_REG_ADDR(i));
}
if (reg_maps[CLKCTRL_REG_IDX].phy_addr) {
seq_puts(s, "\n--------CLKCTRL registers--------\n");
for (i = 0; i < 0xff; i++)
PR_BUS(CLKCTRL_REG_ADDR(i));
}
seq_puts(s, "\n");
return 0;
drivers/media/vout/hdmitx20/hw/reg_ops.c
+1 -1
View File
@@ -32,7 +32,7 @@ int hdmitx_init_reg_map(struct platform_device *pdev)
struct resource res;
struct device_node *np = pdev->dev.of_node;
for (i = CBUS_REG_IDX; i < REG_IDX_END; i++) {
for (i = VPU_REG_IDX; i < REG_IDX_END; i++) {
if (of_address_to_resource(np, i, &res)) {
HDMITX_INFO("not get regbase index %d\n", i);
return 0;
drivers/media/vout/hdmitx20/hw/reg_ops.h
+33 -20
View File
@@ -33,23 +33,34 @@ struct reg_map {
};
enum map_addr_idx_e {
CBUS_REG_IDX = 0,
VCBUS_REG_IDX,
HHI_REG_IDX,
HDMITX_REG_IDX, //DWC
HDMITX_SEC_REG_IDX, //TOP
ELP_ESM_REG_IDX,
/* new added in SC2 */
ANACTRL_REG_IDX,
PWRCTRL_REG_IDX,
RESETCTRL_REG_IDX,
SYSCTRL_REG_IDX,
CLKCTRL_REG_IDX,
PADCTRL_REG_IDX,
/* g12a add */
PERIPHS_REG_IDX,
AOBUS_REG_IDX,
REG_IDX_END
/* VPU */
VPU_REG_IDX = 0,
/* HDMITX_DWC */
HDMITX_SEC_REG_IDX = 1,
/* HDMITX_TOP */
HDMITX_REG_IDX = 2,
/* ESM */
ELP_ESM_REG_IDX = 3,
/* ANACTRL for SC2 and later SOCs */
ANACTRL_REG_IDX = 4,
/* HHICTRL for G12A and previous SOCs */
HHI_REG_IDX = 4,
/* PWRCTRL for SC2 and later SOCs */
PWRCTRL_REG_IDX = 5,
/* CBUS for G12A and previous SOCs */
CBUS_REG_IDX = 5,
/* RESETCTRL */
RESETCTRL_REG_IDX = 6,
/* SYSCTRL for SC2 and later SOCs */
SYSCTRL_REG_IDX = 7,
/* PERIPHS for G12A and previous SOCs */
PERIPHS_REG_IDX = 7,
/* CLKCTRL for SC2 and later SOCs */
CLKCTRL_REG_IDX = 8,
/* AOBUS for G12A and previous SOCs */
AOBUS_REG_IDX = 8,
PADCTRL_REG_IDX = 9,
REG_IDX_END = 10,
};
#define BASE_REG_OFFSET 24
@@ -57,13 +68,15 @@ enum map_addr_idx_e {
#define CBUS_REG_ADDR(reg) \
((CBUS_REG_IDX << BASE_REG_OFFSET) + ((reg) << 2))
#define VCBUS_REG_ADDR(reg) \
((VCBUS_REG_IDX << BASE_REG_OFFSET) + ((reg) << 2))
((VPU_REG_IDX << BASE_REG_OFFSET) + ((reg) << 2))
#define HHI_REG_ADDR(reg) \
((HHI_REG_IDX << BASE_REG_OFFSET) + ((reg) << 2))
/* HDMITX_DWC */
#define HDMITX_SEC_REG_ADDR(reg) \
((HDMITX_SEC_REG_IDX << BASE_REG_OFFSET) + (reg))/*DWC*/
((HDMITX_SEC_REG_IDX << BASE_REG_OFFSET) + (reg))
/* HDMITX_TOP */
#define HDMITX_REG_ADDR(reg) \
((HDMITX_REG_IDX << BASE_REG_OFFSET) + (reg))/*TOP*/
((HDMITX_REG_IDX << BASE_REG_OFFSET) + (reg))
#define ELP_ESM_REG_ADDR(reg) \
((ELP_ESM_REG_IDX << BASE_REG_OFFSET) + ((reg) << 2))
#define ANACTRL_REG_ADDR(reg) \