* Re: [PATCH] i2c-mpc: Add support for 64bit system
From: Ben Dooks @ 2011-03-15 16:12 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev, linux-i2c, ben-linux, B33228
In-Reply-To: <1300204963-15855-1-git-send-email-galak@kernel.crashing.org>
On Tue, Mar 15, 2011 at 11:02:43AM -0500, Kumar Gala wrote:
> Currently i2c-mpc supports 32bit system only, this modification makes it
> supported on both 32-bit and 64-bit systems. The P5020 is the first
> 64-bit PPC system with the i2c-mpc controller.
>
> Based in patch from Xulei <B33228@freescale.com>
>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
ok, will add to -next
> ---
> drivers/i2c/busses/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 113505a..107d5c2 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -433,7 +433,7 @@ config I2C_IXP2000
>
> config I2C_MPC
> tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
> - depends on PPC32
> + depends on PPC
> help
> If you say yes to this option, support will be included for the
> built-in I2C interface on the MPC107, Tsi107, MPC512x, MPC52xx,
> --
> 1.7.2.3
>
--
Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/
Large Hadron Colada: A large Pina Colada that makes the universe disappear.
^ permalink raw reply
* Re: [PATCH 1/3] powerpc/fsl: 85xx: document cache sram bindings
From: Kumar Gala @ 2011-03-15 16:17 UTC (permalink / raw)
To: Linuxppc-dev list
In-Reply-To: <1260257477-21942-1-git-send-email-vivek.mahajan@freescale.com>
On Dec 8, 2009, at 1:31 AM, Vivek Mahajan wrote:
> Adds binding documentation for cache sram for the PQ3 and
> some QorIQ based platforms.
>=20
> Signed-off-by: Vivek Mahajan <vivek.mahajan@freescale.com>
> ---
> .../powerpc/dts-bindings/fsl/85xx_cache_sram.txt | 20 =
++++++++++++++++++++
> 1 files changed, 20 insertions(+), 0 deletions(-)
> create mode 100644 =
Documentation/powerpc/dts-bindings/fsl/85xx_cache_sram.txt
applied
- k=
^ permalink raw reply
* Re: [PATCH][v2] define binding for fsl mpic interrupt controllers
From: Kumar Gala @ 2011-03-15 16:06 UTC (permalink / raw)
To: Stuart yoder; +Cc: devicetree-discuss, linuxppc-dev
In-Reply-To: <1295476214-27698-1-git-send-email-stuart.yoder@freescale.com>
On Jan 19, 2011, at 4:30 PM, Stuart yoder wrote:
> From: Stuart Yoder <stuart.yoder@freescale.com>
>=20
> define the binding for compatible =3D "fsl,mpic", including
> the definition of 4-cell interrupt specifiers. The
> 3rd and 4th cells are needed to define additional
> types of interrupt source outside the "normal"
> external and internal interrupts in FSL SoCs. Define
> error interrupt, IPIs, and PIC timer sources.
>=20
> Signed-off-by: Stuart Yoder <stuart.yoder@freescale.com>
> ---
> -version 2
> -fix some typos
> -move defintion of interrupt number to the interrupt
> type 0
> -defined no-reset property
> -added some examples
>=20
> Documentation/powerpc/dts-bindings/fsl/mpic.txt | 251 =
+++++++++++++++++++----
> 1 files changed, 209 insertions(+), 42 deletions(-)
applied
- k=
^ permalink raw reply
* [PATCH] i2c-mpc: Add support for 64bit system
From: Kumar Gala @ 2011-03-15 16:02 UTC (permalink / raw)
To: ben-linux; +Cc: linuxppc-dev, linux-i2c, B33228
Currently i2c-mpc supports 32bit system only, this modification makes it
supported on both 32-bit and 64-bit systems. The P5020 is the first
64-bit PPC system with the i2c-mpc controller.
Based in patch from Xulei <B33228@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
drivers/i2c/busses/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 113505a..107d5c2 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -433,7 +433,7 @@ config I2C_IXP2000
config I2C_MPC
tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
- depends on PPC32
+ depends on PPC
help
If you say yes to this option, support will be included for the
built-in I2C interface on the MPC107, Tsi107, MPC512x, MPC52xx,
--
1.7.2.3
^ permalink raw reply related
* Re: [PATCH] I2C: Add support for 64bit system.
From: Kumar Gala @ 2011-03-15 16:00 UTC (permalink / raw)
To: Timur Tabi; +Cc: Xulei, linux-i2c, Ben Dooks, linuxppc-dev
In-Reply-To: <AANLkTim0_ttjDPJvx71B-=Ze5dRTrKXfpavx7gxvYr5p@mail.gmail.com>
On Mar 15, 2011, at 10:56 AM, Timur Tabi wrote:
> On Tue, Mar 15, 2011 at 10:44 AM, Kumar Gala =
<galak@kernel.crashing.org> wrote:
>>=20
>> On Dec 20, 2010, at 8:59 AM, Ben Dooks wrote:
>>=20
>>> On Mon, Dec 20, 2010 at 03:37:34PM +0800, Xulei wrote:
>>>> Currently I2C_MPC supports 32bit system only, then this
>>>> modification makes it support 32bit and 64bit system both.
>>>>=20
>>>> Signed-off-by: Xulei <B33228@freescale.com>
>>>=20
>>> This been build or run tested?
>>=20
>> Yes, Any issues with me applying this via the powerpc.git tree?
>=20
> I'm concerned about the fact that we have to have two defines to
> declare code that is 32-bit and 64-bit clean. Technically speaking,
> all drivers should work in both environments. It seems silly to have
> "PPC32 || PPC64" for everything. Isn't there a generic "PPC" config
> option that covers this?
There is, I'll post a new patch that uses it.
- k=
^ permalink raw reply
* Re: [PATCH] I2C: Add support for 64bit system.
From: Timur Tabi @ 2011-03-15 15:56 UTC (permalink / raw)
To: Kumar Gala; +Cc: Xulei, linux-i2c, Ben Dooks, linuxppc-dev
In-Reply-To: <D9BF0938-44B1-4BB8-BF3C-0A9CB44B9CC5@kernel.crashing.org>
On Tue, Mar 15, 2011 at 10:44 AM, Kumar Gala <galak@kernel.crashing.org> wrote:
>
> On Dec 20, 2010, at 8:59 AM, Ben Dooks wrote:
>
>> On Mon, Dec 20, 2010 at 03:37:34PM +0800, Xulei wrote:
>>> Currently I2C_MPC supports 32bit system only, then this
>>> modification makes it support 32bit and 64bit system both.
>>>
>>> Signed-off-by: Xulei <B33228@freescale.com>
>>
>> This been build or run tested?
>
> Yes, Any issues with me applying this via the powerpc.git tree?
I'm concerned about the fact that we have to have two defines to
declare code that is 32-bit and 64-bit clean. Technically speaking,
all drivers should work in both environments. It seems silly to have
"PPC32 || PPC64" for everything. Isn't there a generic "PPC" config
option that covers this?
--
Timur Tabi
Linux kernel developer at Freescale
^ permalink raw reply
* Re: [PATCH 1/2] ATA: Add FSL sata v2 controller support
From: Kumar Gala @ 2011-03-15 15:39 UTC (permalink / raw)
To: Xulei; +Cc: linux-ide, linuxppc-dev, jgarzik
In-Reply-To: <1295428050-21934-1-git-send-email-B33228@freescale.com>
On Jan 19, 2011, at 3:07 AM, Xulei wrote:
> In FSL sata v2 block, the snoop bit of PRDT Word3 description
> information is at bit28 instead of bit22.
>
> This patch adds FSL sata v2 probe and resolve this difference.
>
> Signed-off-by: Lei Xu <B33228@freescale.com>
> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
> Acked-by: Jeff Garzik <jgarzik@redhat.com>
> ---
> drivers/ata/sata_fsl.c | 25 ++++++++++++++++++-------
> 1 files changed, 18 insertions(+), 7 deletions(-)
applied
- k
^ permalink raw reply
* Re: Bug in arch/powerpc/sysdev/fsl_gtm.c
From: Kumar Gala @ 2011-03-15 15:53 UTC (permalink / raw)
To: Jean-Denis Boyer
Cc: 'Anton Vorontsov',
'linuxppc-dev@lists.ozlabs.org'
In-Reply-To: <265ED5BA1B926340AF277A54E6A8341441FD6401F2@exchange.media5corp.com>
On Feb 16, 2011, at 8:59 AM, Jean-Denis Boyer wrote:
> Hi.
> There is a bug in the function gtm_set_ref_timer16.
> When called, it correctly sets the requested timer,
> but the other timer that shares the register GTCFR is reset.
>
> The parameter 'clear' passed to macro clrsetbits_8 should not be
> a bitwise complement, since the macro already complements it.
>
> Here is a patch that should fix this issue.
>
> --- linux-2.6.35.11/arch/powerpc/sysdev/fsl_gtm.c
> +++ linux/arch/powerpc/sysdev/fsl_gtm.c
> @@ -203,13 +203,10 @@
> spin_lock_irqsave(>m->lock, flags);
>
> /*
> - * Properly reset timers: stop, reset, set up prescalers, reference
> + * Properly set timers: stop, set up prescalers, reference
> * value and clear event register.
> */
> - clrsetbits_8(tmr->gtcfr, ~(GTCFR_STP(num) | GTCFR_RST(num)),
> - GTCFR_STP(num) | GTCFR_RST(num));
> -
> - setbits8(tmr->gtcfr, GTCFR_STP(num));
> + setbits8(tmr->gtcfr, GTCFR_STP(num) | GTCFR_RST(num));
>
> if (tmr->gtpsr)
> out_be16(tmr->gtpsr, psr);
If you'd like this applied please re-send w/proper signed-off-by
- k
^ permalink raw reply
* Re: [PATCH] Fix SPE float to integer conversion failure
From: Kumar Gala @ 2011-03-15 15:51 UTC (permalink / raw)
To: Shan Hai; +Cc: linuxppc-dev
In-Reply-To: <1289960933-5172-2-git-send-email-shan.hai@windriver.com>
On Nov 16, 2010, at 8:28 PM, Shan Hai wrote:
> Conversion from float to integer should based on both the instruction
> encoding and the sign of the operand.
>
> Signed-off-by: Shan Hai <shan.hai@windriver.com>
> ---
> arch/powerpc/math-emu/math_efp.c | 12 ++++++++----
> 1 files changed, 8 insertions(+), 4 deletions(-)
applied
- k
^ permalink raw reply
* Re: [PATCH 1/4] drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak
From: Kumar Gala @ 2011-03-15 15:51 UTC (permalink / raw)
To: Julia Lawall
Cc: kernel-janitors, devicetree-discuss, linuxppc-dev, Timur Tabi,
linux-kernel
In-Reply-To: <1283269738-14612-2-git-send-email-julia@diku.dk>
On Aug 31, 2010, at 10:48 AM, Julia Lawall wrote:
> Add a call to of_node_put in the error handling code following a call =
to
> of_find_compatible_node or of_find_node_by_type.
>=20
> This patch also substantially reorganizes the error handling code in =
the
> function, to that it is possible first to jump to code that frees =
qe_port
> and then to jump to code that also puts np.
>=20
> The semantic match that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>=20
> // <smpl>
> @r exists@
> local idexpression x;
> expression E,E1,E2;
> statement S;
> @@
>=20
> *x =3D=20
> (of_find_node_by_path
> |of_find_node_by_name
> |of_find_node_by_phandle
> |of_get_parent
> |of_get_next_parent
> |of_get_next_child
> |of_find_compatible_node
> |of_match_node
> |of_find_node_by_type
> |of_find_node_with_property
> |of_find_matching_node
> |of_parse_phandle
> )(...);
> ...
> if (x =3D=3D NULL) S
> <... when !=3D x =3D E
> *if (...) {
> ... when !=3D of_node_put(x)
> when !=3D if (...) { ... of_node_put(x); ... }
> (
> return <+...x...+>;
> |
> * return ...;
> )
> }
> ...>
> (
> E2 =3D x;
> |
> of_node_put(x);
> )
> // </smpl>
>=20
> Signed-off-by: Julia Lawall <julia@diku.dk>
>=20
> ---
> drivers/serial/ucc_uart.c | 67 =
++++++++++++++++++++++++----------------------
> 1 file changed, 35 insertions(+), 32 deletions(-)
applied
- k=
^ permalink raw reply
* Re: [PATCH] I2C: Add support for 64bit system.
From: Kumar Gala @ 2011-03-15 15:44 UTC (permalink / raw)
To: Ben Dooks; +Cc: Xulei, linux-i2c, linuxppc-dev
In-Reply-To: <20101220145954.GA1126@trinity.fluff.org>
On Dec 20, 2010, at 8:59 AM, Ben Dooks wrote:
> On Mon, Dec 20, 2010 at 03:37:34PM +0800, Xulei wrote:
>> Currently I2C_MPC supports 32bit system only, then this
>> modification makes it support 32bit and 64bit system both.
>>
>> Signed-off-by: Xulei <B33228@freescale.com>
>
> This been build or run tested?
Yes, Any issues with me applying this via the powerpc.git tree?
>
>> ---
>> drivers/i2c/busses/Kconfig | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
>> index 9c6170c..3392f4b 100644
>> --- a/drivers/i2c/busses/Kconfig
>> +++ b/drivers/i2c/busses/Kconfig
>> @@ -422,7 +422,7 @@ config I2C_IXP2000
>>
>> config I2C_MPC
>> tristate "MPC107/824x/85xx/512x/52xx/83xx/86xx"
>> - depends on PPC32
>> + depends on PPC32 || PPC64
>> help
>> If you say yes to this option, support will be included for the
>> built-in I2C interface on the MPC107, Tsi107, MPC512x, MPC52xx,
>> --
>> 1.7.0.4
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> Ben Dooks, ben@fluff.org, http://www.fluff.org/ben/
>
> Large Hadron Colada: A large Pina Colada that makes the universe disappear.
>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply
* Re: [PATCH] [v2] watchdog: booke_wdt: clean up status messages
From: Kumar Gala @ 2011-03-15 15:42 UTC (permalink / raw)
To: Timur Tabi; +Cc: wim, linux-watchdog, linuxppc-dev
In-Reply-To: <1297208386-15010-1-git-send-email-timur@freescale.com>
On Feb 8, 2011, at 5:39 PM, Timur Tabi wrote:
> Improve the status messages that are displayed during some operations =
of the
> PowerPC watchdog timer driver. When the watchdog is enabled, the =
timeout is
> displayed as a number of seconds, instead of an obscure "period". The =
"period"
> is the position of a bit in a 64-bit timer register. The higher the =
value,
> the quicker the watchdog timeout occurs. Some people chose a high =
"period"
> value for the timer and get confused as to why the board resets within =
a
> few seconds.
>=20
> Messages displayed during open and close are now debug messages, so =
that they
> don't clutter the console by default. Finally, printk() is replaced =
with the
> pr_xxx() equivalent.
>=20
> Signed-off-by: Timur Tabi <timur@freescale.com>
> ---
> drivers/watchdog/booke_wdt.c | 19 +++++++++----------
> 1 files changed, 9 insertions(+), 10 deletions(-)
applied
- k=
^ permalink raw reply
* Re: [PATCH 2/2] dts: Update sata controller compatible for p1022ds board
From: Kumar Gala @ 2011-03-15 15:39 UTC (permalink / raw)
To: Xulei; +Cc: linux-ide, linuxppc-dev, jgarzik
In-Reply-To: <1295428050-21934-2-git-send-email-B33228@freescale.com>
On Jan 19, 2011, at 3:07 AM, Xulei wrote:
> Update p1022 sata compatible to "fsl,p1022-sata", "fsl,pq-sata-v2".
> p1022ds sata controller is v2 version comparing previous FSL sata
> controller, for example, mpc8536.
>
> Signed-off-by: Lei Xu <B33228@freescale.com>
> Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>
> ---
> arch/powerpc/boot/dts/p1022ds.dts | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
applied
- k
^ permalink raw reply
* Re: [PATCH] powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
From: Kumar Gala @ 2011-03-15 15:32 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: linuxppc-dev
In-Reply-To: <1294501876-9331-1-git-send-email-agust@denx.de>
On Jan 8, 2011, at 9:51 AM, Anatolij Gustschin wrote:
> Commit da3ed89e7ce272ebcc918487e2a28736ca0dd6bb added
> 'fsl,qoriq-gpio' compatiable searching in the old way
> using for_each_compatible_node(). But the driver have
> previously been changed to use a struct of_device_id
> compatible list passed to for_each_matching_node().
>
> Add 'fsl,qoriq-gpio' compatiable to the existing
> compatible list instead of adding another
> for_each_compatible_node() loop.
>
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
> arch/powerpc/sysdev/mpc8xxx_gpio.c | 4 +---
> 1 files changed, 1 insertions(+), 3 deletions(-)
applied
- k
^ permalink raw reply
* Re: [PATCH] ppc, 8xx: remove obsolete mgsuvd board
From: Kumar Gala @ 2011-03-15 15:11 UTC (permalink / raw)
To: Holger Brunck; +Cc: Heiko Schocher, linuxppc-dev
In-Reply-To: <4D2EEBEF.2010005@keymile.com>
On Jan 13, 2011, at 6:11 AM, Holger Brunck wrote:
> The MPC852 based mgsuvd board from Keymile was initially ported,
> but later on not developed further. This patch removes the respective
> files to decrease merging conflicts and unneeded maintenance.
>=20
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> Acked-by: Heiko Schocher<hs@denx.de>
> Cc: Vitaly Bordug <vitb@kernel.crashing.org>
> Cc: Marcelo Tosatti <marcelo@kvack.org>
> ---
> arch/powerpc/boot/dts/mgsuvd.dts | 163 =
---------------------------------
> arch/powerpc/configs/mgsuvd_defconfig | 81 ----------------
> arch/powerpc/platforms/8xx/Kconfig | 6 -
> arch/powerpc/platforms/8xx/Makefile | 1 -
> arch/powerpc/platforms/8xx/mgsuvd.c | 92 ------------------
> 5 files changed, 0 insertions(+), 343 deletions(-)
> delete mode 100644 arch/powerpc/boot/dts/mgsuvd.dts
> delete mode 100644 arch/powerpc/configs/mgsuvd_defconfig
> delete mode 100644 arch/powerpc/platforms/8xx/mgsuvd.c
applied
- k=
^ permalink raw reply
* Re: [PATCH] e500: Erratum cpu a005 workaround
From: Kumar Gala @ 2011-03-15 15:07 UTC (permalink / raw)
To: Liu Yu; +Cc: B11780, linuxppc-dev
In-Reply-To: <1295935333-13045-1-git-send-email-yu.liu@freescale.com>
On Jan 25, 2011, at 12:02 AM, Liu Yu wrote:
> This errata can occur if a single-precision floating-point, =
double-precision
> floating-point or vector floating-point instruction on a mispredicted =
branch
> path signals one of the floating-point data interrupts which are =
enabled by the
> SPEFSCR (FINVE, FDBZE, FUNFE or FOVFE bits). This interrupt must be =
recorded
> in a one-cycle window when the misprediction is resolved. If this =
extremely
> rare event should occur, the result could be:
>=20
> The SPE Data Exception from the mispredicted path may be reported
> erroneously if a single-precision floating-point, double-precision
> floating-point or vector floating-point instruction is the second =
instruction
> on the correct branch path.
>=20
> According to errata description, some efp instructions
> which are not supposed to trigger SPE exceptions
> can trigger the exceptions in this case.
> However, as we haven't emulated these instructions here,
> a signal will send to userspace, and userspace application would exit.
>=20
> This patch re-issue the efp instruction that we haven't emulated,
> so that hardware can properly execute it again if this case happen.
>=20
> Signed-off-by: Liu Yu <yu.liu@freescale.com>
> ---
> This is an erratum workaround patch.
> It would be better if the patch can go into 2.6.38.
>=20
> arch/powerpc/include/asm/reg.h | 2 +
> arch/powerpc/math-emu/math_efp.c | 53 =
+++++++++++++++++++++++++++++++++++++-
> 2 files changed, 54 insertions(+), 1 deletions(-)
applied
- k=
^ permalink raw reply
* Re: [PATCH] ppc, 82xx: rename and update mgcoge board support
From: Kumar Gala @ 2011-03-15 15:07 UTC (permalink / raw)
To: Holger Brunck; +Cc: Heiko Schocher, linuxppc-dev
In-Reply-To: <1299757965-10235-1-git-send-email-holger.brunck@keymile.com>
On Mar 10, 2011, at 5:52 AM, Holger Brunck wrote:
> The mgcoge board from keymile is now base for some other
> similar boards. Therefore the board specific name mgcoge
> was renamed to a generic name km82xx. Additionally some
> enhancements were made:
> - rework partition table in dts file
> - add cpm2_pio_c gpio controller in dts file
> - update defconfig
> - add pin description for SCC1
> - add pin description and configuration for USB
>=20
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> Acked-by: Heiko Schocher <hs@denx.de>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> CC: Kumar Gala <galak@kernel.crashing.org>
> CC: Heiko Schocher <hs@denx.de>
>=20
> ---
> arch/powerpc/boot/dts/mgcoge.dts | 47 =
++++++++-------
> arch/powerpc/configs/mgcoge_defconfig | 9 +---
> arch/powerpc/platforms/82xx/Makefile | 2 +-
> arch/powerpc/platforms/82xx/{mgcoge.c =3D> km82xx.c} | 62 =
++++++++++++++------
> 4 files changed, 72 insertions(+), 48 deletions(-)
> rename arch/powerpc/platforms/82xx/{mgcoge.c =3D> km82xx.c} (69%)
applied
- k=
^ permalink raw reply
* Re: [PATCH] ppc, 83xx: rename and update kmeter1
From: Kumar Gala @ 2011-03-15 15:07 UTC (permalink / raw)
To: Holger Brunck; +Cc: Heiko Schocher, linuxppc-dev
In-Reply-To: <1299826964-3846-1-git-send-email-holger.brunck@keymile.com>
On Mar 11, 2011, at 1:02 AM, Holger Brunck wrote:
> Beside the MPC 8360 based board kmeter1 other km83xx boards
> from keymile will follow. Therefore the board specific naming
> kmeter1 for functions and files were replaced with km83xx.
> Additionally some updates were made:
> - update defconfig for 2.6.38
> - rework flash partitioning in dts file
> - add gpio controller for qe_pio_c in dts
>=20
> Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
> Acked-by: Heiko Schocher <hs@denx.de>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> CC: Kumar Gala <galak@kernel.crashing.org>
> CC: Heiko Schocher <hs@denx.de>
> ---
> arch/powerpc/boot/dts/kmeter1.dts | 69 =
+++++++++++---------
> arch/powerpc/configs/83xx/kmeter1_defconfig | 7 +--
> arch/powerpc/platforms/83xx/Makefile | 2 +-
> .../powerpc/platforms/83xx/{kmeter1.c =3D> km83xx.c} | 46 =
+++++++++----
> 4 files changed, 71 insertions(+), 53 deletions(-)
> rename arch/powerpc/platforms/83xx/{kmeter1.c =3D> km83xx.c} (80%)
applied
- k=
^ permalink raw reply
* Re: [PATCH] powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e
From: Kumar Gala @ 2011-03-15 14:21 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <1299359119-7176-1-git-send-email-galak@kernel.crashing.org>
On Mar 5, 2011, at 3:05 PM, Kumar Gala wrote:
> From: Kumar Gala <kumar.gala@freescale.com>
>
> If the spin table is located in the linear mapping (which can happen if
> we have 4G or more of memory) we need to access the spin table via a
> cacheable coherent mapping like we do on ppc32 (and do explicit cache
> flush).
>
> See the following commit for the ppc32 version of this issue:
>
> commit d1d47ec6e62ab08d2ebb925fd9203abfad3adfbf
> Author: Peter Tyser <ptyser@xes-inc.com>
> Date: Fri Dec 18 16:50:37 2009 -0600
>
> powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem
>
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> ---
> arch/powerpc/platforms/85xx/smp.c | 6 +++++-
> 1 files changed, 5 insertions(+), 1 deletions(-)
applied
- k
^ permalink raw reply
* Re: Please pull 'next' branch of 4xx tree
From: Josh Boyer @ 2011-03-15 13:19 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <20110215145445.GA2847@zod.rchland.ibm.com>
On Tue, Feb 15, 2011 at 09:54:45AM -0500, Josh Boyer wrote:
>Hi Ben,
>
>Please pull the 'next' branch of the 4xx tree. These commits have been
>sitting there for a while and I wanted to get them into your branch
>before tackling the latest round of 476 stuff from Shaggy.
Ben, I don't see any of these in your -next branch. Did you ever pull
this?
josh
>The following changes since commit 5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9:
>
> powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA (2011-01-12 10:56:29 +1100)
>
>are available in the git repository at:
> ssh://master.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git next
>
>Dave Kleikamp (2):
> powerpc/476: define specific cpu table entry DD2 core
> powerpc/476: Workaround for PLB6 hang
>
>Rupjyoti Sarmah (1):
> powerpc/44x: PHY fixup for USB on canyonlands board
>
>Tirumala Marri (1):
> powerpc/44x: Add USB DWC DTS entry to Canyonlands board
>
> arch/powerpc/boot/dts/canyonlands.dts | 24 +++++
> arch/powerpc/include/asm/cputable.h | 3 +-
> arch/powerpc/kernel/cputable.c | 22 ++++-
> arch/powerpc/mm/tlb_nohash_low.S | 35 +++++++
> arch/powerpc/platforms/44x/44x.h | 4 +
> arch/powerpc/platforms/44x/Kconfig | 1 -
> arch/powerpc/platforms/44x/Makefile | 1 +
> arch/powerpc/platforms/44x/canyonlands.c | 134 ++++++++++++++++++++++++++++
> arch/powerpc/platforms/44x/ppc44x_simple.c | 1 -
> 9 files changed, 218 insertions(+), 7 deletions(-)
> create mode 100644 arch/powerpc/platforms/44x/canyonlands.c
>
>_______________________________________________
>Linuxppc-dev mailing list
>Linuxppc-dev@lists.ozlabs.org
>https://lists.ozlabs.org/listinfo/linuxppc-dev
^ permalink raw reply
* Re: [PATCH v3 1/6] powerpc: Move udbg_early_init() after early_init_devtree()
From: Josh Boyer @ 2011-03-15 13:05 UTC (permalink / raw)
To: Dave Kleikamp; +Cc: linuxppc-dev
In-Reply-To: <1297292893-30241-2-git-send-email-shaggy@linux.vnet.ibm.com>
On Wed, Feb 09, 2011 at 05:08:08PM -0600, Dave Kleikamp wrote:
>so that it can use information from the device tree.
>
>Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
>Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>Cc: Josh Boyer <jwboyer@linux.vnet.ibm.com>
>Cc: linuxppc-dev@lists.ozlabs.org
>---
Ben, you want this patch dropped, right?
josh
> arch/powerpc/kernel/setup_32.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
>index 1d2fbc9..d1ca976 100644
>--- a/arch/powerpc/kernel/setup_32.c
>+++ b/arch/powerpc/kernel/setup_32.c
>@@ -120,12 +120,12 @@ notrace void __init machine_init(unsigned long dt_ptr)
> {
> lockdep_init();
>
>- /* Enable early debugging if any specified (see udbg.h) */
>- udbg_early_init();
>-
> /* Do some early initialization based on the flat device tree */
> early_init_devtree(__va(dt_ptr));
>
>+ /* Enable early debugging if any specified (see udbg.h) */
>+ udbg_early_init();
>+
> probe_machine();
>
> setup_kdump_trampoline();
>--
>1.7.3.4
>
^ permalink raw reply
* Re: [PATCH 1/2] kdump: Allow shrinking of kdump region to be overridden
From: Américo Wang @ 2011-03-15 7:52 UTC (permalink / raw)
To: mahesh
Cc: kexec, linux-kernel, linuxppc-dev, Eric W. Biederman, akpm,
Anton Blanchard
In-Reply-To: <20110314181315.GA16075@in.ibm.com>
On Tue, Mar 15, 2011 at 2:13 AM, Mahesh J Salgaonkar
<mahesh@linux.vnet.ibm.com> wrote:
>
> During free we do free all of them including RMO region. But since the rtas
> region is always on top of RMO, crashkernel memory overlaps rtas region and
> we endup freeing that even, which is causing the crash.
>
Okay, but with this patch applied, we will just ignore rtas region, right?
Thus, when I echo 0 to free all the 128M crashkernel memory, the final
result will be 32M left, which means crash_size will still show 32M.
This looks odd.
How about skipping the 32M as a whole? I mean once the region being freed
has overlap with this rtas region, skip the whole rtas region, and let
crash_size
show 0?
Thanks.
^ permalink raw reply
* Re: [PATCH 3/4 v5] video, sm501: add OF binding to support SM501
From: Heiko Schocher @ 2011-03-15 7:26 UTC (permalink / raw)
To: linuxppc-dev
Cc: linux-fbdev, devicetree-discuss, Samuel Ortiz, Vincent Sanders,
linux-kernel, Ben Dooks, Randy Dunlap, Paul Mundt, Wolfgang Denk
In-Reply-To: <1296026490-14665-1-git-send-email-hs@denx.de>
Hello
Heiko Schocher wrote:
> - add binding to OF, compatible name "smi,sm501"
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
> cc: linux-fbdev@vger.kernel.org
> cc: devicetree-discuss@ozlabs.org
> cc: Ben Dooks <ben@simtec.co.uk>
> cc: Vincent Sanders <vince@simtec.co.uk>
> cc: Samuel Ortiz <sameo@linux.intel.com>
> cc: linux-kernel@vger.kernel.org
> cc: Randy Dunlap <rdunlap@xenotime.net>
> cc: Paul Mundt <lethal@linux-sh.org>
>
> ---
> - changes since v1:
> add Ben Dooks, Vincent Sanders and Samuel Ortiz to cc, as suggested from
> Paul Mundt.
> - changes since v2:
> add comments from Randy Dunlap:
> - move parameter documentation to Documentation/fb/sm501.txt
> - changes since v3:
> - rebased against v2.6.38-rc2
> - split in 3 patches
> - of support patch
> - get rid of "#if defined(CONFIG_PPC_MPC52xx)" usage
> hide this in DTS, as Paul suggested.
> - i/o routine patch
> - edid support patch
> - changes since v4
> replace remaining CONFIG_PPC_MPC52xx with CONFIG_OF, as
> it is no longer MPC52xx only.
> - changes since v5
> free edid_data after its usage, as it is no longer needed,
> suggested from Paul Mundt. Also fall back to default if
> kmemdup(edid_data) fails.
>
> ./scripts/checkpatch.pl 0003-video-sm501-add-OF-binding-to-support-SM501.patch
> total: 0 errors, 0 warnings, 132 lines checked
>
> 0003-video-sm501-add-OF-binding-to-support-SM501.patch has no obvious style problems and is ready for submission.
>
> Documentation/powerpc/dts-bindings/sm501.txt | 34 +++++++++++++++++++++
> drivers/mfd/sm501.c | 9 +++++-
> drivers/video/sm501fb.c | 42 ++++++++++++++++++++++++--
> 3 files changed, 81 insertions(+), 4 deletions(-)
> create mode 100644 Documentation/powerpc/dts-bindings/sm501.txt
This patchset is pending know for a while. I got Acked by from
Samuel Ortiz for the mfd part, see here:
http://www.spinics.net/lists/linux-fbdev/msg02550.html
http://linux.derkeiler.com/Mailing-Lists/Kernel/2011-01/msg11798.html
and for the DTS part from Benjamin Herrenschmidt:
http://lists.ozlabs.org/pipermail/linuxppc-dev/2011-February/088279.html
Are there some more issues?
bye,
Heiko
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply
* inconsistent order of notify_die and kgdb/debugger between powerpc and x86
From: Fredrick Prashanth John Berchmans @ 2011-03-15 2:41 UTC (permalink / raw)
To: linuxppc-dev
In-Reply-To: <AANLkTik5OR4qtgyzkqZ=ove5QBzLOjapiZi_3b6Byrsf@mail.gmail.com>
I see in x86, the die chain notifiers are called first
before going to debugger but in powerpc its the
other way round.
Any reason for this inconsistency?
Because, I wanted to take some action before falling
to debugger in powerpc. Is there any cleaner way to do this which would work
irrespective of the architecture?
Thanks,
Fredrick
^ permalink raw reply
* [PATCH] crypto: caam - standardize device tree naming convention to utilize '-vX.Y'
From: Kim Phillips @ 2011-03-14 22:42 UTC (permalink / raw)
To: Herbert Xu, devicetree-discuss, linux-crypto, linuxppc-dev
Cc: Steve Cornelius, Kumar Gala
Help clarify that the number trailing in compatible nomenclature
is the version number of the device, i.e., change:
"fsl,p4080-sec4.0", "fsl,sec4.0";
to:
"fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Cc: Kumar Gala <kumar.gala@freescale.com>
Cc: Steve Cornelius <sec@pobox.com>
---
.../devicetree/bindings/crypto/fsl-sec4.txt | 68 ++++++++++----------
arch/powerpc/boot/dts/p4080ds.dts | 41 ++++++------
drivers/crypto/caam/caamalg.c | 4 +-
drivers/crypto/caam/ctrl.c | 6 +-
4 files changed, 60 insertions(+), 59 deletions(-)
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
index fce16a8..568aa3c 100644
--- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
+++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt
@@ -53,7 +53,7 @@ PROPERTIES
- compatible
Usage: required
Value type: <string>
- Definition: Must include "fsl,p4080-sec4.0","fsl,sec-4.0"
+ Definition: Must include "fsl,p4080-sec-v4.0","fsl,sec-v4.0"
- #address-cells
Usage: required
@@ -72,7 +72,7 @@ PROPERTIES
Usage: required
Value type: <prop-encoded-array>
Definition: A standard property. Specifies the physical
- address and length of the SEC4.0 configuration registers.
+ address and length of the SEC4 configuration registers.
registers
- ranges
@@ -105,7 +105,7 @@ PROPERTIES
EXAMPLE
crypto@300000 {
- compatible = "fsl,p4080-sec4.0", "fsl,sec4.0";
+ compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
@@ -127,7 +127,7 @@ P4080 Job Ring (JR) Node
- compatible
Usage: required
Value type: <string>
- Definition: Must include "fsl,p4080-sec4.0-job-ring","fsl,sec4.0-job-ring"
+ Definition: Must include "fsl,p4080-sec-v4.0-job-ring","fsl,sec-v4.0-job-ring"
- reg
Usage: required
@@ -163,8 +163,8 @@ P4080 Job Ring (JR) Node
EXAMPLE
jr@1000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
fsl,liodn = <0x081>;
interrupt-parent = <&mpic>;
@@ -186,7 +186,7 @@ P4080 Run Time Integrity Check (RTIC) Node
- compatible
Usage: required
Value type: <string>
- Definition: Must include "fsl,p4080-sec4.0-rtic","fsl,sec4.0-rtic".
+ Definition: Must include "fsl,p4080-sec-v4.0-rtic","fsl,sec-v4.0-rtic".
- #address-cells
Usage: required
@@ -219,8 +219,8 @@ P4080 Run Time Integrity Check (RTIC) Node
EXAMPLE
rtic@6000 {
- compatible = "fsl,p4080-sec4.0-rtic",
- "fsl,sec4.0-rtic";
+ compatible = "fsl,p4080-sec-v4.0-rtic",
+ "fsl,sec-v4.0-rtic";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x6000 0x100>;
@@ -238,7 +238,7 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
- compatible
Usage: required
Value type: <string>
- Definition: Must include "fsl,p4080-sec4.0-rtic-memory","fsl,sec4.0-rtic-memory".
+ Definition: Must include "fsl,p4080-sec-v4.0-rtic-memory","fsl,sec-v4.0-rtic-memory".
- reg
Usage: required
@@ -270,8 +270,8 @@ P4080 Run Time Integrity Check (RTIC) Memory Node
EXAMPLE
rtic-a@0 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>;
fsl,liodn = <0x03c>;
fsl,rtic-region = <0x12345678 0x12345678 0x12345678>;
@@ -288,7 +288,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
- compatible
Usage: required
Value type: <string>
- Definition: Must include "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon".
+ Definition: Must include "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon".
- reg
Usage: required
@@ -315,7 +315,7 @@ P4080 Secure Non-Volatile Storage (SNVS) Node
EXAMPLE
sec_mon@314000 {
- compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon";
+ compatible = "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon";
reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <93 2>;
@@ -325,7 +325,7 @@ EXAMPLE
FULL EXAMPLE
crypto: crypto@300000 {
- compatible = "fsl,p4080-sec4.0", "fsl,sec4.0";
+ compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
@@ -334,73 +334,73 @@ FULL EXAMPLE
interrupts = <92 2>;
sec_jr0: jr@1000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <88 2>;
};
sec_jr1: jr@2000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <89 2>;
};
sec_jr2: jr@3000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <90 2>;
};
sec_jr3: jr@4000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x4000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <91 2>;
};
rtic@6000 {
- compatible = "fsl,p4080-sec4.0-rtic",
- "fsl,sec4.0-rtic";
+ compatible = "fsl,p4080-sec-v4.0-rtic",
+ "fsl,sec-v4.0-rtic";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x6000 0x100>;
ranges = <0x0 0x6100 0xe00>;
rtic_a: rtic-a@0 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>;
};
rtic_b: rtic-b@20 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x20 0x20 0x200 0x80>;
};
rtic_c: rtic-c@40 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x40 0x20 0x300 0x80>;
};
rtic_d: rtic-d@60 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x60 0x20 0x500 0x80>;
};
};
};
sec_mon: sec_mon@314000 {
- compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon";
+ compatible = "fsl,p4080-sec-v4.0-mon", "fsl,sec-v4.0-mon";
reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <93 2>;
diff --git a/arch/powerpc/boot/dts/p4080ds.dts b/arch/powerpc/boot/dts/p4080ds.dts
index c78e801..0430d24 100644
--- a/arch/powerpc/boot/dts/p4080ds.dts
+++ b/arch/powerpc/boot/dts/p4080ds.dts
@@ -423,7 +423,7 @@
};
crypto: crypto@300000 {
- compatible = "fsl,p4080-sec4.0", "fsl,sec4.0";
+ compatible = "fsl,p4080-sec-v4.0", "fsl,sec-v4.0";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x300000 0x10000>;
@@ -432,73 +432,74 @@
interrupts = <92 2>;
sec_jr0: jr@1000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x1000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <88 2>;
};
sec_jr1: jr@2000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x2000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <89 2>;
};
sec_jr2: jr@3000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x3000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <90 2>;
};
sec_jr3: jr@4000 {
- compatible = "fsl,p4080-sec4.0-job-ring",
- "fsl,sec4.0-job-ring";
+ compatible = "fsl,p4080-sec-v4.0-job-ring",
+ "fsl,sec-v4.0-job-ring";
reg = <0x4000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <91 2>;
};
rtic@6000 {
- compatible = "fsl,p4080-sec4.0-rtic",
- "fsl,sec4.0-rtic";
+ compatible = "fsl,p4080-sec-v4.0-rtic",
+ "fsl,sec-v4.0-rtic";
#address-cells = <1>;
#size-cells = <1>;
reg = <0x6000 0x100>;
ranges = <0x0 0x6100 0xe00>;
rtic_a: rtic-a@0 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x00 0x20 0x100 0x80>;
};
rtic_b: rtic-b@20 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x20 0x20 0x200 0x80>;
};
rtic_c: rtic-c@40 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x40 0x20 0x300 0x80>;
};
rtic_d: rtic-d@60 {
- compatible = "fsl,p4080-sec4.0-rtic-memory",
- "fsl,sec4.0-rtic-memory";
+ compatible = "fsl,p4080-sec-v4.0-rtic-memory",
+ "fsl,sec-v4.0-rtic-memory";
reg = <0x60 0x20 0x500 0x80>;
};
};
};
sec_mon: sec_mon@314000 {
- compatible = "fsl,p4080-sec4.0-mon", "fsl,sec4.0-mon";
+ compatible = "fsl,p4080-sec-v4.0-mon",
+ "fsl,sec-v4.0-mon";
reg = <0x314000 0x1000>;
interrupt-parent = <&mpic>;
interrupts = <93 2>;
diff --git a/drivers/crypto/caam/caamalg.c b/drivers/crypto/caam/caamalg.c
index d7fe3d3..1403434 100644
--- a/drivers/crypto/caam/caamalg.c
+++ b/drivers/crypto/caam/caamalg.c
@@ -1020,7 +1020,7 @@ static void __exit caam_algapi_exit(void)
struct caam_crypto_alg *t_alg, *n;
int i, err;
- dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
+ dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
if (!dev_node)
return;
@@ -1094,7 +1094,7 @@ static int __init caam_algapi_init(void)
struct caam_drv_private *priv;
int i = 0, err = 0;
- dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec4.0");
+ dev_node = of_find_compatible_node(NULL, NULL, "fsl,sec-v4.0");
if (!dev_node)
return -ENODEV;
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index aa22161..59aae4e 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -108,7 +108,7 @@ static int caam_probe(struct platform_device *pdev,
* for all, then go probe each one.
*/
rspec = 0;
- for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring")
+ for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring")
rspec++;
ctrlpriv->jrdev = kzalloc(sizeof(struct device *) * rspec, GFP_KERNEL);
if (ctrlpriv->jrdev == NULL) {
@@ -118,7 +118,7 @@ static int caam_probe(struct platform_device *pdev,
ring = 0;
ctrlpriv->total_jobrs = 0;
- for_each_compatible_node(np, NULL, "fsl,sec4.0-job-ring") {
+ for_each_compatible_node(np, NULL, "fsl,sec-v4.0-job-ring") {
caam_jr_probe(pdev, np, ring);
ctrlpriv->total_jobrs++;
ring++;
@@ -236,7 +236,7 @@ static int caam_probe(struct platform_device *pdev,
static struct of_device_id caam_match[] = {
{
- .compatible = "fsl,sec4.0",
+ .compatible = "fsl,sec-v4.0",
},
{},
};
--
1.7.4.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox