mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux: clean up Amlogic patches
- rename aarch64 patch dir to "amlogic-3.14" - move common 3.10 patches to "amlogic-3.10"
This commit is contained in:
kszaq
parent
9e4c5ea828
commit
1562a7ea14
@ -33,11 +33,13 @@ case "$LINUX" in
|
||||
PKG_VERSION="86c93aa"
|
||||
PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
|
||||
PKG_PATCH_DIRS="amlogic-3.10"
|
||||
;;
|
||||
amlogic-3.14)
|
||||
PKG_VERSION="1cc2d39"
|
||||
PKG_URL="https://github.com/LibreELEC/linux-amlogic/archive/$PKG_VERSION.tar.gz"
|
||||
PKG_SOURCE_DIR="$PKG_NAME-amlogic-$PKG_VERSION*"
|
||||
PKG_PATCH_DIRS="amlogic-3.14"
|
||||
;;
|
||||
imx6)
|
||||
PKG_VERSION="3.14-mx6-sr"
|
||||
|
||||
@ -1,905 +0,0 @@
|
||||
diff --git a/arch/arm/mach-mesong9bb/hdmi_tx_hw_20/hdmi_tx_cec_hw.c b/arch/arm/mach-mesong9bb/hdmi_tx_hw_20/hdmi_tx_cec_hw.c
|
||||
index a2a78bd..762feba 100644
|
||||
--- a/arch/arm/mach-mesong9bb/hdmi_tx_hw_20/hdmi_tx_cec_hw.c
|
||||
+++ b/arch/arm/mach-mesong9bb/hdmi_tx_hw_20/hdmi_tx_cec_hw.c
|
||||
@@ -996,6 +996,7 @@ void cec_tx_irq_handle(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
void cec_polling_online_dev(int log_addr, int *bool)
|
||||
{
|
||||
#ifdef AO_CEC
|
||||
@@ -1005,7 +1006,7 @@ void cec_polling_online_dev(int log_addr, int *bool)
|
||||
#endif
|
||||
hdmi_print(INF, CEC "CEC: poll online logic device: 0x%x BOOL: %d\n", log_addr, *bool);
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
|
||||
// DELETE LATER, TEST ONLY
|
||||
void cec_test_(unsigned int cmd)
|
||||
diff --git a/drivers/amlogic/hdmi/Kconfig b/drivers/amlogic/hdmi/Kconfig
|
||||
index 71f6bf8..1bfc289 100755
|
||||
--- a/drivers/amlogic/hdmi/Kconfig
|
||||
+++ b/drivers/amlogic/hdmi/Kconfig
|
||||
@@ -24,4 +24,12 @@ config AML_HDMI_TX_HDCP
|
||||
hdmitx hdcp enable, it should be enalbe if board burned hdmitx hdcp keys
|
||||
endif
|
||||
|
||||
+if AML_HDMI_TX
|
||||
+config AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
+ bool "HDMI new CEC driver"
|
||||
+ default n
|
||||
+ help
|
||||
+ hdmitx uses new CEC driver
|
||||
+endif
|
||||
+
|
||||
endmenu
|
||||
diff --git a/drivers/amlogic/hdmi/hdmi_tx/Makefile b/drivers/amlogic/hdmi/hdmi_tx/Makefile
|
||||
index 7a944cd..f74ec1f 100755
|
||||
--- a/drivers/amlogic/hdmi/hdmi_tx/Makefile
|
||||
+++ b/drivers/amlogic/hdmi/hdmi_tx/Makefile
|
||||
@@ -1,5 +1,11 @@
|
||||
obj-$(CONFIG_AML_HDMI_TX) += hdmitx.o
|
||||
|
||||
-hdmitx-objs := hdmi_tx.o hdmi_tx_cec.o hdmi_cec_key.o hdmi_tx_video.o hdmi_tx_audio.o hdmi_tx_edid.o hdmi_tx_audio.o hdmi_tx_hdcp.o hdmi_tx_compliance.o
|
||||
+hdmitx-objs := hdmi_tx.o hdmi_tx_video.o hdmi_tx_audio.o hdmi_tx_edid.o hdmi_tx_audio.o hdmi_tx_hdcp.o hdmi_tx_compliance.o
|
||||
+
|
||||
+ifdef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
+ hdmitx-objs += amlogic_cec.o
|
||||
+else
|
||||
+ hdmitx-objs += hdmi_tx_cec.o hdmi_cec_key.o
|
||||
+endif
|
||||
|
||||
#EXTRA_CFLAGS += -O2
|
||||
diff --git a/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
|
||||
new file mode 100644
|
||||
index 0000000..1bfc29b
|
||||
--- /dev/null
|
||||
+++ b/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
|
||||
@@ -0,0 +1,679 @@
|
||||
+/* linux/drivers/amlogic/hdmi/hdmi_tx/amlogic_cec.c
|
||||
+ *
|
||||
+ * Copyright (c) 2016 Gerald Dachs
|
||||
+ *
|
||||
+ * CEC interface file for Amlogic
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License version 2 as
|
||||
+ * published by the Free Software Foundation.
|
||||
+*/
|
||||
+
|
||||
+#include <linux/slab.h>
|
||||
+#include <linux/uaccess.h>
|
||||
+#include <linux/poll.h>
|
||||
+#include <linux/miscdevice.h>
|
||||
+#include <linux/clk.h>
|
||||
+#include <linux/sched.h>
|
||||
+#include <linux/interrupt.h>
|
||||
+#include <linux/export.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/cdev.h>
|
||||
+#include <linux/list.h>
|
||||
+#include <linux/delay.h>
|
||||
+#include <linux/types.h>
|
||||
+#include <linux/atomic.h>
|
||||
+#include <linux/semaphore.h>
|
||||
+
|
||||
+#include <asm/uaccess.h>
|
||||
+#include <asm/delay.h>
|
||||
+#include <mach/am_regs.h>
|
||||
+#include <mach/power_gate.h>
|
||||
+#include <linux/amlogic/tvin/tvin.h>
|
||||
+
|
||||
+#include <mach/gpio.h>
|
||||
+#include <linux/amlogic/hdmi_tx/hdmi_info_global.h>
|
||||
+#include <linux/amlogic/hdmi_tx/hdmi_tx_module.h>
|
||||
+#include <mach/hdmi_tx_reg.h>
|
||||
+#include <linux/amlogic/hdmi_tx/hdmi_tx_cec.h>
|
||||
+
|
||||
+#define CONFIG_TV_DEBUG // for verbose output
|
||||
+//#undef CONFIG_TV_DEBUG
|
||||
+unsigned long amlogic_cec_debug_flag = 1;
|
||||
+
|
||||
+MODULE_AUTHOR("Gerald Dachs");
|
||||
+MODULE_DESCRIPTION("Amlogic CEC driver");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+
|
||||
+//unused, only left to satisfy the linker
|
||||
+bool cec_msg_dbg_en = 1;
|
||||
+
|
||||
+#define DRV_NAME "amlogic_cec"
|
||||
+#ifndef amlogic_cec_log_dbg
|
||||
+#define amlogic_cec_log_dbg(fmt, ...) \
|
||||
+ if (amlogic_cec_debug_flag) \
|
||||
+ printk(KERN_INFO "[%s] %s(): " fmt, DRV_NAME, __func__, ##__VA_ARGS__)
|
||||
+#endif
|
||||
+
|
||||
+#define CEC_IOC_MAGIC 'c'
|
||||
+#define CEC_IOC_SETLADDR _IOW(CEC_IOC_MAGIC, 0, unsigned int)
|
||||
+#define CEC_IOC_GETPADDR _IO(CEC_IOC_MAGIC, 1)
|
||||
+
|
||||
+#define VERSION "0.0.1" /* Driver version number */
|
||||
+#define CEC_MINOR 243 /* Major 10, Minor 242, /dev/cec */
|
||||
+
|
||||
+/* CEC Rx buffer size */
|
||||
+#define CEC_RX_BUFF_SIZE 16
|
||||
+/* CEC Tx buffer size */
|
||||
+#define CEC_TX_BUFF_SIZE 16
|
||||
+
|
||||
+static DEFINE_SEMAPHORE(init_mutex);
|
||||
+
|
||||
+struct cec_rx_list {
|
||||
+ u8 buffer[CEC_RX_BUFF_SIZE];
|
||||
+ unsigned char size;
|
||||
+ struct list_head list;
|
||||
+};
|
||||
+
|
||||
+struct cec_rx_struct {
|
||||
+ spinlock_t lock;
|
||||
+ wait_queue_head_t waitq;
|
||||
+ atomic_t state;
|
||||
+ struct list_head list;
|
||||
+};
|
||||
+
|
||||
+struct cec_tx_struct {
|
||||
+ spinlock_t lock;
|
||||
+ wait_queue_head_t waitq;
|
||||
+ atomic_t state;
|
||||
+};
|
||||
+
|
||||
+enum cec_state {
|
||||
+ STATE_RX,
|
||||
+ STATE_TX,
|
||||
+ STATE_DONE,
|
||||
+ STATE_ERROR
|
||||
+};
|
||||
+
|
||||
+static char banner[] __initdata =
|
||||
+ "Amlogic CEC Driver, (c) 2016 Gerald Dachs";
|
||||
+
|
||||
+static struct cec_rx_struct cec_rx_struct;
|
||||
+
|
||||
+static struct cec_tx_struct cec_tx_struct;
|
||||
+
|
||||
+static atomic_t hdmi_on = ATOMIC_INIT(0);
|
||||
+
|
||||
+cec_global_info_t cec_global_info;
|
||||
+
|
||||
+static hdmitx_dev_t* hdmitx_device = NULL;
|
||||
+
|
||||
+static void amlogic_cec_set_rx_state(enum cec_state state)
|
||||
+{
|
||||
+ atomic_set(&cec_rx_struct.state, state);
|
||||
+}
|
||||
+
|
||||
+static void amlogic_cec_set_tx_state(enum cec_state state)
|
||||
+{
|
||||
+ atomic_set(&cec_tx_struct.state, state);
|
||||
+}
|
||||
+
|
||||
+static void amlogic_cec_msg_dump(char * msg_tag, const unsigned char *data, unsigned char count)
|
||||
+{
|
||||
+ int i;
|
||||
+ int pos;
|
||||
+ unsigned char msg_log_buf[128] = { 0 };
|
||||
+
|
||||
+ if (amlogic_cec_debug_flag == 1)
|
||||
+ {
|
||||
+ pos = 0;
|
||||
+ pos += sprintf(msg_log_buf + pos, "msg %s len: %d dat: ", msg_tag, count);
|
||||
+ for (i = 0; i < count; ++i)
|
||||
+ {
|
||||
+ pos += sprintf(msg_log_buf + pos, "%02x ", data[i]);
|
||||
+ }
|
||||
+ pos += sprintf(msg_log_buf + pos, "\n");
|
||||
+ msg_log_buf[pos] = '\0';
|
||||
+ hdmi_print(INF, "[amlogic_cec] dump: %s", msg_log_buf);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static unsigned int amlogic_cec_read_reg(unsigned int reg)
|
||||
+{
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ return hdmi_rd_reg(CEC0_BASE_ADDR + reg);
|
||||
+#endif
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+ return aocec_rd_reg(reg);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+static void amlogic_cec_write_reg(unsigned int reg, unsigned int value)
|
||||
+{
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR + reg, value);
|
||||
+#endif
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+ aocec_wr_reg(reg, value);
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+static int amlogic_cec_read_hw(unsigned char *data, unsigned char *count)
|
||||
+{
|
||||
+ int ret = -1;
|
||||
+ int valid_msg;
|
||||
+ int rx_msg_status;
|
||||
+ int rx_num_msg;
|
||||
+
|
||||
+ rx_msg_status = amlogic_cec_read_reg(CEC_RX_MSG_STATUS);
|
||||
+ rx_num_msg = amlogic_cec_read_reg(CEC_RX_NUM_MSG);
|
||||
+
|
||||
+ amlogic_cec_log_dbg("rx_msg_status: %d, rx_num_msg: %d\n", rx_msg_status, rx_num_msg);
|
||||
+
|
||||
+ valid_msg = (RX_DONE == rx_msg_status) && (1 == rx_num_msg);
|
||||
+
|
||||
+ if (valid_msg)
|
||||
+ {
|
||||
+ int i;
|
||||
+
|
||||
+ *count = amlogic_cec_read_reg(CEC_RX_MSG_LENGTH) + 1;
|
||||
+ for (i = 0; i < (*count) && i < CEC_RX_BUFF_SIZE; ++i)
|
||||
+ {
|
||||
+ data[i]= amlogic_cec_read_reg(CEC_RX_MSG_0_HEADER + i);
|
||||
+ }
|
||||
+
|
||||
+ amlogic_cec_msg_dump("RX", data, *count);
|
||||
+
|
||||
+ ret = RX_DONE;
|
||||
+ }
|
||||
+
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+ aml_write_reg32(P_AO_CEC_INTR_CLR, aml_read_reg32(P_AO_CEC_INTR_CLR) | (1 << 2));
|
||||
+#endif
|
||||
+ amlogic_cec_write_reg(CEC_RX_MSG_CMD, valid_msg ? RX_ACK_NEXT : RX_ACK_CURRENT);
|
||||
+ amlogic_cec_write_reg(CEC_RX_MSG_CMD, RX_NO_OP);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+static void amlogic_cec_write_hw(const char *data, size_t count)
|
||||
+{
|
||||
+ int i;
|
||||
+
|
||||
+ for (i = 0; i < count; ++i)
|
||||
+ {
|
||||
+ amlogic_cec_write_reg(CEC_TX_MSG_0_HEADER + i, data[i]);
|
||||
+ }
|
||||
+ amlogic_cec_write_reg(CEC_TX_MSG_LENGTH, count - 1);
|
||||
+ amlogic_cec_write_reg(CEC_TX_MSG_CMD, TX_REQ_CURRENT);
|
||||
+
|
||||
+ amlogic_cec_msg_dump("TX", data, count);
|
||||
+}
|
||||
+
|
||||
+unsigned short cec_log_addr_to_dev_type(unsigned char log_addr)
|
||||
+{
|
||||
+// unused, just to satisfy the linker
|
||||
+ return log_addr;
|
||||
+}
|
||||
+
|
||||
+void cec_node_init(hdmitx_dev_t* hdmitx_device)
|
||||
+{
|
||||
+ unsigned long cec_phy_addr;
|
||||
+ unsigned long spin_flags;
|
||||
+ struct cec_rx_list *entry;
|
||||
+
|
||||
+ cec_phy_addr = (((hdmitx_device->hdmi_info.vsdb_phy_addr.a) & 0xf) << 12)
|
||||
+ | (((hdmitx_device->hdmi_info.vsdb_phy_addr.b) & 0xf) << 8)
|
||||
+ | (((hdmitx_device->hdmi_info.vsdb_phy_addr.c) & 0xf) << 4)
|
||||
+ | (((hdmitx_device->hdmi_info.vsdb_phy_addr.d) & 0xf) << 0);
|
||||
+
|
||||
+ // If VSDB is not valid,use last or default physical address.
|
||||
+ if (hdmitx_device->hdmi_info.vsdb_phy_addr.valid == 0)
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("no valid cec physical address\n");
|
||||
+ if (aml_read_reg32(P_AO_DEBUG_REG1) & 0xffff)
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("use last physical address\n");
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ aml_write_reg32(P_AO_DEBUG_REG1, (aml_read_reg32(P_AO_DEBUG_REG1) & (0xf << 16)) | 0x1000);
|
||||
+ amlogic_cec_log_dbg("use default physical address\n");
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if (cec_global_info.my_node_index)
|
||||
+ {
|
||||
+ // prevent write operations
|
||||
+ if (down_interruptible(&init_mutex))
|
||||
+ {
|
||||
+ printk(KERN_ERR "[amlogic] ##### cec node init interrupted! #####\n");
|
||||
+ return;
|
||||
+ }
|
||||
+ hdmitx_device->cec_init_ready = 0;
|
||||
+ spin_lock_irqsave(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ amlogic_cec_log_dbg("start reset\n");
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ aml_write_reg32(P_HDMI_CTRL_PORT, aml_read_reg32(P_HDMI_CTRL_PORT)|(1<<16));
|
||||
+ hdmi_wr_reg(OTHER_BASE_ADDR+HDMI_OTHER_CTRL0, 0xc); //[3]cec_creg_sw_rst [2]cec_sys_sw_rst
|
||||
+
|
||||
+#if 0
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_TX_CLEAR_BUF, 0x1);
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_RX_CLEAR_BUF, 0x1);
|
||||
+
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_TX_CLEAR_BUF, 0x0);
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_RX_CLEAR_BUF, 0x0);
|
||||
+#endif
|
||||
+
|
||||
+ hdmi_wr_reg(OTHER_BASE_ADDR+HDMI_OTHER_CTRL0, 0x0);
|
||||
+ aml_write_reg32(P_HDMI_CTRL_PORT, aml_read_reg32(P_HDMI_CTRL_PORT)&(~(1<<16)));
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_CLOCK_DIV_H, 0x00 );
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_CLOCK_DIV_L, 0xf0 );
|
||||
+
|
||||
+#endif
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+ // regain rx interrupts
|
||||
+ cec_enable_irq();
|
||||
+#endif
|
||||
+ spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ hdmitx_device->cec_init_ready = 1;
|
||||
+
|
||||
+ up(&init_mutex);
|
||||
+ amlogic_cec_log_dbg("stop reset\n");
|
||||
+ }
|
||||
+
|
||||
+ if ((aml_read_reg32(P_AO_DEBUG_REG1) & 0xffff) != cec_phy_addr)
|
||||
+ {
|
||||
+ aml_write_reg32(P_AO_DEBUG_REG1, (aml_read_reg32(P_AO_DEBUG_REG1) & (0xf << 16)) | cec_phy_addr);
|
||||
+ amlogic_cec_log_dbg("physical address:0x%x\n", aml_read_reg32(P_AO_DEBUG_REG1) & 0xffff);
|
||||
+
|
||||
+ if ((hdmitx_device->cec_init_ready != 0) && (hdmitx_device->hpd_state != 0))
|
||||
+ {
|
||||
+ if ((entry = kmalloc(sizeof(struct cec_rx_list), GFP_ATOMIC)) == NULL)
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("can't alloc cec_rx_list\n");
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ // let the libCEC ask for new physical Address
|
||||
+ entry->buffer[0] = 0xff;
|
||||
+ entry->size = 1;
|
||||
+ INIT_LIST_HEAD(&entry->list);
|
||||
+
|
||||
+ spin_lock_irqsave(&cec_rx_struct.lock, spin_flags);
|
||||
+ list_add_tail(&entry->list, &cec_rx_struct.list);
|
||||
+ amlogic_cec_set_rx_state(STATE_DONE);
|
||||
+ spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ amlogic_cec_log_dbg("trigger libCEC\n");
|
||||
+ wake_up_interruptible(&cec_rx_struct.waitq);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static irqreturn_t amlogic_cec_irq_handler(int irq, void *dummy)
|
||||
+{
|
||||
+ unsigned long spin_flags;
|
||||
+ struct cec_rx_list *entry;
|
||||
+ unsigned int tx_msg_state;
|
||||
+ unsigned int rx_msg_state;
|
||||
+
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ udelay(100); //Delay execution a little. This fixes an issue when HDMI CEC stops working after a while.
|
||||
+#endif
|
||||
+
|
||||
+ tx_msg_state = amlogic_cec_read_reg(CEC_TX_MSG_STATUS);
|
||||
+ rx_msg_state = amlogic_cec_read_reg(CEC_RX_MSG_STATUS);
|
||||
+
|
||||
+ amlogic_cec_log_dbg("cec msg status: rx: 0x%x; tx: 0x%x\n", rx_msg_state, tx_msg_state);
|
||||
+
|
||||
+ if ((tx_msg_state == TX_DONE) || (tx_msg_state == TX_ERROR))
|
||||
+ {
|
||||
+ amlogic_cec_write_reg(CEC_TX_MSG_CMD, TX_NO_OP);
|
||||
+
|
||||
+ switch (tx_msg_state) {
|
||||
+ case TX_ERROR :
|
||||
+ amlogic_cec_set_tx_state(STATE_ERROR);
|
||||
+ break;
|
||||
+ case TX_DONE :
|
||||
+ amlogic_cec_set_tx_state(STATE_DONE);
|
||||
+ break;
|
||||
+ }
|
||||
+ wake_up_interruptible(&cec_tx_struct.waitq);
|
||||
+ }
|
||||
+
|
||||
+ if (rx_msg_state == RX_DONE)
|
||||
+ {
|
||||
+
|
||||
+ if ((entry = kmalloc(sizeof(struct cec_rx_list), GFP_ATOMIC)) == NULL)
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("can't alloc cec_rx_list\n");
|
||||
+ return IRQ_HANDLED;
|
||||
+ }
|
||||
+
|
||||
+ INIT_LIST_HEAD(&entry->list);
|
||||
+
|
||||
+ spin_lock_irqsave(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ if ((-1) == amlogic_cec_read_hw(entry->buffer, &entry->size))
|
||||
+ {
|
||||
+ kfree(entry);
|
||||
+ amlogic_cec_log_dbg("amlogic_cec_irq_handler: nothing to read\n");
|
||||
+ spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
|
||||
+ return IRQ_HANDLED;
|
||||
+ }
|
||||
+
|
||||
+ list_add_tail(&entry->list, &cec_rx_struct.list);
|
||||
+ amlogic_cec_set_rx_state(STATE_DONE);
|
||||
+ spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ wake_up_interruptible(&cec_rx_struct.waitq);
|
||||
+ }
|
||||
+
|
||||
+ return IRQ_HANDLED;
|
||||
+}
|
||||
+
|
||||
+static int amlogic_cec_open(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+ int ret = 0;
|
||||
+
|
||||
+ if (atomic_read(&hdmi_on))
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("do not allow multiple open for tvout cec\n");
|
||||
+ ret = -EBUSY;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ atomic_inc(&hdmi_on);
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ if (request_irq(INT_HDMI_CEC, &amlogic_cec_irq_handler,
|
||||
+ IRQF_SHARED, "amhdmitx-cec",(void *)hdmitx_device))
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("Can't register IRQ %d\n",INT_HDMI_CEC);
|
||||
+ return -EFAULT;
|
||||
+ }
|
||||
+#endif
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+ if (request_irq(INT_AO_CEC, &amlogic_cec_irq_handler,
|
||||
+ IRQF_SHARED, "amhdmitx-aocec",(void *)hdmitx_device))
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("Can't register IRQ %d\n",INT_HDMI_CEC);
|
||||
+ return -EFAULT;
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ cec_gpi_init();
|
||||
+#endif
|
||||
+
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ aml_set_reg32_bits(P_PERIPHS_PIN_MUX_1, 1, 25, 1);
|
||||
+ // Clear CEC Int. state and set CEC Int. mask
|
||||
+ aml_write_reg32(P_SYS_CPU_0_IRQ_IN1_INTR_STAT_CLR, aml_read_reg32(P_SYS_CPU_0_IRQ_IN1_INTR_STAT_CLR) | (1 << 23)); // Clear the interrupt
|
||||
+ aml_write_reg32(P_SYS_CPU_0_IRQ_IN1_INTR_MASK, aml_read_reg32(P_SYS_CPU_0_IRQ_IN1_INTR_MASK) | (1 << 23)); // Enable the hdmi cec interrupt
|
||||
+#endif
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+// GPIOAO_12
|
||||
+ aml_set_reg32_bits(P_AO_RTI_PIN_MUX_REG, 0, 14, 1); // bit[14]: AO_PWM_C pinmux //0xc8100014
|
||||
+ aml_set_reg32_bits(P_AO_RTI_PULL_UP_REG, 1, 12, 1); // bit[12]: enable AO_12 internal pull-up //0xc810002c
|
||||
+ aml_set_reg32_bits(P_AO_RTI_PIN_MUX_REG, 1, 17, 1); // bit[17]: AO_CEC pinmux //0xc8100014
|
||||
+ ao_cec_init();
|
||||
+ cec_arbit_bit_time_set(3, 0x118, 0);
|
||||
+ cec_arbit_bit_time_set(5, 0x000, 0);
|
||||
+ cec_arbit_bit_time_set(7, 0x2aa, 0);
|
||||
+#endif
|
||||
+ amlogic_cec_write_reg(CEC_LOGICAL_ADDR0, (0x1 << 4) | 0xf);
|
||||
+
|
||||
+ hdmitx_device->cec_init_ready = 1;
|
||||
+
|
||||
+ }
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int amlogic_cec_release(struct inode *inode, struct file *file)
|
||||
+{
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ aml_write_reg32(P_SYS_CPU_0_IRQ_IN1_INTR_MASK, aml_read_reg32(P_SYS_CPU_0_IRQ_IN1_INTR_MASK) & ~(1 << 23)); // Disable the hdmi cec interrupt
|
||||
+ free_irq(INT_HDMI_CEC, (void *)hdmitx_device);
|
||||
+#endif
|
||||
+#if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON8
|
||||
+ free_irq(INT_AO_CEC, (void *)hdmitx_device);
|
||||
+#endif
|
||||
+
|
||||
+ amlogic_cec_write_reg(CEC_LOGICAL_ADDR0, (0x1 << 4) | 0xf);
|
||||
+
|
||||
+ atomic_dec(&hdmi_on);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static ssize_t amlogic_cec_read(struct file *file, char __user *buffer,
|
||||
+ size_t count, loff_t *ppos)
|
||||
+{
|
||||
+ ssize_t retval;
|
||||
+ unsigned long spin_flags;
|
||||
+ struct cec_rx_list* entry = NULL;
|
||||
+
|
||||
+ if (wait_event_interruptible(cec_rx_struct.waitq,
|
||||
+ atomic_read(&cec_rx_struct.state) == STATE_DONE))
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("error during wait on state change\n");
|
||||
+ return -ERESTARTSYS;
|
||||
+ }
|
||||
+
|
||||
+ spin_lock_irqsave(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ entry = list_first_entry_or_null(&cec_rx_struct.list, struct cec_rx_list, list);
|
||||
+
|
||||
+ if (entry == NULL || entry->size > count)
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("entry is NULL, or empty\n");
|
||||
+ retval = -1;
|
||||
+ goto error_exit;
|
||||
+ }
|
||||
+
|
||||
+ if (copy_to_user(buffer, entry->buffer, entry->size))
|
||||
+ {
|
||||
+ printk(KERN_ERR " copy_to_user() failed!\n");
|
||||
+
|
||||
+ retval = -EFAULT;
|
||||
+ goto error_exit;
|
||||
+ }
|
||||
+
|
||||
+ retval = entry->size;
|
||||
+
|
||||
+
|
||||
+error_exit:
|
||||
+ if (entry != NULL)
|
||||
+ {
|
||||
+ list_del(&entry->list);
|
||||
+ kfree(entry);
|
||||
+ }
|
||||
+
|
||||
+ if (list_empty(&cec_rx_struct.list))
|
||||
+ {
|
||||
+ amlogic_cec_set_rx_state(STATE_RX);
|
||||
+ }
|
||||
+
|
||||
+ spin_unlock_irqrestore(&cec_rx_struct.lock, spin_flags);
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+static ssize_t amlogic_cec_write(struct file *file, const char __user *buffer,
|
||||
+ size_t count, loff_t *ppos)
|
||||
+{
|
||||
+ int retval = count;
|
||||
+ char data[CEC_TX_BUFF_SIZE];
|
||||
+
|
||||
+ /* check data size */
|
||||
+ if (count > CEC_TX_BUFF_SIZE || count == 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ if (copy_from_user(data, buffer, count))
|
||||
+ {
|
||||
+ printk(KERN_ERR " copy_from_user() failed!\n");
|
||||
+ return -EFAULT;
|
||||
+ }
|
||||
+
|
||||
+ amlogic_cec_set_tx_state(STATE_TX);
|
||||
+
|
||||
+ // don't write if cec_node_init() is in progress
|
||||
+ if (down_interruptible(&init_mutex))
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("error during wait on state change\n");
|
||||
+ printk(KERN_ERR "[amlogic] ##### cec write error! #####\n");
|
||||
+ return -ERESTARTSYS;
|
||||
+ }
|
||||
+
|
||||
+ amlogic_cec_write_hw(data, count);
|
||||
+
|
||||
+ if (wait_event_interruptible_timeout(cec_tx_struct.waitq,
|
||||
+ atomic_read(&cec_tx_struct.state) != STATE_TX, 2 * HZ) <= 0)
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("error during wait on state change, resetting\n");
|
||||
+ printk(KERN_ERR "[amlogic] ##### cec write error! #####\n");
|
||||
+ amlogic_cec_write_reg(CEC_TX_MSG_CMD, TX_ABORT); // stop cec tx for hw retry.
|
||||
+ amlogic_cec_write_reg(CEC_TX_MSG_CMD, TX_NO_OP);
|
||||
+ retval = -ERESTARTSYS;
|
||||
+ goto error_exit;
|
||||
+ }
|
||||
+
|
||||
+ if (atomic_read(&cec_tx_struct.state) != STATE_DONE)
|
||||
+ {
|
||||
+ printk(KERN_ERR "[amlogic] ##### cec write error! #####\n");
|
||||
+ retval = -1;
|
||||
+ }
|
||||
+
|
||||
+error_exit:
|
||||
+ up(&init_mutex);
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+static long amlogic_cec_ioctl(struct file *file, unsigned int cmd,
|
||||
+ unsigned long arg)
|
||||
+{
|
||||
+ unsigned char logical_addr;
|
||||
+ unsigned int reg;
|
||||
+
|
||||
+ switch(cmd) {
|
||||
+ case CEC_IOC_SETLADDR:
|
||||
+ if (get_user(logical_addr, (unsigned char __user *)arg))
|
||||
+ {
|
||||
+ amlogic_cec_log_dbg("Failed to get logical addr from user\n");
|
||||
+ return -EFAULT;
|
||||
+ }
|
||||
+
|
||||
+ amlogic_cec_write_reg(CEC_LOGICAL_ADDR0, (0x1 << 4) | logical_addr);
|
||||
+ cec_global_info.my_node_index = logical_addr;
|
||||
+ /*
|
||||
+ * use DEBUG_REG1 bit 16 ~ 31 to save logic address.
|
||||
+ * So uboot can use this logic address directly
|
||||
+ */
|
||||
+ reg = (aml_read_reg32(P_AO_DEBUG_REG1) & 0xffff);
|
||||
+ reg |= ((unsigned int)logical_addr) << 16;
|
||||
+ aml_write_reg32(P_AO_DEBUG_REG1, reg);
|
||||
+
|
||||
+ amlogic_cec_log_dbg("amlogic_cec_ioctl: Set logical address: %d\n", logical_addr);
|
||||
+ return 0;
|
||||
+
|
||||
+ case CEC_IOC_GETPADDR:
|
||||
+ amlogic_cec_log_dbg("amlogic_cec_ioctl: return physical address 0x%x\n", aml_read_reg32(P_AO_DEBUG_REG1) & 0xffff);
|
||||
+ return aml_read_reg32(P_AO_DEBUG_REG1) & 0xffff;
|
||||
+ }
|
||||
+
|
||||
+ return -EINVAL;
|
||||
+}
|
||||
+
|
||||
+static u32 amlogic_cec_poll(struct file *file, poll_table *wait)
|
||||
+{
|
||||
+
|
||||
+ if (atomic_read(&cec_rx_struct.state) != STATE_DONE)
|
||||
+ {
|
||||
+ poll_wait(file, &cec_rx_struct.waitq, wait);
|
||||
+ }
|
||||
+
|
||||
+ if (atomic_read(&cec_rx_struct.state) == STATE_DONE)
|
||||
+ {
|
||||
+ return POLLIN | POLLRDNORM;
|
||||
+ }
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct file_operations cec_fops = {
|
||||
+ .owner = THIS_MODULE,
|
||||
+ .open = amlogic_cec_open,
|
||||
+ .release = amlogic_cec_release,
|
||||
+ .read = amlogic_cec_read,
|
||||
+ .write = amlogic_cec_write,
|
||||
+ .unlocked_ioctl = amlogic_cec_ioctl,
|
||||
+ .poll = amlogic_cec_poll,
|
||||
+};
|
||||
+
|
||||
+static struct miscdevice cec_misc_device = {
|
||||
+ .minor = CEC_MINOR,
|
||||
+ .name = "AmlogicCEC",
|
||||
+ .fops = &cec_fops,
|
||||
+};
|
||||
+
|
||||
+static int amlogic_cec_init(void)
|
||||
+{
|
||||
+ int retval = 0;
|
||||
+ extern hdmitx_dev_t * get_hdmitx_device(void);
|
||||
+
|
||||
+ if (down_interruptible(&init_mutex))
|
||||
+ {
|
||||
+ return -ERESTARTSYS;
|
||||
+ }
|
||||
+
|
||||
+ INIT_LIST_HEAD(&cec_rx_struct.list);
|
||||
+
|
||||
+ printk("%s, Version: %s\n", banner, VERSION);
|
||||
+
|
||||
+ hdmitx_device = get_hdmitx_device();
|
||||
+ amlogic_cec_log_dbg("CEC init\n");
|
||||
+
|
||||
+ amlogic_cec_write_reg(CEC_LOGICAL_ADDR0, (0x1 << 4) | 0xf);
|
||||
+
|
||||
+#if MESON_CPU_TYPE == MESON_CPU_TYPE_MESON6
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_CLOCK_DIV_H, 0x00 );
|
||||
+ hdmi_wr_reg(CEC0_BASE_ADDR+CEC_CLOCK_DIV_L, 0xf0 );
|
||||
+#endif
|
||||
+
|
||||
+ init_waitqueue_head(&cec_rx_struct.waitq);
|
||||
+
|
||||
+ spin_lock_init(&cec_rx_struct.lock);
|
||||
+
|
||||
+ init_waitqueue_head(&cec_tx_struct.waitq);
|
||||
+
|
||||
+ spin_lock_init(&cec_tx_struct.lock);
|
||||
+
|
||||
+ if (misc_register(&cec_misc_device))
|
||||
+ {
|
||||
+ printk(KERN_WARNING " Couldn't register device 10, %d.\n", CEC_MINOR);
|
||||
+ retval = -EBUSY;
|
||||
+ }
|
||||
+
|
||||
+ // release initial lock on init_mutex
|
||||
+ up(&init_mutex);
|
||||
+
|
||||
+ amlogic_cec_log_dbg("CEC init finished: %d\n", retval);
|
||||
+
|
||||
+ return retval;
|
||||
+}
|
||||
+
|
||||
+static void amlogic_cec_exit(void)
|
||||
+{
|
||||
+ misc_deregister(&cec_misc_device);
|
||||
+}
|
||||
+
|
||||
+module_init(amlogic_cec_init);
|
||||
+module_exit(amlogic_cec_exit);
|
||||
+
|
||||
diff --git a/drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c b/drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c
|
||||
index 3e043bc..2b11c72 100755
|
||||
--- a/drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c
|
||||
+++ b/drivers/amlogic/hdmi/hdmi_tx/hdmi_tx.c
|
||||
@@ -542,6 +542,7 @@ static ssize_t store_disp_mode(struct device * dev, struct device_attribute *att
|
||||
return 16;
|
||||
}
|
||||
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
/*cec attr*/
|
||||
static ssize_t show_cec(struct device * dev, struct device_attribute *attr, char * buf)
|
||||
{
|
||||
@@ -589,6 +590,20 @@ static ssize_t show_cec_lang_config(struct device * dev, struct device_attribute
|
||||
pos+=snprintf(buf+pos, PAGE_SIZE, "%x\n",cec_global_info.cec_node_info[cec_global_info.my_node_index].menu_lang);
|
||||
return pos;
|
||||
}
|
||||
+#else
|
||||
+
|
||||
+extern unsigned long amlogic_cec_debug_flag;
|
||||
+
|
||||
+static ssize_t show_amlogic_cec_debug_config(struct device *dev, struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ return snprintf(buf, PAGE_SIZE, "amlogic_cec_debug:%lu\n", amlogic_cec_debug_flag);
|
||||
+}
|
||||
+
|
||||
+static ssize_t store_amlogic_cec_debug_config(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
|
||||
+{
|
||||
+ return kstrtoul(buf, 16, &amlogic_cec_debug_flag) ? 0 : count;
|
||||
+}
|
||||
+#endif
|
||||
|
||||
/*aud_mode attr*/
|
||||
static ssize_t show_aud_mode(struct device * dev, struct device_attribute *attr, char * buf)
|
||||
@@ -963,10 +978,14 @@ static DEVICE_ATTR(disp_cap_3d, S_IWUSR | S_IRUGO, show_disp_cap_3d, NULL);
|
||||
static DEVICE_ATTR(hdcp_ksv_info, S_IWUSR | S_IRUGO, show_hdcp_ksv_info, NULL);
|
||||
static DEVICE_ATTR(hpd_state, S_IWUSR | S_IRUGO, show_hpd_state, NULL);
|
||||
static DEVICE_ATTR(support_3d, S_IWUSR | S_IRUGO, show_support_3d, NULL);
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
static DEVICE_ATTR(cec, S_IWUSR | S_IRUGO, show_cec, store_cec);
|
||||
static DEVICE_ATTR(cec_config, S_IWUSR | S_IRUGO | S_IWGRP, show_cec_config, store_cec_config);
|
||||
//static DEVICE_ATTR(cec_config, S_IWUGO | S_IRUGO , NULL, store_cec_config);
|
||||
static DEVICE_ATTR(cec_lang_config, S_IWUSR | S_IRUGO | S_IWGRP, show_cec_lang_config, store_cec_lang_config);
|
||||
+#else
|
||||
+static DEVICE_ATTR(amlogic_cec_debug_config, S_IWUSR | S_IRUGO | S_IWGRP, show_amlogic_cec_debug_config, store_amlogic_cec_debug_config);
|
||||
+#endif
|
||||
|
||||
/*****************************
|
||||
* hdmitx display client interface
|
||||
@@ -1582,7 +1601,9 @@ extern void register_hdmi_is_special_tv_func( int (*pfunc)(void) );
|
||||
|
||||
static int amhdmitx_probe(struct platform_device *pdev)
|
||||
{
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
extern struct switch_dev lang_dev;
|
||||
+#endif
|
||||
int r,ret=0;
|
||||
|
||||
#ifdef CONFIG_USE_OF
|
||||
@@ -1643,9 +1664,13 @@ static int amhdmitx_probe(struct platform_device *pdev)
|
||||
ret=device_create_file(hdmitx_dev, &dev_attr_hdcp_ksv_info);
|
||||
ret=device_create_file(hdmitx_dev, &dev_attr_hpd_state);
|
||||
ret=device_create_file(hdmitx_dev, &dev_attr_support_3d);
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
ret=device_create_file(hdmitx_dev, &dev_attr_cec);
|
||||
ret=device_create_file(hdmitx_dev, &dev_attr_cec_config);
|
||||
ret=device_create_file(hdmitx_dev, &dev_attr_cec_lang_config);
|
||||
+#else
|
||||
+ ret=device_create_file(hdmitx_dev, &dev_attr_amlogic_cec_debug_config);
|
||||
+#endif
|
||||
|
||||
if (hdmitx_dev == NULL) {
|
||||
hdmi_print(ERR, SYS "device_create create error\n");
|
||||
@@ -1732,7 +1757,9 @@ static int amhdmitx_probe(struct platform_device *pdev)
|
||||
}
|
||||
#endif
|
||||
switch_dev_register(&sdev);
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
switch_dev_register(&lang_dev);
|
||||
+#endif
|
||||
|
||||
hdmitx_init_parameters(&hdmitx_device.hdmi_info);
|
||||
HDMITX_Meson_Init(&hdmitx_device);
|
||||
@@ -1771,8 +1798,9 @@ static int amhdmitx_remove(struct platform_device *pdev)
|
||||
device_remove_file(hdmitx_dev, &dev_attr_disp_cap_3d);
|
||||
device_remove_file(hdmitx_dev, &dev_attr_hpd_state);
|
||||
device_remove_file(hdmitx_dev, &dev_attr_support_3d);
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
device_remove_file(hdmitx_dev, &dev_attr_cec);
|
||||
-
|
||||
+#endif
|
||||
cdev_del(&hdmitx_device.cdev);
|
||||
|
||||
device_destroy(hdmitx_class, hdmitx_id);
|
||||
diff --git a/drivers/amlogic/input/new_remote/remote_func.c b/drivers/amlogic/input/new_remote/remote_func.c
|
||||
index e36e272..807c255 100755
|
||||
--- a/drivers/amlogic/input/new_remote/remote_func.c
|
||||
+++ b/drivers/amlogic/input/new_remote/remote_func.c
|
||||
@@ -525,6 +525,7 @@ int remote_hw_reprot_key(struct remote *remote_data)
|
||||
mod_timer(&remote_data->timer, jiffies + msecs_to_jiffies(remote_data->release_delay[remote_data->map_num]+remote_data->repeat_delay[remote_data->map_num]));
|
||||
} else if((remote_data->frame_status & REPEARTFLAG) && remote_data->enable_repeat_falg) { //repeate key
|
||||
#ifdef CONFIG_AML_HDMI_TX
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
extern int rc_long_press_pwr_key;
|
||||
if((remote_data->repeat_release_code == 0x1a) && (!cec_repeat)) {
|
||||
rc_long_press_pwr_key = 1;
|
||||
@@ -534,6 +535,7 @@ int remote_hw_reprot_key(struct remote *remote_data)
|
||||
cec_repeat--;
|
||||
|
||||
#endif
|
||||
+#endif
|
||||
if (remote_data->repeat_enable) {
|
||||
repeat_count++;
|
||||
if (remote_data->repeat_tick < jiffies) {
|
||||
@@ -618,6 +620,7 @@ int remote_hw_nec_rca_2in1_reprot_key(struct remote *remote_data)
|
||||
mod_timer(&remote_data->timer, jiffies + msecs_to_jiffies(remote_data->release_delay[remote_data->map_num]+remote_data->repeat_delay[remote_data->map_num]));
|
||||
} else if((remote_data->frame_status & REPEARTFLAG) && remote_data->enable_repeat_falg) { //repeate key
|
||||
#ifdef CONFIG_AML_HDMI_TX
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
extern int rc_long_press_pwr_key;
|
||||
if((remote_data->repeat_release_code == 0x1a) && (!cec_repeat)) {
|
||||
rc_long_press_pwr_key = 1;
|
||||
@@ -627,6 +630,7 @@ int remote_hw_nec_rca_2in1_reprot_key(struct remote *remote_data)
|
||||
cec_repeat--;
|
||||
|
||||
#endif
|
||||
+#endif
|
||||
if (remote_data->repeat_enable) {
|
||||
repeat_count++;
|
||||
if (remote_data->repeat_tick < jiffies) {
|
||||
@@ -700,6 +704,7 @@ int remote_hw_nec_toshiba_2in1_reprot_key(struct remote *remote_data)
|
||||
mod_timer(&remote_data->timer, jiffies + msecs_to_jiffies(remote_data->release_delay[remote_data->map_num]+remote_data->repeat_delay[remote_data->map_num]));
|
||||
} else if((remote_data->frame_status & REPEARTFLAG) && remote_data->enable_repeat_falg) { //repeate key
|
||||
#ifdef CONFIG_AML_HDMI_TX
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
extern int rc_long_press_pwr_key;
|
||||
if((remote_data->repeat_release_code == 0x1a) && (!cec_repeat)) {
|
||||
rc_long_press_pwr_key = 1;
|
||||
@@ -709,6 +714,7 @@ int remote_hw_nec_toshiba_2in1_reprot_key(struct remote *remote_data)
|
||||
cec_repeat--;
|
||||
|
||||
#endif
|
||||
+#endif
|
||||
if (remote_data->repeat_enable) {
|
||||
repeat_count++;
|
||||
if (remote_data->repeat_tick < jiffies) {
|
||||
diff --git a/drivers/amlogic/input/remote/am_remote.c b/drivers/amlogic/input/remote/am_remote.c
|
||||
index c824efb..01f0bfb 100755
|
||||
--- a/drivers/amlogic/input/remote/am_remote.c
|
||||
+++ b/drivers/amlogic/input/remote/am_remote.c
|
||||
@@ -390,6 +390,7 @@ static inline int remote_hw_reprot_key(struct remote *remote_data)
|
||||
}
|
||||
#ifdef CONFIG_AML_HDMI_TX
|
||||
#ifdef CONFIG_ARCH_MESON6
|
||||
+#ifndef CONFIG_AML_HDMI_TX_NEW_CEC_DRIVER
|
||||
//printk("last_scan_code:%x\n", last_scan_code);
|
||||
if((((scan_code >> 16) & 0xff) == 0x1a) && (!cec_repeat)) {
|
||||
extern int rc_long_press_pwr_key;
|
||||
@@ -401,6 +402,7 @@ static inline int remote_hw_reprot_key(struct remote *remote_data)
|
||||
cec_repeat--;
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
if (remote_data->repeat_enable) {
|
||||
if ((remote_data->repeat_tick < jiffies)&&(repeat_flag == 1)) {
|
||||
remote_send_key(remote_data->input, (scan_code >> 16) & 0xff, 2);
|
||||
@ -1,166 +0,0 @@
|
||||
From cb984d101b30eb7478d32df56a0023e4603cba7f Mon Sep 17 00:00:00 2001
|
||||
From: Joe Perches <joe@perches.com>
|
||||
Date: Thu, 25 Jun 2015 15:01:02 -0700
|
||||
Subject: compiler-gcc: integrate the various compiler-gcc[345].h files
|
||||
|
||||
As gcc major version numbers are going to advance rather rapidly in the
|
||||
future, there's no real value in separate files for each compiler
|
||||
version.
|
||||
|
||||
Deduplicate some of the macros #defined in each file too.
|
||||
|
||||
Neaten comments using normal kernel commenting style.
|
||||
|
||||
Signed-off-by: Joe Perches <joe@perches.com>
|
||||
Cc: Andi Kleen <andi@firstfloor.org>
|
||||
Cc: Michal Marek <mmarek@suse.cz>
|
||||
Cc: Segher Boessenkool <segher@kernel.crashing.org>
|
||||
Cc: Sasha Levin <levinsasha928@gmail.com>
|
||||
Cc: Anton Blanchard <anton@samba.org>
|
||||
Cc: Alan Modra <amodra@gmail.com>
|
||||
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
||||
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
---
|
||||
include/linux/compiler-gcc.h | 120 ++++++++++++++++++++++++++++++++++++++++--
|
||||
include/linux/compiler-gcc3.h | 23 --------
|
||||
include/linux/compiler-gcc4.h | 91 --------------------------------
|
||||
include/linux/compiler-gcc5.h | 67 -----------------------
|
||||
4 files changed, 116 insertions(+), 185 deletions(-)
|
||||
delete mode 100644 include/linux/compiler-gcc3.h
|
||||
delete mode 100644 include/linux/compiler-gcc4.h
|
||||
delete mode 100644 include/linux/compiler-gcc5.h
|
||||
|
||||
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h
|
||||
index 5c2c14e..dfaa7b3 100644
|
||||
--- a/include/linux/compiler-gcc.h
|
||||
+++ b/include/linux/compiler-gcc.h
|
||||
@@ -122,10 +122,122 @@
|
||||
#define __maybe_unused __attribute__((unused))
|
||||
#define __always_unused __attribute__((unused))
|
||||
|
||||
-#define __gcc_header(x) #x
|
||||
-#define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h)
|
||||
-#define gcc_header(x) _gcc_header(x)
|
||||
-#include gcc_header(__GNUC__)
|
||||
+/* gcc version specific checks */
|
||||
+
|
||||
+#if GCC_VERSION < 30200
|
||||
+# error Sorry, your compiler is too old - please upgrade it.
|
||||
+#endif
|
||||
+
|
||||
+#if GCC_VERSION < 30300
|
||||
+# define __used __attribute__((__unused__))
|
||||
+#else
|
||||
+# define __used __attribute__((__used__))
|
||||
+#endif
|
||||
+
|
||||
+#ifdef CONFIG_GCOV_KERNEL
|
||||
+# if GCC_VERSION < 30400
|
||||
+# error "GCOV profiling support for gcc versions below 3.4 not included"
|
||||
+# endif /* __GNUC_MINOR__ */
|
||||
+#endif /* CONFIG_GCOV_KERNEL */
|
||||
+
|
||||
+#if GCC_VERSION >= 30400
|
||||
+#define __must_check __attribute__((warn_unused_result))
|
||||
+#endif
|
||||
+
|
||||
+#if GCC_VERSION >= 40000
|
||||
+
|
||||
+/* GCC 4.1.[01] miscompiles __weak */
|
||||
+#ifdef __KERNEL__
|
||||
+# if GCC_VERSION >= 40100 && GCC_VERSION <= 40101
|
||||
+# error Your version of gcc miscompiles the __weak directive
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
+#define __used __attribute__((__used__))
|
||||
+#define __compiler_offsetof(a, b) \
|
||||
+ __builtin_offsetof(a, b)
|
||||
+
|
||||
+#if GCC_VERSION >= 40100 && GCC_VERSION < 40600
|
||||
+# define __compiletime_object_size(obj) __builtin_object_size(obj, 0)
|
||||
+#endif
|
||||
+
|
||||
+#if GCC_VERSION >= 40300
|
||||
+/* Mark functions as cold. gcc will assume any path leading to a call
|
||||
+ * to them will be unlikely. This means a lot of manual unlikely()s
|
||||
+ * are unnecessary now for any paths leading to the usual suspects
|
||||
+ * like BUG(), printk(), panic() etc. [but let's keep them for now for
|
||||
+ * older compilers]
|
||||
+ *
|
||||
+ * Early snapshots of gcc 4.3 don't support this and we can't detect this
|
||||
+ * in the preprocessor, but we can live with this because they're unreleased.
|
||||
+ * Maketime probing would be overkill here.
|
||||
+ *
|
||||
+ * gcc also has a __attribute__((__hot__)) to move hot functions into
|
||||
+ * a special section, but I don't see any sense in this right now in
|
||||
+ * the kernel context
|
||||
+ */
|
||||
+#define __cold __attribute__((__cold__))
|
||||
+
|
||||
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
|
||||
+
|
||||
+#ifndef __CHECKER__
|
||||
+# define __compiletime_warning(message) __attribute__((warning(message)))
|
||||
+# define __compiletime_error(message) __attribute__((error(message)))
|
||||
+#endif /* __CHECKER__ */
|
||||
+#endif /* GCC_VERSION >= 40300 */
|
||||
+
|
||||
+#if GCC_VERSION >= 40500
|
||||
+/*
|
||||
+ * Mark a position in code as unreachable. This can be used to
|
||||
+ * suppress control flow warnings after asm blocks that transfer
|
||||
+ * control elsewhere.
|
||||
+ *
|
||||
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
|
||||
+ * this in the preprocessor, but we can live with this because they're
|
||||
+ * unreleased. Really, we need to have autoconf for the kernel.
|
||||
+ */
|
||||
+#define unreachable() __builtin_unreachable()
|
||||
+
|
||||
+/* Mark a function definition as prohibited from being cloned. */
|
||||
+#define __noclone __attribute__((__noclone__))
|
||||
+
|
||||
+#endif /* GCC_VERSION >= 40500 */
|
||||
+
|
||||
+#if GCC_VERSION >= 40600
|
||||
+/*
|
||||
+ * Tell the optimizer that something else uses this function or variable.
|
||||
+ */
|
||||
+#define __visible __attribute__((externally_visible))
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ * GCC 'asm goto' miscompiles certain code sequences:
|
||||
+ *
|
||||
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
|
||||
+ *
|
||||
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
|
||||
+ *
|
||||
+ * (asm goto is automatically volatile - the naming reflects this.)
|
||||
+ */
|
||||
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
|
||||
+
|
||||
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
|
||||
+#if GCC_VERSION >= 40400
|
||||
+#define __HAVE_BUILTIN_BSWAP32__
|
||||
+#define __HAVE_BUILTIN_BSWAP64__
|
||||
+#endif
|
||||
+#if GCC_VERSION >= 40800 || (defined(__powerpc__) && GCC_VERSION >= 40600)
|
||||
+#define __HAVE_BUILTIN_BSWAP16__
|
||||
+#endif
|
||||
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
|
||||
+
|
||||
+#if GCC_VERSION >= 50000
|
||||
+#define KASAN_ABI_VERSION 4
|
||||
+#elif GCC_VERSION >= 40902
|
||||
+#define KASAN_ABI_VERSION 3
|
||||
+#endif
|
||||
+
|
||||
+#endif /* gcc version >= 40000 specific checks */
|
||||
|
||||
#if !defined(__noclone)
|
||||
#define __noclone /* not needed */
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user