From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5D2B1D514E for ; Sun, 26 Jul 2026 01:05:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785027926; cv=none; b=uvap6M5T7sxTIdibq0iqQtDB025tiMhlst4mcBlDPZuGIsju/L7shRmLrmpQY2rjFQL61cMs9zzCTH88CHulz672GaVz0LfEgbncw8l5ow3KxNHQ04OJNK+9VgvCJN0JtKfT/25fGf/gyAlZ7c4yGRFOQiIk+RZ0QrUuVt943ms= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785027926; c=relaxed/simple; bh=P+yS06lHchG5siRz+mOw5xXexzbDxhJfSVKS22jmjZw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bFPn5ZSVXAEuVjW9qI56QJBbkK/1LUIHMjJMbn89Iv4UfJxm6+/Gjw4zIpAUDYjYvx7Fp6IQ6NWEqFEyjGSZH9jTgpjBNk65ezaLAvBcNdPHmMPrYOLPNykPtzLYGg6rOgXnK40cJ32b9ScJ8igshE5nWI8WZk/+bdvlLNRDxmk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UGJpcV0I; arc=none smtp.client-ip=209.85.216.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UGJpcV0I" Received: by mail-pj1-f45.google.com with SMTP id 98e67ed59e1d1-38a0c7e841fso1938338a91.2 for ; Sat, 25 Jul 2026 18:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785027924; x=1785632724; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=F/5LdFIg/LU7rFG3leYAHwWxQcBTNGDs6wAJLayt2JU=; b=UGJpcV0IBLXeQODI2JQ6uWOqarsm0LUJywv7gMc0ACGkzwnZjkINw6hrUHTCh+kLzT gWJWAGsqvjPDESTGrJJzSbg8+7Tz9KYjoEhoXl5ScOfZ+Y/yVgaU+VwigAMppSuUQInG JPWusBPSI/U2SR2R6ba0kAl+hICGByxJMGwCC5uwbSDEssJdiXKiI3Ez9YMwiV1svIQE Ag5GSNX7I3TcyyQ3kt7CvUJ0BMJ0g6bS1w+2hwuhZkrPm/Chepwb9svWS3vN+GxlPAoA WQTLB7devcP9bcYJNie9gj0H/PmQgxegLFrau64qqUZGoXLDEsYz+79xmebARQlK49Vw ykxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785027924; x=1785632724; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=F/5LdFIg/LU7rFG3leYAHwWxQcBTNGDs6wAJLayt2JU=; b=MkGn04aOB7hCgytTAL+o0Qtf06jN5eaPwvzQRI4Q42O28NpVB7XZyYp7fuCWCq0bQm Mxcn6sL1wQCmQbFxbIMWdxRsXlDkhgb5j4GeMm3aBheshHeinRU/HZ/BcIzJyXOIi3/I bJJZCKjO97ti4hSgHAPf/6CWZrUmW6GmmEcSYos/xvBmTq1+qU8fqYq1yTfAvUAGQHFU sCH+o/qQPF3cPNzLDwr+/2w1WJDKjDvXLWY0rjIo14ZK71Z8FlgRYad4Ea6nUAZyNbG0 Im89p8ZHDi7QJ9I8IEOyIWR7ytV56KoJYM7qImWom6TecqQpnYNRXsOQBH6f6GfaORXm ktPw== X-Forwarded-Encrypted: i=1; AHgh+RquPOr44VikIE95RTtXX8uDU+bkF3Uwl1DWXnPIle4JfsiEJ+KOW/m4NqXV5GKsDlyvZ3ojDWmosF046OI=@vger.kernel.org X-Gm-Message-State: AOJu0YzlSTQXRV58qILklHJXAxce4MCYPbWqJgJVCBzXATRMonMxLk51 EFEcnHbcHslWv72RdnoLrqgRJqgedWZkDXfYB7SMLfvxfxX4cI+Nmool X-Gm-Gg: AR+sD10Wm7+dTD0GTlK0xYgO9rh4pX6u6B1JOLx93Fn7FRFMNI3JBTrRll55M66qC82 VN6VSJ9Qt0jwt17aDoRD8fqVMsTjtS9EHZFh+0T4AiRy3RvkjZYN2IFq/ei3WG4yA+T/Fz1u0R9 5IK0erF3UvuOlngjyKsSndX4ZEeaWDID3aZJZDi27YuOG2CZaT7Cy1kYQ03PnBiUNWhD/n7iY+/ ZURwp6NSdk+18Lnoce8soH5b93/UNdMbf9fOW8Fb6OWs+AnW/aKtrJA3J/WeRebK3PV0WMgaePz o/82TWA3t+57poaLng53HHU4kX0JRJcLqbXdt97IKrnm9Hw5STEfCN4270hJiA33kYLo63IoYxZ pxGR5R2bh+5oFZr84l1C++C8p3oWQuF8f+1lokvuF7kzipnB/jb+2dTk2fcv/Fqw7hIlRFfb0z9 /wnIR27zLnX4ECC4LtIuESgm+LDJDGfwcCpPvhpUylQJqyRkPWZ5Bo7dJv2ydt6MnPmG4vmCBep iY6 X-Received: by 2002:a17:90b:1a91:b0:387:e0db:3faf with SMTP id 98e67ed59e1d1-38f298bcfc8mr3203455a91.40.1785027924060; Sat, 25 Jul 2026 18:05:24 -0700 (PDT) Received: from dtor-ws.sjc.corp.google.com ([2a00:79e0:2ebe:8:e2c2:1f24:32d5:9d51]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e0f4a039asm11821445c88.9.2026.07.25.18.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 18:05:23 -0700 (PDT) From: Dmitry Torokhov To: Shenghao Ding , Kevin Lu , Baojun Xu , Sen Wang , Liam Girdwood , Mark Brown Cc: Jaroslav Kysela , Takashi Iwai , linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/7] ASoC: tlv320aic32x4: remove global header with platform data Date: Sat, 25 Jul 2026 18:05:11 -0700 Message-ID: <20260726010519.117805-1-dmitry.torokhov@gmail.com> X-Mailer: git-send-email 2.55.0.229.g6434b31f56-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Commit 69d5b62c4bde ("ASoC: codec: tlv320aic32x4: Drop aic32x4_pdata usage") removed support for platform data, but left a global header file with #defines and platform data structure. Move the contents to the driver-private header. Signed-off-by: Dmitry Torokhov --- include/sound/tlv320aic32x4.h | 43 -------------------------------- sound/soc/codecs/tlv320aic32x4.c | 5 +++- sound/soc/codecs/tlv320aic32x4.h | 27 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 44 deletions(-) delete mode 100644 include/sound/tlv320aic32x4.h diff --git a/include/sound/tlv320aic32x4.h b/include/sound/tlv320aic32x4.h deleted file mode 100644 index b779d671a995..000000000000 --- a/include/sound/tlv320aic32x4.h +++ /dev/null @@ -1,43 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * tlv320aic32x4.h -- TLV320AIC32X4 Soc Audio driver platform data - * - * Copyright 2011 Vista Silicon S.L. - * - * Author: Javier Martin - */ - -#ifndef _AIC32X4_PDATA_H -#define _AIC32X4_PDATA_H - -#define AIC32X4_PWR_MICBIAS_2075_LDOIN 0x00000001 -#define AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE 0x00000002 -#define AIC32X4_PWR_AIC32X4_LDO_ENABLE 0x00000004 -#define AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36 0x00000008 -#define AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED 0x00000010 - -#define AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K 0x00000001 -#define AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K 0x00000002 - -/* GPIO API */ -#define AIC32X4_MFPX_DEFAULT_VALUE 0xff - -#define AIC32X4_MFP1_DIN_DISABLED 0 -#define AIC32X4_MFP1_DIN_ENABLED 0x2 -#define AIC32X4_MFP1_GPIO_IN 0x4 - -#define AIC32X4_MFP2_GPIO_OUT_LOW 0x0 -#define AIC32X4_MFP2_GPIO_OUT_HIGH 0x1 - -#define AIC32X4_MFP_GPIO_ENABLED 0x4 - -#define AIC32X4_MFP5_GPIO_DISABLED 0x0 -#define AIC32X4_MFP5_GPIO_INPUT 0x8 -#define AIC32X4_MFP5_GPIO_OUTPUT 0xc -#define AIC32X4_MFP5_GPIO_OUT_LOW 0x0 -#define AIC32X4_MFP5_GPIO_OUT_HIGH 0x1 - -struct aic32x4_setup_data { - unsigned int gpio_func[5]; -}; -#endif diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c index d85094557215..da582f2c940c 100644 --- a/sound/soc/codecs/tlv320aic32x4.c +++ b/sound/soc/codecs/tlv320aic32x4.c @@ -28,10 +28,13 @@ #include #include #include -#include #include "tlv320aic32x4.h" +struct aic32x4_setup_data { + unsigned int gpio_func[5]; +}; + struct aic32x4_priv { struct regmap *regmap; u32 power_cfg; diff --git a/sound/soc/codecs/tlv320aic32x4.h b/sound/soc/codecs/tlv320aic32x4.h index f68a846ef61d..8eb9c6a4c99e 100644 --- a/sound/soc/codecs/tlv320aic32x4.h +++ b/sound/soc/codecs/tlv320aic32x4.h @@ -234,4 +234,31 @@ int aic32x4_register_clocks(struct device *dev, const char *mclk_name); #define AIC32X4_MAX_CODEC_CLKIN_FREQ 110000000 #define AIC32X4_MAX_PLL_CLKIN 20000000 +#define AIC32X4_PWR_MICBIAS_2075_LDOIN 0x00000001 +#define AIC32X4_PWR_AVDD_DVDD_WEAK_DISABLE 0x00000002 +#define AIC32X4_PWR_AIC32X4_LDO_ENABLE 0x00000004 +#define AIC32X4_PWR_CMMODE_LDOIN_RANGE_18_36 0x00000008 +#define AIC32X4_PWR_CMMODE_HP_LDOIN_POWERED 0x00000010 + +#define AIC32X4_MICPGA_ROUTE_LMIC_IN2R_10K 0x00000001 +#define AIC32X4_MICPGA_ROUTE_RMIC_IN1L_10K 0x00000002 + +/* GPIO API */ +#define AIC32X4_MFPX_DEFAULT_VALUE 0xff + +#define AIC32X4_MFP1_DIN_DISABLED 0 +#define AIC32X4_MFP1_DIN_ENABLED 0x2 +#define AIC32X4_MFP1_GPIO_IN 0x4 + +#define AIC32X4_MFP2_GPIO_OUT_LOW 0x0 +#define AIC32X4_MFP2_GPIO_OUT_HIGH 0x1 + +#define AIC32X4_MFP_GPIO_ENABLED 0x4 + +#define AIC32X4_MFP5_GPIO_DISABLED 0x0 +#define AIC32X4_MFP5_GPIO_INPUT 0x8 +#define AIC32X4_MFP5_GPIO_OUTPUT 0xc +#define AIC32X4_MFP5_GPIO_OUT_LOW 0x0 +#define AIC32X4_MFP5_GPIO_OUT_HIGH 0x1 + #endif /* _TLV320AIC32X4_H */ -- 2.55.0.229.g6434b31f56-goog