shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-24 19:40:21 +09:00
Code Issues Packages Projects Releases Wiki Activity

ODROID-GOA: Support single kernel image for all OGA boards

Browse Source 
Change-Id: I6de106840db9e36693cefb0a80f320efce3f6fa7
This commit is contained in:
Joy Cho
2020-11-27 19:27:52 +09:00
parent d3f4a5c0f8
commit 6cd3fd65eb
12 changed files with 73 additions and 4976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/Kconfig.platforms
View File

@@ -63,12 +63,14 @@ config ARCH_ROCKCHIP
This enables support for the ARMv8 based Rockchip chipsets,
like the RK3368.
config ARCH_ROCKCHIP_ODROIDGO2
bool "Hardkkernel's ODROID-GO2 Board"
config ARCH_ROCKCHIP_ODROIDGOA
bool "Hardkkernel's ODROID-GO Advanced Boards"
depends on ARCH_ROCKCHIP
help
This enables support for Hardkernel ODROID-GO2
This enables support for Hardkernel ODROID-GO Advanced Boards
based on Rockchip RK3326.
(ODROID-GO2 Rev 1.0, Rev 1.1 with built-in WIFI module
and ODROID-GO3)
config ARCH_SEATTLE
bool "AMD Seattle SoC Family"

4909
arch/arm64/configs/odroidgo3_defconfig
View File

File diff suppressed because it is too large Load Diff

11
arch/arm64/configs/odroidgo2_defconfig → arch/arm64/configs/odroidgoa_defconfig
View File

@@ -325,7 +325,7 @@ CONFIG_FREEZER=y
# CONFIG_ARCH_MEDIATEK is not set
# CONFIG_ARCH_QCOM is not set
CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_ROCKCHIP_ODROIDGO2=y
CONFIG_ARCH_ROCKCHIP_ODROIDGOA=y
# CONFIG_ARCH_SEATTLE is not set
# CONFIG_ARCH_STRATIX10 is not set
# CONFIG_ARCH_TEGRA is not set
@@ -382,7 +382,6 @@ CONFIG_HZ_250=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=250
CONFIG_SCHED_HRTICK=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
@@ -1769,6 +1768,7 @@ CONFIG_JOYSTICK_XPAD_FF=y
CONFIG_JOYSTICK_XPAD_LEDS=y
# CONFIG_JOYSTICK_ADC is not set
CONFIG_JOYSTICK_ODROIDGO2=y
CONFIG_JOYSTICK_ODROIDGO3=y
# CONFIG_INPUT_TABLET is not set
# CONFIG_INPUT_TOUCHSCREEN is not set
# CONFIG_ROCKCHIP_REMOTECTL is not set
@@ -2783,6 +2783,7 @@ CONFIG_DRM_PANEL_SIMPLE=y
# CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
# CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
# CONFIG_DRM_PANEL_ODROID_ST7701S is not set
CONFIG_DRM_BRIDGE=y
#
@@ -3768,6 +3769,11 @@ CONFIG_FIQ_DEBUGGER_CONSOLE_DEFAULT_ENABLE=y
# CONFIG_WILC1000_DRIVER is not set
# CONFIG_MOST is not set
# CONFIG_POWERVR_ROGUE_N is not set
#
# Qualcomm Atheros CLD WLAN module
#
# CONFIG_QCA_CLD_WLAN is not set
# CONFIG_GOLDFISH is not set
# CONFIG_CHROME_PLATFORMS is not set
CONFIG_CLKDEV_LOOKUP=y
@@ -4485,7 +4491,6 @@ CONFIG_DEBUG_KERNEL=y
# Memory Debugging
#
# CONFIG_PAGE_EXTENSION is not set
# CONFIG_DEBUG_PAGEALLOC is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_DEBUG_ON is not set
# CONFIG_SLUB_STATS is not set

6
drivers/bluetooth/hci_qca.c
View File

@@ -454,7 +454,7 @@ static int qca_open(struct hci_uart *hu)
return 0;
}
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
static void qca_debugfs_init(struct hci_dev *hdev)
{
struct hci_uart *hu = hci_get_drvdata(hdev);
@@ -933,7 +933,7 @@ static int qca_setup(struct hci_uart *hu)
hci_uart_set_baudrate(hu, speed);
}
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
/* Setup patch / NVM configurations */
ret = qca_uart_setup_rome(hdev, qca_baudrate);
if (!ret) {
@@ -962,7 +962,7 @@ static struct hci_uart_proto qca_proto = {
.name = "QCA",
.manufacturer = 29,
.init_speed = 115200,
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
.oper_speed = 3000000,
#else
.oper_speed = 2000000,

45
drivers/gpu/drm/panel/panel-simple.c
View File

@@ -40,8 +40,7 @@
#include <linux/of_graph.h>
#include <video/videomode.h>
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#endif
@@ -115,16 +114,14 @@ struct panel_simple {
const struct panel_desc *desc;
struct backlight_device *backlight;
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) && \
!defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
struct regulator *backlight_supply;
#endif
struct regulator *supply;
struct i2c_adapter *ddc;
struct gpio_desc *enable_gpio;
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
int reset_gpio;
bool reset_gpio_active;
#else
@@ -555,8 +552,7 @@ static int panel_simple_regulator_enable(struct drm_panel *panel)
return err;
}
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) && \
!defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
err = regulator_enable(p->backlight_supply);
if (err < 0)
dev_err(panel->dev, "failed to enable supply: %d\n", err);
@@ -582,8 +578,7 @@ static int panel_simple_regulator_disable(struct drm_panel *panel)
regulator_disable(p->supply);
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) && \
!defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
regulator_disable(p->backlight_supply);
#endif
return err;
@@ -651,8 +646,7 @@ static int panel_simple_unprepare(struct drm_panel *panel)
dev_err(p->dev, "failed to send off cmds\n");
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
if (p->reset_gpio)
gpio_set_value(p->reset_gpio, p->reset_gpio_active);
#else
@@ -693,8 +687,7 @@ static int panel_simple_prepare(struct drm_panel *panel)
if (p->desc && p->desc->delay.prepare)
panel_simple_sleep(p->desc->delay.prepare);
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
if (p->reset_gpio)
gpio_set_value(p->reset_gpio, p->reset_gpio_active);
#else
@@ -705,8 +698,7 @@ static int panel_simple_prepare(struct drm_panel *panel)
if (p->desc && p->desc->delay.reset)
panel_simple_sleep(p->desc->delay.reset);
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
if (p->reset_gpio)
gpio_set_value(p->reset_gpio, !p->reset_gpio_active);
#else
@@ -910,11 +902,20 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
return err;
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) && \
!defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
panel->backlight_supply = devm_regulator_get(dev, "backlight");
if (IS_ERR(panel->backlight_supply))
if (IS_ERR(panel->backlight_supply)) {
return PTR_ERR(panel->backlight_supply);
} else {
/*
* Ensure physical regulator is present.
* (e.g. could be dummy regulator.)
*/
if (regulator_get_voltage(panel->backlight_supply) < 0)
dev_err(dev,"using dummy regulator, no backlight_supply\n");
else
dev_err(dev,"actual backlight_supply exists\n");
}
#endif
panel->enable_gpio = devm_gpiod_get_optional(dev, "enable", 0);
if (IS_ERR(panel->enable_gpio)) {
@@ -923,8 +924,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)
return err;
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
{
enum of_gpio_flags flags;
panel->reset_gpio = of_get_named_gpio_flags(dev->of_node,
@@ -1090,8 +1090,7 @@ static void panel_simple_shutdown(struct device *dev)
panel_simple_disable(&panel->base);
if (panel->prepared) {
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2) || \
defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO3)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
if (panel->reset_gpio)
gpio_set_value(panel->reset_gpio,
panel->reset_gpio_active);

6
drivers/input/joystick/Kconfig
View File

@@ -332,20 +332,20 @@ config JOYSTICK_MAPLE
config JOYSTICK_ADC
tristate "SARADC-JOYSTICK"
depends on ARCH_ROCKCHIP_ODROIDGO2
depends on ARCH_ROCKCHIP_ODROIDGOA
help
This driver is a joystick driver using the saradc driver.
Made for ODROIDGO2-Advance.
config JOYSTICK_ODROIDGO2
tristate "ODROIDGO2-Advance joypad driver"
depends on ARCH_ROCKCHIP_ODROIDGO2
depends on ARCH_ROCKCHIP_ODROIDGOA
help
Made for ODROIDGO2-Advance.
config JOYSTICK_ODROIDGO3
tristate "ODROIDGO3 joypad driver"
depends on ARCH_ROCKCHIP_ODROIDGO2
depends on ARCH_ROCKCHIP_ODROIDGOA
help
Made for ODROIDGO3.
endif

2
drivers/mfd/rk808.c
View File

@@ -1048,7 +1048,7 @@ static int rk817_reboot_notifier_handler(struct notifier_block *nb,
struct rk817_reboot_data_t *data;
int ret;
struct device *dev;
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
int value, power_en_active0, power_en_active1;
regmap_read(data->rk808->regmap, RK817_POWER_EN_SAVE0,

4
drivers/power/rk817_battery.c
View File

@@ -1942,7 +1942,7 @@ static enum power_supply_property rk817_bat_props[] = {
POWER_SUPPLY_PROP_VOLTAGE_NOW,
POWER_SUPPLY_PROP_HEALTH,
POWER_SUPPLY_PROP_CAPACITY,
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
POWER_SUPPLY_PROP_TEMP,
#endif
POWER_SUPPLY_PROP_CHARGE_COUNTER,
@@ -2041,7 +2041,7 @@ static int rk817_battery_get_property(struct power_supply *psy,
case POWER_SUPPLY_PROP_HEALTH:
val->intval = POWER_SUPPLY_HEALTH_GOOD;
break;
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
case POWER_SUPPLY_PROP_TEMP:
val->intval = battery->temperature;
if (battery->pdata->bat_mode == MODE_VIRTUAL)

16
drivers/power/rk817_charger.c
View File

@@ -273,7 +273,7 @@ struct charger_platform_data {
u32 dc_det_level;
int dc_det_pin;
bool support_dc_det;
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
int chg_led_pin;
bool chg_led_on;
#endif
@@ -302,7 +302,7 @@ struct rk817_charger {
struct delayed_work host_work;
struct delayed_work discnt_work;
struct delayed_work irq_work;
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
struct workqueue_struct *led_wq;
struct delayed_work led_work;
#endif
@@ -886,7 +886,7 @@ static irqreturn_t rk817_charge_dc_det_isr(int irq, void *charger)
else
irq_set_irq_type(irq, IRQF_TRIGGER_HIGH);
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
queue_delayed_work(charge->dc_charger_wq, &charge->dc_work,
msecs_to_jiffies(2000));
#else
@@ -910,7 +910,7 @@ static enum charger_t rk817_charge_get_dc_state(struct rk817_charger *charge)
DC_TYPE_DC_CHARGER : DC_TYPE_NONE_CHARGER;
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
static void rk817_charge_led_worker(struct work_struct *work)
{
struct rk817_charger *charge = container_of(work,
@@ -989,7 +989,7 @@ static int rk817_charge_init_dc(struct rk817_charger *charge)
return ret;
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
if (charge->pdata->chg_led_pin) {
ret = devm_gpio_request(charge->dev,
charge->pdata->chg_led_pin,
@@ -1452,7 +1452,7 @@ static int rk817_charge_parse_dt(struct rk817_charger *charge)
dev_err(dev, "invalid dc det gpio!\n");
return -EINVAL;
}
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
if (!of_find_property(np, "chg_led_gpio", &ret)) {
DBG("not support charge led\n");
pdata->chg_led_pin = 0;
@@ -1677,7 +1677,7 @@ irq_fail:
destroy_workqueue(charge->usb_charger_wq);
destroy_workqueue(charge->dc_charger_wq);
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
cancel_delayed_work_sync(&charge->led_work);
destroy_workqueue(charge->led_wq);
#endif
@@ -1765,7 +1765,7 @@ static void rk817_charger_shutdown(struct platform_device *dev)
cancel_delayed_work_sync(&charge->irq_work);
flush_workqueue(charge->usb_charger_wq);
flush_workqueue(charge->dc_charger_wq);
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGO2)
#if defined(CONFIG_ARCH_ROCKCHIP_ODROIDGOA)
cancel_delayed_work_sync(&charge->led_work);
destroy_workqueue(charge->led_wq);
#endif

30
sound/soc/codecs/rk817_codec.c
View File

@@ -54,7 +54,7 @@ module_param_named(dbg_level, dbg_enable, int, 0644);
*/
#define OUT_VOLUME (0x03)
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
#define RK817_DAC_VOLUME \
SOC_DOUBLE_R("Playback Volume", RK817_CODEC_DDAC_VOLL, RK817_CODEC_DDAC_VOLR, 0, 0xff, 1)
static const DECLARE_TLV_DB_MINMAX(rk817_vol_tlv, -9500, -675);
@@ -73,7 +73,7 @@ static const DECLARE_TLV_DB_MINMAX(rk817_vol_tlv, -9500, -675);
#define CODEC_SET_SPK 1
#define CODEC_SET_HP 2
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
#define RK817_ADC_VOLUME \
SOC_DOUBLE_R("Record Volume", RK817_CODEC_DADC_VOLL, RK817_CODEC_DADC_VOLR, 0, 0xFF, 1)
#endif
@@ -165,7 +165,7 @@ static const struct reg_default rk817_reg_defaults[] = {
{ RK817_CODEC_DI2S_TXCR3_TXCMD, 0x00 },
};
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
static const struct snd_kcontrol_new rk817_dac_controls[] = {
SOC_DOUBLE_R_RANGE_TLV("Playback Volume", RK817_CODEC_DDAC_VOLL,
RK817_CODEC_DDAC_VOLR, 0, 0x12, 0xff, 1, rk817_vol_tlv),
@@ -464,7 +464,7 @@ static int rk817_codec_power_down(struct snd_soc_codec *codec, int type)
/* For tiny alsa playback/capture/voice call path */
static const char * const rk817_playback_path_mode[] = {
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
"OFF", "RCV", "SPK", "HP", "HP_NO_MIC", "BT", "SPK_HP", /* 0-6 */
"RING_SPK", "RING_HP", "RING_HP_NO_MIC", "RING_SPK_HP"}; /* 7-10 */
#else
@@ -472,7 +472,7 @@ static const char * const rk817_playback_path_mode[] = {
#endif
static const char * const rk817_capture_path_mode[] = {
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
"MIC OFF", "Main Mic", "Hands Free Mic", "BT Sco Mic"};
static const char * const rk817_call_path_mode[] = {
@@ -489,7 +489,7 @@ static SOC_ENUM_SINGLE_DECL(rk817_playback_path_type,
static SOC_ENUM_SINGLE_DECL(rk817_capture_path_type,
0, 0, rk817_capture_path_mode);
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
static SOC_ENUM_SINGLE_DECL(rk817_call_path_type,
0, 0, rk817_call_path_mode);
@@ -536,7 +536,7 @@ static int rk817_playback_path_put(struct snd_kcontrol *kcontrol,
switch (rk817->playback_path) {
case OFF:
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
if (pre_path != OFF && (pre_path != HP_PATH &&
pre_path != HP_NO_MIC && pre_path != RING_HP &&
pre_path != RING_HP_NO_MIC)) {
@@ -582,7 +582,7 @@ static int rk817_playback_path_put(struct snd_kcontrol *kcontrol,
snd_soc_update_bits(codec, RK817_CODEC_DDAC_MUTE_MIXCTL,
DACMT_ENABLE, DACMT_DISABLE);
}
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
snd_soc_write(codec, RK817_CODEC_DDAC_VOLL, rk817->spk_volume);
snd_soc_write(codec, RK817_CODEC_DDAC_VOLR, rk817->spk_volume);
break;
@@ -607,7 +607,7 @@ static int rk817_playback_path_put(struct snd_kcontrol *kcontrol,
snd_soc_update_bits(codec, RK817_CODEC_DDAC_MUTE_MIXCTL,
DACMT_ENABLE, DACMT_DISABLE);
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
snd_soc_write(codec, RK817_CODEC_DDAC_VOLL, rk817->hp_volume);
snd_soc_write(codec, RK817_CODEC_DDAC_VOLR, rk817->hp_volume);
break;
@@ -641,7 +641,7 @@ static int rk817_playback_path_put(struct snd_kcontrol *kcontrol,
snd_soc_write(codec, RK817_CODEC_ACLASSD_CFG2, 0xc4);
}
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
snd_soc_write(codec, RK817_CODEC_DDAC_VOLL, rk817->hp_volume);
snd_soc_write(codec, RK817_CODEC_DDAC_VOLR, rk817->hp_volume);
#endif
@@ -716,7 +716,7 @@ static int rk817_capture_path_put(struct snd_kcontrol *kcontrol,
PWD_PGA_L_MASK, PWD_PGA_L_EN);
}
break;
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
case HANDS_FREE_MIC:
if (pre_path == MIC_OFF)
rk817_codec_power_up(codec, RK817_CODEC_CAPTURE);
@@ -843,14 +843,14 @@ static int rk817_digital_mute(struct snd_soc_dai *dai, int mute)
} else {
switch (rk817->playback_path) {
case SPK_PATH:
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
case RING_SPK:
#endif
rk817_codec_ctl_gpio(rk817, CODEC_SET_SPK, 1);
rk817_codec_ctl_gpio(rk817, CODEC_SET_HP, 0);
break;
case HP_PATH:
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
case HP_NO_MIC:
case RING_HP:
case RING_HP_NO_MIC:
@@ -859,7 +859,7 @@ static int rk817_digital_mute(struct snd_soc_dai *dai, int mute)
rk817_codec_ctl_gpio(rk817, CODEC_SET_HP, 1);
break;
case SPK_HP:
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
case RING_SPK_HP:
#endif
rk817_codec_ctl_gpio(rk817, CODEC_SET_SPK, 1);
@@ -1077,7 +1077,7 @@ static struct snd_soc_codec_driver soc_codec_dev_rk817 = {
.get_regmap = rk817_get_regmap,
.suspend = rk817_suspend,
.resume = rk817_resume,
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifdef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
.controls = rk817_dac_controls,
.num_controls = ARRAY_SIZE(rk817_dac_controls),
#endif

8
sound/soc/codecs/rk817_codec.h
View File

@@ -179,17 +179,17 @@ enum {
enum {
OFF,
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
RCV,
#endif
SPK_PATH,
HP_PATH,
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
HP_NO_MIC,
BT,
#endif
SPK_HP,
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
RING_SPK,
RING_HP,
RING_HP_NO_MIC,
@@ -200,7 +200,7 @@ enum {
enum {
MIC_OFF,
MAIN_MIC,
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
HANDS_FREE_MIC,
BT_SCO_MIC,
#endif

4
sound/soc/generic/simple-card.c
View File

@@ -115,7 +115,7 @@ static struct snd_soc_ops asoc_simple_card_ops = {
static struct snd_soc_jack simple_card_hp_jack;
static struct snd_soc_jack_pin simple_card_hp_jack_pins[] = {
{
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
.pin = "Headphones",
#else
.pin = "Headphone Jack",
@@ -222,7 +222,7 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd)
&simple_card_mic_jack_gpio);
}
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGO2
#ifndef CONFIG_ARCH_ROCKCHIP_ODROIDGOA
//Once is enough
if (priv->codec_hp_det)
snd_soc_card_jack_new(rtd->card, "Headphones",