From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Wolfram Sang <wsa@kernel.org>
Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
Sekhar Nori <nsekhar@ti.com>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [PATCH 02/12] ARM: davinci: Constify the software nodes
Date: Mon, 29 Mar 2021 13:50:37 +0300 [thread overview]
Message-ID: <20210329105047.51033-3-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <20210329105047.51033-1-heikki.krogerus@linux.intel.com>
Additional device properties are always just a part of a
software fwnode. If the device properties are constant, the
software node can also be constant.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
arch/arm/mach-davinci/board-da830-evm.c | 6 +++++-
arch/arm/mach-davinci/board-dm365-evm.c | 6 +++++-
arch/arm/mach-davinci/board-dm644x-evm.c | 6 +++++-
arch/arm/mach-davinci/board-dm646x-evm.c | 6 +++++-
arch/arm/mach-davinci/board-mityomapl138.c | 6 +++++-
arch/arm/mach-davinci/board-sffsdr.c | 6 +++++-
6 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index a20ba12d876c6..823c9cc98f18b 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -454,6 +454,10 @@ static const struct property_entry da830_evm_i2c_eeprom_properties[] = {
{ }
};
+static const struct software_node da830_evm_i2c_eeprom_node = {
+ .properties = da830_evm_i2c_eeprom_properties,
+};
+
static int __init da830_evm_ui_expander_setup(struct i2c_client *client,
int gpio, unsigned ngpio, void *context)
{
@@ -485,7 +489,7 @@ static struct pcf857x_platform_data __initdata da830_evm_ui_expander_info = {
static struct i2c_board_info __initdata da830_evm_i2c_devices[] = {
{
I2C_BOARD_INFO("24c256", 0x50),
- .properties = da830_evm_i2c_eeprom_properties,
+ .swnode = &da830_evm_i2c_eeprom_node,
},
{
I2C_BOARD_INFO("tlv320aic3x", 0x18),
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index bdf31eb776204..b3bef74c982a3 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -232,10 +232,14 @@ static const struct property_entry eeprom_properties[] = {
{ }
};
+static const struct software_node eeprom_node = {
+ .properties = eeprom_properties,
+};
+
static struct i2c_board_info i2c_info[] = {
{
I2C_BOARD_INFO("24c256", 0x50),
- .properties = eeprom_properties,
+ .swnode = &eeprom_node,
},
{
I2C_BOARD_INFO("tlv320aic3x", 0x18),
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 7755cccec550c..cce3a621eb20b 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -541,6 +541,10 @@ static const struct property_entry eeprom_properties[] = {
{ }
};
+static const struct software_node eeprom_node = {
+ .properties = eeprom_properties,
+};
+
/*
* MSP430 supports RTC, card detection, input from IR remote, and
* a bit more. It triggers interrupts on GPIO(7) from pressing
@@ -647,7 +651,7 @@ static struct i2c_board_info __initdata i2c_info[] = {
},
{
I2C_BOARD_INFO("24c256", 0x50),
- .properties = eeprom_properties,
+ .swnode = &eeprom_node,
},
{
I2C_BOARD_INFO("tlv320aic33", 0x1b),
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 952ddabc743e0..ee91d81ebbfdf 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -362,6 +362,10 @@ static const struct property_entry eeprom_properties[] = {
PROPERTY_ENTRY_U32("pagesize", 64),
{ }
};
+
+static const struct software_node eeprom_node = {
+ .properties = eeprom_properties,
+};
#endif
static u8 dm646x_iis_serializer_direction[] = {
@@ -430,7 +434,7 @@ static void evm_init_cpld(void)
static struct i2c_board_info __initdata i2c_info[] = {
{
I2C_BOARD_INFO("24c256", 0x50),
- .properties = eeprom_properties,
+ .swnode = &eeprom_node,
},
{
I2C_BOARD_INFO("pcf8574a", 0x38),
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 5205008c8061b..2127969beb965 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -197,6 +197,10 @@ static const struct property_entry mityomapl138_fd_chip_properties[] = {
{ }
};
+static const struct software_node mityomapl138_fd_chip_node = {
+ .properties = mityomapl138_fd_chip_properties,
+};
+
static struct davinci_i2c_platform_data mityomap_i2c_0_pdata = {
.bus_freq = 100, /* kHz */
.bus_delay = 0, /* usec */
@@ -323,7 +327,7 @@ static struct i2c_board_info __initdata mityomap_tps65023_info[] = {
},
{
I2C_BOARD_INFO("24c02", 0x50),
- .properties = mityomapl138_fd_chip_properties,
+ .swnode = &mityomapl138_fd_chip_node,
},
};
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 79b47958e9926..6930b2f485d19 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -84,10 +84,14 @@ static const struct property_entry eeprom_properties[] = {
{ }
};
+static const struct software_node eeprom_node = {
+ .properties = eeprom_properties,
+};
+
static struct i2c_board_info __initdata i2c_info[] = {
{
I2C_BOARD_INFO("24c64", 0x50),
- .properties = eeprom_properties,
+ .swnode = &eeprom_node,
},
/* Other I2C devices:
* MSP430, addr 0x23 (not used)
--
2.30.2
next prev parent reply other threads:[~2021-03-29 10:51 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-29 10:50 [PATCH 00/12] i2c: Adding support for software nodes Heikki Krogerus
2021-03-29 10:50 ` [PATCH 01/12] i2c: Add " Heikki Krogerus
2021-03-29 10:50 ` Heikki Krogerus [this message]
2021-04-06 19:38 ` [PATCH 02/12] ARM: davinci: Constify the " Wolfram Sang
2021-04-07 7:41 ` Bartosz Golaszewski
2021-03-29 10:50 ` [PATCH 03/12] ARM: omap1: osk: Constify the software node Heikki Krogerus
2021-03-31 6:15 ` Tony Lindgren
2021-03-29 10:50 ` [PATCH 04/12] ARM: pxa: stargate2: " Heikki Krogerus
2021-04-06 19:39 ` Wolfram Sang
2021-04-10 8:16 ` Robert Jarzmik
2021-03-29 10:50 ` [PATCH 05/12] ARM: s3c: mini2440: " Heikki Krogerus
2021-03-29 10:58 ` Krzysztof Kozlowski
2021-03-29 12:32 ` Heikki Krogerus
2021-04-01 17:44 ` Krzysztof Kozlowski
2021-04-06 19:40 ` Wolfram Sang
2021-04-06 20:28 ` Krzysztof Kozlowski
2021-03-29 10:50 ` [PATCH 06/12] platform/x86: intel_cht_int33fe_microb: " Heikki Krogerus
2021-03-29 15:27 ` Hans de Goede
2021-04-06 19:40 ` Wolfram Sang
2021-04-06 19:49 ` Hans de Goede
2021-03-29 10:50 ` [PATCH 07/12] i2c: cht-wc: " Heikki Krogerus
2021-03-29 15:28 ` Hans de Goede
2021-03-29 10:50 ` [PATCH 08/12] i2c: nvidia-gpu: " Heikki Krogerus
2021-03-29 10:50 ` [PATCH 09/12] i2c: icy: " Heikki Krogerus
2021-03-30 13:58 ` Max Staudt
2021-04-08 21:22 ` Wolfram Sang
2021-04-08 22:13 ` Max Staudt
2021-03-29 10:50 ` [PATCH 10/12] platform/chrome: chromeos_laptop - Prepare complete software nodes Heikki Krogerus
2021-03-30 16:33 ` Enric Balletbo i Serra
2021-03-29 10:50 ` [PATCH 11/12] Input: elantech - Prepare a complete software node for the device Heikki Krogerus
2021-03-29 19:05 ` Dmitry Torokhov
2021-03-29 10:50 ` [PATCH 12/12] i2c: Remove support for dangling device properties Heikki Krogerus
2021-03-31 9:22 ` [PATCH 00/12] i2c: Adding support for software nodes Wolfram Sang
2021-03-31 10:17 ` Heikki Krogerus
2021-04-06 19:37 ` Wolfram Sang
2021-04-08 21:53 ` Wolfram Sang
2021-04-09 9:39 ` Heikki Krogerus
2021-04-10 19:48 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210329105047.51033-3-heikki.krogerus@linux.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).