* [PATCH v3 0/2] i2c: sunxi: Change compatibles pattern @ 2014-03-13 11:37 Maxime Ripard 2014-03-13 11:37 ` [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles Maxime Ripard 2014-03-13 11:37 ` [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new " Maxime Ripard 0 siblings, 2 replies; 7+ messages in thread From: Maxime Ripard @ 2014-03-13 11:37 UTC (permalink / raw) To: linux-arm-kernel Hi, This is the third version of the i2c compatible changes. Changes from v2: - rebased on top of current i2c/for-next Maxime Ripard (2): i2c: sunxi: Change i2c compatibles ARM: sunxi: dt: Convert to the new i2c compatibles Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 2 +- arch/arm/boot/dts/sun4i-a10.dtsi | 6 +++--- arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +++--- arch/arm/boot/dts/sun5i-a13.dtsi | 6 +++--- arch/arm/boot/dts/sun7i-a20.dtsi | 10 +++++----- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) -- 1.9.0 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles 2014-03-13 11:37 [PATCH v3 0/2] i2c: sunxi: Change compatibles pattern Maxime Ripard @ 2014-03-13 11:37 ` Maxime Ripard 2014-03-13 17:31 ` Mark Rutland 2014-03-13 11:37 ` [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new " Maxime Ripard 1 sibling, 1 reply; 7+ messages in thread From: Maxime Ripard @ 2014-03-13 11:37 UTC (permalink / raw) To: linux-arm-kernel The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Move to the other pattern for consistency across all Allwinner Socs. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 2 +- drivers/i2c/busses/i2c-mv64xxx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt index befd4fb4764f..5c30026921ae 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt @@ -5,7 +5,7 @@ Required properties : - reg : Offset and length of the register set for the device - compatible : Should be either: - - "allwinner,sun4i-i2c" + - "allwinner,sun4i-a10-i2c" - "allwinner,sun6i-a31-i2c" - "marvell,mv64xxx-i2c" - "marvell,mv78230-i2c" diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 203a5482a866..2f817b0978a2 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -692,7 +692,7 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = { ***************************************************************************** */ static const struct of_device_id mv64xxx_i2c_of_match_table[] = { - { .compatible = "allwinner,sun4i-i2c", .data = &mv64xxx_i2c_regs_sun4i}, + { .compatible = "allwinner,sun4i-a10-i2c", .data = &mv64xxx_i2c_regs_sun4i}, { .compatible = "allwinner,sun6i-a31-i2c", .data = &mv64xxx_i2c_regs_sun4i}, { .compatible = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, { .compatible = "marvell,mv78230-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, -- 1.9.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles 2014-03-13 11:37 ` [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles Maxime Ripard @ 2014-03-13 17:31 ` Mark Rutland 2014-03-14 9:13 ` Maxime Ripard 0 siblings, 1 reply; 7+ messages in thread From: Mark Rutland @ 2014-03-13 17:31 UTC (permalink / raw) To: linux-arm-kernel On Thu, Mar 13, 2014 at 11:37:22AM +0000, Maxime Ripard wrote: > The Allwinner A10 compatibles were following a slightly different compatible > patterns than the rest of the SoCs for historical reasons. Move to the other > pattern for consistency across all Allwinner Socs. Dropping support for the existing string breaks existing DTBs. Is this really necessary? Thanks, Mark. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 2 +- > drivers/i2c/busses/i2c-mv64xxx.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt > index befd4fb4764f..5c30026921ae 100644 > --- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt > +++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt > @@ -5,7 +5,7 @@ Required properties : > > - reg : Offset and length of the register set for the device > - compatible : Should be either: > - - "allwinner,sun4i-i2c" > + - "allwinner,sun4i-a10-i2c" > - "allwinner,sun6i-a31-i2c" > - "marvell,mv64xxx-i2c" > - "marvell,mv78230-i2c" > diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c > index 203a5482a866..2f817b0978a2 100644 > --- a/drivers/i2c/busses/i2c-mv64xxx.c > +++ b/drivers/i2c/busses/i2c-mv64xxx.c > @@ -692,7 +692,7 @@ static const struct i2c_algorithm mv64xxx_i2c_algo = { > ***************************************************************************** > */ > static const struct of_device_id mv64xxx_i2c_of_match_table[] = { > - { .compatible = "allwinner,sun4i-i2c", .data = &mv64xxx_i2c_regs_sun4i}, > + { .compatible = "allwinner,sun4i-a10-i2c", .data = &mv64xxx_i2c_regs_sun4i}, > { .compatible = "allwinner,sun6i-a31-i2c", .data = &mv64xxx_i2c_regs_sun4i}, > { .compatible = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, > { .compatible = "marvell,mv78230-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, > -- > 1.9.0 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles 2014-03-13 17:31 ` Mark Rutland @ 2014-03-14 9:13 ` Maxime Ripard 0 siblings, 0 replies; 7+ messages in thread From: Maxime Ripard @ 2014-03-14 9:13 UTC (permalink / raw) To: linux-arm-kernel On Thu, Mar 13, 2014 at 05:31:28PM +0000, Mark Rutland wrote: > On Thu, Mar 13, 2014 at 11:37:22AM +0000, Maxime Ripard wrote: > > The Allwinner A10 compatibles were following a slightly different compatible > > patterns than the rest of the SoCs for historical reasons. Move to the other > > pattern for consistency across all Allwinner Socs. > > Dropping support for the existing string breaks existing DTBs. Is > this really necessary? I added new ones at first, and Rob said it wasn't worth it since we were a "work-in-progress" platform. http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/229438.html -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140314/8d5d4eb4/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-03-13 11:37 [PATCH v3 0/2] i2c: sunxi: Change compatibles pattern Maxime Ripard 2014-03-13 11:37 ` [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles Maxime Ripard @ 2014-03-13 11:37 ` Maxime Ripard 2014-03-13 21:27 ` Wolfram Sang 1 sibling, 1 reply; 7+ messages in thread From: Maxime Ripard @ 2014-03-13 11:37 UTC (permalink / raw) To: linux-arm-kernel Switch the device tree to the new compatibles introduced in the i2c drivers to have a common pattern accross all Allwinner SoCs. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 6 +++--- arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +++--- arch/arm/boot/dts/sun5i-a13.dtsi | 6 +++--- arch/arm/boot/dts/sun7i-a20.dtsi | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 27dc6ee8d0d6..6d3e39b8bb29 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -641,7 +641,7 @@ }; i2c0: i2c at 01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -650,7 +650,7 @@ }; i2c1: i2c at 01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -659,7 +659,7 @@ }; i2c2: i2c at 01c2b400 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <9>; clocks = <&apb1_gates 2>; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index f34e0d85c9be..4977f47aeab3 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -519,7 +519,7 @@ i2c0: i2c at 01c2ac00 { #address-cells = <1>; #size-cells = <0>; - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -530,7 +530,7 @@ i2c1: i2c at 01c2b000 { #address-cells = <1>; #size-cells = <0>; - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -541,7 +541,7 @@ i2c2: i2c at 01c2b400 { #address-cells = <1>; #size-cells = <0>; - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <9>; clocks = <&apb1_gates 2>; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 0e9c239af689..7e0ef8374bbf 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -461,7 +461,7 @@ }; i2c0: i2c at 01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -470,7 +470,7 @@ }; i2c1: i2c at 01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -479,7 +479,7 @@ }; i2c2: i2c at 01c2b400 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <9>; clocks = <&apb1_gates 2>; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 4cc2f5f2ecad..c1fd510fd2c4 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -762,7 +762,7 @@ }; i2c0: i2c at 01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <0 7 4>; clocks = <&apb1_gates 0>; @@ -771,7 +771,7 @@ }; i2c1: i2c at 01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <0 8 4>; clocks = <&apb1_gates 1>; @@ -780,7 +780,7 @@ }; i2c2: i2c at 01c2b400 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <0 9 4>; clocks = <&apb1_gates 2>; @@ -789,7 +789,7 @@ }; i2c3: i2c at 01c2b800 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b800 0x400>; interrupts = <0 88 4>; clocks = <&apb1_gates 3>; @@ -798,7 +798,7 @@ }; i2c4: i2c at 01c2bc00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2bc00 0x400>; interrupts = <0 89 4>; clocks = <&apb1_gates 15>; -- 1.9.0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-03-13 11:37 ` [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new " Maxime Ripard @ 2014-03-13 21:27 ` Wolfram Sang 2014-03-24 14:39 ` Maxime Ripard 0 siblings, 1 reply; 7+ messages in thread From: Wolfram Sang @ 2014-03-13 21:27 UTC (permalink / raw) To: linux-arm-kernel > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > index 4cc2f5f2ecad..c1fd510fd2c4 100644 > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -762,7 +762,7 @@ > }; > > i2c0: i2c at 01c2ac00 { > - compatible = "allwinner,sun4i-i2c"; > + compatible = "allwinner,sun4i-a10-i2c"; I still wonder why there is no "allwinner,sun4i-a20-i2c" entry first (even if there is no similar entry in the driver *yet*). From the devicetree wiki [1]: === compatible is a list of strings. The first string in the list specifies the exact device that the node represents in the form "<manufacturer>,<model>". The following strings represent other devices that the device is compatible with. For example, the Freescale MPC8349 System on Chip (SoC) has a serial device which implements the National Semiconductor ns16550 register interface. The compatible property for the MPC8349 serial device should therefore be: compatible = "fsl,mpc8349-uart", "ns16550". In this case, fsl,mpc8349-uart specifies the exact device, and ns16550 states that it is register-level compatible with a National Semiconductor 16550 UART. Note: ns16550 doesn't have a manufacturer prefix purely for historical reasons. All new compatible values should use the manufacturer prefix. This practice allows existing device drivers to be bound to a newer device, while still uniquely identifying the exact hardware. === [1] http://www.devicetree.org/Device_Tree_Usage#Understanding_the_compatible_Property -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140313/d1b25041/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-03-13 21:27 ` Wolfram Sang @ 2014-03-24 14:39 ` Maxime Ripard 0 siblings, 0 replies; 7+ messages in thread From: Maxime Ripard @ 2014-03-24 14:39 UTC (permalink / raw) To: linux-arm-kernel On Thu, Mar 13, 2014 at 10:27:25PM +0100, Wolfram Sang wrote: > > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > > index 4cc2f5f2ecad..c1fd510fd2c4 100644 > > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > > @@ -762,7 +762,7 @@ > > }; > > > > i2c0: i2c at 01c2ac00 { > > - compatible = "allwinner,sun4i-i2c"; > > + compatible = "allwinner,sun4i-a10-i2c"; > > I still wonder why there is no "allwinner,sun4i-a20-i2c" entry first > (even if there is no similar entry in the driver *yet*). Ahh, I didn't understand it like that in your previous mail. Yes, it makes sense. I'll update the patches and resend. Thanks, Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140324/76b58905/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-03-24 14:39 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-13 11:37 [PATCH v3 0/2] i2c: sunxi: Change compatibles pattern Maxime Ripard 2014-03-13 11:37 ` [PATCH v3 1/2] i2c: sunxi: Change i2c compatibles Maxime Ripard 2014-03-13 17:31 ` Mark Rutland 2014-03-14 9:13 ` Maxime Ripard 2014-03-13 11:37 ` [PATCH v3 2/2] ARM: sunxi: dt: Convert to the new " Maxime Ripard 2014-03-13 21:27 ` Wolfram Sang 2014-03-24 14:39 ` Maxime Ripard
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).