* [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern @ 2014-02-06 9:51 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-06 9:51 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Maxime Ripard Hi, This is the second version of the i2c compatible changes. The only difference with the v1 being that we're now droping the old compatibles, instead of keeping them, since the DT maintainers said it was fine. Thanks, Maxime 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.8.4.2 ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern @ 2014-02-06 9:51 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-06 9:51 UTC (permalink / raw) To: linux-arm-kernel Hi, This is the second version of the i2c compatible changes. The only difference with the v1 being that we're now droping the old compatibles, instead of keeping them, since the DT maintainers said it was fine. Thanks, Maxime 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.8.4.2 ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <1391680285-16668-1-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>]
* [PATCH v2 1/2] i2c: sunxi: Change i2c compatibles 2014-02-06 9:51 ` Maxime Ripard @ 2014-02-06 9:51 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-06 9:51 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Maxime Ripard 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-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> --- 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 582b465..5f4c0c8 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt @@ -4,7 +4,7 @@ Required properties : - reg : Offset and length of the register set for the device - - compatible : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c" + - compatible : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-a10-i2c" or "marvell,mv78230-i2c" or "marvell,mv78230-a0-i2c" Note: Only use "marvell,mv78230-a0-i2c" for a very rare, initial version of the SoC which had broken offload diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index b8c5187..eb72301 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -689,7 +689,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 = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, { .compatible = "marvell,mv78230-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, { .compatible = "marvell,mv78230-a0-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 1/2] i2c: sunxi: Change i2c compatibles @ 2014-02-06 9:51 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-06 9:51 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 582b465..5f4c0c8 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt @@ -4,7 +4,7 @@ Required properties : - reg : Offset and length of the register set for the device - - compatible : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-i2c" + - compatible : Should be "marvell,mv64xxx-i2c" or "allwinner,sun4i-a10-i2c" or "marvell,mv78230-i2c" or "marvell,mv78230-a0-i2c" Note: Only use "marvell,mv78230-a0-i2c" for a very rare, initial version of the SoC which had broken offload diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index b8c5187..eb72301 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -689,7 +689,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 = "marvell,mv64xxx-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, { .compatible = "marvell,mv78230-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, { .compatible = "marvell,mv78230-a0-i2c", .data = &mv64xxx_i2c_regs_mv64xxx}, -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-02-06 9:51 ` Maxime Ripard @ 2014-02-06 9:51 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-06 9:51 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Maxime Ripard 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-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> --- 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 28273f9..ac65c8a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -518,7 +518,7 @@ }; i2c0: i2c@01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -527,7 +527,7 @@ }; i2c1: i2c@01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -536,7 +536,7 @@ }; i2c2: i2c@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 2318082..a2005c7 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -435,7 +435,7 @@ i2c0: i2c@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>; @@ -446,7 +446,7 @@ i2c1: i2c@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>; @@ -457,7 +457,7 @@ i2c2: i2c@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 6de40b6..537072c 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -377,7 +377,7 @@ }; i2c0: i2c@01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -386,7 +386,7 @@ }; i2c1: i2c@01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -395,7 +395,7 @@ }; i2c2: i2c@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 bfb2cf2..ec4463f 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -564,7 +564,7 @@ }; i2c0: i2c@01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <0 7 4>; clocks = <&apb1_gates 0>; @@ -573,7 +573,7 @@ }; i2c1: i2c@01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <0 8 4>; clocks = <&apb1_gates 1>; @@ -582,7 +582,7 @@ }; i2c2: i2c@01c2b400 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b400 0x400>; interrupts = <0 9 4>; clocks = <&apb1_gates 2>; @@ -591,7 +591,7 @@ }; i2c3: i2c@01c2b800 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b800 0x400>; interrupts = <0 88 4>; clocks = <&apb1_gates 3>; @@ -600,7 +600,7 @@ }; i2c4: i2c@01c2bc00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2bc00 0x400>; interrupts = <0 89 4>; clocks = <&apb1_gates 15>; -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles @ 2014-02-06 9:51 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-06 9:51 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 28273f9..ac65c8a 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -518,7 +518,7 @@ }; i2c0: i2c at 01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -527,7 +527,7 @@ }; i2c1: i2c at 01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -536,7 +536,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 2318082..a2005c7 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -435,7 +435,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>; @@ -446,7 +446,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>; @@ -457,7 +457,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 6de40b6..537072c 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -377,7 +377,7 @@ }; i2c0: i2c at 01c2ac00 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2ac00 0x400>; interrupts = <7>; clocks = <&apb1_gates 0>; @@ -386,7 +386,7 @@ }; i2c1: i2c at 01c2b000 { - compatible = "allwinner,sun4i-i2c"; + compatible = "allwinner,sun4i-a10-i2c"; reg = <0x01c2b000 0x400>; interrupts = <8>; clocks = <&apb1_gates 1>; @@ -395,7 +395,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 bfb2cf2..ec4463f 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -564,7 +564,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>; @@ -573,7 +573,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>; @@ -582,7 +582,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>; @@ -591,7 +591,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>; @@ -600,7 +600,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.8.4.2 ^ permalink raw reply related [flat|nested] 18+ messages in thread
[parent not found: <1391680285-16668-3-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>]
* Re: [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-02-06 9:51 ` Maxime Ripard @ 2014-02-13 8:26 ` Wolfram Sang -1 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2014-02-13 8:26 UTC (permalink / raw) To: Maxime Ripard Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 1814 bytes --] Why is the devicetree list not on CC? (Added now) On Thu, Feb 06, 2014 at 10:51:25AM +0100, Maxime Ripard wrote: > 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-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > --- > 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 28273f9..ac65c8a 100644 > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > @@ -518,7 +518,7 @@ > }; > > i2c0: i2c@01c2ac00 { > - compatible = "allwinner,sun4i-i2c"; > + compatible = "allwinner,sun4i-a10-i2c"; Can't we have: compatible = "allwinner,sun4i-a10-i2c", "allwinner,sun4i-i2c"; ? And keep the old "allwinner,sun4i-i2c" and extend it with a SoC specific a10 compatible entry when a distinction is needed? > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi > index 6de40b6..537072c 100644 > --- a/arch/arm/boot/dts/sun5i-a13.dtsi > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi > @@ -377,7 +377,7 @@ > }; > > i2c0: i2c@01c2ac00 { > - compatible = "allwinner,sun4i-i2c"; > + compatible = "allwinner,sun4i-a10-i2c"; For non-a10, That should be at least compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; or compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; depending on the outcome above. Or is my knowledge outdated already? [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles @ 2014-02-13 8:26 ` Wolfram Sang 0 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2014-02-13 8:26 UTC (permalink / raw) To: linux-arm-kernel Why is the devicetree list not on CC? (Added now) On Thu, Feb 06, 2014 at 10:51:25AM +0100, Maxime Ripard wrote: > 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 28273f9..ac65c8a 100644 > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > @@ -518,7 +518,7 @@ > }; > > i2c0: i2c at 01c2ac00 { > - compatible = "allwinner,sun4i-i2c"; > + compatible = "allwinner,sun4i-a10-i2c"; Can't we have: compatible = "allwinner,sun4i-a10-i2c", "allwinner,sun4i-i2c"; ? And keep the old "allwinner,sun4i-i2c" and extend it with a SoC specific a10 compatible entry when a distinction is needed? > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi > index 6de40b6..537072c 100644 > --- a/arch/arm/boot/dts/sun5i-a13.dtsi > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi > @@ -377,7 +377,7 @@ > }; > > i2c0: i2c at 01c2ac00 { > - compatible = "allwinner,sun4i-i2c"; > + compatible = "allwinner,sun4i-a10-i2c"; For non-a10, That should be at least compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; or compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; depending on the outcome above. Or is my knowledge outdated already? -------------- 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/20140213/a0ffedbe/attachment.sig> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-02-13 8:26 ` Wolfram Sang @ 2014-02-13 22:52 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-13 22:52 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 2428 bytes --] On Thu, Feb 13, 2014 at 09:26:30AM +0100, Wolfram Sang wrote: > > Why is the devicetree list not on CC? (Added now) > > On Thu, Feb 06, 2014 at 10:51:25AM +0100, Maxime Ripard wrote: > > 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-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> > > --- > > 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 28273f9..ac65c8a 100644 > > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > > @@ -518,7 +518,7 @@ > > }; > > > > i2c0: i2c@01c2ac00 { > > - compatible = "allwinner,sun4i-i2c"; > > + compatible = "allwinner,sun4i-a10-i2c"; > > Can't we have: > > compatible = "allwinner,sun4i-a10-i2c", "allwinner,sun4i-i2c"; > > ? And keep the old "allwinner,sun4i-i2c" and extend it with a SoC > specific a10 compatible entry when a distinction is needed? Actually, the two are exactly equivalent. The point is that the compatible naming scheme doesn't follow what we are using (which is <family>-<soc>-i2c), so we wan't to get rid of the old naming scheme all together. > > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi > > index 6de40b6..537072c 100644 > > --- a/arch/arm/boot/dts/sun5i-a13.dtsi > > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi > > @@ -377,7 +377,7 @@ > > }; > > > > i2c0: i2c@01c2ac00 { > > - compatible = "allwinner,sun4i-i2c"; > > + compatible = "allwinner,sun4i-a10-i2c"; > > For non-a10, That should be at least > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; > > or > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; > > depending on the outcome above. > > Or is my knowledge outdated already? > Since they are strictly compatible, we don't need to introduce any different compatible string here. -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles @ 2014-02-13 22:52 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-13 22:52 UTC (permalink / raw) To: linux-arm-kernel On Thu, Feb 13, 2014 at 09:26:30AM +0100, Wolfram Sang wrote: > > Why is the devicetree list not on CC? (Added now) > > On Thu, Feb 06, 2014 at 10:51:25AM +0100, Maxime Ripard wrote: > > 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 28273f9..ac65c8a 100644 > > --- a/arch/arm/boot/dts/sun4i-a10.dtsi > > +++ b/arch/arm/boot/dts/sun4i-a10.dtsi > > @@ -518,7 +518,7 @@ > > }; > > > > i2c0: i2c at 01c2ac00 { > > - compatible = "allwinner,sun4i-i2c"; > > + compatible = "allwinner,sun4i-a10-i2c"; > > Can't we have: > > compatible = "allwinner,sun4i-a10-i2c", "allwinner,sun4i-i2c"; > > ? And keep the old "allwinner,sun4i-i2c" and extend it with a SoC > specific a10 compatible entry when a distinction is needed? Actually, the two are exactly equivalent. The point is that the compatible naming scheme doesn't follow what we are using (which is <family>-<soc>-i2c), so we wan't to get rid of the old naming scheme all together. > > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi > > index 6de40b6..537072c 100644 > > --- a/arch/arm/boot/dts/sun5i-a13.dtsi > > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi > > @@ -377,7 +377,7 @@ > > }; > > > > i2c0: i2c at 01c2ac00 { > > - compatible = "allwinner,sun4i-i2c"; > > + compatible = "allwinner,sun4i-a10-i2c"; > > For non-a10, That should be at least > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; > > or > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; > > depending on the outcome above. > > Or is my knowledge outdated already? > Since they are strictly compatible, we don't need to introduce any different compatible string here. -- 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/20140213/e625a811/attachment.sig> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-02-13 22:52 ` Maxime Ripard @ 2014-02-14 7:44 ` Wolfram Sang -1 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2014-02-14 7:44 UTC (permalink / raw) To: Maxime Ripard Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 670 bytes --] > > For non-a10, That should be at least > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; > > > > or > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; > > > > depending on the outcome above. > > > > Or is my knowledge outdated already? > > > > Since they are strictly compatible, we don't need to introduce any > different compatible string here. You never know all errata in advance. From what I know, one should always use the specfic naming first, and then the generic fallback. So, in case a distinction is needed later (think errata), then one doesn't need to change the devicetrees. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles @ 2014-02-14 7:44 ` Wolfram Sang 0 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2014-02-14 7:44 UTC (permalink / raw) To: linux-arm-kernel > > For non-a10, That should be at least > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; > > > > or > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; > > > > depending on the outcome above. > > > > Or is my knowledge outdated already? > > > > Since they are strictly compatible, we don't need to introduce any > different compatible string here. You never know all errata in advance. From what I know, one should always use the specfic naming first, and then the generic fallback. So, in case a distinction is needed later (think errata), then one doesn't need to change the devicetrees. -------------- 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/20140214/23f31104/attachment.sig> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles 2014-02-14 7:44 ` Wolfram Sang @ 2014-02-14 20:36 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-14 20:36 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA [-- Attachment #1: Type: text/plain, Size: 1127 bytes --] On Fri, Feb 14, 2014 at 08:44:07AM +0100, Wolfram Sang wrote: > > > > For non-a10, That should be at least > > > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; > > > > > > or > > > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; > > > > > > depending on the outcome above. > > > > > > Or is my knowledge outdated already? > > > > > > > Since they are strictly compatible, we don't need to introduce any > > different compatible string here. > > You never know all errata in advance. From what I know, one should > always use the specfic naming first, and then the generic fallback. So, > in case a distinction is needed later (think errata), then one doesn't > need to change the devicetrees. > And adding a A13-specific compatible wouldn't change anything, because it does work on at least one revision of them, so if you'd have to deal with an errata, you'd have to introduce a new compatible for this revision only anyway. -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new i2c compatibles @ 2014-02-14 20:36 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-14 20:36 UTC (permalink / raw) To: linux-arm-kernel On Fri, Feb 14, 2014 at 08:44:07AM +0100, Wolfram Sang wrote: > > > > For non-a10, That should be at least > > > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-a10-i2c"; > > > > > > or > > > > > > compatible = "allwinner,sun4i-a13-i2c", "allwinner,sun4i-i2c"; > > > > > > depending on the outcome above. > > > > > > Or is my knowledge outdated already? > > > > > > > Since they are strictly compatible, we don't need to introduce any > > different compatible string here. > > You never know all errata in advance. From what I know, one should > always use the specfic naming first, and then the generic fallback. So, > in case a distinction is needed later (think errata), then one doesn't > need to change the devicetrees. > And adding a A13-specific compatible wouldn't change anything, because it does work on at least one revision of them, so if you'd have to deal with an errata, you'd have to introduce a new compatible for this revision only anyway. -- 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/20140214/357283a9/attachment.sig> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern 2014-02-06 9:51 ` Maxime Ripard @ 2014-02-13 8:19 ` Wolfram Sang -1 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2014-02-13 8:19 UTC (permalink / raw) To: Maxime Ripard Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r [-- Attachment #1: Type: text/plain, Size: 264 bytes --] > This is the second version of the i2c compatible changes. > The only difference with the v1 being that we're now droping the old > compatibles, instead of keeping them, since the DT maintainers said it was > fine. Please provide a pointer to that discussion. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern @ 2014-02-13 8:19 ` Wolfram Sang 0 siblings, 0 replies; 18+ messages in thread From: Wolfram Sang @ 2014-02-13 8:19 UTC (permalink / raw) To: linux-arm-kernel > This is the second version of the i2c compatible changes. > The only difference with the v1 being that we're now droping the old > compatibles, instead of keeping them, since the DT maintainers said it was > fine. Please provide a pointer to that discussion. -------------- 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/20140213/34f6179e/attachment.sig> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern 2014-02-13 8:19 ` Wolfram Sang @ 2014-02-13 22:37 ` Maxime Ripard -1 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-13 22:37 UTC (permalink / raw) To: Wolfram Sang Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r [-- Attachment #1: Type: text/plain, Size: 547 bytes --] On Thu, Feb 13, 2014 at 09:19:36AM +0100, Wolfram Sang wrote: > > > This is the second version of the i2c compatible changes. > > The only difference with the v1 being that we're now droping the old > > compatibles, instead of keeping them, since the DT maintainers said it was > > fine. > > Please provide a pointer to that discussion. > 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 [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern @ 2014-02-13 22:37 ` Maxime Ripard 0 siblings, 0 replies; 18+ messages in thread From: Maxime Ripard @ 2014-02-13 22:37 UTC (permalink / raw) To: linux-arm-kernel On Thu, Feb 13, 2014 at 09:19:36AM +0100, Wolfram Sang wrote: > > > This is the second version of the i2c compatible changes. > > The only difference with the v1 being that we're now droping the old > > compatibles, instead of keeping them, since the DT maintainers said it was > > fine. > > Please provide a pointer to that discussion. > 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/20140213/5f8a90e9/attachment.sig> ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-02-14 20:36 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-06 9:51 [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern Maxime Ripard
2014-02-06 9:51 ` Maxime Ripard
[not found] ` <1391680285-16668-1-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2014-02-06 9:51 ` [PATCH v2 1/2] i2c: sunxi: Change i2c compatibles Maxime Ripard
2014-02-06 9:51 ` Maxime Ripard
2014-02-06 9:51 ` [PATCH v2 2/2] ARM: sunxi: dt: Convert to the new " Maxime Ripard
2014-02-06 9:51 ` Maxime Ripard
[not found] ` <1391680285-16668-3-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2014-02-13 8:26 ` Wolfram Sang
2014-02-13 8:26 ` Wolfram Sang
2014-02-13 22:52 ` Maxime Ripard
2014-02-13 22:52 ` Maxime Ripard
2014-02-14 7:44 ` Wolfram Sang
2014-02-14 7:44 ` Wolfram Sang
2014-02-14 20:36 ` Maxime Ripard
2014-02-14 20:36 ` Maxime Ripard
2014-02-13 8:19 ` [PATCH v2 0/2] i2c: sunxi: Change compatibles pattern Wolfram Sang
2014-02-13 8:19 ` Wolfram Sang
2014-02-13 22:37 ` Maxime Ripard
2014-02-13 22:37 ` Maxime Ripard
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.