From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751765Ab3GJH1k (ORCPT ); Wed, 10 Jul 2013 03:27:40 -0400 Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]:57642 "EHLO na3sys009aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751087Ab3GJH1i (ORCPT ); Wed, 10 Jul 2013 03:27:38 -0400 From: Neil Zhang To: Jason Cooper CC: "grant.likely@linaro.org" , "haojian.zhuang@gmail.com" , "arnd@arndb.de" , "devicetree-discuss@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Date: Wed, 10 Jul 2013 00:25:17 -0700 Subject: RE: [PATCH V3 1/3] dts: change Marvell prefix to 'marvell' Thread-Topic: [PATCH V3 1/3] dts: change Marvell prefix to 'marvell' Thread-Index: Ac58orejsd1rpSmgSLmTIux6xlHTEwAm700Q Message-ID: <175CCF5F49938B4D99B2E3EF7F558EBE3DBC97FA8F@SC-VEXCH4.marvell.com> References: <1373352166-10064-1-git-send-email-zhangwm@marvell.com> <1373352166-10064-2-git-send-email-zhangwm@marvell.com> <20130709124900.GG11908@titan.lakedaemon.net> In-Reply-To: <20130709124900.GG11908@titan.lakedaemon.net> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US Content-Type: text/plain; charset="gb2312" MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id r6A7Rr7g015216 Jason, > -----Original Message----- > From: Jason Cooper [mailto:jason@lakedaemon.net] > Sent: 201379 20:49 > To: Neil Zhang > Cc: grant.likely@linaro.org; haojian.zhuang@gmail.com; arnd@arndb.de; > devicetree-discuss@lists.ozlabs.org; linux-kernel@vger.kernel.org; > linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH V3 1/3] dts: change Marvell prefix to 'marvell' > > Neil, > > On Tue, Jul 09, 2013 at 02:42:44PM +0800, Neil Zhang wrote: > > The documented vendor prefix for Marvell is 'marvell', not 'mrvl', so > > let's change it. > > > > Signed-off-by: Neil Zhang > > --- > > .../devicetree/bindings/arm/mrvl/intc.txt | 16 +++--- > > .../devicetree/bindings/arm/mrvl/mrvl.txt | 6 +- > > .../devicetree/bindings/arm/mrvl/timer.txt | 4 +- > > Documentation/devicetree/bindings/i2c/i2c-pxa.txt | 14 +++--- > > .../devicetree/bindings/mmc/sdhci-pxa.txt | 8 ++-- > > .../devicetree/bindings/rtc/sa1100-rtc.txt | 4 +- > > .../devicetree/bindings/serial/mrvl-serial.txt | 2 +- > > arch/arm/boot/dts/mmp2-brownstone.dts | 2 +- > > arch/arm/boot/dts/mmp2.dtsi | 56 > ++++++++++---------- > > arch/arm/boot/dts/pxa168-aspenite.dts | 2 +- > > arch/arm/boot/dts/pxa168.dtsi | 24 > ++++---- > > arch/arm/boot/dts/pxa2xx.dtsi | 16 +++--- > > arch/arm/boot/dts/pxa3xx.dtsi | 2 +- > > arch/arm/boot/dts/pxa910-dkb.dts | 2 +- > > arch/arm/boot/dts/pxa910.dtsi | 27 > +++++----- > > arch/arm/mach-mmp/irq.c | 16 > +++--- > > arch/arm/mach-mmp/mmp-dt.c | 28 > +++++----- > > arch/arm/mach-mmp/mmp2-dt.c | 16 > +++--- > > arch/arm/mach-mmp/time.c | 2 +- > > arch/arm/mach-pxa/pxa-dt.c | 14 > +++--- > > drivers/i2c/busses/i2c-pxa.c | 10 ++-- > > drivers/mmc/host/sdhci-pxav2.c | 4 +- > > drivers/mmc/host/sdhci-pxav3.c | 4 +- > > drivers/rtc/rtc-sa1100.c | 4 +- > > drivers/tty/serial/pxa.c | 4 +- > > 25 files changed, 144 insertions(+), 143 deletions(-) > > I agree with the need to change, however, this has been in the binding > documentation since v3.5. I wish we had caught this when we decided > against using stock ticker symbols (not all stock markets use alphabetical > abbreviated names, not all companies are listed on any stock exchange). > > To do this properly, the drivers are going to have to be compatible with the > old and the new names, and the binding docs updated to reflect the legacy > name and the preferred name. > Do you mean it's better to support both legacy and preferred name at the same time? > thx, > > Jason. > > > diff --git a/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > b/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > index 8b53273..ad27548 100644 > > --- a/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > +++ b/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > @@ -1,8 +1,8 @@ > > * Marvell MMP Interrupt controller > > > > Required properties: > > -- compatible : Should be "mrvl,mmp-intc", "mrvl,mmp2-intc" or > > - "mrvl,mmp2-mux-intc" > > +- compatible : Should be "marvell,mmp-intc", "marvell,mmp2-intc" or > > + "marvell,mmp2-mux-intc" > > - reg : Address and length of the register set of the interrupt controller. > > If the interrupt controller is intc, address and length means the range > > of the whold interrupt controller. If the interrupt controller is > > mux-intc, @@ -15,28 +15,28 @@ Required properties: > > - interrupt-controller : Identifies the node as an interrupt controller. > > - #interrupt-cells : Specifies the number of cells needed to encode an > > interrupt source. > > -- mrvl,intc-nr-irqs : Specifies the number of interrupts in the > > interrupt > > +- marvell,intc-nr-irqs : Specifies the number of interrupts in the > > +interrupt > > controller. > > -- mrvl,clr-mfp-irq : Specifies the interrupt that needs to clear MFP > > edge > > +- marvell,clr-mfp-irq : Specifies the interrupt that needs to clear > > +MFP edge > > detection first. > > > > Example: > > intc: interrupt-controller@d4282000 { > > - compatible = "mrvl,mmp2-intc"; > > + compatible = "marvell,mmp2-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > }; > > > > intcmux4@d4282150 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <4>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x150 0x4>, <0x168 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > > > * Marvell Orion Interrupt controller > > diff --git a/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > b/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > index 117d741..87f1d42 100644 > > --- a/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > +++ b/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > @@ -3,12 +3,12 @@ Marvell Platforms Device Tree Bindings > > > > PXA168 Aspenite Board > > Required root node properties: > > - - compatible = "mrvl,pxa168-aspenite", "mrvl,pxa168"; > > + - compatible = "marvell,pxa168-aspenite", "marvell,pxa168"; > > > > PXA910 DKB Board > > Required root node properties: > > - - compatible = "mrvl,pxa910-dkb"; > > + - compatible = "marvell,pxa910-dkb"; > > > > MMP2 Brownstone Board > > Required root node properties: > > - - compatible = "mrvl,mmp2-brownstone"; > > + - compatible = "marvell,mmp2-brownstone"; > > diff --git a/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > b/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > index 9a6e251..1304526 100644 > > --- a/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > +++ b/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > @@ -1,13 +1,13 @@ > > * Marvell MMP Timer controller > > > > Required properties: > > -- compatible : Should be "mrvl,mmp-timer". > > +- compatible : Should be "marvell,mmp-timer". > > - reg : Address and length of the register set of timer controller. > > - interrupts : Should be the interrupt number. > > > > Example: > > timer0: timer@d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > diff --git a/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > b/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > index 12b78ac..34fdf5d 100644 > > --- a/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > +++ b/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > @@ -3,9 +3,9 @@ > > Required properties : > > > > - reg : Offset and length of the register set for the device > > - - compatible : should be "mrvl,mmp-twsi" where mmp is the name of a > > + - compatible : should be "marvell,mmp-twsi" where mmp is the name of > > + a > > compatible processor, e.g. pxa168, pxa910, mmp2, mmp3. > > - For the pxa2xx/pxa3xx, an additional node "mrvl,pxa-i2c" is required > > + For the pxa2xx/pxa3xx, an additional node "marvell,pxa-i2c" is > > + required > > as shown in the example below. > > > > Recommended properties : > > @@ -14,20 +14,20 @@ Recommended properties : > > - interrupt-parent : the phandle for the interrupt controller that > > services interrupts for this device. If the parent is the default > > interrupt controller in device tree, it could be ignored. > > - - mrvl,i2c-polling : Disable interrupt of i2c controller. Polling > > + - marvell,i2c-polling : Disable interrupt of i2c controller. Polling > > status register of i2c controller instead. > > - - mrvl,i2c-fast-mode : Enable fast mode of i2c controller. > > + - marvell,i2c-fast-mode : Enable fast mode of i2c controller. > > > > Examples: > > twsi1: i2c@d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > }; > > > > twsi2: i2c@d4025000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4025000 0x1000>; > > interrupts = <58>; > > }; > > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > index dbe98a3..d603a3e 100644 > > --- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > +++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > @@ -4,18 +4,18 @@ This file documents differences between the core > > properties in mmc.txt and the properties used by the sdhci-pxav2 and > sdhci-pxav3 drivers. > > > > Required properties: > > -- compatible: Should be "mrvl,pxav2-mmc" or "mrvl,pxav3-mmc". > > +- compatible: Should be "marvell,pxav2-mmc" or "marvell,pxav3-mmc". > > > > Optional properties: > > -- mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning. > > +- marvell,clk-delay-cycles: Specify a number of cycles to delay for tuning. > > > > Example: > > > > sdhci@d4280800 { > > - compatible = "mrvl,pxav3-mmc"; > > + compatible = "marvell,pxav3-mmc"; > > reg = <0xd4280800 0x800>; > > bus-width = <8>; > > interrupts = <27>; > > non-removable; > > - mrvl,clk-delay-cycles = <31>; > > + marvell,clk-delay-cycles = <31>; > > }; > > diff --git a/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > b/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > index 0cda19a..886fe15 100644 > > --- a/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > +++ b/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > @@ -1,7 +1,7 @@ > > * Marvell Real Time Clock controller > > > > Required properties: > > -- compatible: should be "mrvl,sa1100-rtc" > > +- compatible: should be "marvell,sa1100-rtc" > > - reg: physical base address of the controller and length of memory > mapped > > region. > > - interrupts: Should be two. The first interrupt number is the rtc > > alarm @@ -10,7 +10,7 @@ Required properties: > > > > Example: > > rtc: rtc@d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <5>, <6>; > > interrupt-name = "rtc 1Hz", "rtc alarm"; diff --git > > a/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > b/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > index d744340..659d35e 100644 > > --- a/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > +++ b/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > @@ -1,4 +1,4 @@ > > PXA UART controller > > > > Required properties: > > -- compatible : should be "mrvl,mmp-uart" or "mrvl,pxa-uart". > > +- compatible : should be "marvell,mmp-uart" or "marvell,pxa-uart". > > diff --git a/arch/arm/boot/dts/mmp2-brownstone.dts > > b/arch/arm/boot/dts/mmp2-brownstone.dts > > index 7f70a39..26abfde 100644 > > --- a/arch/arm/boot/dts/mmp2-brownstone.dts > > +++ b/arch/arm/boot/dts/mmp2-brownstone.dts > > @@ -12,7 +12,7 @@ > > > > / { > > model = "Marvell MMP2 Brownstone Development Board"; > > - compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; > > + compatible = "marvell,mmp2-brownstone", "marvell,mmp2"; > > > > chosen { > > bootargs = "console=ttyS2,38400 root=/dev/nfs > > nfsroot=192.168.1.100:/nfsroot/ > > ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; > > diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi > > index 4e8b08c..ac13654 100644 > > --- a/arch/arm/boot/dts/mmp2.dtsi > > +++ b/arch/arm/boot/dts/mmp2.dtsi > > @@ -32,128 +32,128 @@ > > }; > > > > axi@d4200000 { /* AXI */ > > - compatible = "mrvl,axi-bus", "simple-bus"; > > + compatible = "marvell,axi-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4200000 0x00200000>; > > ranges; > > > > intc: interrupt-controller@d4282000 { > > - compatible = "mrvl,mmp2-intc"; > > + compatible = "marvell,mmp2-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > }; > > > > intcmux4: interrupt-controller@d4282150 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <4>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x150 0x4>, <0x168 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > > > intcmux5: interrupt-controller@d4282154 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <5>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x154 0x4>, <0x16c 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > - mrvl,clr-mfp-irq = <1>; > > + marvell,intc-nr-irqs = <2>; > > + marvell,clr-mfp-irq = <1>; > > }; > > > > intcmux9: interrupt-controller@d4282180 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <9>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x180 0x4>, <0x17c 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <3>; > > + marvell,intc-nr-irqs = <3>; > > }; > > > > intcmux17: interrupt-controller@d4282158 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <17>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x158 0x4>, <0x170 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <5>; > > + marvell,intc-nr-irqs = <5>; > > }; > > > > intcmux35: interrupt-controller@d428215c { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <35>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x15c 0x4>, <0x174 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <15>; > > + marvell,intc-nr-irqs = <15>; > > }; > > > > intcmux51: interrupt-controller@d4282160 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <51>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x160 0x4>, <0x178 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > > > intcmux55: interrupt-controller@d4282188 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <55>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x188 0x4>, <0x184 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > }; > > > > apb@d4000000 { /* APB */ > > - compatible = "mrvl,apb-bus", "simple-bus"; > > + compatible = "marvell,apb-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4000000 0x00200000>; > > ranges; > > > > timer0: timer@d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > > > uart1: uart@d4030000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4030000 0x1000>; > > interrupts = <27>; > > status = "disabled"; > > }; > > > > uart2: uart@d4017000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4017000 0x1000>; > > interrupts = <28>; > > status = "disabled"; > > }; > > > > uart3: uart@d4018000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4018000 0x1000>; > > interrupts = <24>; > > status = "disabled"; > > }; > > > > uart4: uart@d4016000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4016000 0x1000>; > > interrupts = <46>; > > status = "disabled"; > > @@ -198,24 +198,24 @@ > > }; > > > > twsi1: i2c@d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > #address-cells = <1>; > > #size-cells = <0>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > status = "disabled"; > > }; > > > > twsi2: i2c@d4025000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4025000 0x1000>; > > interrupts = <58>; > > status = "disabled"; > > }; > > > > rtc: rtc@d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <1 0>; > > interrupt-names = "rtc 1Hz", "rtc alarm"; diff --git > > a/arch/arm/boot/dts/pxa168-aspenite.dts > > b/arch/arm/boot/dts/pxa168-aspenite.dts > > index e762fac..1e2ac17 100644 > > --- a/arch/arm/boot/dts/pxa168-aspenite.dts > > +++ b/arch/arm/boot/dts/pxa168-aspenite.dts > > @@ -12,7 +12,7 @@ > > > > / { > > model = "Marvell PXA168 Aspenite Development Board"; > > - compatible = "mrvl,pxa168-aspenite", "mrvl,pxa168"; > > + compatible = "marvell,pxa168-aspenite", "marvell,pxa168"; > > > > chosen { > > bootargs = "console=ttyS0,115200 root=/dev/nfs > > nfsroot=192.168.1.100:/nfsroot/ > > ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; > > diff --git a/arch/arm/boot/dts/pxa168.dtsi > > b/arch/arm/boot/dts/pxa168.dtsi index 975dad2..c08f5fc 100644 > > --- a/arch/arm/boot/dts/pxa168.dtsi > > +++ b/arch/arm/boot/dts/pxa168.dtsi > > @@ -26,51 +26,51 @@ > > ranges; > > > > axi@d4200000 { /* AXI */ > > - compatible = "mrvl,axi-bus", "simple-bus"; > > + compatible = "marvell,axi-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4200000 0x00200000>; > > ranges; > > > > intc: interrupt-controller@d4282000 { > > - compatible = "mrvl,mmp-intc"; > > + compatible = "marvell,mmp-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > }; > > > > }; > > > > apb@d4000000 { /* APB */ > > - compatible = "mrvl,apb-bus", "simple-bus"; > > + compatible = "marvell,apb-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4000000 0x00200000>; > > ranges; > > > > timer0: timer@d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > > > uart1: uart@d4017000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4017000 0x1000>; > > interrupts = <27>; > > status = "disabled"; > > }; > > > > uart2: uart@d4018000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4018000 0x1000>; > > interrupts = <28>; > > status = "disabled"; > > }; > > > > uart3: uart@d4026000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4026000 0x1000>; > > interrupts = <29>; > > status = "disabled"; > > @@ -107,22 +107,22 @@ > > }; > > > > twsi1: i2c@d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > status = "disabled"; > > }; > > > > twsi2: i2c@d4025000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4025000 0x1000>; > > interrupts = <58>; > > status = "disabled"; > > }; > > > > rtc: rtc@d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <5 6>; > > interrupt-names = "rtc 1Hz", "rtc alarm"; diff --git > > a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index > > a5e90f0..c426b1e 100644 > > --- a/arch/arm/boot/dts/pxa2xx.dtsi > > +++ b/arch/arm/boot/dts/pxa2xx.dtsi > > @@ -47,7 +47,7 @@ > > }; > > > > gpio: gpio@40e00000 { > > - compatible = "mrvl,pxa-gpio"; > > + compatible = "marvell,pxa-gpio"; > > #address-cells = <0x1>; > > #size-cells = <0x1>; > > reg = <0x40e00000 0x10000>; > > @@ -76,35 +76,35 @@ > > }; > > > > ffuart: uart@40100000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x40100000 0x30>; > > interrupts = <22>; > > status = "disabled"; > > }; > > > > btuart: uart@40200000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x40200000 0x30>; > > interrupts = <21>; > > status = "disabled"; > > }; > > > > stuart: uart@40700000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x40700000 0x30>; > > interrupts = <20>; > > status = "disabled"; > > }; > > > > hwuart: uart@41100000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x41100000 0x30>; > > interrupts = <7>; > > status = "disabled"; > > }; > > > > pxai2c1: i2c@40301680 { > > - compatible = "mrvl,pxa-i2c"; > > + compatible = "marvell,pxa-i2c"; > > reg = <0x40301680 0x30>; > > interrupts = <18>; > > #address-cells = <0x1>; > > @@ -113,14 +113,14 @@ > > }; > > > > usb0: ohci@4c000000 { > > - compatible = "mrvl,pxa-ohci"; > > + compatible = "marvell,pxa-ohci"; > > reg = <0x4c000000 0x10000>; > > interrupts = <3>; > > status = "disabled"; > > }; > > > > mmc0: mmc@41100000 { > > - compatible = "mrvl,pxa-mmc"; > > + compatible = "marvell,pxa-mmc"; > > reg = <0x41100000 0x1000>; > > interrupts = <23>; > > status = "disabled"; > > diff --git a/arch/arm/boot/dts/pxa3xx.dtsi > > b/arch/arm/boot/dts/pxa3xx.dtsi index f9d92da..0798031 100644 > > --- a/arch/arm/boot/dts/pxa3xx.dtsi > > +++ b/arch/arm/boot/dts/pxa3xx.dtsi > > @@ -7,7 +7,7 @@ > > > > pxabus { > > pwri2c: i2c@40f500c0 { > > - compatible = "mrvl,pwri2c"; > > + compatible = "marvell,pwri2c"; > > reg = <0x40f500c0 0x30>; > > interrupts = <6>; > > #address-cells = <0x1>; > > diff --git a/arch/arm/boot/dts/pxa910-dkb.dts > > b/arch/arm/boot/dts/pxa910-dkb.dts > > index 595492a..7384254 100644 > > --- a/arch/arm/boot/dts/pxa910-dkb.dts > > +++ b/arch/arm/boot/dts/pxa910-dkb.dts > > @@ -12,7 +12,7 @@ > > > > / { > > model = "Marvell PXA910 DKB Development Board"; > > - compatible = "mrvl,pxa910-dkb", "mrvl,pxa910"; > > + compatible = "marvell,pxa910-dkb", "marvell,pxa910"; > > > > chosen { > > bootargs = "console=ttyS0,115200 root=/dev/nfs > > nfsroot=192.168.1.100:/nfsroot/ > > ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; > > diff --git a/arch/arm/boot/dts/pxa910.dtsi > > b/arch/arm/boot/dts/pxa910.dtsi index 0247c62..b5594a0 100644 > > --- a/arch/arm/boot/dts/pxa910.dtsi > > +++ b/arch/arm/boot/dts/pxa910.dtsi > > @@ -31,58 +31,59 @@ > > }; > > > > axi@d4200000 { /* AXI */ > > - compatible = "mrvl,axi-bus", "simple-bus"; > > + compatible = "marvell,axi-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4200000 0x00200000>; > > ranges; > > > > intc: interrupt-controller@d4282000 { > > - compatible = "mrvl,mmp-intc"; > > + compatible = "marvell,mmp-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > + > > }; > > > > }; > > > > apb@d4000000 { /* APB */ > > - compatible = "mrvl,apb-bus", "simple-bus"; > > + compatible = "marvell,apb-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4000000 0x00200000>; > > ranges; > > > > timer0: timer@d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > > > timer1: timer@d4016000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4016000 0x100>; > > interrupts = <29>; > > status = "disabled"; > > }; > > > > uart1: uart@d4017000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4017000 0x1000>; > > interrupts = <27>; > > status = "disabled"; > > }; > > > > uart2: uart@d4018000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4018000 0x1000>; > > interrupts = <28>; > > status = "disabled"; > > }; > > > > uart3: uart@d4036000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4036000 0x1000>; > > interrupts = <59>; > > status = "disabled"; > > @@ -119,17 +120,17 @@ > > }; > > > > twsi1: i2c@d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > #address-cells = <1>; > > #size-cells = <0>; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > status = "disabled"; > > }; > > > > twsi2: i2c@d4037000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > #address-cells = <1>; > > #size-cells = <0>; > > reg = <0xd4037000 0x1000>; > > @@ -138,7 +139,7 @@ > > }; > > > > rtc: rtc@d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <5 6>; > > interrupt-names = "rtc 1Hz", "rtc alarm"; diff --git > > a/arch/arm/mach-mmp/irq.c b/arch/arm/mach-mmp/irq.c index > > 3c71246..a7a53611 100644 > > --- a/arch/arm/mach-mmp/irq.c > > +++ b/arch/arm/mach-mmp/irq.c > > @@ -327,13 +327,13 @@ void __init mmp2_init_icu(void) > > > > #ifdef CONFIG_OF > > static const struct of_device_id intc_ids[] __initconst = { > > - { .compatible = "mrvl,mmp-intc", .data = &mmp_conf }, > > - { .compatible = "mrvl,mmp2-intc", .data = &mmp2_conf }, > > + { .compatible = "marvell,mmp-intc", .data = &mmp_conf }, > > + { .compatible = "marvell,mmp2-intc", .data = &mmp2_conf }, > > {} > > }; > > > > static const struct of_device_id mmp_mux_irq_match[] __initconst = { > > - { .compatible = "mrvl,mmp2-mux-intc" }, > > + { .compatible = "marvell,mmp2-mux-intc" }, > > {} > > }; > > > > @@ -352,10 +352,10 @@ int __init mmp2_mux_init(struct device_node > *parent) > > if (!node) > > break; > > of_id = of_match_node(&mmp_mux_irq_match[0], node); > > - ret = of_property_read_u32(node, "mrvl,intc-nr-irqs", > > + ret = of_property_read_u32(node, "marvell,intc-nr-irqs", > > &nr_irqs); > > if (ret) { > > - pr_err("Not found mrvl,intc-nr-irqs property\n"); > > + pr_err("Not found marvell,intc-nr-irqs property\n"); > > ret = -EINVAL; > > goto err; > > } > > @@ -385,7 +385,7 @@ int __init mmp2_mux_init(struct device_node > *parent) > > ret = irq_base; > > goto err; > > } > > - if (!of_property_read_u32(node, "mrvl,clr-mfp-irq", > > + if (!of_property_read_u32(node, "marvell,clr-mfp-irq", > > &mfp_irq)) { > > icu_data[i].clr_mfp_irq_base = irq_base; > > icu_data[i].clr_mfp_hwirq = mfp_irq; @@ -424,9 +424,9 @@ > void > > __init mmp_dt_irq_init(void) > > of_id = of_match_node(intc_ids, node); > > conf = of_id->data; > > > > - ret = of_property_read_u32(node, "mrvl,intc-nr-irqs", &nr_irqs); > > + ret = of_property_read_u32(node, "marvell,intc-nr-irqs", &nr_irqs); > > if (ret) { > > - pr_err("Not found mrvl,intc-nr-irqs property\n"); > > + pr_err("Not found marvell,intc-nr-irqs property\n"); > > return; > > } > > > > diff --git a/arch/arm/mach-mmp/mmp-dt.c > b/arch/arm/mach-mmp/mmp-dt.c > > index b37915d..62c5adb 100644 > > --- a/arch/arm/mach-mmp/mmp-dt.c > > +++ b/arch/arm/mach-mmp/mmp-dt.c > > @@ -23,24 +23,24 @@ extern void __init mmp_dt_irq_init(void); extern > > void __init mmp_dt_init_timer(void); > > > > static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4026000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > > +NULL), > > OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + OF_DEV_AUXDATA("marvell,mmp-rtc", 0xd4010000, "sa1100-rtc", > NULL), > > {} > > }; > > > > static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > > +NULL), > > OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + OF_DEV_AUXDATA("marvell,mmp-rtc", 0xd4010000, "sa1100-rtc", > NULL), > > {} > > }; > > > > @@ -57,8 +57,8 @@ static void __init pxa910_dt_init(void) } > > > > static const char *mmp_dt_board_compat[] __initdata = { > > - "mrvl,pxa168-aspenite", > > - "mrvl,pxa910-dkb", > > + "marvell,pxa168-aspenite", > > + "marvell,pxa910-dkb", > > NULL, > > }; > > > > diff --git a/arch/arm/mach-mmp/mmp2-dt.c > b/arch/arm/mach-mmp/mmp2-dt.c > > index 4ac2567..6523ecf 100644 > > --- a/arch/arm/mach-mmp/mmp2-dt.c > > +++ b/arch/arm/mach-mmp/mmp2-dt.c > > @@ -25,14 +25,14 @@ extern void __init mmp_dt_irq_init(void); extern > > void __init mmp_dt_init_timer(void); > > > > static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4030000, "pxa2xx-uart.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.1", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.2", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4016000, "pxa2xx-uart.3", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4030000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4017000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4018000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4016000, "pxa2xx-uart.3", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > > +NULL), > > OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp2-gpio", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + OF_DEV_AUXDATA("marvell,mmp-rtc", 0xd4010000, "sa1100-rtc", > NULL), > > {} > > }; > > > > @@ -43,7 +43,7 @@ static void __init mmp2_dt_init(void) } > > > > static const char *mmp2_dt_board_compat[] __initdata = { > > - "mrvl,mmp2-brownstone", > > + "marvell,mmp2-brownstone", > > NULL, > > }; > > > > diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c > index > > 7ac41e8..67e7d5c 100644 > > --- a/arch/arm/mach-mmp/time.c > > +++ b/arch/arm/mach-mmp/time.c > > @@ -208,7 +208,7 @@ void __init timer_init(int irq) > > > > #ifdef CONFIG_OF > > static struct of_device_id mmp_timer_dt_ids[] = { > > - { .compatible = "mrvl,mmp-timer", }, > > + { .compatible = "marvell,mmp-timer", }, > > {} > > }; > > > > diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c > > index 3835979..b679367 100644 > > --- a/arch/arm/mach-pxa/pxa-dt.c > > +++ b/arch/arm/mach-pxa/pxa-dt.c > > @@ -23,15 +23,15 @@ > > extern void __init pxa3xx_dt_init_irq(void); > > > > static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40100000, > "pxa2xx-uart.0", NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40200000, > "pxa2xx-uart.1", NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40700000, > "pxa2xx-uart.2", NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x41600000, > "pxa2xx-uart.3", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x40100000, > "pxa2xx-uart.0", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x40200000, > "pxa2xx-uart.1", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x40700000, > "pxa2xx-uart.2", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x41600000, > "pxa2xx-uart.3", NULL), > > OF_DEV_AUXDATA("marvell,pxa-mmc", 0x41100000, "pxa2xx-mci.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-gpio", 0x40e00000, "pxa-gpio", > NULL), > > + OF_DEV_AUXDATA("marvell,pxa-gpio", 0x40e00000, "pxa-gpio", > NULL), > > OF_DEV_AUXDATA("marvell,pxa-ohci", 0x4c000000, "pxa27x-ohci", > NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-i2c", 0x40301680, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,pwri2c", 0x40f500c0, "pxa3xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,pxa-i2c", 0x40301680, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,pwri2c", 0x40f500c0, "pxa3xx-i2c.1", > NULL), > > OF_DEV_AUXDATA("marvell,pxa3xx-nand", 0x43100000, "pxa3xx-nand", > NULL), > > {} > > }; > > diff --git a/drivers/i2c/busses/i2c-pxa.c > > b/drivers/i2c/busses/i2c-pxa.c index fbafed2..6f2b17d 100644 > > --- a/drivers/i2c/busses/i2c-pxa.c > > +++ b/drivers/i2c/busses/i2c-pxa.c > > @@ -1040,9 +1040,9 @@ static const struct i2c_algorithm > > i2c_pxa_pio_algorithm = { }; > > > > static struct of_device_id i2c_pxa_dt_ids[] = { > > - { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX }, > > - { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX }, > > - { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA2XX }, > > + { .compatible = "marvell,pxa-i2c", .data = (void *)REGS_PXA2XX }, > > + { .compatible = "marvell,pwri2c", .data = (void *)REGS_PXA3XX }, > > + { .compatible = "marvell,mmp-twsi", .data = (void *)REGS_PXA2XX }, > > {} > > }; > > MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids); @@ -1060,9 +1060,9 @@ > static > > int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, > > /* For device tree we always use the dynamic or alias-assigned ID */ > > i2c->adap.nr = -1; > > > > - if (of_get_property(np, "mrvl,i2c-polling", NULL)) > > + if (of_get_property(np, "marvell,i2c-polling", NULL)) > > i2c->use_pio = 1; > > - if (of_get_property(np, "mrvl,i2c-fast-mode", NULL)) > > + if (of_get_property(np, "marvell,i2c-fast-mode", NULL)) > > i2c->fast_mode = 1; > > *i2c_types = (u32)(of_id->data); > > return 0; > > diff --git a/drivers/mmc/host/sdhci-pxav2.c > > b/drivers/mmc/host/sdhci-pxav2.c index 6a3f702..1dd6500 100644 > > --- a/drivers/mmc/host/sdhci-pxav2.c > > +++ b/drivers/mmc/host/sdhci-pxav2.c > > @@ -120,7 +120,7 @@ static const struct sdhci_ops pxav2_sdhci_ops = { > > #ifdef CONFIG_OF static const struct of_device_id > > sdhci_pxav2_of_match[] = { > > { > > - .compatible = "mrvl,pxav2-mmc", > > + .compatible = "marvell,pxav2-mmc", > > }, > > {}, > > }; > > @@ -144,7 +144,7 @@ static struct sdhci_pxa_platdata > *pxav2_get_mmc_pdata(struct device *dev) > > if (bus_width == 8) > > pdata->flags |= PXA_FLAG_SD_8_BIT_CAPABLE_SLOT; > > > > - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); > > + of_property_read_u32(np, "marvell,clk-delay-cycles", > > +&clk_delay_cycles); > > if (clk_delay_cycles > 0) { > > pdata->clk_delay_sel = 1; > > pdata->clk_delay_cycles = clk_delay_cycles; diff --git > > a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > > index 1ae358e..a88974b 100644 > > --- a/drivers/mmc/host/sdhci-pxav3.c > > +++ b/drivers/mmc/host/sdhci-pxav3.c > > @@ -185,7 +185,7 @@ static struct sdhci_pltfm_data sdhci_pxav3_pdata > = > > { #ifdef CONFIG_OF static const struct of_device_id > > sdhci_pxav3_of_match[] = { > > { > > - .compatible = "mrvl,pxav3-mmc", > > + .compatible = "marvell,pxav3-mmc", > > }, > > {}, > > }; > > @@ -201,7 +201,7 @@ static struct sdhci_pxa_platdata > *pxav3_get_mmc_pdata(struct device *dev) > > if (!pdata) > > return NULL; > > > > - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); > > + of_property_read_u32(np, "marvell,clk-delay-cycles", > > +&clk_delay_cycles); > > if (clk_delay_cycles > 0) > > pdata->clk_delay_cycles = clk_delay_cycles; > > > > diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index > > 0f7adeb..307dd37 100644 > > --- a/drivers/rtc/rtc-sa1100.c > > +++ b/drivers/rtc/rtc-sa1100.c > > @@ -339,8 +339,8 @@ static SIMPLE_DEV_PM_OPS(sa1100_rtc_pm_ops, > > sa1100_rtc_suspend, > > > > #ifdef CONFIG_OF > > static struct of_device_id sa1100_rtc_dt_ids[] = { > > - { .compatible = "mrvl,sa1100-rtc", }, > > - { .compatible = "mrvl,mmp-rtc", }, > > + { .compatible = "marvell,sa1100-rtc", }, > > + { .compatible = "marvell,mmp-rtc", }, > > {} > > }; > > MODULE_DEVICE_TABLE(of, sa1100_rtc_dt_ids); diff --git > > a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index > > 05f504e..cb1a439 100644 > > --- a/drivers/tty/serial/pxa.c > > +++ b/drivers/tty/serial/pxa.c > > @@ -852,8 +852,8 @@ static const struct dev_pm_ops > serial_pxa_pm_ops = > > { #endif > > > > static struct of_device_id serial_pxa_dt_ids[] = { > > - { .compatible = "mrvl,pxa-uart", }, > > - { .compatible = "mrvl,mmp-uart", }, > > + { .compatible = "marvell,pxa-uart", }, > > + { .compatible = "marvell,mmp-uart", }, > > {} > > }; > > MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); > > -- > > 1.7.4.1 > > > > Best Regards, Neil Zhang > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel {.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Zhang Subject: RE: [PATCH V3 1/3] dts: change Marvell prefix to 'marvell' Date: Wed, 10 Jul 2013 00:25:17 -0700 Message-ID: <175CCF5F49938B4D99B2E3EF7F558EBE3DBC97FA8F@SC-VEXCH4.marvell.com> References: <1373352166-10064-1-git-send-email-zhangwm@marvell.com> <1373352166-10064-2-git-send-email-zhangwm@marvell.com> <20130709124900.GG11908@titan.lakedaemon.net> Mime-Version: 1.0 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20130709124900.GG11908@titan.lakedaemon.net> Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org To: Jason Cooper Cc: "grant.likely@linaro.org" , "haojian.zhuang@gmail.com" , "arnd@arndb.de" , "devicetree-discuss@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" List-Id: devicetree@vger.kernel.org SmFzb24sDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogSmFzb24gQ29v cGVyIFttYWlsdG86amFzb25AbGFrZWRhZW1vbi5uZXRdDQo+IFNlbnQ6IDIwMTPE6jfUwjnI1SAy MDo0OQ0KPiBUbzogTmVpbCBaaGFuZw0KPiBDYzogZ3JhbnQubGlrZWx5QGxpbmFyby5vcmc7IGhh b2ppYW4uemh1YW5nQGdtYWlsLmNvbTsgYXJuZEBhcm5kYi5kZTsNCj4gZGV2aWNldHJlZS1kaXNj dXNzQGxpc3RzLm96bGFicy5vcmc7IGxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmc7DQo+IGxp bnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZw0KPiBTdWJqZWN0OiBSZTogW1BBVENI IFYzIDEvM10gZHRzOiBjaGFuZ2UgTWFydmVsbCBwcmVmaXggdG8gJ21hcnZlbGwnDQo+DQo+IE5l aWwsDQo+DQo+IE9uIFR1ZSwgSnVsIDA5LCAyMDEzIGF0IDAyOjQyOjQ0UE0gKzA4MDAsIE5laWwg Wmhhbmcgd3JvdGU6DQo+ID4gVGhlIGRvY3VtZW50ZWQgdmVuZG9yIHByZWZpeCBmb3IgTWFydmVs bCBpcyAnbWFydmVsbCcsIG5vdCAnbXJ2bCcsIHNvDQo+ID4gbGV0J3MgY2hhbmdlIGl0Lg0KPiA+ DQo+ID4gU2lnbmVkLW9mZi1ieTogTmVpbCBaaGFuZyA8emhhbmd3bUBtYXJ2ZWxsLmNvbT4NCj4g PiAtLS0NCj4gPiAgLi4uL2RldmljZXRyZWUvYmluZGluZ3MvYXJtL21ydmwvaW50Yy50eHQgICAg ICAgICAgfCAgIDE2ICsrKy0tLQ0KPiA+ICAuLi4vZGV2aWNldHJlZS9iaW5kaW5ncy9hcm0vbXJ2 bC9tcnZsLnR4dCAgICAgICAgICB8ICAgIDYgKy0NCj4gPiAgLi4uL2RldmljZXRyZWUvYmluZGlu Z3MvYXJtL21ydmwvdGltZXIudHh0ICAgICAgICAgfCAgICA0ICstDQo+ID4gIERvY3VtZW50YXRp b24vZGV2aWNldHJlZS9iaW5kaW5ncy9pMmMvaTJjLXB4YS50eHQgIHwgICAxNCArKystLS0NCj4g PiAgLi4uL2RldmljZXRyZWUvYmluZGluZ3MvbW1jL3NkaGNpLXB4YS50eHQgICAgICAgICAgfCAg ICA4ICsrLS0NCj4gPiAgLi4uL2RldmljZXRyZWUvYmluZGluZ3MvcnRjL3NhMTEwMC1ydGMudHh0 ICAgICAgICAgfCAgICA0ICstDQo+ID4gIC4uLi9kZXZpY2V0cmVlL2JpbmRpbmdzL3NlcmlhbC9t cnZsLXNlcmlhbC50eHQgICAgIHwgICAgMiArLQ0KPiA+ICBhcmNoL2FybS9ib290L2R0cy9tbXAy LWJyb3duc3RvbmUuZHRzICAgICAgICAgICAgICB8ICAgIDIgKy0NCj4gPiAgYXJjaC9hcm0vYm9v dC9kdHMvbW1wMi5kdHNpICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDU2DQo+ICsrKysrKysr KystLS0tLS0tLS0tDQo+ID4gIGFyY2gvYXJtL2Jvb3QvZHRzL3B4YTE2OC1hc3Blbml0ZS5kdHMg ICAgICAgICAgICAgIHwgICAgMiArLQ0KPiA+ICBhcmNoL2FybS9ib290L2R0cy9weGExNjguZHRz aSAgICAgICAgICAgICAgICAgICAgICB8ICAgMjQNCj4gKysrKy0tLS0NCj4gPiAgYXJjaC9hcm0v Ym9vdC9kdHMvcHhhMnh4LmR0c2kgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKy0tLQ0K PiA+ICBhcmNoL2FybS9ib290L2R0cy9weGEzeHguZHRzaSAgICAgICAgICAgICAgICAgICAgICB8 ICAgIDIgKy0NCj4gPiAgYXJjaC9hcm0vYm9vdC9kdHMvcHhhOTEwLWRrYi5kdHMgICAgICAgICAg ICAgICAgICAgfCAgICAyICstDQo+ID4gIGFyY2gvYXJtL2Jvb3QvZHRzL3B4YTkxMC5kdHNpICAg ICAgICAgICAgICAgICAgICAgIHwgICAyNw0KPiArKysrKy0tLS0tDQo+ID4gIGFyY2gvYXJtL21h Y2gtbW1wL2lycS5jICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNg0KPiArKystLS0N Cj4gPiAgYXJjaC9hcm0vbWFjaC1tbXAvbW1wLWR0LmMgICAgICAgICAgICAgICAgICAgICAgICAg fCAgIDI4DQo+ICsrKysrLS0tLS0NCj4gPiAgYXJjaC9hcm0vbWFjaC1tbXAvbW1wMi1kdC5jICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDE2DQo+ICsrKy0tLQ0KPiA+ICBhcmNoL2FybS9tYWNo LW1tcC90aW1lLmMgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDIgKy0NCj4gPiAgYXJj aC9hcm0vbWFjaC1weGEvcHhhLWR0LmMgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE0DQo+ ICsrKy0tLQ0KPiA+ICBkcml2ZXJzL2kyYy9idXNzZXMvaTJjLXB4YS5jICAgICAgICAgICAgICAg ICAgICAgICB8ICAgMTAgKystLQ0KPiA+ICBkcml2ZXJzL21tYy9ob3N0L3NkaGNpLXB4YXYyLmMg ICAgICAgICAgICAgICAgICAgICB8ICAgIDQgKy0NCj4gPiAgZHJpdmVycy9tbWMvaG9zdC9zZGhj aS1weGF2My5jICAgICAgICAgICAgICAgICAgICAgfCAgICA0ICstDQo+ID4gIGRyaXZlcnMvcnRj L3J0Yy1zYTExMDAuYyAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgNCArLQ0KPiA+ICBk cml2ZXJzL3R0eS9zZXJpYWwvcHhhLmMgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDQg Ky0NCj4gPiAgMjUgZmlsZXMgY2hhbmdlZCwgMTQ0IGluc2VydGlvbnMoKyksIDE0MyBkZWxldGlv bnMoLSkNCj4NCj4gSSBhZ3JlZSB3aXRoIHRoZSBuZWVkIHRvIGNoYW5nZSwgaG93ZXZlciwgdGhp cyBoYXMgYmVlbiBpbiB0aGUgYmluZGluZw0KPiBkb2N1bWVudGF0aW9uIHNpbmNlIHYzLjUuICBJ IHdpc2ggd2UgaGFkIGNhdWdodCB0aGlzIHdoZW4gd2UgZGVjaWRlZA0KPiBhZ2FpbnN0IHVzaW5n IHN0b2NrIHRpY2tlciBzeW1ib2xzIChub3QgYWxsIHN0b2NrIG1hcmtldHMgdXNlIGFscGhhYmV0 aWNhbA0KPiBhYmJyZXZpYXRlZCBuYW1lcywgbm90IGFsbCBjb21wYW5pZXMgYXJlIGxpc3RlZCBv biBhbnkgc3RvY2sgZXhjaGFuZ2UpLg0KPg0KPiBUbyBkbyB0aGlzIHByb3Blcmx5LCB0aGUgZHJp dmVycyBhcmUgZ29pbmcgdG8gaGF2ZSB0byBiZSBjb21wYXRpYmxlIHdpdGggdGhlDQo+IG9sZCBh bmQgdGhlIG5ldyBuYW1lcywgYW5kIHRoZSBiaW5kaW5nIGRvY3MgdXBkYXRlZCB0byByZWZsZWN0 IHRoZSBsZWdhY3kNCj4gbmFtZSBhbmQgdGhlIHByZWZlcnJlZCBuYW1lLg0KPg0KRG8geW91IG1l YW4gaXQncyBiZXR0ZXIgdG8gc3VwcG9ydCBib3RoIGxlZ2FjeSBhbmQgcHJlZmVycmVkIG5hbWUg YXQgdGhlIHNhbWUgdGltZT8NCg0KPiB0aHgsDQo+DQo+IEphc29uLg0KPg0KPiA+IGRpZmYgLS1n aXQgYS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvYXJtL21ydmwvaW50Yy50eHQN Cj4gPiBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9hcm0vbXJ2bC9pbnRjLnR4 dA0KPiA+IGluZGV4IDhiNTMyNzMuLmFkMjc1NDggMTAwNjQ0DQo+ID4gLS0tIGEvRG9jdW1lbnRh dGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9tcnZsL2ludGMudHh0DQo+ID4gKysrIGIvRG9j dW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9tcnZsL2ludGMudHh0DQo+ID4gQEAg LTEsOCArMSw4IEBADQo+ID4gICogTWFydmVsbCBNTVAgSW50ZXJydXB0IGNvbnRyb2xsZXINCj4g Pg0KPiA+ICBSZXF1aXJlZCBwcm9wZXJ0aWVzOg0KPiA+IC0tIGNvbXBhdGlibGUgOiBTaG91bGQg YmUgIm1ydmwsbW1wLWludGMiLCAibXJ2bCxtbXAyLWludGMiIG9yDQo+ID4gLSAgIm1ydmwsbW1w Mi1tdXgtaW50YyINCj4gPiArLSBjb21wYXRpYmxlIDogU2hvdWxkIGJlICJtYXJ2ZWxsLG1tcC1p bnRjIiwgIm1hcnZlbGwsbW1wMi1pbnRjIiBvcg0KPiA+ICsgICJtYXJ2ZWxsLG1tcDItbXV4LWlu dGMiDQo+ID4gIC0gcmVnIDogQWRkcmVzcyBhbmQgbGVuZ3RoIG9mIHRoZSByZWdpc3RlciBzZXQg b2YgdGhlIGludGVycnVwdCBjb250cm9sbGVyLg0KPiA+ICAgIElmIHRoZSBpbnRlcnJ1cHQgY29u dHJvbGxlciBpcyBpbnRjLCBhZGRyZXNzIGFuZCBsZW5ndGggbWVhbnMgdGhlIHJhbmdlDQo+ID4g ICAgb2YgdGhlIHdob2xkIGludGVycnVwdCBjb250cm9sbGVyLiBJZiB0aGUgaW50ZXJydXB0IGNv bnRyb2xsZXIgaXMNCj4gPiBtdXgtaW50YywgQEAgLTE1LDI4ICsxNSwyOCBAQCBSZXF1aXJlZCBw cm9wZXJ0aWVzOg0KPiA+ICAtIGludGVycnVwdC1jb250cm9sbGVyIDogSWRlbnRpZmllcyB0aGUg bm9kZSBhcyBhbiBpbnRlcnJ1cHQgY29udHJvbGxlci4NCj4gPiAgLSAjaW50ZXJydXB0LWNlbGxz IDogU3BlY2lmaWVzIHRoZSBudW1iZXIgb2YgY2VsbHMgbmVlZGVkIHRvIGVuY29kZSBhbg0KPiA+ ICAgIGludGVycnVwdCBzb3VyY2UuDQo+ID4gLS0gbXJ2bCxpbnRjLW5yLWlycXMgOiBTcGVjaWZp ZXMgdGhlIG51bWJlciBvZiBpbnRlcnJ1cHRzIGluIHRoZQ0KPiA+IGludGVycnVwdA0KPiA+ICst IG1hcnZlbGwsaW50Yy1uci1pcnFzIDogU3BlY2lmaWVzIHRoZSBudW1iZXIgb2YgaW50ZXJydXB0 cyBpbiB0aGUNCj4gPiAraW50ZXJydXB0DQo+ID4gICAgY29udHJvbGxlci4NCj4gPiAtLSBtcnZs LGNsci1tZnAtaXJxIDogU3BlY2lmaWVzIHRoZSBpbnRlcnJ1cHQgdGhhdCBuZWVkcyB0byBjbGVh ciBNRlANCj4gPiBlZGdlDQo+ID4gKy0gbWFydmVsbCxjbHItbWZwLWlycSA6IFNwZWNpZmllcyB0 aGUgaW50ZXJydXB0IHRoYXQgbmVlZHMgdG8gY2xlYXINCj4gPiArTUZQIGVkZ2UNCj4gPiAgICBk ZXRlY3Rpb24gZmlyc3QuDQo+ID4NCj4gPiAgRXhhbXBsZToNCj4gPiAgICAgaW50YzogaW50ZXJy dXB0LWNvbnRyb2xsZXJAZDQyODIwMDAgew0KPiA+IC0gICAgICAgICAgIGNvbXBhdGlibGUgPSAi bXJ2bCxtbXAyLWludGMiOw0KPiA+ICsgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxt bXAyLWludGMiOw0KPiA+ICAgICAgICAgICAgIGludGVycnVwdC1jb250cm9sbGVyOw0KPiA+ICAg ICAgICAgICAgICNpbnRlcnJ1cHQtY2VsbHMgPSA8MT47DQo+ID4gICAgICAgICAgICAgcmVnID0g PDB4ZDQyODIwMDAgMHgxMDAwPjsNCj4gPiAtICAgICAgICAgICBtcnZsLGludGMtbnItaXJxcyA9 IDw2ND47DQo+ID4gKyAgICAgICAgICAgbWFydmVsbCxpbnRjLW5yLWlycXMgPSA8NjQ+Ow0KPiA+ ICAgICB9Ow0KPiA+DQo+ID4gICAgIGludGNtdXg0QGQ0MjgyMTUwIHsNCj4gPiAtICAgICAgICAg ICBjb21wYXRpYmxlID0gIm1ydmwsbW1wMi1tdXgtaW50YyI7DQo+ID4gKyAgICAgICAgICAgY29t cGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcDItbXV4LWludGMiOw0KPiA+ICAgICAgICAgICAgIGludGVy cnVwdHMgPSA8ND47DQo+ID4gICAgICAgICAgICAgaW50ZXJydXB0LWNvbnRyb2xsZXI7DQo+ID4g ICAgICAgICAgICAgI2ludGVycnVwdC1jZWxscyA9IDwxPjsNCj4gPiAgICAgICAgICAgICByZWcg PSA8MHgxNTAgMHg0PiwgPDB4MTY4IDB4ND47DQo+ID4gICAgICAgICAgICAgcmVnLW5hbWVzID0g Im11eCBzdGF0dXMiLCAibXV4IG1hc2siOw0KPiA+IC0gICAgICAgICAgIG1ydmwsaW50Yy1uci1p cnFzID0gPDI+Ow0KPiA+ICsgICAgICAgICAgIG1hcnZlbGwsaW50Yy1uci1pcnFzID0gPDI+Ow0K PiA+ICAgICB9Ow0KPiA+DQo+ID4gICogTWFydmVsbCBPcmlvbiBJbnRlcnJ1cHQgY29udHJvbGxl cg0KPiA+IGRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvYXJt L21ydmwvbXJ2bC50eHQNCj4gPiBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9h cm0vbXJ2bC9tcnZsLnR4dA0KPiA+IGluZGV4IDExN2Q3NDEuLjg3ZjFkNDIgMTAwNjQ0DQo+ID4g LS0tIGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9tcnZsL21ydmwudHh0 DQo+ID4gKysrIGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9tcnZsL21y dmwudHh0DQo+ID4gQEAgLTMsMTIgKzMsMTIgQEAgTWFydmVsbCBQbGF0Zm9ybXMgRGV2aWNlIFRy ZWUgQmluZGluZ3MNCj4gPg0KPiA+ICBQWEExNjggQXNwZW5pdGUgQm9hcmQNCj4gPiAgUmVxdWly ZWQgcm9vdCBub2RlIHByb3BlcnRpZXM6DQo+ID4gLSAgIC0gY29tcGF0aWJsZSA9ICJtcnZsLHB4 YTE2OC1hc3Blbml0ZSIsICJtcnZsLHB4YTE2OCI7DQo+ID4gKyAgIC0gY29tcGF0aWJsZSA9ICJt YXJ2ZWxsLHB4YTE2OC1hc3Blbml0ZSIsICJtYXJ2ZWxsLHB4YTE2OCI7DQo+ID4NCj4gPiAgUFhB OTEwIERLQiBCb2FyZA0KPiA+ICBSZXF1aXJlZCByb290IG5vZGUgcHJvcGVydGllczoNCj4gPiAt ICAgLSBjb21wYXRpYmxlID0gIm1ydmwscHhhOTEwLWRrYiI7DQo+ID4gKyAgIC0gY29tcGF0aWJs ZSA9ICJtYXJ2ZWxsLHB4YTkxMC1ka2IiOw0KPiA+DQo+ID4gIE1NUDIgQnJvd25zdG9uZSBCb2Fy ZA0KPiA+ICBSZXF1aXJlZCByb290IG5vZGUgcHJvcGVydGllczoNCj4gPiAtICAgLSBjb21wYXRp YmxlID0gIm1ydmwsbW1wMi1icm93bnN0b25lIjsNCj4gPiArICAgLSBjb21wYXRpYmxlID0gIm1h cnZlbGwsbW1wMi1icm93bnN0b25lIjsNCj4gPiBkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlvbi9k ZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9tcnZsL3RpbWVyLnR4dA0KPiA+IGIvRG9jdW1lbnRhdGlv bi9kZXZpY2V0cmVlL2JpbmRpbmdzL2FybS9tcnZsL3RpbWVyLnR4dA0KPiA+IGluZGV4IDlhNmUy NTEuLjEzMDQ1MjYgMTAwNjQ0DQo+ID4gLS0tIGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2Jp bmRpbmdzL2FybS9tcnZsL3RpbWVyLnR4dA0KPiA+ICsrKyBiL0RvY3VtZW50YXRpb24vZGV2aWNl dHJlZS9iaW5kaW5ncy9hcm0vbXJ2bC90aW1lci50eHQNCj4gPiBAQCAtMSwxMyArMSwxMyBAQA0K PiA+ICAqIE1hcnZlbGwgTU1QIFRpbWVyIGNvbnRyb2xsZXINCj4gPg0KPiA+ICBSZXF1aXJlZCBw cm9wZXJ0aWVzOg0KPiA+IC0tIGNvbXBhdGlibGUgOiBTaG91bGQgYmUgIm1ydmwsbW1wLXRpbWVy Ii4NCj4gPiArLSBjb21wYXRpYmxlIDogU2hvdWxkIGJlICJtYXJ2ZWxsLG1tcC10aW1lciIuDQo+ ID4gIC0gcmVnIDogQWRkcmVzcyBhbmQgbGVuZ3RoIG9mIHRoZSByZWdpc3RlciBzZXQgb2YgdGlt ZXIgY29udHJvbGxlci4NCj4gPiAgLSBpbnRlcnJ1cHRzIDogU2hvdWxkIGJlIHRoZSBpbnRlcnJ1 cHQgbnVtYmVyLg0KPiA+DQo+ID4gIEV4YW1wbGU6DQo+ID4gICAgIHRpbWVyMDogdGltZXJAZDQw MTQwMDAgew0KPiA+IC0gICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAtdGltZXIiOw0K PiA+ICsgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdGltZXIiOw0KPiA+ICAg ICAgICAgICAgIHJlZyA9IDwweGQ0MDE0MDAwIDB4MTAwPjsNCj4gPiAgICAgICAgICAgICBpbnRl cnJ1cHRzID0gPDEzPjsNCj4gPiAgICAgfTsNCj4gPiBkaWZmIC0tZ2l0IGEvRG9jdW1lbnRhdGlv bi9kZXZpY2V0cmVlL2JpbmRpbmdzL2kyYy9pMmMtcHhhLnR4dA0KPiA+IGIvRG9jdW1lbnRhdGlv bi9kZXZpY2V0cmVlL2JpbmRpbmdzL2kyYy9pMmMtcHhhLnR4dA0KPiA+IGluZGV4IDEyYjc4YWMu LjM0ZmRmNWQgMTAwNjQ0DQo+ID4gLS0tIGEvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRp bmdzL2kyYy9pMmMtcHhhLnR4dA0KPiA+ICsrKyBiL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9i aW5kaW5ncy9pMmMvaTJjLXB4YS50eHQNCj4gPiBAQCAtMyw5ICszLDkgQEANCj4gPiAgUmVxdWly ZWQgcHJvcGVydGllcyA6DQo+ID4NCj4gPiAgIC0gcmVnIDogT2Zmc2V0IGFuZCBsZW5ndGggb2Yg dGhlIHJlZ2lzdGVyIHNldCBmb3IgdGhlIGRldmljZQ0KPiA+IC0gLSBjb21wYXRpYmxlIDogc2hv dWxkIGJlICJtcnZsLG1tcC10d3NpIiB3aGVyZSBtbXAgaXMgdGhlIG5hbWUgb2YgYQ0KPiA+ICsg LSBjb21wYXRpYmxlIDogc2hvdWxkIGJlICJtYXJ2ZWxsLG1tcC10d3NpIiB3aGVyZSBtbXAgaXMg dGhlIG5hbWUgb2YNCj4gPiArIGENCj4gPiAgICAgY29tcGF0aWJsZSBwcm9jZXNzb3IsIGUuZy4g cHhhMTY4LCBweGE5MTAsIG1tcDIsIG1tcDMuDQo+ID4gLSAgIEZvciB0aGUgcHhhMnh4L3B4YTN4 eCwgYW4gYWRkaXRpb25hbCBub2RlICJtcnZsLHB4YS1pMmMiIGlzIHJlcXVpcmVkDQo+ID4gKyAg IEZvciB0aGUgcHhhMnh4L3B4YTN4eCwgYW4gYWRkaXRpb25hbCBub2RlICJtYXJ2ZWxsLHB4YS1p MmMiIGlzDQo+ID4gKyByZXF1aXJlZA0KPiA+ICAgICBhcyBzaG93biBpbiB0aGUgZXhhbXBsZSBi ZWxvdy4NCj4gPg0KPiA+ICBSZWNvbW1lbmRlZCBwcm9wZXJ0aWVzIDoNCj4gPiBAQCAtMTQsMjAg KzE0LDIwIEBAIFJlY29tbWVuZGVkIHByb3BlcnRpZXMgOg0KPiA+ICAgLSBpbnRlcnJ1cHQtcGFy ZW50IDogdGhlIHBoYW5kbGUgZm9yIHRoZSBpbnRlcnJ1cHQgY29udHJvbGxlciB0aGF0DQo+ID4g ICAgIHNlcnZpY2VzIGludGVycnVwdHMgZm9yIHRoaXMgZGV2aWNlLiBJZiB0aGUgcGFyZW50IGlz IHRoZSBkZWZhdWx0DQo+ID4gICAgIGludGVycnVwdCBjb250cm9sbGVyIGluIGRldmljZSB0cmVl LCBpdCBjb3VsZCBiZSBpZ25vcmVkLg0KPiA+IC0gLSBtcnZsLGkyYy1wb2xsaW5nIDogRGlzYWJs ZSBpbnRlcnJ1cHQgb2YgaTJjIGNvbnRyb2xsZXIuIFBvbGxpbmcNCj4gPiArIC0gbWFydmVsbCxp MmMtcG9sbGluZyA6IERpc2FibGUgaW50ZXJydXB0IG9mIGkyYyBjb250cm9sbGVyLiBQb2xsaW5n DQo+ID4gICAgIHN0YXR1cyByZWdpc3RlciBvZiBpMmMgY29udHJvbGxlciBpbnN0ZWFkLg0KPiA+ IC0gLSBtcnZsLGkyYy1mYXN0LW1vZGUgOiBFbmFibGUgZmFzdCBtb2RlIG9mIGkyYyBjb250cm9s bGVyLg0KPiA+ICsgLSBtYXJ2ZWxsLGkyYy1mYXN0LW1vZGUgOiBFbmFibGUgZmFzdCBtb2RlIG9m IGkyYyBjb250cm9sbGVyLg0KPiA+DQo+ID4gIEV4YW1wbGVzOg0KPiA+ICAgICB0d3NpMTogaTJj QGQ0MDExMDAwIHsNCj4gPiAtICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1wLXR3c2ki Ow0KPiA+ICsgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdHdzaSI7DQo+ID4g ICAgICAgICAgICAgcmVnID0gPDB4ZDQwMTEwMDAgMHgxMDAwPjsNCj4gPiAgICAgICAgICAgICBp bnRlcnJ1cHRzID0gPDc+Ow0KPiA+IC0gICAgICAgICAgIG1ydmwsaTJjLWZhc3QtbW9kZTsNCj4g PiArICAgICAgICAgICBtYXJ2ZWxsLGkyYy1mYXN0LW1vZGU7DQo+ID4gICAgIH07DQo+ID4NCj4g PiAgICAgdHdzaTI6IGkyY0BkNDAyNTAwMCB7DQo+ID4gLSAgICAgICAgICAgY29tcGF0aWJsZSA9 ICJtcnZsLG1tcC10d3NpIjsNCj4gPiArICAgICAgICAgICBjb21wYXRpYmxlID0gIm1hcnZlbGws bW1wLXR3c2kiOw0KPiA+ICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDI1MDAwIDB4MTAwMD47DQo+ ID4gICAgICAgICAgICAgaW50ZXJydXB0cyA9IDw1OD47DQo+ID4gICAgIH07DQo+ID4gZGlmZiAt LWdpdCBhL0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9tbWMvc2RoY2ktcHhhLnR4 dA0KPiA+IGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL21tYy9zZGhjaS1weGEu dHh0DQo+ID4gaW5kZXggZGJlOThhMy4uZDYwM2EzZSAxMDA2NDQNCj4gPiAtLS0gYS9Eb2N1bWVu dGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvbW1jL3NkaGNpLXB4YS50eHQNCj4gPiArKysgYi9E b2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvbW1jL3NkaGNpLXB4YS50eHQNCj4gPiBA QCAtNCwxOCArNCwxOCBAQCBUaGlzIGZpbGUgZG9jdW1lbnRzIGRpZmZlcmVuY2VzIGJldHdlZW4g dGhlIGNvcmUNCj4gPiBwcm9wZXJ0aWVzIGluIG1tYy50eHQgIGFuZCB0aGUgcHJvcGVydGllcyB1 c2VkIGJ5IHRoZSBzZGhjaS1weGF2MiBhbmQNCj4gc2RoY2ktcHhhdjMgZHJpdmVycy4NCj4gPg0K PiA+ICBSZXF1aXJlZCBwcm9wZXJ0aWVzOg0KPiA+IC0tIGNvbXBhdGlibGU6IFNob3VsZCBiZSAi bXJ2bCxweGF2Mi1tbWMiIG9yICJtcnZsLHB4YXYzLW1tYyIuDQo+ID4gKy0gY29tcGF0aWJsZTog U2hvdWxkIGJlICJtYXJ2ZWxsLHB4YXYyLW1tYyIgb3IgIm1hcnZlbGwscHhhdjMtbW1jIi4NCj4g Pg0KPiA+ICBPcHRpb25hbCBwcm9wZXJ0aWVzOg0KPiA+IC0tIG1ydmwsY2xrLWRlbGF5LWN5Y2xl czogU3BlY2lmeSBhIG51bWJlciBvZiBjeWNsZXMgdG8gZGVsYXkgZm9yIHR1bmluZy4NCj4gPiAr LSBtYXJ2ZWxsLGNsay1kZWxheS1jeWNsZXM6IFNwZWNpZnkgYSBudW1iZXIgb2YgY3ljbGVzIHRv IGRlbGF5IGZvciB0dW5pbmcuDQo+ID4NCj4gPiAgRXhhbXBsZToNCj4gPg0KPiA+ICBzZGhjaUBk NDI4MDgwMCB7DQo+ID4gLSAgIGNvbXBhdGlibGUgPSAibXJ2bCxweGF2My1tbWMiOw0KPiA+ICsg ICBjb21wYXRpYmxlID0gIm1hcnZlbGwscHhhdjMtbW1jIjsNCj4gPiAgICAgcmVnID0gPDB4ZDQy ODA4MDAgMHg4MDA+Ow0KPiA+ICAgICBidXMtd2lkdGggPSA8OD47DQo+ID4gICAgIGludGVycnVw dHMgPSA8Mjc+Ow0KPiA+ICAgICBub24tcmVtb3ZhYmxlOw0KPiA+IC0gICBtcnZsLGNsay1kZWxh eS1jeWNsZXMgPSA8MzE+Ow0KPiA+ICsgICBtYXJ2ZWxsLGNsay1kZWxheS1jeWNsZXMgPSA8MzE+ Ow0KPiA+ICB9Ow0KPiA+IGRpZmYgLS1naXQgYS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmlu ZGluZ3MvcnRjL3NhMTEwMC1ydGMudHh0DQo+ID4gYi9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUv YmluZGluZ3MvcnRjL3NhMTEwMC1ydGMudHh0DQo+ID4gaW5kZXggMGNkYTE5YS4uODg2ZmUxNSAx MDA2NDQNCj4gPiAtLS0gYS9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3MvcnRjL3Nh MTEwMC1ydGMudHh0DQo+ID4gKysrIGIvRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdz L3J0Yy9zYTExMDAtcnRjLnR4dA0KPiA+IEBAIC0xLDcgKzEsNyBAQA0KPiA+ICAqIE1hcnZlbGwg UmVhbCBUaW1lIENsb2NrIGNvbnRyb2xsZXINCj4gPg0KPiA+ICBSZXF1aXJlZCBwcm9wZXJ0aWVz Og0KPiA+IC0tIGNvbXBhdGlibGU6IHNob3VsZCBiZSAibXJ2bCxzYTExMDAtcnRjIg0KPiA+ICst IGNvbXBhdGlibGU6IHNob3VsZCBiZSAibWFydmVsbCxzYTExMDAtcnRjIg0KPiA+ICAtIHJlZzog cGh5c2ljYWwgYmFzZSBhZGRyZXNzIG9mIHRoZSBjb250cm9sbGVyIGFuZCBsZW5ndGggb2YgbWVt b3J5DQo+IG1hcHBlZA0KPiA+ICAgIHJlZ2lvbi4NCj4gPiAgLSBpbnRlcnJ1cHRzOiBTaG91bGQg YmUgdHdvLiBUaGUgZmlyc3QgaW50ZXJydXB0IG51bWJlciBpcyB0aGUgcnRjDQo+ID4gYWxhcm0g QEAgLTEwLDcgKzEwLDcgQEAgUmVxdWlyZWQgcHJvcGVydGllczoNCj4gPg0KPiA+ICBFeGFtcGxl Og0KPiA+ICAgICBydGM6IHJ0Y0BkNDAxMDAwMCB7DQo+ID4gLSAgICAgICAgICAgY29tcGF0aWJs ZSA9ICJtcnZsLG1tcC1ydGMiOw0KPiA+ICsgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVs bCxtbXAtcnRjIjsNCj4gPiAgICAgICAgICAgICByZWcgPSA8MHhkNDAxMDAwMCAweDEwMDA+Ow0K PiA+ICAgICAgICAgICAgIGludGVycnVwdHMgPSA8NT4sIDw2PjsNCj4gPiAgICAgICAgICAgICBp bnRlcnJ1cHQtbmFtZSA9ICJydGMgMUh6IiwgInJ0YyBhbGFybSI7IGRpZmYgLS1naXQNCj4gPiBh L0RvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9zZXJpYWwvbXJ2bC1zZXJpYWwudHh0 DQo+ID4gYi9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3Mvc2VyaWFsL21ydmwtc2Vy aWFsLnR4dA0KPiA+IGluZGV4IGQ3NDQzNDAuLjY1OWQzNWUgMTAwNjQ0DQo+ID4gLS0tIGEvRG9j dW1lbnRhdGlvbi9kZXZpY2V0cmVlL2JpbmRpbmdzL3NlcmlhbC9tcnZsLXNlcmlhbC50eHQNCj4g PiArKysgYi9Eb2N1bWVudGF0aW9uL2RldmljZXRyZWUvYmluZGluZ3Mvc2VyaWFsL21ydmwtc2Vy aWFsLnR4dA0KPiA+IEBAIC0xLDQgKzEsNCBAQA0KPiA+ICBQWEEgVUFSVCBjb250cm9sbGVyDQo+ ID4NCj4gPiAgUmVxdWlyZWQgcHJvcGVydGllczoNCj4gPiAtLSBjb21wYXRpYmxlIDogc2hvdWxk IGJlICJtcnZsLG1tcC11YXJ0IiBvciAibXJ2bCxweGEtdWFydCIuDQo+ID4gKy0gY29tcGF0aWJs ZSA6IHNob3VsZCBiZSAibWFydmVsbCxtbXAtdWFydCIgb3IgIm1hcnZlbGwscHhhLXVhcnQiLg0K PiA+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9tbXAyLWJyb3duc3RvbmUuZHRzDQo+ ID4gYi9hcmNoL2FybS9ib290L2R0cy9tbXAyLWJyb3duc3RvbmUuZHRzDQo+ID4gaW5kZXggN2Y3 MGEzOS4uMjZhYmZkZSAxMDA2NDQNCj4gPiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9tbXAyLWJy b3duc3RvbmUuZHRzDQo+ID4gKysrIGIvYXJjaC9hcm0vYm9vdC9kdHMvbW1wMi1icm93bnN0b25l LmR0cw0KPiA+IEBAIC0xMiw3ICsxMiw3IEBADQo+ID4NCj4gPiAgLyB7DQo+ID4gICAgIG1vZGVs ID0gIk1hcnZlbGwgTU1QMiBCcm93bnN0b25lIERldmVsb3BtZW50IEJvYXJkIjsNCj4gPiAtICAg Y29tcGF0aWJsZSA9ICJtcnZsLG1tcDItYnJvd25zdG9uZSIsICJtcnZsLG1tcDIiOw0KPiA+ICsg ICBjb21wYXRpYmxlID0gIm1hcnZlbGwsbW1wMi1icm93bnN0b25lIiwgIm1hcnZlbGwsbW1wMiI7 DQo+ID4NCj4gPiAgICAgY2hvc2VuIHsNCj4gPiAgICAgICAgICAgICBib290YXJncyA9ICJjb25z b2xlPXR0eVMyLDM4NDAwIHJvb3Q9L2Rldi9uZnMNCj4gPiBuZnNyb290PTE5Mi4xNjguMS4xMDA6 L25mc3Jvb3QvDQo+ID4gaXA9MTkyLjE2OC4xLjEwMToxOTIuMTY4LjEuMTAwOjoyNTUuMjU1LjI1 NS4wOjpldGgwOm9uIjsNCj4gPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vYm9vdC9kdHMvbW1wMi5k dHNpIGIvYXJjaC9hcm0vYm9vdC9kdHMvbW1wMi5kdHNpDQo+ID4gaW5kZXggNGU4YjA4Yy4uYWMx MzY1NCAxMDA2NDQNCj4gPiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9tbXAyLmR0c2kNCj4gPiAr KysgYi9hcmNoL2FybS9ib290L2R0cy9tbXAyLmR0c2kNCj4gPiBAQCAtMzIsMTI4ICszMiwxMjgg QEANCj4gPiAgICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgYXhpQGQ0MjAwMDAw IHsgIC8qIEFYSSAqLw0KPiA+IC0gICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZs LGF4aS1idXMiLCAic2ltcGxlLWJ1cyI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICBjb21wYXRp YmxlID0gIm1hcnZlbGwsYXhpLWJ1cyIsICJzaW1wbGUtYnVzIjsNCj4gPiAgICAgICAgICAgICAg ICAgICAgICNhZGRyZXNzLWNlbGxzID0gPDE+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgI3Np emUtY2VsbHMgPSA8MT47DQo+ID4gICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHhkNDIwMDAw MCAweDAwMjAwMDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIHJhbmdlczsNCj4gPg0KPiA+ ICAgICAgICAgICAgICAgICAgICAgaW50YzogaW50ZXJydXB0LWNvbnRyb2xsZXJAZDQyODIwMDAg ew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1w Mi1pbnRjIjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJt YXJ2ZWxsLG1tcDItaW50YyI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVy cnVwdC1jb250cm9sbGVyOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjaW50ZXJy dXB0LWNlbGxzID0gPDE+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcgPSA8 MHhkNDI4MjAwMCAweDEwMDA+Ow0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBtcnZs LGludGMtbnItaXJxcyA9IDw2ND47DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIG1h cnZlbGwsaW50Yy1uci1pcnFzID0gPDY0PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ ID4NCj4gPiAgICAgICAgICAgICAgICAgICAgIGludGNtdXg0OiBpbnRlcnJ1cHQtY29udHJvbGxl ckBkNDI4MjE1MCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUg PSAibXJ2bCxtbXAyLW11eC1pbnRjIjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcDItbXV4LWludGMiOw0KPiA+ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDQ+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBpbnRlcnJ1cHQtY29udHJvbGxlcjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgI2ludGVycnVwdC1jZWxscyA9IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmVnID0gPDB4MTUwIDB4ND4sIDwweDE2OCAweDQ+Ow0KPiA+ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZWctbmFtZXMgPSAibXV4IHN0YXR1cyIsICJtdXggbWFzayI7DQo+ID4g LSAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ydmwsaW50Yy1uci1pcnFzID0gPDI+Ow0KPiA+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJ2ZWxsLGludGMtbnItaXJxcyA9IDwyPjsN Cj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICAgICAgICAg IGludGNtdXg1OiBpbnRlcnJ1cHQtY29udHJvbGxlckBkNDI4MjE1NCB7DQo+ID4gLSAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAyLW11eC1pbnRjIjsNCj4g PiArICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcDIt bXV4LWludGMiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHRzID0g PDU+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHQtY29udHJvbGxl cjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI2ludGVycnVwdC1jZWxscyA9IDwx PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4MTU0IDB4ND4sIDww eDE2YyAweDQ+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWctbmFtZXMgPSAi bXV4IHN0YXR1cyIsICJtdXggbWFzayI7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAg IG1ydmwsaW50Yy1uci1pcnFzID0gPDI+Ow0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAg ICBtcnZsLGNsci1tZnAtaXJxID0gPDE+Ow0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAg ICBtYXJ2ZWxsLGludGMtbnItaXJxcyA9IDwyPjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAg ICAgICAgbWFydmVsbCxjbHItbWZwLWlycSA9IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAg IH07DQo+ID4NCj4gPiAgICAgICAgICAgICAgICAgICAgIGludGNtdXg5OiBpbnRlcnJ1cHQtY29u dHJvbGxlckBkNDI4MjE4MCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBh dGlibGUgPSAibXJ2bCxtbXAyLW11eC1pbnRjIjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcDItbXV4LWludGMiOw0KPiA+ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDk+Ow0KPiA+ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbnRlcnJ1cHQtY29udHJvbGxlcjsNCj4gPiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgI2ludGVycnVwdC1jZWxscyA9IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmVnID0gPDB4MTgwIDB4ND4sIDwweDE3YyAweDQ+Ow0KPiA+ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZWctbmFtZXMgPSAibXV4IHN0YXR1cyIsICJtdXggbWFzayI7 DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ydmwsaW50Yy1uci1pcnFzID0gPDM+ Ow0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJ2ZWxsLGludGMtbnItaXJxcyA9 IDwzPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICAg ICAgICAgIGludGNtdXgxNzogaW50ZXJydXB0LWNvbnRyb2xsZXJAZDQyODIxNTggew0KPiA+IC0g ICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1wMi1tdXgtaW50 YyI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVs bCxtbXAyLW11eC1pbnRjIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJy dXB0cyA9IDwxNz47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdC1j b250cm9sbGVyOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjaW50ZXJydXB0LWNl bGxzID0gPDE+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHgxNTgg MHg0PiwgPDB4MTcwIDB4ND47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZy1u YW1lcyA9ICJtdXggc3RhdHVzIiwgIm11eCBtYXNrIjsNCj4gPiAtICAgICAgICAgICAgICAgICAg ICAgICAgICAgbXJ2bCxpbnRjLW5yLWlycXMgPSA8NT47DQo+ID4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1hcnZlbGwsaW50Yy1uci1pcnFzID0gPDU+Ow0KPiA+ICAgICAgICAgICAgICAg ICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgaW50Y211eDM1OiBpbnRlcnJ1 cHQtY29udHJvbGxlckBkNDI4MjE1YyB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbXBhdGlibGUgPSAibXJ2bCxtbXAyLW11eC1pbnRjIjsNCj4gPiArICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcDItbXV4LWludGMiOw0KPiA+ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDM1PjsNCj4gPiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0LWNvbnRyb2xsZXI7DQo+ID4gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICNpbnRlcnJ1cHQtY2VsbHMgPSA8MT47DQo+ID4gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweDE1YyAweDQ+LCA8MHgxNzQgMHg0PjsNCj4gPiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnLW5hbWVzID0gIm11eCBzdGF0dXMiLCAibXV4 IG1hc2siOw0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBtcnZsLGludGMtbnItaXJx cyA9IDwxNT47DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIG1hcnZlbGwsaW50Yy1u ci1pcnFzID0gPDE1PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAg ICAgICAgICAgICAgICAgIGludGNtdXg1MTogaW50ZXJydXB0LWNvbnRyb2xsZXJAZDQyODIxNjAg ew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1w Mi1tdXgtaW50YyI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUg PSAibWFydmVsbCxtbXAyLW11eC1pbnRjIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgaW50ZXJydXB0cyA9IDw1MT47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlu dGVycnVwdC1jb250cm9sbGVyOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjaW50 ZXJydXB0LWNlbGxzID0gPDE+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcg PSA8MHgxNjAgMHg0PiwgPDB4MTc4IDB4ND47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlZy1uYW1lcyA9ICJtdXggc3RhdHVzIiwgIm11eCBtYXNrIjsNCj4gPiAtICAgICAgICAg ICAgICAgICAgICAgICAgICAgbXJ2bCxpbnRjLW5yLWlycXMgPSA8Mj47DQo+ID4gKyAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1hcnZlbGwsaW50Yy1uci1pcnFzID0gPDI+Ow0KPiA+ICAgICAg ICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgaW50Y211eDU1 OiBpbnRlcnJ1cHQtY29udHJvbGxlckBkNDI4MjE4OCB7DQo+ID4gLSAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAyLW11eC1pbnRjIjsNCj4gPiArICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcDItbXV4LWludGMi Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDU1PjsNCj4g PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0LWNvbnRyb2xsZXI7DQo+ID4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICNpbnRlcnJ1cHQtY2VsbHMgPSA8MT47DQo+ID4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweDE4OCAweDQ+LCA8MHgxODQgMHg0 PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnLW5hbWVzID0gIm11eCBzdGF0 dXMiLCAibXV4IG1hc2siOw0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBtcnZsLGlu dGMtbnItaXJxcyA9IDwyPjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFydmVs bCxpbnRjLW5yLWlycXMgPSA8Mj47DQo+ID4gICAgICAgICAgICAgICAgICAgICB9Ow0KPiA+ICAg ICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICBhcGJAZDQwMDAwMDAgeyAgLyogQVBC ICovDQo+ID4gLSAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsYXBiLWJ1cyIs ICJzaW1wbGUtYnVzIjsNCj4gPiArICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFy dmVsbCxhcGItYnVzIiwgInNpbXBsZS1idXMiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgI2Fk ZHJlc3MtY2VsbHMgPSA8MT47DQo+ID4gICAgICAgICAgICAgICAgICAgICAjc2l6ZS1jZWxscyA9 IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDAwMDAwIDB4MDAyMDAw MDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgcmFuZ2VzOw0KPiA+DQo+ID4gICAgICAgICAg ICAgICAgICAgICB0aW1lcjA6IHRpbWVyQGQ0MDE0MDAwIHsNCj4gPiAtICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLG1tcC10aW1lciI7DQo+ID4gKyAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdGltZXIiOw0KPiA+ ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHhkNDAxNDAwMCAweDEwMD47DQo+ ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8MTM+Ow0KPiA+ICAg ICAgICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgdWFydDE6 IHVhcnRAZDQwMzAwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRp YmxlID0gIm1ydmwsbW1wLXVhcnQiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBj b21wYXRpYmxlID0gIm1hcnZlbGwsbW1wLXVhcnQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZWcgPSA8MHhkNDAzMDAwMCAweDEwMDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDI3PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RhdHVzID0gImRpc2FibGVkIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ ID4NCj4gPiAgICAgICAgICAgICAgICAgICAgIHVhcnQyOiB1YXJ0QGQ0MDE3MDAwIHsNCj4gPiAt ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLG1tcC11YXJ0IjsN Cj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1t cC11YXJ0IjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQwMTcw MDAgMHgxMDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0cyA9 IDwyOD47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cyA9ICJkaXNhYmxl ZCI7DQo+ID4gICAgICAgICAgICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgICAg ICAgICB1YXJ0MzogdWFydEBkNDAxODAwMCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAtdWFydCI7DQo+ID4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdWFydCI7DQo+ID4gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDE4MDAwIDB4MTAwMD47DQo+ID4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8MjQ+Ow0KPiA+ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+ICAgICAgICAgICAgICAg ICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgdWFydDQ6IHVhcnRAZDQwMTYw MDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmws bW1wLXVhcnQiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0g Im1hcnZlbGwsbW1wLXVhcnQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcg PSA8MHhkNDAxNjAwMCAweDEwMDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBp bnRlcnJ1cHRzID0gPDQ2PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVz ID0gImRpc2FibGVkIjsNCj4gPiBAQCAtMTk4LDI0ICsxOTgsMjQgQEANCj4gPiAgICAgICAgICAg ICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICAgICAgICAgIHR3c2kxOiBpMmNAZDQw MTEwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1y dmwsbW1wLXR3c2kiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxl ID0gIm1hcnZlbGwsbW1wLXR3c2kiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZWcgPSA8MHhkNDAxMTAwMCAweDEwMDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBpbnRlcnJ1cHRzID0gPDc+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjYWRk cmVzcy1jZWxscyA9IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgI3NpemUt Y2VsbHMgPSA8MD47DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ydmwsaTJjLWZh c3QtbW9kZTsNCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFydmVsbCxpMmMtZmFz dC1tb2RlOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlzYWJs ZWQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAg ICAgICAgdHdzaTI6IGkyY0BkNDAyNTAwMCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAtdHdzaSI7DQo+ID4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdHdzaSI7DQo+ID4gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDI1MDAwIDB4MTAwMD47DQo+ID4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8NTg+Ow0KPiA+ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+ICAgICAgICAgICAgICAg ICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgcnRjOiBydGNAZDQwMTAwMDAg ew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1w LXJ0YyI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFy dmVsbCxtbXAtcnRjIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4 ZDQwMTAwMDAgMHgxMDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJy dXB0cyA9IDwxIDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHQt bmFtZXMgPSAicnRjIDFIeiIsICJydGMgYWxhcm0iOyBkaWZmIC0tZ2l0DQo+ID4gYS9hcmNoL2Fy bS9ib290L2R0cy9weGExNjgtYXNwZW5pdGUuZHRzDQo+ID4gYi9hcmNoL2FybS9ib290L2R0cy9w eGExNjgtYXNwZW5pdGUuZHRzDQo+ID4gaW5kZXggZTc2MmZhYy4uMWUyYWMxNyAxMDA2NDQNCj4g PiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9weGExNjgtYXNwZW5pdGUuZHRzDQo+ID4gKysrIGIv YXJjaC9hcm0vYm9vdC9kdHMvcHhhMTY4LWFzcGVuaXRlLmR0cw0KPiA+IEBAIC0xMiw3ICsxMiw3 IEBADQo+ID4NCj4gPiAgLyB7DQo+ID4gICAgIG1vZGVsID0gIk1hcnZlbGwgUFhBMTY4IEFzcGVu aXRlIERldmVsb3BtZW50IEJvYXJkIjsNCj4gPiAtICAgY29tcGF0aWJsZSA9ICJtcnZsLHB4YTE2 OC1hc3Blbml0ZSIsICJtcnZsLHB4YTE2OCI7DQo+ID4gKyAgIGNvbXBhdGlibGUgPSAibWFydmVs bCxweGExNjgtYXNwZW5pdGUiLCAibWFydmVsbCxweGExNjgiOw0KPiA+DQo+ID4gICAgIGNob3Nl biB7DQo+ID4gICAgICAgICAgICAgYm9vdGFyZ3MgPSAiY29uc29sZT10dHlTMCwxMTUyMDAgcm9v dD0vZGV2L25mcw0KPiA+IG5mc3Jvb3Q9MTkyLjE2OC4xLjEwMDovbmZzcm9vdC8NCj4gPiBpcD0x OTIuMTY4LjEuMTAxOjE5Mi4xNjguMS4xMDA6OjI1NS4yNTUuMjU1LjA6OmV0aDA6b24iOw0KPiA+ IGRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2R0cy9weGExNjguZHRzaQ0KPiA+IGIvYXJjaC9h cm0vYm9vdC9kdHMvcHhhMTY4LmR0c2kgaW5kZXggOTc1ZGFkMi4uYzA4ZjVmYyAxMDA2NDQNCj4g PiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9weGExNjguZHRzaQ0KPiA+ICsrKyBiL2FyY2gvYXJt L2Jvb3QvZHRzL3B4YTE2OC5kdHNpDQo+ID4gQEAgLTI2LDUxICsyNiw1MSBAQA0KPiA+ICAgICAg ICAgICAgIHJhbmdlczsNCj4gPg0KPiA+ICAgICAgICAgICAgIGF4aUBkNDIwMDAwMCB7ICAvKiBB WEkgKi8NCj4gPiAtICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxheGktYnVz IiwgInNpbXBsZS1idXMiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJt YXJ2ZWxsLGF4aS1idXMiLCAic2ltcGxlLWJ1cyI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAj YWRkcmVzcy1jZWxscyA9IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICNzaXplLWNlbGxz ID0gPDE+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQyMDAwMDAgMHgwMDIw MDAwMD47DQo+ID4gICAgICAgICAgICAgICAgICAgICByYW5nZXM7DQo+ID4NCj4gPiAgICAgICAg ICAgICAgICAgICAgIGludGM6IGludGVycnVwdC1jb250cm9sbGVyQGQ0MjgyMDAwIHsNCj4gPiAt ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLG1tcC1pbnRjIjsN Cj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1t cC1pbnRjIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0LWNvbnRy b2xsZXI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICNpbnRlcnJ1cHQtY2VsbHMg PSA8MT47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MjgyMDAw IDB4MTAwMD47DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIG1ydmwsaW50Yy1uci1p cnFzID0gPDY0PjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgbWFydmVsbCxpbnRj LW5yLWlycXMgPSA8NjQ+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAg ICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICBhcGJAZDQwMDAwMDAgeyAgLyogQVBC ICovDQo+ID4gLSAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsYXBiLWJ1cyIs ICJzaW1wbGUtYnVzIjsNCj4gPiArICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFy dmVsbCxhcGItYnVzIiwgInNpbXBsZS1idXMiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgI2Fk ZHJlc3MtY2VsbHMgPSA8MT47DQo+ID4gICAgICAgICAgICAgICAgICAgICAjc2l6ZS1jZWxscyA9 IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDAwMDAwIDB4MDAyMDAw MDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgcmFuZ2VzOw0KPiA+DQo+ID4gICAgICAgICAg ICAgICAgICAgICB0aW1lcjA6IHRpbWVyQGQ0MDE0MDAwIHsNCj4gPiAtICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLG1tcC10aW1lciI7DQo+ID4gKyAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdGltZXIiOw0KPiA+ ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHhkNDAxNDAwMCAweDEwMD47DQo+ ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8MTM+Ow0KPiA+ICAg ICAgICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgdWFydDE6 IHVhcnRAZDQwMTcwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRp YmxlID0gIm1ydmwsbW1wLXVhcnQiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBj b21wYXRpYmxlID0gIm1hcnZlbGwsbW1wLXVhcnQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZWcgPSA8MHhkNDAxNzAwMCAweDEwMDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDI3PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgc3RhdHVzID0gImRpc2FibGVkIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ ID4NCj4gPiAgICAgICAgICAgICAgICAgICAgIHVhcnQyOiB1YXJ0QGQ0MDE4MDAwIHsNCj4gPiAt ICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLG1tcC11YXJ0IjsN Cj4gPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1t cC11YXJ0IjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQwMTgw MDAgMHgxMDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0cyA9 IDwyOD47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cyA9ICJkaXNhYmxl ZCI7DQo+ID4gICAgICAgICAgICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgICAg ICAgICB1YXJ0MzogdWFydEBkNDAyNjAwMCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAtdWFydCI7DQo+ID4gKyAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdWFydCI7DQo+ID4gICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDI2MDAwIDB4MTAwMD47DQo+ID4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8Mjk+Ow0KPiA+ICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+IEBAIC0xMDcsMjIgKzEw NywyMiBAQA0KPiA+ICAgICAgICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAg ICAgICAgICAgdHdzaTE6IGkyY0BkNDAxMTAwMCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAtdHdzaSI7DQo+ID4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdHdzaSI7DQo+ID4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDExMDAwIDB4MTAwMD47DQo+ID4gICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8Nz47DQo+ID4gLSAgICAgICAg ICAgICAgICAgICAgICAgICAgIG1ydmwsaTJjLWZhc3QtbW9kZTsNCj4gPiArICAgICAgICAgICAg ICAgICAgICAgICAgICAgbWFydmVsbCxpMmMtZmFzdC1tb2RlOw0KPiA+ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+ICAgICAgICAgICAgICAgICAg ICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgdHdzaTI6IGkyY0BkNDAyNTAwMCB7 DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAt dHdzaSI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFy dmVsbCxtbXAtdHdzaSI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDww eGQ0MDI1MDAwIDB4MTAwMD47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVy cnVwdHMgPSA8NTg+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXMgPSAi ZGlzYWJsZWQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAg ICAgICAgICAgICAgcnRjOiBydGNAZDQwMTAwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAg ICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1wLXJ0YyI7DQo+ID4gKyAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtcnRjIjsNCj4gPiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQwMTAwMDAgMHgxMDAwPjsNCj4gPiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0cyA9IDw1IDY+Ow0KPiA+ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHQtbmFtZXMgPSAicnRjIDFIeiIsICJydGMgYWxh cm0iOyBkaWZmIC0tZ2l0DQo+ID4gYS9hcmNoL2FybS9ib290L2R0cy9weGEyeHguZHRzaSBiL2Fy Y2gvYXJtL2Jvb3QvZHRzL3B4YTJ4eC5kdHNpIGluZGV4DQo+ID4gYTVlOTBmMC4uYzQyNmIxZSAx MDA2NDQNCj4gPiAtLS0gYS9hcmNoL2FybS9ib290L2R0cy9weGEyeHguZHRzaQ0KPiA+ICsrKyBi L2FyY2gvYXJtL2Jvb3QvZHRzL3B4YTJ4eC5kdHNpDQo+ID4gQEAgLTQ3LDcgKzQ3LDcgQEANCj4g PiAgICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgZ3BpbzogZ3Bpb0A0MGUwMDAw MCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwscHhhLWdwaW8i Ow0KPiA+ICsgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLHB4YS1ncGlv IjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICNhZGRyZXNzLWNlbGxzID0gPDB4MT47DQo+ID4g ICAgICAgICAgICAgICAgICAgICAjc2l6ZS1jZWxscyA9IDwweDE+Ow0KPiA+ICAgICAgICAgICAg ICAgICAgICAgcmVnID0gPDB4NDBlMDAwMDAgMHgxMDAwMD47DQo+ID4gQEAgLTc2LDM1ICs3Niwz NSBAQA0KPiA+ICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICBmZnVhcnQ6IHVh cnRANDAxMDAwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZs LHB4YS11YXJ0IjsNCj4gPiArICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVs bCxweGEtdWFydCI7DQo+ID4gICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHg0MDEwMDAwMCAw eDMwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8MjI+Ow0KPiA+ICAg ICAgICAgICAgICAgICAgICAgc3RhdHVzID0gImRpc2FibGVkIjsNCj4gPiAgICAgICAgICAgICB9 Ow0KPiA+DQo+ID4gICAgICAgICAgICAgYnR1YXJ0OiB1YXJ0QDQwMjAwMDAwIHsNCj4gPiAtICAg ICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxweGEtdWFydCI7DQo+ID4gKyAgICAg ICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1hcnZlbGwscHhhLXVhcnQiOw0KPiA+ICAgICAg ICAgICAgICAgICAgICAgcmVnID0gPDB4NDAyMDAwMDAgMHgzMD47DQo+ID4gICAgICAgICAgICAg ICAgICAgICBpbnRlcnJ1cHRzID0gPDIxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIHN0YXR1 cyA9ICJkaXNhYmxlZCI7DQo+ID4gICAgICAgICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAg IHN0dWFydDogdWFydEA0MDcwMDAwMCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICBjb21wYXRp YmxlID0gIm1ydmwscHhhLXVhcnQiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgY29tcGF0aWJs ZSA9ICJtYXJ2ZWxsLHB4YS11YXJ0IjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDww eDQwNzAwMDAwIDB4MzA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0cyA9IDwy MD47DQo+ID4gICAgICAgICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+ICAg ICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICBod3VhcnQ6IHVhcnRANDExMDAwMDAg ew0KPiA+IC0gICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLHB4YS11YXJ0IjsN Cj4gPiArICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxweGEtdWFydCI7 DQo+ID4gICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHg0MTEwMDAwMCAweDMwPjsNCj4gPiAg ICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8Nz47DQo+ID4gICAgICAgICAgICAgICAg ICAgICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+ICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAg ICAgICAgICAgICBweGFpMmMxOiBpMmNANDAzMDE2ODAgew0KPiA+IC0gICAgICAgICAgICAgICAg ICAgY29tcGF0aWJsZSA9ICJtcnZsLHB4YS1pMmMiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAg Y29tcGF0aWJsZSA9ICJtYXJ2ZWxsLHB4YS1pMmMiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAg cmVnID0gPDB4NDAzMDE2ODAgMHgzMD47DQo+ID4gICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1 cHRzID0gPDE4PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICNhZGRyZXNzLWNlbGxzID0gPDB4 MT47DQo+ID4gQEAgLTExMywxNCArMTEzLDE0IEBADQo+ID4gICAgICAgICAgICAgfTsNCj4gPg0K PiA+ICAgICAgICAgICAgIHVzYjA6IG9oY2lANGMwMDAwMDAgew0KPiA+IC0gICAgICAgICAgICAg ICAgICAgY29tcGF0aWJsZSA9ICJtcnZsLHB4YS1vaGNpIjsNCj4gPiArICAgICAgICAgICAgICAg ICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxweGEtb2hjaSI7DQo+ID4gICAgICAgICAgICAgICAg ICAgICByZWcgPSA8MHg0YzAwMDAwMCAweDEwMDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAg IGludGVycnVwdHMgPSA8Mz47DQo+ID4gICAgICAgICAgICAgICAgICAgICBzdGF0dXMgPSAiZGlz YWJsZWQiOw0KPiA+ICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICBtbWMwOiBt bWNANDExMDAwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtcnZs LHB4YS1tbWMiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxs LHB4YS1tbWMiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4NDExMDAwMDAgMHgx MDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8MjM+Ow0KPiA+ICAg ICAgICAgICAgICAgICAgICAgc3RhdHVzID0gImRpc2FibGVkIjsNCj4gPiBkaWZmIC0tZ2l0IGEv YXJjaC9hcm0vYm9vdC9kdHMvcHhhM3h4LmR0c2kNCj4gPiBiL2FyY2gvYXJtL2Jvb3QvZHRzL3B4 YTN4eC5kdHNpIGluZGV4IGY5ZDkyZGEuLjA3OTgwMzEgMTAwNjQ0DQo+ID4gLS0tIGEvYXJjaC9h cm0vYm9vdC9kdHMvcHhhM3h4LmR0c2kNCj4gPiArKysgYi9hcmNoL2FybS9ib290L2R0cy9weGEz eHguZHRzaQ0KPiA+IEBAIC03LDcgKzcsNyBAQA0KPiA+DQo+ID4gICAgIHB4YWJ1cyB7DQo+ID4g ICAgICAgICAgICAgcHdyaTJjOiBpMmNANDBmNTAwYzAgew0KPiA+IC0gICAgICAgICAgICAgICAg ICAgY29tcGF0aWJsZSA9ICJtcnZsLHB3cmkyYyI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICBj b21wYXRpYmxlID0gIm1hcnZlbGwscHdyaTJjIjsNCj4gPiAgICAgICAgICAgICAgICAgICAgIHJl ZyA9IDwweDQwZjUwMGMwIDB4MzA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0 cyA9IDw2PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICNhZGRyZXNzLWNlbGxzID0gPDB4MT47 DQo+ID4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2Jvb3QvZHRzL3B4YTkxMC1ka2IuZHRzDQo+ID4g Yi9hcmNoL2FybS9ib290L2R0cy9weGE5MTAtZGtiLmR0cw0KPiA+IGluZGV4IDU5NTQ5MmEuLjcz ODQyNTQgMTAwNjQ0DQo+ID4gLS0tIGEvYXJjaC9hcm0vYm9vdC9kdHMvcHhhOTEwLWRrYi5kdHMN Cj4gPiArKysgYi9hcmNoL2FybS9ib290L2R0cy9weGE5MTAtZGtiLmR0cw0KPiA+IEBAIC0xMiw3 ICsxMiw3IEBADQo+ID4NCj4gPiAgLyB7DQo+ID4gICAgIG1vZGVsID0gIk1hcnZlbGwgUFhBOTEw IERLQiBEZXZlbG9wbWVudCBCb2FyZCI7DQo+ID4gLSAgIGNvbXBhdGlibGUgPSAibXJ2bCxweGE5 MTAtZGtiIiwgIm1ydmwscHhhOTEwIjsNCj4gPiArICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLHB4 YTkxMC1ka2IiLCAibWFydmVsbCxweGE5MTAiOw0KPiA+DQo+ID4gICAgIGNob3NlbiB7DQo+ID4g ICAgICAgICAgICAgYm9vdGFyZ3MgPSAiY29uc29sZT10dHlTMCwxMTUyMDAgcm9vdD0vZGV2L25m cw0KPiA+IG5mc3Jvb3Q9MTkyLjE2OC4xLjEwMDovbmZzcm9vdC8NCj4gPiBpcD0xOTIuMTY4LjEu MTAxOjE5Mi4xNjguMS4xMDA6OjI1NS4yNTUuMjU1LjA6OmV0aDA6b24iOw0KPiA+IGRpZmYgLS1n aXQgYS9hcmNoL2FybS9ib290L2R0cy9weGE5MTAuZHRzaQ0KPiA+IGIvYXJjaC9hcm0vYm9vdC9k dHMvcHhhOTEwLmR0c2kgaW5kZXggMDI0N2M2Mi4uYjU1OTRhMCAxMDA2NDQNCj4gPiAtLS0gYS9h cmNoL2FybS9ib290L2R0cy9weGE5MTAuZHRzaQ0KPiA+ICsrKyBiL2FyY2gvYXJtL2Jvb3QvZHRz L3B4YTkxMC5kdHNpDQo+ID4gQEAgLTMxLDU4ICszMSw1OSBAQA0KPiA+ICAgICAgICAgICAgIH07 DQo+ID4NCj4gPiAgICAgICAgICAgICBheGlAZDQyMDAwMDAgeyAgLyogQVhJICovDQo+ID4gLSAg ICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsYXhpLWJ1cyIsICJzaW1wbGUtYnVz IjsNCj4gPiArICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxheGktYnVz IiwgInNpbXBsZS1idXMiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgI2FkZHJlc3MtY2VsbHMg PSA8MT47DQo+ID4gICAgICAgICAgICAgICAgICAgICAjc2l6ZS1jZWxscyA9IDwxPjsNCj4gPiAg ICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MjAwMDAwIDB4MDAyMDAwMDA+Ow0KPiA+ICAg ICAgICAgICAgICAgICAgICAgcmFuZ2VzOw0KPiA+DQo+ID4gICAgICAgICAgICAgICAgICAgICBp bnRjOiBpbnRlcnJ1cHQtY29udHJvbGxlckBkNDI4MjAwMCB7DQo+ID4gLSAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAtaW50YyI7DQo+ID4gKyAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtaW50YyI7DQo+ID4g ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVycnVwdC1jb250cm9sbGVyOw0KPiA+ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAjaW50ZXJydXB0LWNlbGxzID0gPDE+Ow0KPiA+ICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHhkNDI4MjAwMCAweDEwMDA+Ow0KPiA+ IC0gICAgICAgICAgICAgICAgICAgICAgICAgICBtcnZsLGludGMtbnItaXJxcyA9IDw2ND47DQo+ ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIG1hcnZlbGwsaW50Yy1uci1pcnFzID0gPDY0 PjsNCj4gPiArDQo+ID4gICAgICAgICAgICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAg ICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgIGFwYkBkNDAwMDAwMCB7ICAvKiBBUEIgKi8NCj4g PiAtICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxhcGItYnVzIiwgInNpbXBs ZS1idXMiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLGFw Yi1idXMiLCAic2ltcGxlLWJ1cyI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAjYWRkcmVzcy1j ZWxscyA9IDwxPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICNzaXplLWNlbGxzID0gPDE+Ow0K PiA+ICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQwMDAwMDAgMHgwMDIwMDAwMD47DQo+ ID4gICAgICAgICAgICAgICAgICAgICByYW5nZXM7DQo+ID4NCj4gPiAgICAgICAgICAgICAgICAg ICAgIHRpbWVyMDogdGltZXJAZDQwMTQwMDAgew0KPiA+IC0gICAgICAgICAgICAgICAgICAgICAg ICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1wLXRpbWVyIjsNCj4gPiArICAgICAgICAgICAgICAg ICAgICAgICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcC10aW1lciI7DQo+ID4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDE0MDAwIDB4MTAwPjsNCj4gPiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0cyA9IDwxMz47DQo+ID4gICAgICAgICAg ICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgICAgICAgICB0aW1lcjE6IHRpbWVy QGQ0MDE2MDAwIHsNCj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgY29tcGF0aWJsZSA9 ICJtcnZsLG1tcC10aW1lciI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBh dGlibGUgPSAibWFydmVsbCxtbXAtdGltZXIiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZWcgPSA8MHhkNDAxNjAwMCAweDEwMD47DQo+ID4gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGludGVycnVwdHMgPSA8Mjk+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzdGF0dXMgPSAiZGlzYWJsZWQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgfTsNCj4gPg0K PiA+ICAgICAgICAgICAgICAgICAgICAgdWFydDE6IHVhcnRAZDQwMTcwMDAgew0KPiA+IC0gICAg ICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1ydmwsbW1wLXVhcnQiOw0KPiA+ ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXRpYmxlID0gIm1hcnZlbGwsbW1wLXVh cnQiOw0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZWcgPSA8MHhkNDAxNzAwMCAw eDEwMDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnRlcnJ1cHRzID0gPDI3 PjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVzID0gImRpc2FibGVkIjsN Cj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICAgICAgICAg IHVhcnQyOiB1YXJ0QGQ0MDE4MDAwIHsNCj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29tcGF0aWJsZSA9ICJtcnZsLG1tcC11YXJ0IjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcC11YXJ0IjsNCj4gPiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQwMTgwMDAgMHgxMDAwPjsNCj4gPiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgaW50ZXJydXB0cyA9IDwyOD47DQo+ID4gICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHN0YXR1cyA9ICJkaXNhYmxlZCI7DQo+ID4gICAgICAgICAgICAgICAgICAg ICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgICAgICAgICB1YXJ0MzogdWFydEBkNDAzNjAwMCB7 DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxtbXAt dWFydCI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibWFy dmVsbCxtbXAtdWFydCI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlZyA9IDww eGQ0MDM2MDAwIDB4MTAwMD47DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludGVy cnVwdHMgPSA8NTk+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXMgPSAi ZGlzYWJsZWQiOw0KPiA+IEBAIC0xMTksMTcgKzEyMCwxNyBAQA0KPiA+ICAgICAgICAgICAgICAg ICAgICAgfTsNCj4gPg0KPiA+ICAgICAgICAgICAgICAgICAgICAgdHdzaTE6IGkyY0BkNDAxMTAw MCB7DQo+ID4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAibXJ2bCxt bXAtdHdzaSI7DQo+ID4gKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBhdGlibGUgPSAi bWFydmVsbCxtbXAtdHdzaSI7DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICNhZGRy ZXNzLWNlbGxzID0gPDE+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjc2l6ZS1j ZWxscyA9IDwwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVnID0gPDB4ZDQw MTEwMDAgMHgxMDAwPjsNCj4gPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJydXB0 cyA9IDw3PjsNCj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAgbXJ2bCxpMmMtZmFzdC1t b2RlOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICBtYXJ2ZWxsLGkyYy1mYXN0LW1v ZGU7DQo+ID4gICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cyA9ICJkaXNhYmxlZCI7 DQo+ID4gICAgICAgICAgICAgICAgICAgICB9Ow0KPiA+DQo+ID4gICAgICAgICAgICAgICAgICAg ICB0d3NpMjogaTJjQGQ0MDM3MDAwIHsNCj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29tcGF0aWJsZSA9ICJtcnZsLG1tcC10d3NpIjsNCj4gPiArICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcC10d3NpIjsNCj4gPiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgI2FkZHJlc3MtY2VsbHMgPSA8MT47DQo+ID4gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICNzaXplLWNlbGxzID0gPDA+Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByZWcgPSA8MHhkNDAzNzAwMCAweDEwMDA+Ow0KPiA+IEBAIC0xMzgsNyArMTM5LDcg QEANCj4gPiAgICAgICAgICAgICAgICAgICAgIH07DQo+ID4NCj4gPiAgICAgICAgICAgICAgICAg ICAgIHJ0YzogcnRjQGQ0MDEwMDAwIHsNCj4gPiAtICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29tcGF0aWJsZSA9ICJtcnZsLG1tcC1ydGMiOw0KPiA+ICsgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb21wYXRpYmxlID0gIm1hcnZlbGwsbW1wLXJ0YyI7DQo+ID4gICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJlZyA9IDwweGQ0MDEwMDAwIDB4MTAwMD47DQo+ID4gICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGludGVycnVwdHMgPSA8NSA2PjsNCj4gPiAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW50ZXJydXB0LW5hbWVzID0gInJ0YyAxSHoiLCAicnRjIGFsYXJtIjsgZGlm ZiAtLWdpdA0KPiA+IGEvYXJjaC9hcm0vbWFjaC1tbXAvaXJxLmMgYi9hcmNoL2FybS9tYWNoLW1t cC9pcnEuYyBpbmRleA0KPiA+IDNjNzEyNDYuLmE3YTUzNjExIDEwMDY0NA0KPiA+IC0tLSBhL2Fy Y2gvYXJtL21hY2gtbW1wL2lycS5jDQo+ID4gKysrIGIvYXJjaC9hcm0vbWFjaC1tbXAvaXJxLmMN Cj4gPiBAQCAtMzI3LDEzICszMjcsMTMgQEAgdm9pZCBfX2luaXQgbW1wMl9pbml0X2ljdSh2b2lk KQ0KPiA+DQo+ID4gICNpZmRlZiBDT05GSUdfT0YNCj4gPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBv Zl9kZXZpY2VfaWQgaW50Y19pZHNbXSBfX2luaXRjb25zdCA9IHsNCj4gPiAtICAgeyAuY29tcGF0 aWJsZSA9ICJtcnZsLG1tcC1pbnRjIiwgLmRhdGEgPSAmbW1wX2NvbmYgfSwNCj4gPiAtICAgeyAu Y29tcGF0aWJsZSA9ICJtcnZsLG1tcDItaW50YyIsIC5kYXRhID0gJm1tcDJfY29uZiB9LA0KPiA+ ICsgICB7IC5jb21wYXRpYmxlID0gIm1hcnZlbGwsbW1wLWludGMiLCAuZGF0YSA9ICZtbXBfY29u ZiB9LA0KPiA+ICsgICB7IC5jb21wYXRpYmxlID0gIm1hcnZlbGwsbW1wMi1pbnRjIiwgLmRhdGEg PSAmbW1wMl9jb25mIH0sDQo+ID4gICAgIHt9DQo+ID4gIH07DQo+ID4NCj4gPiAgc3RhdGljIGNv bnN0IHN0cnVjdCBvZl9kZXZpY2VfaWQgbW1wX211eF9pcnFfbWF0Y2hbXSBfX2luaXRjb25zdCA9 IHsNCj4gPiAtICAgeyAuY29tcGF0aWJsZSA9ICJtcnZsLG1tcDItbXV4LWludGMiIH0sDQo+ID4g KyAgIHsgLmNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAyLW11eC1pbnRjIiB9LA0KPiA+ICAgICB7 fQ0KPiA+ICB9Ow0KPiA+DQo+ID4gQEAgLTM1MiwxMCArMzUyLDEwIEBAIGludCBfX2luaXQgbW1w Ml9tdXhfaW5pdChzdHJ1Y3QgZGV2aWNlX25vZGUNCj4gKnBhcmVudCkNCj4gPiAgICAgICAgICAg ICBpZiAoIW5vZGUpDQo+ID4gICAgICAgICAgICAgICAgICAgICBicmVhazsNCj4gPiAgICAgICAg ICAgICBvZl9pZCA9IG9mX21hdGNoX25vZGUoJm1tcF9tdXhfaXJxX21hdGNoWzBdLCBub2RlKTsN Cj4gPiAtICAgICAgICAgICByZXQgPSBvZl9wcm9wZXJ0eV9yZWFkX3UzMihub2RlLCAibXJ2bCxp bnRjLW5yLWlycXMiLA0KPiA+ICsgICAgICAgICAgIHJldCA9IG9mX3Byb3BlcnR5X3JlYWRfdTMy KG5vZGUsICJtYXJ2ZWxsLGludGMtbnItaXJxcyIsDQo+ID4gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJm5yX2lycXMpOw0KPiA+ICAgICAgICAgICAgIGlmIChyZXQpIHsN Cj4gPiAtICAgICAgICAgICAgICAgICAgIHByX2VycigiTm90IGZvdW5kIG1ydmwsaW50Yy1uci1p cnFzIHByb3BlcnR5XG4iKTsNCj4gPiArICAgICAgICAgICAgICAgICAgIHByX2VycigiTm90IGZv dW5kIG1hcnZlbGwsaW50Yy1uci1pcnFzIHByb3BlcnR5XG4iKTsNCj4gPiAgICAgICAgICAgICAg ICAgICAgIHJldCA9IC1FSU5WQUw7DQo+ID4gICAgICAgICAgICAgICAgICAgICBnb3RvIGVycjsN Cj4gPiAgICAgICAgICAgICB9DQo+ID4gQEAgLTM4NSw3ICszODUsNyBAQCBpbnQgX19pbml0IG1t cDJfbXV4X2luaXQoc3RydWN0IGRldmljZV9ub2RlDQo+ICpwYXJlbnQpDQo+ID4gICAgICAgICAg ICAgICAgICAgICByZXQgPSBpcnFfYmFzZTsNCj4gPiAgICAgICAgICAgICAgICAgICAgIGdvdG8g ZXJyOw0KPiA+ICAgICAgICAgICAgIH0NCj4gPiAtICAgICAgICAgICBpZiAoIW9mX3Byb3BlcnR5 X3JlYWRfdTMyKG5vZGUsICJtcnZsLGNsci1tZnAtaXJxIiwNCj4gPiArICAgICAgICAgICBpZiAo IW9mX3Byb3BlcnR5X3JlYWRfdTMyKG5vZGUsICJtYXJ2ZWxsLGNsci1tZnAtaXJxIiwNCj4gPiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZtZnBfaXJxKSkgew0KPiA+ICAg ICAgICAgICAgICAgICAgICAgaWN1X2RhdGFbaV0uY2xyX21mcF9pcnFfYmFzZSA9IGlycV9iYXNl Ow0KPiA+ICAgICAgICAgICAgICAgICAgICAgaWN1X2RhdGFbaV0uY2xyX21mcF9od2lycSA9IG1m cF9pcnE7IEBAIC00MjQsOSArNDI0LDkgQEANCj4gdm9pZA0KPiA+IF9faW5pdCBtbXBfZHRfaXJx X2luaXQodm9pZCkNCj4gPiAgICAgb2ZfaWQgPSBvZl9tYXRjaF9ub2RlKGludGNfaWRzLCBub2Rl KTsNCj4gPiAgICAgY29uZiA9IG9mX2lkLT5kYXRhOw0KPiA+DQo+ID4gLSAgIHJldCA9IG9mX3By b3BlcnR5X3JlYWRfdTMyKG5vZGUsICJtcnZsLGludGMtbnItaXJxcyIsICZucl9pcnFzKTsNCj4g PiArICAgcmV0ID0gb2ZfcHJvcGVydHlfcmVhZF91MzIobm9kZSwgIm1hcnZlbGwsaW50Yy1uci1p cnFzIiwgJm5yX2lycXMpOw0KPiA+ICAgICBpZiAocmV0KSB7DQo+ID4gLSAgICAgICAgICAgcHJf ZXJyKCJOb3QgZm91bmQgbXJ2bCxpbnRjLW5yLWlycXMgcHJvcGVydHlcbiIpOw0KPiA+ICsgICAg ICAgICAgIHByX2VycigiTm90IGZvdW5kIG1hcnZlbGwsaW50Yy1uci1pcnFzIHByb3BlcnR5XG4i KTsNCj4gPiAgICAgICAgICAgICByZXR1cm47DQo+ID4gICAgIH0NCj4gPg0KPiA+IGRpZmYgLS1n aXQgYS9hcmNoL2FybS9tYWNoLW1tcC9tbXAtZHQuYw0KPiBiL2FyY2gvYXJtL21hY2gtbW1wL21t cC1kdC5jDQo+ID4gaW5kZXggYjM3OTE1ZC4uNjJjNWFkYiAxMDA2NDQNCj4gPiAtLS0gYS9hcmNo L2FybS9tYWNoLW1tcC9tbXAtZHQuYw0KPiA+ICsrKyBiL2FyY2gvYXJtL21hY2gtbW1wL21tcC1k dC5jDQo+ID4gQEAgLTIzLDI0ICsyMywyNCBAQCBleHRlcm4gdm9pZCBfX2luaXQgbW1wX2R0X2ly cV9pbml0KHZvaWQpOyAgZXh0ZXJuDQo+ID4gdm9pZCBfX2luaXQgbW1wX2R0X2luaXRfdGltZXIo dm9pZCk7DQo+ID4NCj4gPiAgc3RhdGljIGNvbnN0IHN0cnVjdCBvZl9kZXZfYXV4ZGF0YSBweGEx NjhfYXV4ZGF0YV9sb29rdXBbXSBfX2luaXRjb25zdA0KPiA9IHsNCj4gPiAtICAgT0ZfREVWX0FV WERBVEEoIm1ydmwsbW1wLXVhcnQiLCAweGQ0MDE3MDAwLCAicHhhMnh4LXVhcnQuMCIsDQo+IE5V TEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxtbXAtdWFydCIsIDB4ZDQwMTgwMDAs ICJweGEyeHgtdWFydC4xIiwNCj4gTlVMTCksDQo+ID4gLSAgIE9GX0RFVl9BVVhEQVRBKCJtcnZs LG1tcC11YXJ0IiwgMHhkNDAyNjAwMCwgInB4YTJ4eC11YXJ0LjIiLA0KPiBOVUxMKSwNCj4gPiAt ICAgT0ZfREVWX0FVWERBVEEoIm1ydmwsbW1wLXR3c2kiLCAweGQ0MDExMDAwLCAicHhhMnh4LWky Yy4wIiwNCj4gTlVMTCksDQo+ID4gLSAgIE9GX0RFVl9BVVhEQVRBKCJtcnZsLG1tcC10d3NpIiwg MHhkNDAyNTAwMCwgInB4YTJ4eC1pMmMuMSIsDQo+IE5VTEwpLA0KPiA+ICsgICBPRl9ERVZfQVVY REFUQSgibWFydmVsbCxtbXAtdWFydCIsIDB4ZDQwMTcwMDAsICJweGEyeHgtdWFydC4wIiwNCj4g TlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1tcC11YXJ0IiwgMHhkNDAx ODAwMCwgInB4YTJ4eC11YXJ0LjEiLA0KPiBOVUxMKSwNCj4gPiArICAgT0ZfREVWX0FVWERBVEEo Im1hcnZlbGwsbW1wLXVhcnQiLCAweGQ0MDI2MDAwLCAicHhhMnh4LXVhcnQuMiIsDQo+IE5VTEwp LA0KPiA+ICsgICBPRl9ERVZfQVVYREFUQSgibWFydmVsbCxtbXAtdHdzaSIsIDB4ZDQwMTEwMDAs ICJweGEyeHgtaTJjLjAiLA0KPiBOVUxMKSwNCj4gPiArICAgT0ZfREVWX0FVWERBVEEoIm1hcnZl bGwsbW1wLXR3c2kiLCAweGQ0MDI1MDAwLCAicHhhMnh4LWkyYy4xIiwNCj4gPiArTlVMTCksDQo+ ID4gICAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1tcC1ncGlvIiwgMHhkNDAxOTAwMCwgIm1t cC1ncGlvIiwNCj4gTlVMTCksDQo+ID4gLSAgIE9GX0RFVl9BVVhEQVRBKCJtcnZsLG1tcC1ydGMi LCAweGQ0MDEwMDAwLCAic2ExMTAwLXJ0YyIsIE5VTEwpLA0KPiA+ICsgICBPRl9ERVZfQVVYREFU QSgibWFydmVsbCxtbXAtcnRjIiwgMHhkNDAxMDAwMCwgInNhMTEwMC1ydGMiLA0KPiBOVUxMKSwN Cj4gPiAgICAge30NCj4gPiAgfTsNCj4gPg0KPiA+ICBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2Rl dl9hdXhkYXRhIHB4YTkxMF9hdXhkYXRhX2xvb2t1cFtdIF9faW5pdGNvbnN0DQo+ID0gew0KPiA+ IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxtbXAtdWFydCIsIDB4ZDQwMTcwMDAsICJweGEyeHgt dWFydC4wIiwNCj4gTlVMTCksDQo+ID4gLSAgIE9GX0RFVl9BVVhEQVRBKCJtcnZsLG1tcC11YXJ0 IiwgMHhkNDAxODAwMCwgInB4YTJ4eC11YXJ0LjEiLA0KPiBOVUxMKSwNCj4gPiAtICAgT0ZfREVW X0FVWERBVEEoIm1ydmwsbW1wLXVhcnQiLCAweGQ0MDM2MDAwLCAicHhhMnh4LXVhcnQuMiIsDQo+ IE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxtbXAtdHdzaSIsIDB4ZDQwMTEw MDAsICJweGEyeHgtaTJjLjAiLA0KPiBOVUxMKSwNCj4gPiAtICAgT0ZfREVWX0FVWERBVEEoIm1y dmwsbW1wLXR3c2kiLCAweGQ0MDM3MDAwLCAicHhhMnh4LWkyYy4xIiwNCj4gTlVMTCksDQo+ID4g KyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1tcC11YXJ0IiwgMHhkNDAxNzAwMCwgInB4YTJ4 eC11YXJ0LjAiLA0KPiBOVUxMKSwNCj4gPiArICAgT0ZfREVWX0FVWERBVEEoIm1hcnZlbGwsbW1w LXVhcnQiLCAweGQ0MDE4MDAwLCAicHhhMnh4LXVhcnQuMSIsDQo+IE5VTEwpLA0KPiA+ICsgICBP Rl9ERVZfQVVYREFUQSgibWFydmVsbCxtbXAtdWFydCIsIDB4ZDQwMzYwMDAsICJweGEyeHgtdWFy dC4yIiwNCj4gTlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1tcC10d3Np IiwgMHhkNDAxMTAwMCwgInB4YTJ4eC1pMmMuMCIsDQo+IE5VTEwpLA0KPiA+ICsgICBPRl9ERVZf QVVYREFUQSgibWFydmVsbCxtbXAtdHdzaSIsIDB4ZDQwMzcwMDAsICJweGEyeHgtaTJjLjEiLA0K PiA+ICtOVUxMKSwNCj4gPiAgICAgT0ZfREVWX0FVWERBVEEoIm1hcnZlbGwsbW1wLWdwaW8iLCAw eGQ0MDE5MDAwLCAibW1wLWdwaW8iLA0KPiBOVUxMKSwNCj4gPiAtICAgT0ZfREVWX0FVWERBVEEo Im1ydmwsbW1wLXJ0YyIsIDB4ZDQwMTAwMDAsICJzYTExMDAtcnRjIiwgTlVMTCksDQo+ID4gKyAg IE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1tcC1ydGMiLCAweGQ0MDEwMDAwLCAic2ExMTAwLXJ0 YyIsDQo+IE5VTEwpLA0KPiA+ICAgICB7fQ0KPiA+ICB9Ow0KPiA+DQo+ID4gQEAgLTU3LDggKzU3 LDggQEAgc3RhdGljIHZvaWQgX19pbml0IHB4YTkxMF9kdF9pbml0KHZvaWQpICB9DQo+ID4NCj4g PiAgc3RhdGljIGNvbnN0IGNoYXIgKm1tcF9kdF9ib2FyZF9jb21wYXRbXSBfX2luaXRkYXRhID0g ew0KPiA+IC0gICAibXJ2bCxweGExNjgtYXNwZW5pdGUiLA0KPiA+IC0gICAibXJ2bCxweGE5MTAt ZGtiIiwNCj4gPiArICAgIm1hcnZlbGwscHhhMTY4LWFzcGVuaXRlIiwNCj4gPiArICAgIm1hcnZl bGwscHhhOTEwLWRrYiIsDQo+ID4gICAgIE5VTEwsDQo+ID4gIH07DQo+ID4NCj4gPiBkaWZmIC0t Z2l0IGEvYXJjaC9hcm0vbWFjaC1tbXAvbW1wMi1kdC5jDQo+IGIvYXJjaC9hcm0vbWFjaC1tbXAv bW1wMi1kdC5jDQo+ID4gaW5kZXggNGFjMjU2Ny4uNjUyM2VjZiAxMDA2NDQNCj4gPiAtLS0gYS9h cmNoL2FybS9tYWNoLW1tcC9tbXAyLWR0LmMNCj4gPiArKysgYi9hcmNoL2FybS9tYWNoLW1tcC9t bXAyLWR0LmMNCj4gPiBAQCAtMjUsMTQgKzI1LDE0IEBAIGV4dGVybiB2b2lkIF9faW5pdCBtbXBf ZHRfaXJxX2luaXQodm9pZCk7ICBleHRlcm4NCj4gPiB2b2lkIF9faW5pdCBtbXBfZHRfaW5pdF90 aW1lcih2b2lkKTsNCj4gPg0KPiA+ICBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2Rldl9hdXhkYXRh IG1tcDJfYXV4ZGF0YV9sb29rdXBbXSBfX2luaXRjb25zdA0KPiA9IHsNCj4gPiAtICAgT0ZfREVW X0FVWERBVEEoIm1ydmwsbW1wLXVhcnQiLCAweGQ0MDMwMDAwLCAicHhhMnh4LXVhcnQuMCIsDQo+ IE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxtbXAtdWFydCIsIDB4ZDQwMTcw MDAsICJweGEyeHgtdWFydC4xIiwNCj4gTlVMTCksDQo+ID4gLSAgIE9GX0RFVl9BVVhEQVRBKCJt cnZsLG1tcC11YXJ0IiwgMHhkNDAxODAwMCwgInB4YTJ4eC11YXJ0LjIiLA0KPiBOVUxMKSwNCj4g PiAtICAgT0ZfREVWX0FVWERBVEEoIm1ydmwsbW1wLXVhcnQiLCAweGQ0MDE2MDAwLCAicHhhMnh4 LXVhcnQuMyIsDQo+IE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxtbXAtdHdz aSIsIDB4ZDQwMTEwMDAsICJweGEyeHgtaTJjLjAiLA0KPiBOVUxMKSwNCj4gPiAtICAgT0ZfREVW X0FVWERBVEEoIm1ydmwsbW1wLXR3c2kiLCAweGQ0MDI1MDAwLCAicHhhMnh4LWkyYy4xIiwNCj4g TlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1tcC11YXJ0IiwgMHhkNDAz MDAwMCwgInB4YTJ4eC11YXJ0LjAiLA0KPiBOVUxMKSwNCj4gPiArICAgT0ZfREVWX0FVWERBVEEo Im1hcnZlbGwsbW1wLXVhcnQiLCAweGQ0MDE3MDAwLCAicHhhMnh4LXVhcnQuMSIsDQo+IE5VTEwp LA0KPiA+ICsgICBPRl9ERVZfQVVYREFUQSgibWFydmVsbCxtbXAtdWFydCIsIDB4ZDQwMTgwMDAs ICJweGEyeHgtdWFydC4yIiwNCj4gTlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2 ZWxsLG1tcC11YXJ0IiwgMHhkNDAxNjAwMCwgInB4YTJ4eC11YXJ0LjMiLA0KPiBOVUxMKSwNCj4g PiArICAgT0ZfREVWX0FVWERBVEEoIm1hcnZlbGwsbW1wLXR3c2kiLCAweGQ0MDExMDAwLCAicHhh Mnh4LWkyYy4wIiwNCj4gTlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLG1t cC10d3NpIiwgMHhkNDAyNTAwMCwgInB4YTJ4eC1pMmMuMSIsDQo+ID4gK05VTEwpLA0KPiA+ICAg ICBPRl9ERVZfQVVYREFUQSgibWFydmVsbCxtbXAtZ3BpbyIsIDB4ZDQwMTkwMDAsICJtbXAyLWdw aW8iLA0KPiBOVUxMKSwNCj4gPiAtICAgT0ZfREVWX0FVWERBVEEoIm1ydmwsbW1wLXJ0YyIsIDB4 ZDQwMTAwMDAsICJzYTExMDAtcnRjIiwgTlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJt YXJ2ZWxsLG1tcC1ydGMiLCAweGQ0MDEwMDAwLCAic2ExMTAwLXJ0YyIsDQo+IE5VTEwpLA0KPiA+ ICAgICB7fQ0KPiA+ICB9Ow0KPiA+DQo+ID4gQEAgLTQzLDcgKzQzLDcgQEAgc3RhdGljIHZvaWQg X19pbml0IG1tcDJfZHRfaW5pdCh2b2lkKSAgfQ0KPiA+DQo+ID4gIHN0YXRpYyBjb25zdCBjaGFy ICptbXAyX2R0X2JvYXJkX2NvbXBhdFtdIF9faW5pdGRhdGEgPSB7DQo+ID4gLSAgICJtcnZsLG1t cDItYnJvd25zdG9uZSIsDQo+ID4gKyAgICJtYXJ2ZWxsLG1tcDItYnJvd25zdG9uZSIsDQo+ID4g ICAgIE5VTEwsDQo+ID4gIH07DQo+ID4NCj4gPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1t bXAvdGltZS5jIGIvYXJjaC9hcm0vbWFjaC1tbXAvdGltZS5jDQo+IGluZGV4DQo+ID4gN2FjNDFl OC4uNjdlN2Q1YyAxMDA2NDQNCj4gPiAtLS0gYS9hcmNoL2FybS9tYWNoLW1tcC90aW1lLmMNCj4g PiArKysgYi9hcmNoL2FybS9tYWNoLW1tcC90aW1lLmMNCj4gPiBAQCAtMjA4LDcgKzIwOCw3IEBA IHZvaWQgX19pbml0IHRpbWVyX2luaXQoaW50IGlycSkNCj4gPg0KPiA+ICAjaWZkZWYgQ09ORklH X09GDQo+ID4gIHN0YXRpYyBzdHJ1Y3Qgb2ZfZGV2aWNlX2lkIG1tcF90aW1lcl9kdF9pZHNbXSA9 IHsNCj4gPiAtICAgeyAuY29tcGF0aWJsZSA9ICJtcnZsLG1tcC10aW1lciIsIH0sDQo+ID4gKyAg IHsgLmNvbXBhdGlibGUgPSAibWFydmVsbCxtbXAtdGltZXIiLCB9LA0KPiA+ICAgICB7fQ0KPiA+ ICB9Ow0KPiA+DQo+ID4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtcHhhL3B4YS1kdC5jIGIv YXJjaC9hcm0vbWFjaC1weGEvcHhhLWR0LmMNCj4gPiBpbmRleCAzODM1OTc5Li5iNjc5MzY3IDEw MDY0NA0KPiA+IC0tLSBhL2FyY2gvYXJtL21hY2gtcHhhL3B4YS1kdC5jDQo+ID4gKysrIGIvYXJj aC9hcm0vbWFjaC1weGEvcHhhLWR0LmMNCj4gPiBAQCAtMjMsMTUgKzIzLDE1IEBADQo+ID4gIGV4 dGVybiB2b2lkIF9faW5pdCBweGEzeHhfZHRfaW5pdF9pcnEodm9pZCk7DQo+ID4NCj4gPiAgc3Rh dGljIGNvbnN0IHN0cnVjdCBvZl9kZXZfYXV4ZGF0YSBweGEzeHhfYXV4ZGF0YV9sb29rdXBbXSBf X2luaXRjb25zdA0KPiA9IHsNCj4gPiAtICAgT0ZfREVWX0FVWERBVEEoIm1ydmwscHhhLXVhcnQi LCAgICAgICAgIDB4NDAxMDAwMDAsDQo+ICJweGEyeHgtdWFydC4wIiwgTlVMTCksDQo+ID4gLSAg IE9GX0RFVl9BVVhEQVRBKCJtcnZsLHB4YS11YXJ0IiwgICAgICAgICAweDQwMjAwMDAwLA0KPiAi cHhhMnh4LXVhcnQuMSIsIE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxweGEt dWFydCIsICAgICAgICAgMHg0MDcwMDAwMCwNCj4gInB4YTJ4eC11YXJ0LjIiLCBOVUxMKSwNCj4g PiAtICAgT0ZfREVWX0FVWERBVEEoIm1ydmwscHhhLXVhcnQiLCAgICAgICAgIDB4NDE2MDAwMDAs DQo+ICJweGEyeHgtdWFydC4zIiwgTlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2 ZWxsLHB4YS11YXJ0IiwgICAgICAweDQwMTAwMDAwLA0KPiAicHhhMnh4LXVhcnQuMCIsIE5VTEwp LA0KPiA+ICsgICBPRl9ERVZfQVVYREFUQSgibWFydmVsbCxweGEtdWFydCIsICAgICAgMHg0MDIw MDAwMCwNCj4gInB4YTJ4eC11YXJ0LjEiLCBOVUxMKSwNCj4gPiArICAgT0ZfREVWX0FVWERBVEEo Im1hcnZlbGwscHhhLXVhcnQiLCAgICAgIDB4NDA3MDAwMDAsDQo+ICJweGEyeHgtdWFydC4yIiwg TlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhEQVRBKCJtYXJ2ZWxsLHB4YS11YXJ0IiwgICAgICAw eDQxNjAwMDAwLA0KPiAicHhhMnh4LXVhcnQuMyIsIE5VTEwpLA0KPiA+ICAgICBPRl9ERVZfQVVY REFUQSgibWFydmVsbCxweGEtbW1jIiwgICAgICAgMHg0MTEwMDAwMCwgInB4YTJ4eC1tY2kuMCIs DQo+IE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxweGEtZ3BpbyIsICAgICAg ICAgMHg0MGUwMDAwMCwgInB4YS1ncGlvIiwNCj4gTlVMTCksDQo+ID4gKyAgIE9GX0RFVl9BVVhE QVRBKCJtYXJ2ZWxsLHB4YS1ncGlvIiwgICAgICAweDQwZTAwMDAwLCAicHhhLWdwaW8iLA0KPiBO VUxMKSwNCj4gPiAgICAgT0ZfREVWX0FVWERBVEEoIm1hcnZlbGwscHhhLW9oY2kiLCAgICAgIDB4 NGMwMDAwMDAsICJweGEyN3gtb2hjaSIsDQo+IE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFU QSgibXJ2bCxweGEtaTJjIiwgICAgICAgICAgMHg0MDMwMTY4MCwgInB4YTJ4eC1pMmMuMCIsDQo+ IE5VTEwpLA0KPiA+IC0gICBPRl9ERVZfQVVYREFUQSgibXJ2bCxwd3JpMmMiLCAgICAgICAgICAg MHg0MGY1MDBjMCwgInB4YTN4eC1pMmMuMSIsDQo+IE5VTEwpLA0KPiA+ICsgICBPRl9ERVZfQVVY REFUQSgibWFydmVsbCxweGEtaTJjIiwgICAgICAgMHg0MDMwMTY4MCwgInB4YTJ4eC1pMmMuMCIs DQo+IE5VTEwpLA0KPiA+ICsgICBPRl9ERVZfQVVYREFUQSgibWFydmVsbCxwd3JpMmMiLCAgICAg ICAgMHg0MGY1MDBjMCwgInB4YTN4eC1pMmMuMSIsDQo+IE5VTEwpLA0KPiA+ICAgICBPRl9ERVZf QVVYREFUQSgibWFydmVsbCxweGEzeHgtbmFuZCIsICAgMHg0MzEwMDAwMCwgInB4YTN4eC1uYW5k IiwNCj4gTlVMTCksDQo+ID4gICAgIHt9DQo+ID4gIH07DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvaTJjL2J1c3Nlcy9pMmMtcHhhLmMNCj4gPiBiL2RyaXZlcnMvaTJjL2J1c3Nlcy9pMmMtcHhh LmMgaW5kZXggZmJhZmVkMi4uNmYyYjE3ZCAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL2kyYy9i dXNzZXMvaTJjLXB4YS5jDQo+ID4gKysrIGIvZHJpdmVycy9pMmMvYnVzc2VzL2kyYy1weGEuYw0K PiA+IEBAIC0xMDQwLDkgKzEwNDAsOSBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGkyY19hbGdvcml0 aG0NCj4gPiBpMmNfcHhhX3Bpb19hbGdvcml0aG0gPSB7ICB9Ow0KPiA+DQo+ID4gIHN0YXRpYyBz dHJ1Y3Qgb2ZfZGV2aWNlX2lkIGkyY19weGFfZHRfaWRzW10gPSB7DQo+ID4gLSAgIHsgLmNvbXBh dGlibGUgPSAibXJ2bCxweGEtaTJjIiwgLmRhdGEgPSAodm9pZCAqKVJFR1NfUFhBMlhYIH0sDQo+ ID4gLSAgIHsgLmNvbXBhdGlibGUgPSAibXJ2bCxwd3JpMmMiLCAuZGF0YSA9ICh2b2lkICopUkVH U19QWEEzWFggfSwNCj4gPiAtICAgeyAuY29tcGF0aWJsZSA9ICJtcnZsLG1tcC10d3NpIiwgLmRh dGEgPSAodm9pZCAqKVJFR1NfUFhBMlhYIH0sDQo+ID4gKyAgIHsgLmNvbXBhdGlibGUgPSAibWFy dmVsbCxweGEtaTJjIiwgLmRhdGEgPSAodm9pZCAqKVJFR1NfUFhBMlhYIH0sDQo+ID4gKyAgIHsg LmNvbXBhdGlibGUgPSAibWFydmVsbCxwd3JpMmMiLCAuZGF0YSA9ICh2b2lkICopUkVHU19QWEEz WFggfSwNCj4gPiArICAgeyAuY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLG1tcC10d3NpIiwgLmRhdGEg PSAodm9pZCAqKVJFR1NfUFhBMlhYIH0sDQo+ID4gICAgIHt9DQo+ID4gIH07DQo+ID4gIE1PRFVM RV9ERVZJQ0VfVEFCTEUob2YsIGkyY19weGFfZHRfaWRzKTsgQEAgLTEwNjAsOSArMTA2MCw5IEBA DQo+IHN0YXRpYw0KPiA+IGludCBpMmNfcHhhX3Byb2JlX2R0KHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKnBkZXYsIHN0cnVjdCBweGFfaTJjICppMmMsDQo+ID4gICAgIC8qIEZvciBkZXZpY2UgdHJl ZSB3ZSBhbHdheXMgdXNlIHRoZSBkeW5hbWljIG9yIGFsaWFzLWFzc2lnbmVkIElEICovDQo+ID4g ICAgIGkyYy0+YWRhcC5uciA9IC0xOw0KPiA+DQo+ID4gLSAgIGlmIChvZl9nZXRfcHJvcGVydHko bnAsICJtcnZsLGkyYy1wb2xsaW5nIiwgTlVMTCkpDQo+ID4gKyAgIGlmIChvZl9nZXRfcHJvcGVy dHkobnAsICJtYXJ2ZWxsLGkyYy1wb2xsaW5nIiwgTlVMTCkpDQo+ID4gICAgICAgICAgICAgaTJj LT51c2VfcGlvID0gMTsNCj4gPiAtICAgaWYgKG9mX2dldF9wcm9wZXJ0eShucCwgIm1ydmwsaTJj LWZhc3QtbW9kZSIsIE5VTEwpKQ0KPiA+ICsgICBpZiAob2ZfZ2V0X3Byb3BlcnR5KG5wLCAibWFy dmVsbCxpMmMtZmFzdC1tb2RlIiwgTlVMTCkpDQo+ID4gICAgICAgICAgICAgaTJjLT5mYXN0X21v ZGUgPSAxOw0KPiA+ICAgICAqaTJjX3R5cGVzID0gKHUzMikob2ZfaWQtPmRhdGEpOw0KPiA+ICAg ICByZXR1cm4gMDsNCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tbWMvaG9zdC9zZGhjaS1weGF2 Mi5jDQo+ID4gYi9kcml2ZXJzL21tYy9ob3N0L3NkaGNpLXB4YXYyLmMgaW5kZXggNmEzZjcwMi4u MWRkNjUwMCAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL21tYy9ob3N0L3NkaGNpLXB4YXYyLmMN Cj4gPiArKysgYi9kcml2ZXJzL21tYy9ob3N0L3NkaGNpLXB4YXYyLmMNCj4gPiBAQCAtMTIwLDcg KzEyMCw3IEBAIHN0YXRpYyBjb25zdCBzdHJ1Y3Qgc2RoY2lfb3BzIHB4YXYyX3NkaGNpX29wcyA9 IHsNCj4gPiAjaWZkZWYgQ09ORklHX09GICBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9p ZA0KPiA+IHNkaGNpX3B4YXYyX29mX21hdGNoW10gPSB7DQo+ID4gICAgIHsNCj4gPiAtICAgICAg ICAgICAuY29tcGF0aWJsZSA9ICJtcnZsLHB4YXYyLW1tYyIsDQo+ID4gKyAgICAgICAgICAgLmNv bXBhdGlibGUgPSAibWFydmVsbCxweGF2Mi1tbWMiLA0KPiA+ICAgICB9LA0KPiA+ICAgICB7fSwN Cj4gPiAgfTsNCj4gPiBAQCAtMTQ0LDcgKzE0NCw3IEBAIHN0YXRpYyBzdHJ1Y3Qgc2RoY2lfcHhh X3BsYXRkYXRhDQo+ICpweGF2Ml9nZXRfbW1jX3BkYXRhKHN0cnVjdCBkZXZpY2UgKmRldikNCj4g PiAgICAgaWYgKGJ1c193aWR0aCA9PSA4KQ0KPiA+ICAgICAgICAgICAgIHBkYXRhLT5mbGFncyB8 PSBQWEFfRkxBR19TRF84X0JJVF9DQVBBQkxFX1NMT1Q7DQo+ID4NCj4gPiAtICAgb2ZfcHJvcGVy dHlfcmVhZF91MzIobnAsICJtcnZsLGNsay1kZWxheS1jeWNsZXMiLCAmY2xrX2RlbGF5X2N5Y2xl cyk7DQo+ID4gKyAgIG9mX3Byb3BlcnR5X3JlYWRfdTMyKG5wLCAibWFydmVsbCxjbGstZGVsYXkt Y3ljbGVzIiwNCj4gPiArJmNsa19kZWxheV9jeWNsZXMpOw0KPiA+ICAgICBpZiAoY2xrX2RlbGF5 X2N5Y2xlcyA+IDApIHsNCj4gPiAgICAgICAgICAgICBwZGF0YS0+Y2xrX2RlbGF5X3NlbCA9IDE7 DQo+ID4gICAgICAgICAgICAgcGRhdGEtPmNsa19kZWxheV9jeWNsZXMgPSBjbGtfZGVsYXlfY3lj bGVzOyBkaWZmIC0tZ2l0DQo+ID4gYS9kcml2ZXJzL21tYy9ob3N0L3NkaGNpLXB4YXYzLmMgYi9k cml2ZXJzL21tYy9ob3N0L3NkaGNpLXB4YXYzLmMNCj4gPiBpbmRleCAxYWUzNThlLi5hODg5NzRi IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvbW1jL2hvc3Qvc2RoY2ktcHhhdjMuYw0KPiA+ICsr KyBiL2RyaXZlcnMvbW1jL2hvc3Qvc2RoY2ktcHhhdjMuYw0KPiA+IEBAIC0xODUsNyArMTg1LDcg QEAgc3RhdGljIHN0cnVjdCBzZGhjaV9wbHRmbV9kYXRhIHNkaGNpX3B4YXYzX3BkYXRhDQo+ID0N Cj4gPiB7ICAjaWZkZWYgQ09ORklHX09GICBzdGF0aWMgY29uc3Qgc3RydWN0IG9mX2RldmljZV9p ZA0KPiA+IHNkaGNpX3B4YXYzX29mX21hdGNoW10gPSB7DQo+ID4gICAgIHsNCj4gPiAtICAgICAg ICAgICAuY29tcGF0aWJsZSA9ICJtcnZsLHB4YXYzLW1tYyIsDQo+ID4gKyAgICAgICAgICAgLmNv bXBhdGlibGUgPSAibWFydmVsbCxweGF2My1tbWMiLA0KPiA+ICAgICB9LA0KPiA+ICAgICB7fSwN Cj4gPiAgfTsNCj4gPiBAQCAtMjAxLDcgKzIwMSw3IEBAIHN0YXRpYyBzdHJ1Y3Qgc2RoY2lfcHhh X3BsYXRkYXRhDQo+ICpweGF2M19nZXRfbW1jX3BkYXRhKHN0cnVjdCBkZXZpY2UgKmRldikNCj4g PiAgICAgaWYgKCFwZGF0YSkNCj4gPiAgICAgICAgICAgICByZXR1cm4gTlVMTDsNCj4gPg0KPiA+ IC0gICBvZl9wcm9wZXJ0eV9yZWFkX3UzMihucCwgIm1ydmwsY2xrLWRlbGF5LWN5Y2xlcyIsICZj bGtfZGVsYXlfY3ljbGVzKTsNCj4gPiArICAgb2ZfcHJvcGVydHlfcmVhZF91MzIobnAsICJtYXJ2 ZWxsLGNsay1kZWxheS1jeWNsZXMiLA0KPiA+ICsmY2xrX2RlbGF5X2N5Y2xlcyk7DQo+ID4gICAg IGlmIChjbGtfZGVsYXlfY3ljbGVzID4gMCkNCj4gPiAgICAgICAgICAgICBwZGF0YS0+Y2xrX2Rl bGF5X2N5Y2xlcyA9IGNsa19kZWxheV9jeWNsZXM7DQo+ID4NCj4gPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9ydGMvcnRjLXNhMTEwMC5jIGIvZHJpdmVycy9ydGMvcnRjLXNhMTEwMC5jIGluZGV4DQo+ ID4gMGY3YWRlYi4uMzA3ZGQzNyAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL3J0Yy9ydGMtc2Ex MTAwLmMNCj4gPiArKysgYi9kcml2ZXJzL3J0Yy9ydGMtc2ExMTAwLmMNCj4gPiBAQCAtMzM5LDgg KzMzOSw4IEBAIHN0YXRpYyBTSU1QTEVfREVWX1BNX09QUyhzYTExMDBfcnRjX3BtX29wcywNCj4g PiBzYTExMDBfcnRjX3N1c3BlbmQsDQo+ID4NCj4gPiAgI2lmZGVmIENPTkZJR19PRg0KPiA+ICBz dGF0aWMgc3RydWN0IG9mX2RldmljZV9pZCBzYTExMDBfcnRjX2R0X2lkc1tdID0gew0KPiA+IC0g ICB7IC5jb21wYXRpYmxlID0gIm1ydmwsc2ExMTAwLXJ0YyIsIH0sDQo+ID4gLSAgIHsgLmNvbXBh dGlibGUgPSAibXJ2bCxtbXAtcnRjIiwgfSwNCj4gPiArICAgeyAuY29tcGF0aWJsZSA9ICJtYXJ2 ZWxsLHNhMTEwMC1ydGMiLCB9LA0KPiA+ICsgICB7IC5jb21wYXRpYmxlID0gIm1hcnZlbGwsbW1w LXJ0YyIsIH0sDQo+ID4gICAgIHt9DQo+ID4gIH07DQo+ID4gIE1PRFVMRV9ERVZJQ0VfVEFCTEUo b2YsIHNhMTEwMF9ydGNfZHRfaWRzKTsgZGlmZiAtLWdpdA0KPiA+IGEvZHJpdmVycy90dHkvc2Vy aWFsL3B4YS5jIGIvZHJpdmVycy90dHkvc2VyaWFsL3B4YS5jIGluZGV4DQo+ID4gMDVmNTA0ZS4u Y2IxYTQzOSAxMDA2NDQNCj4gPiAtLS0gYS9kcml2ZXJzL3R0eS9zZXJpYWwvcHhhLmMNCj4gPiAr KysgYi9kcml2ZXJzL3R0eS9zZXJpYWwvcHhhLmMNCj4gPiBAQCAtODUyLDggKzg1Miw4IEBAIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29wcw0KPiBzZXJpYWxfcHhhX3BtX29wcyA9DQo+ID4g eyAgI2VuZGlmDQo+ID4NCj4gPiAgc3RhdGljIHN0cnVjdCBvZl9kZXZpY2VfaWQgc2VyaWFsX3B4 YV9kdF9pZHNbXSA9IHsNCj4gPiAtICAgeyAuY29tcGF0aWJsZSA9ICJtcnZsLHB4YS11YXJ0Iiwg fSwNCj4gPiAtICAgeyAuY29tcGF0aWJsZSA9ICJtcnZsLG1tcC11YXJ0IiwgfSwNCj4gPiArICAg eyAuY29tcGF0aWJsZSA9ICJtYXJ2ZWxsLHB4YS11YXJ0IiwgfSwNCj4gPiArICAgeyAuY29tcGF0 aWJsZSA9ICJtYXJ2ZWxsLG1tcC11YXJ0IiwgfSwNCj4gPiAgICAge30NCj4gPiAgfTsNCj4gPiAg TU9EVUxFX0RFVklDRV9UQUJMRShvZiwgc2VyaWFsX3B4YV9kdF9pZHMpOw0KPiA+IC0tDQo+ID4g MS43LjQuMQ0KPiA+DQo+ID4NCg0KQmVzdCBSZWdhcmRzLA0KTmVpbCBaaGFuZw0KDQoNCj4gPiBf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXw0KPiA+IGxpbnV4 LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0DQo+ID4gbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZy YWRlYWQub3JnDQo+ID4gaHR0cDovL2xpc3RzLmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5m by9saW51eC1hcm0ta2VybmVsDQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: zhangwm@marvell.com (Neil Zhang) Date: Wed, 10 Jul 2013 00:25:17 -0700 Subject: [PATCH V3 1/3] dts: change Marvell prefix to 'marvell' In-Reply-To: <20130709124900.GG11908@titan.lakedaemon.net> References: <1373352166-10064-1-git-send-email-zhangwm@marvell.com> <1373352166-10064-2-git-send-email-zhangwm@marvell.com> <20130709124900.GG11908@titan.lakedaemon.net> Message-ID: <175CCF5F49938B4D99B2E3EF7F558EBE3DBC97FA8F@SC-VEXCH4.marvell.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Jason, > -----Original Message----- > From: Jason Cooper [mailto:jason at lakedaemon.net] > Sent: 2013?7?9? 20:49 > To: Neil Zhang > Cc: grant.likely at linaro.org; haojian.zhuang at gmail.com; arnd at arndb.de; > devicetree-discuss at lists.ozlabs.org; linux-kernel at vger.kernel.org; > linux-arm-kernel at lists.infradead.org > Subject: Re: [PATCH V3 1/3] dts: change Marvell prefix to 'marvell' > > Neil, > > On Tue, Jul 09, 2013 at 02:42:44PM +0800, Neil Zhang wrote: > > The documented vendor prefix for Marvell is 'marvell', not 'mrvl', so > > let's change it. > > > > Signed-off-by: Neil Zhang > > --- > > .../devicetree/bindings/arm/mrvl/intc.txt | 16 +++--- > > .../devicetree/bindings/arm/mrvl/mrvl.txt | 6 +- > > .../devicetree/bindings/arm/mrvl/timer.txt | 4 +- > > Documentation/devicetree/bindings/i2c/i2c-pxa.txt | 14 +++--- > > .../devicetree/bindings/mmc/sdhci-pxa.txt | 8 ++-- > > .../devicetree/bindings/rtc/sa1100-rtc.txt | 4 +- > > .../devicetree/bindings/serial/mrvl-serial.txt | 2 +- > > arch/arm/boot/dts/mmp2-brownstone.dts | 2 +- > > arch/arm/boot/dts/mmp2.dtsi | 56 > ++++++++++---------- > > arch/arm/boot/dts/pxa168-aspenite.dts | 2 +- > > arch/arm/boot/dts/pxa168.dtsi | 24 > ++++---- > > arch/arm/boot/dts/pxa2xx.dtsi | 16 +++--- > > arch/arm/boot/dts/pxa3xx.dtsi | 2 +- > > arch/arm/boot/dts/pxa910-dkb.dts | 2 +- > > arch/arm/boot/dts/pxa910.dtsi | 27 > +++++----- > > arch/arm/mach-mmp/irq.c | 16 > +++--- > > arch/arm/mach-mmp/mmp-dt.c | 28 > +++++----- > > arch/arm/mach-mmp/mmp2-dt.c | 16 > +++--- > > arch/arm/mach-mmp/time.c | 2 +- > > arch/arm/mach-pxa/pxa-dt.c | 14 > +++--- > > drivers/i2c/busses/i2c-pxa.c | 10 ++-- > > drivers/mmc/host/sdhci-pxav2.c | 4 +- > > drivers/mmc/host/sdhci-pxav3.c | 4 +- > > drivers/rtc/rtc-sa1100.c | 4 +- > > drivers/tty/serial/pxa.c | 4 +- > > 25 files changed, 144 insertions(+), 143 deletions(-) > > I agree with the need to change, however, this has been in the binding > documentation since v3.5. I wish we had caught this when we decided > against using stock ticker symbols (not all stock markets use alphabetical > abbreviated names, not all companies are listed on any stock exchange). > > To do this properly, the drivers are going to have to be compatible with the > old and the new names, and the binding docs updated to reflect the legacy > name and the preferred name. > Do you mean it's better to support both legacy and preferred name at the same time? > thx, > > Jason. > > > diff --git a/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > b/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > index 8b53273..ad27548 100644 > > --- a/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > +++ b/Documentation/devicetree/bindings/arm/mrvl/intc.txt > > @@ -1,8 +1,8 @@ > > * Marvell MMP Interrupt controller > > > > Required properties: > > -- compatible : Should be "mrvl,mmp-intc", "mrvl,mmp2-intc" or > > - "mrvl,mmp2-mux-intc" > > +- compatible : Should be "marvell,mmp-intc", "marvell,mmp2-intc" or > > + "marvell,mmp2-mux-intc" > > - reg : Address and length of the register set of the interrupt controller. > > If the interrupt controller is intc, address and length means the range > > of the whold interrupt controller. If the interrupt controller is > > mux-intc, @@ -15,28 +15,28 @@ Required properties: > > - interrupt-controller : Identifies the node as an interrupt controller. > > - #interrupt-cells : Specifies the number of cells needed to encode an > > interrupt source. > > -- mrvl,intc-nr-irqs : Specifies the number of interrupts in the > > interrupt > > +- marvell,intc-nr-irqs : Specifies the number of interrupts in the > > +interrupt > > controller. > > -- mrvl,clr-mfp-irq : Specifies the interrupt that needs to clear MFP > > edge > > +- marvell,clr-mfp-irq : Specifies the interrupt that needs to clear > > +MFP edge > > detection first. > > > > Example: > > intc: interrupt-controller at d4282000 { > > - compatible = "mrvl,mmp2-intc"; > > + compatible = "marvell,mmp2-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > }; > > > > intcmux4 at d4282150 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <4>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x150 0x4>, <0x168 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > > > * Marvell Orion Interrupt controller > > diff --git a/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > b/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > index 117d741..87f1d42 100644 > > --- a/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > +++ b/Documentation/devicetree/bindings/arm/mrvl/mrvl.txt > > @@ -3,12 +3,12 @@ Marvell Platforms Device Tree Bindings > > > > PXA168 Aspenite Board > > Required root node properties: > > - - compatible = "mrvl,pxa168-aspenite", "mrvl,pxa168"; > > + - compatible = "marvell,pxa168-aspenite", "marvell,pxa168"; > > > > PXA910 DKB Board > > Required root node properties: > > - - compatible = "mrvl,pxa910-dkb"; > > + - compatible = "marvell,pxa910-dkb"; > > > > MMP2 Brownstone Board > > Required root node properties: > > - - compatible = "mrvl,mmp2-brownstone"; > > + - compatible = "marvell,mmp2-brownstone"; > > diff --git a/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > b/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > index 9a6e251..1304526 100644 > > --- a/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > +++ b/Documentation/devicetree/bindings/arm/mrvl/timer.txt > > @@ -1,13 +1,13 @@ > > * Marvell MMP Timer controller > > > > Required properties: > > -- compatible : Should be "mrvl,mmp-timer". > > +- compatible : Should be "marvell,mmp-timer". > > - reg : Address and length of the register set of timer controller. > > - interrupts : Should be the interrupt number. > > > > Example: > > timer0: timer at d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > diff --git a/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > b/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > index 12b78ac..34fdf5d 100644 > > --- a/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > +++ b/Documentation/devicetree/bindings/i2c/i2c-pxa.txt > > @@ -3,9 +3,9 @@ > > Required properties : > > > > - reg : Offset and length of the register set for the device > > - - compatible : should be "mrvl,mmp-twsi" where mmp is the name of a > > + - compatible : should be "marvell,mmp-twsi" where mmp is the name of > > + a > > compatible processor, e.g. pxa168, pxa910, mmp2, mmp3. > > - For the pxa2xx/pxa3xx, an additional node "mrvl,pxa-i2c" is required > > + For the pxa2xx/pxa3xx, an additional node "marvell,pxa-i2c" is > > + required > > as shown in the example below. > > > > Recommended properties : > > @@ -14,20 +14,20 @@ Recommended properties : > > - interrupt-parent : the phandle for the interrupt controller that > > services interrupts for this device. If the parent is the default > > interrupt controller in device tree, it could be ignored. > > - - mrvl,i2c-polling : Disable interrupt of i2c controller. Polling > > + - marvell,i2c-polling : Disable interrupt of i2c controller. Polling > > status register of i2c controller instead. > > - - mrvl,i2c-fast-mode : Enable fast mode of i2c controller. > > + - marvell,i2c-fast-mode : Enable fast mode of i2c controller. > > > > Examples: > > twsi1: i2c at d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > }; > > > > twsi2: i2c at d4025000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4025000 0x1000>; > > interrupts = <58>; > > }; > > diff --git a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > index dbe98a3..d603a3e 100644 > > --- a/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > +++ b/Documentation/devicetree/bindings/mmc/sdhci-pxa.txt > > @@ -4,18 +4,18 @@ This file documents differences between the core > > properties in mmc.txt and the properties used by the sdhci-pxav2 and > sdhci-pxav3 drivers. > > > > Required properties: > > -- compatible: Should be "mrvl,pxav2-mmc" or "mrvl,pxav3-mmc". > > +- compatible: Should be "marvell,pxav2-mmc" or "marvell,pxav3-mmc". > > > > Optional properties: > > -- mrvl,clk-delay-cycles: Specify a number of cycles to delay for tuning. > > +- marvell,clk-delay-cycles: Specify a number of cycles to delay for tuning. > > > > Example: > > > > sdhci at d4280800 { > > - compatible = "mrvl,pxav3-mmc"; > > + compatible = "marvell,pxav3-mmc"; > > reg = <0xd4280800 0x800>; > > bus-width = <8>; > > interrupts = <27>; > > non-removable; > > - mrvl,clk-delay-cycles = <31>; > > + marvell,clk-delay-cycles = <31>; > > }; > > diff --git a/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > b/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > index 0cda19a..886fe15 100644 > > --- a/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > +++ b/Documentation/devicetree/bindings/rtc/sa1100-rtc.txt > > @@ -1,7 +1,7 @@ > > * Marvell Real Time Clock controller > > > > Required properties: > > -- compatible: should be "mrvl,sa1100-rtc" > > +- compatible: should be "marvell,sa1100-rtc" > > - reg: physical base address of the controller and length of memory > mapped > > region. > > - interrupts: Should be two. The first interrupt number is the rtc > > alarm @@ -10,7 +10,7 @@ Required properties: > > > > Example: > > rtc: rtc at d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <5>, <6>; > > interrupt-name = "rtc 1Hz", "rtc alarm"; diff --git > > a/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > b/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > index d744340..659d35e 100644 > > --- a/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > +++ b/Documentation/devicetree/bindings/serial/mrvl-serial.txt > > @@ -1,4 +1,4 @@ > > PXA UART controller > > > > Required properties: > > -- compatible : should be "mrvl,mmp-uart" or "mrvl,pxa-uart". > > +- compatible : should be "marvell,mmp-uart" or "marvell,pxa-uart". > > diff --git a/arch/arm/boot/dts/mmp2-brownstone.dts > > b/arch/arm/boot/dts/mmp2-brownstone.dts > > index 7f70a39..26abfde 100644 > > --- a/arch/arm/boot/dts/mmp2-brownstone.dts > > +++ b/arch/arm/boot/dts/mmp2-brownstone.dts > > @@ -12,7 +12,7 @@ > > > > / { > > model = "Marvell MMP2 Brownstone Development Board"; > > - compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; > > + compatible = "marvell,mmp2-brownstone", "marvell,mmp2"; > > > > chosen { > > bootargs = "console=ttyS2,38400 root=/dev/nfs > > nfsroot=192.168.1.100:/nfsroot/ > > ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; > > diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi > > index 4e8b08c..ac13654 100644 > > --- a/arch/arm/boot/dts/mmp2.dtsi > > +++ b/arch/arm/boot/dts/mmp2.dtsi > > @@ -32,128 +32,128 @@ > > }; > > > > axi at d4200000 { /* AXI */ > > - compatible = "mrvl,axi-bus", "simple-bus"; > > + compatible = "marvell,axi-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4200000 0x00200000>; > > ranges; > > > > intc: interrupt-controller at d4282000 { > > - compatible = "mrvl,mmp2-intc"; > > + compatible = "marvell,mmp2-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > }; > > > > intcmux4: interrupt-controller at d4282150 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <4>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x150 0x4>, <0x168 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > > > intcmux5: interrupt-controller at d4282154 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <5>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x154 0x4>, <0x16c 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > - mrvl,clr-mfp-irq = <1>; > > + marvell,intc-nr-irqs = <2>; > > + marvell,clr-mfp-irq = <1>; > > }; > > > > intcmux9: interrupt-controller at d4282180 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <9>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x180 0x4>, <0x17c 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <3>; > > + marvell,intc-nr-irqs = <3>; > > }; > > > > intcmux17: interrupt-controller at d4282158 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <17>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x158 0x4>, <0x170 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <5>; > > + marvell,intc-nr-irqs = <5>; > > }; > > > > intcmux35: interrupt-controller at d428215c { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <35>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x15c 0x4>, <0x174 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <15>; > > + marvell,intc-nr-irqs = <15>; > > }; > > > > intcmux51: interrupt-controller at d4282160 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <51>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x160 0x4>, <0x178 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > > > intcmux55: interrupt-controller at d4282188 { > > - compatible = "mrvl,mmp2-mux-intc"; > > + compatible = "marvell,mmp2-mux-intc"; > > interrupts = <55>; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0x188 0x4>, <0x184 0x4>; > > reg-names = "mux status", "mux mask"; > > - mrvl,intc-nr-irqs = <2>; > > + marvell,intc-nr-irqs = <2>; > > }; > > }; > > > > apb at d4000000 { /* APB */ > > - compatible = "mrvl,apb-bus", "simple-bus"; > > + compatible = "marvell,apb-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4000000 0x00200000>; > > ranges; > > > > timer0: timer at d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > > > uart1: uart at d4030000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4030000 0x1000>; > > interrupts = <27>; > > status = "disabled"; > > }; > > > > uart2: uart at d4017000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4017000 0x1000>; > > interrupts = <28>; > > status = "disabled"; > > }; > > > > uart3: uart at d4018000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4018000 0x1000>; > > interrupts = <24>; > > status = "disabled"; > > }; > > > > uart4: uart at d4016000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4016000 0x1000>; > > interrupts = <46>; > > status = "disabled"; > > @@ -198,24 +198,24 @@ > > }; > > > > twsi1: i2c at d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > #address-cells = <1>; > > #size-cells = <0>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > status = "disabled"; > > }; > > > > twsi2: i2c at d4025000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4025000 0x1000>; > > interrupts = <58>; > > status = "disabled"; > > }; > > > > rtc: rtc at d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <1 0>; > > interrupt-names = "rtc 1Hz", "rtc alarm"; diff --git > > a/arch/arm/boot/dts/pxa168-aspenite.dts > > b/arch/arm/boot/dts/pxa168-aspenite.dts > > index e762fac..1e2ac17 100644 > > --- a/arch/arm/boot/dts/pxa168-aspenite.dts > > +++ b/arch/arm/boot/dts/pxa168-aspenite.dts > > @@ -12,7 +12,7 @@ > > > > / { > > model = "Marvell PXA168 Aspenite Development Board"; > > - compatible = "mrvl,pxa168-aspenite", "mrvl,pxa168"; > > + compatible = "marvell,pxa168-aspenite", "marvell,pxa168"; > > > > chosen { > > bootargs = "console=ttyS0,115200 root=/dev/nfs > > nfsroot=192.168.1.100:/nfsroot/ > > ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; > > diff --git a/arch/arm/boot/dts/pxa168.dtsi > > b/arch/arm/boot/dts/pxa168.dtsi index 975dad2..c08f5fc 100644 > > --- a/arch/arm/boot/dts/pxa168.dtsi > > +++ b/arch/arm/boot/dts/pxa168.dtsi > > @@ -26,51 +26,51 @@ > > ranges; > > > > axi at d4200000 { /* AXI */ > > - compatible = "mrvl,axi-bus", "simple-bus"; > > + compatible = "marvell,axi-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4200000 0x00200000>; > > ranges; > > > > intc: interrupt-controller at d4282000 { > > - compatible = "mrvl,mmp-intc"; > > + compatible = "marvell,mmp-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > }; > > > > }; > > > > apb at d4000000 { /* APB */ > > - compatible = "mrvl,apb-bus", "simple-bus"; > > + compatible = "marvell,apb-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4000000 0x00200000>; > > ranges; > > > > timer0: timer at d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > > > uart1: uart at d4017000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4017000 0x1000>; > > interrupts = <27>; > > status = "disabled"; > > }; > > > > uart2: uart at d4018000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4018000 0x1000>; > > interrupts = <28>; > > status = "disabled"; > > }; > > > > uart3: uart at d4026000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4026000 0x1000>; > > interrupts = <29>; > > status = "disabled"; > > @@ -107,22 +107,22 @@ > > }; > > > > twsi1: i2c at d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > status = "disabled"; > > }; > > > > twsi2: i2c at d4025000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > reg = <0xd4025000 0x1000>; > > interrupts = <58>; > > status = "disabled"; > > }; > > > > rtc: rtc at d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <5 6>; > > interrupt-names = "rtc 1Hz", "rtc alarm"; diff --git > > a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index > > a5e90f0..c426b1e 100644 > > --- a/arch/arm/boot/dts/pxa2xx.dtsi > > +++ b/arch/arm/boot/dts/pxa2xx.dtsi > > @@ -47,7 +47,7 @@ > > }; > > > > gpio: gpio at 40e00000 { > > - compatible = "mrvl,pxa-gpio"; > > + compatible = "marvell,pxa-gpio"; > > #address-cells = <0x1>; > > #size-cells = <0x1>; > > reg = <0x40e00000 0x10000>; > > @@ -76,35 +76,35 @@ > > }; > > > > ffuart: uart at 40100000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x40100000 0x30>; > > interrupts = <22>; > > status = "disabled"; > > }; > > > > btuart: uart at 40200000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x40200000 0x30>; > > interrupts = <21>; > > status = "disabled"; > > }; > > > > stuart: uart at 40700000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x40700000 0x30>; > > interrupts = <20>; > > status = "disabled"; > > }; > > > > hwuart: uart at 41100000 { > > - compatible = "mrvl,pxa-uart"; > > + compatible = "marvell,pxa-uart"; > > reg = <0x41100000 0x30>; > > interrupts = <7>; > > status = "disabled"; > > }; > > > > pxai2c1: i2c at 40301680 { > > - compatible = "mrvl,pxa-i2c"; > > + compatible = "marvell,pxa-i2c"; > > reg = <0x40301680 0x30>; > > interrupts = <18>; > > #address-cells = <0x1>; > > @@ -113,14 +113,14 @@ > > }; > > > > usb0: ohci at 4c000000 { > > - compatible = "mrvl,pxa-ohci"; > > + compatible = "marvell,pxa-ohci"; > > reg = <0x4c000000 0x10000>; > > interrupts = <3>; > > status = "disabled"; > > }; > > > > mmc0: mmc at 41100000 { > > - compatible = "mrvl,pxa-mmc"; > > + compatible = "marvell,pxa-mmc"; > > reg = <0x41100000 0x1000>; > > interrupts = <23>; > > status = "disabled"; > > diff --git a/arch/arm/boot/dts/pxa3xx.dtsi > > b/arch/arm/boot/dts/pxa3xx.dtsi index f9d92da..0798031 100644 > > --- a/arch/arm/boot/dts/pxa3xx.dtsi > > +++ b/arch/arm/boot/dts/pxa3xx.dtsi > > @@ -7,7 +7,7 @@ > > > > pxabus { > > pwri2c: i2c at 40f500c0 { > > - compatible = "mrvl,pwri2c"; > > + compatible = "marvell,pwri2c"; > > reg = <0x40f500c0 0x30>; > > interrupts = <6>; > > #address-cells = <0x1>; > > diff --git a/arch/arm/boot/dts/pxa910-dkb.dts > > b/arch/arm/boot/dts/pxa910-dkb.dts > > index 595492a..7384254 100644 > > --- a/arch/arm/boot/dts/pxa910-dkb.dts > > +++ b/arch/arm/boot/dts/pxa910-dkb.dts > > @@ -12,7 +12,7 @@ > > > > / { > > model = "Marvell PXA910 DKB Development Board"; > > - compatible = "mrvl,pxa910-dkb", "mrvl,pxa910"; > > + compatible = "marvell,pxa910-dkb", "marvell,pxa910"; > > > > chosen { > > bootargs = "console=ttyS0,115200 root=/dev/nfs > > nfsroot=192.168.1.100:/nfsroot/ > > ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on"; > > diff --git a/arch/arm/boot/dts/pxa910.dtsi > > b/arch/arm/boot/dts/pxa910.dtsi index 0247c62..b5594a0 100644 > > --- a/arch/arm/boot/dts/pxa910.dtsi > > +++ b/arch/arm/boot/dts/pxa910.dtsi > > @@ -31,58 +31,59 @@ > > }; > > > > axi at d4200000 { /* AXI */ > > - compatible = "mrvl,axi-bus", "simple-bus"; > > + compatible = "marvell,axi-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4200000 0x00200000>; > > ranges; > > > > intc: interrupt-controller at d4282000 { > > - compatible = "mrvl,mmp-intc"; > > + compatible = "marvell,mmp-intc"; > > interrupt-controller; > > #interrupt-cells = <1>; > > reg = <0xd4282000 0x1000>; > > - mrvl,intc-nr-irqs = <64>; > > + marvell,intc-nr-irqs = <64>; > > + > > }; > > > > }; > > > > apb at d4000000 { /* APB */ > > - compatible = "mrvl,apb-bus", "simple-bus"; > > + compatible = "marvell,apb-bus", "simple-bus"; > > #address-cells = <1>; > > #size-cells = <1>; > > reg = <0xd4000000 0x00200000>; > > ranges; > > > > timer0: timer at d4014000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4014000 0x100>; > > interrupts = <13>; > > }; > > > > timer1: timer at d4016000 { > > - compatible = "mrvl,mmp-timer"; > > + compatible = "marvell,mmp-timer"; > > reg = <0xd4016000 0x100>; > > interrupts = <29>; > > status = "disabled"; > > }; > > > > uart1: uart at d4017000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4017000 0x1000>; > > interrupts = <27>; > > status = "disabled"; > > }; > > > > uart2: uart at d4018000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4018000 0x1000>; > > interrupts = <28>; > > status = "disabled"; > > }; > > > > uart3: uart at d4036000 { > > - compatible = "mrvl,mmp-uart"; > > + compatible = "marvell,mmp-uart"; > > reg = <0xd4036000 0x1000>; > > interrupts = <59>; > > status = "disabled"; > > @@ -119,17 +120,17 @@ > > }; > > > > twsi1: i2c at d4011000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > #address-cells = <1>; > > #size-cells = <0>; > > reg = <0xd4011000 0x1000>; > > interrupts = <7>; > > - mrvl,i2c-fast-mode; > > + marvell,i2c-fast-mode; > > status = "disabled"; > > }; > > > > twsi2: i2c at d4037000 { > > - compatible = "mrvl,mmp-twsi"; > > + compatible = "marvell,mmp-twsi"; > > #address-cells = <1>; > > #size-cells = <0>; > > reg = <0xd4037000 0x1000>; > > @@ -138,7 +139,7 @@ > > }; > > > > rtc: rtc at d4010000 { > > - compatible = "mrvl,mmp-rtc"; > > + compatible = "marvell,mmp-rtc"; > > reg = <0xd4010000 0x1000>; > > interrupts = <5 6>; > > interrupt-names = "rtc 1Hz", "rtc alarm"; diff --git > > a/arch/arm/mach-mmp/irq.c b/arch/arm/mach-mmp/irq.c index > > 3c71246..a7a53611 100644 > > --- a/arch/arm/mach-mmp/irq.c > > +++ b/arch/arm/mach-mmp/irq.c > > @@ -327,13 +327,13 @@ void __init mmp2_init_icu(void) > > > > #ifdef CONFIG_OF > > static const struct of_device_id intc_ids[] __initconst = { > > - { .compatible = "mrvl,mmp-intc", .data = &mmp_conf }, > > - { .compatible = "mrvl,mmp2-intc", .data = &mmp2_conf }, > > + { .compatible = "marvell,mmp-intc", .data = &mmp_conf }, > > + { .compatible = "marvell,mmp2-intc", .data = &mmp2_conf }, > > {} > > }; > > > > static const struct of_device_id mmp_mux_irq_match[] __initconst = { > > - { .compatible = "mrvl,mmp2-mux-intc" }, > > + { .compatible = "marvell,mmp2-mux-intc" }, > > {} > > }; > > > > @@ -352,10 +352,10 @@ int __init mmp2_mux_init(struct device_node > *parent) > > if (!node) > > break; > > of_id = of_match_node(&mmp_mux_irq_match[0], node); > > - ret = of_property_read_u32(node, "mrvl,intc-nr-irqs", > > + ret = of_property_read_u32(node, "marvell,intc-nr-irqs", > > &nr_irqs); > > if (ret) { > > - pr_err("Not found mrvl,intc-nr-irqs property\n"); > > + pr_err("Not found marvell,intc-nr-irqs property\n"); > > ret = -EINVAL; > > goto err; > > } > > @@ -385,7 +385,7 @@ int __init mmp2_mux_init(struct device_node > *parent) > > ret = irq_base; > > goto err; > > } > > - if (!of_property_read_u32(node, "mrvl,clr-mfp-irq", > > + if (!of_property_read_u32(node, "marvell,clr-mfp-irq", > > &mfp_irq)) { > > icu_data[i].clr_mfp_irq_base = irq_base; > > icu_data[i].clr_mfp_hwirq = mfp_irq; @@ -424,9 +424,9 @@ > void > > __init mmp_dt_irq_init(void) > > of_id = of_match_node(intc_ids, node); > > conf = of_id->data; > > > > - ret = of_property_read_u32(node, "mrvl,intc-nr-irqs", &nr_irqs); > > + ret = of_property_read_u32(node, "marvell,intc-nr-irqs", &nr_irqs); > > if (ret) { > > - pr_err("Not found mrvl,intc-nr-irqs property\n"); > > + pr_err("Not found marvell,intc-nr-irqs property\n"); > > return; > > } > > > > diff --git a/arch/arm/mach-mmp/mmp-dt.c > b/arch/arm/mach-mmp/mmp-dt.c > > index b37915d..62c5adb 100644 > > --- a/arch/arm/mach-mmp/mmp-dt.c > > +++ b/arch/arm/mach-mmp/mmp-dt.c > > @@ -23,24 +23,24 @@ extern void __init mmp_dt_irq_init(void); extern > > void __init mmp_dt_init_timer(void); > > > > static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4026000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > > +NULL), > > OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + OF_DEV_AUXDATA("marvell,mmp-rtc", 0xd4010000, "sa1100-rtc", > NULL), > > {} > > }; > > > > static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4017000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4018000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4036000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", > > +NULL), > > OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp-gpio", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + OF_DEV_AUXDATA("marvell,mmp-rtc", 0xd4010000, "sa1100-rtc", > NULL), > > {} > > }; > > > > @@ -57,8 +57,8 @@ static void __init pxa910_dt_init(void) } > > > > static const char *mmp_dt_board_compat[] __initdata = { > > - "mrvl,pxa168-aspenite", > > - "mrvl,pxa910-dkb", > > + "marvell,pxa168-aspenite", > > + "marvell,pxa910-dkb", > > NULL, > > }; > > > > diff --git a/arch/arm/mach-mmp/mmp2-dt.c > b/arch/arm/mach-mmp/mmp2-dt.c > > index 4ac2567..6523ecf 100644 > > --- a/arch/arm/mach-mmp/mmp2-dt.c > > +++ b/arch/arm/mach-mmp/mmp2-dt.c > > @@ -25,14 +25,14 @@ extern void __init mmp_dt_irq_init(void); extern > > void __init mmp_dt_init_timer(void); > > > > static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4030000, "pxa2xx-uart.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4017000, "pxa2xx-uart.1", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4018000, "pxa2xx-uart.2", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4016000, "pxa2xx-uart.3", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4030000, "pxa2xx-uart.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4017000, "pxa2xx-uart.1", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4018000, "pxa2xx-uart.2", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-uart", 0xd4016000, "pxa2xx-uart.3", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", > > +NULL), > > OF_DEV_AUXDATA("marvell,mmp-gpio", 0xd4019000, "mmp2-gpio", > NULL), > > - OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL), > > + OF_DEV_AUXDATA("marvell,mmp-rtc", 0xd4010000, "sa1100-rtc", > NULL), > > {} > > }; > > > > @@ -43,7 +43,7 @@ static void __init mmp2_dt_init(void) } > > > > static const char *mmp2_dt_board_compat[] __initdata = { > > - "mrvl,mmp2-brownstone", > > + "marvell,mmp2-brownstone", > > NULL, > > }; > > > > diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c > index > > 7ac41e8..67e7d5c 100644 > > --- a/arch/arm/mach-mmp/time.c > > +++ b/arch/arm/mach-mmp/time.c > > @@ -208,7 +208,7 @@ void __init timer_init(int irq) > > > > #ifdef CONFIG_OF > > static struct of_device_id mmp_timer_dt_ids[] = { > > - { .compatible = "mrvl,mmp-timer", }, > > + { .compatible = "marvell,mmp-timer", }, > > {} > > }; > > > > diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c > > index 3835979..b679367 100644 > > --- a/arch/arm/mach-pxa/pxa-dt.c > > +++ b/arch/arm/mach-pxa/pxa-dt.c > > @@ -23,15 +23,15 @@ > > extern void __init pxa3xx_dt_init_irq(void); > > > > static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst > = { > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40100000, > "pxa2xx-uart.0", NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40200000, > "pxa2xx-uart.1", NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40700000, > "pxa2xx-uart.2", NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-uart", 0x41600000, > "pxa2xx-uart.3", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x40100000, > "pxa2xx-uart.0", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x40200000, > "pxa2xx-uart.1", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x40700000, > "pxa2xx-uart.2", NULL), > > + OF_DEV_AUXDATA("marvell,pxa-uart", 0x41600000, > "pxa2xx-uart.3", NULL), > > OF_DEV_AUXDATA("marvell,pxa-mmc", 0x41100000, "pxa2xx-mci.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-gpio", 0x40e00000, "pxa-gpio", > NULL), > > + OF_DEV_AUXDATA("marvell,pxa-gpio", 0x40e00000, "pxa-gpio", > NULL), > > OF_DEV_AUXDATA("marvell,pxa-ohci", 0x4c000000, "pxa27x-ohci", > NULL), > > - OF_DEV_AUXDATA("mrvl,pxa-i2c", 0x40301680, "pxa2xx-i2c.0", > NULL), > > - OF_DEV_AUXDATA("mrvl,pwri2c", 0x40f500c0, "pxa3xx-i2c.1", > NULL), > > + OF_DEV_AUXDATA("marvell,pxa-i2c", 0x40301680, "pxa2xx-i2c.0", > NULL), > > + OF_DEV_AUXDATA("marvell,pwri2c", 0x40f500c0, "pxa3xx-i2c.1", > NULL), > > OF_DEV_AUXDATA("marvell,pxa3xx-nand", 0x43100000, "pxa3xx-nand", > NULL), > > {} > > }; > > diff --git a/drivers/i2c/busses/i2c-pxa.c > > b/drivers/i2c/busses/i2c-pxa.c index fbafed2..6f2b17d 100644 > > --- a/drivers/i2c/busses/i2c-pxa.c > > +++ b/drivers/i2c/busses/i2c-pxa.c > > @@ -1040,9 +1040,9 @@ static const struct i2c_algorithm > > i2c_pxa_pio_algorithm = { }; > > > > static struct of_device_id i2c_pxa_dt_ids[] = { > > - { .compatible = "mrvl,pxa-i2c", .data = (void *)REGS_PXA2XX }, > > - { .compatible = "mrvl,pwri2c", .data = (void *)REGS_PXA3XX }, > > - { .compatible = "mrvl,mmp-twsi", .data = (void *)REGS_PXA2XX }, > > + { .compatible = "marvell,pxa-i2c", .data = (void *)REGS_PXA2XX }, > > + { .compatible = "marvell,pwri2c", .data = (void *)REGS_PXA3XX }, > > + { .compatible = "marvell,mmp-twsi", .data = (void *)REGS_PXA2XX }, > > {} > > }; > > MODULE_DEVICE_TABLE(of, i2c_pxa_dt_ids); @@ -1060,9 +1060,9 @@ > static > > int i2c_pxa_probe_dt(struct platform_device *pdev, struct pxa_i2c *i2c, > > /* For device tree we always use the dynamic or alias-assigned ID */ > > i2c->adap.nr = -1; > > > > - if (of_get_property(np, "mrvl,i2c-polling", NULL)) > > + if (of_get_property(np, "marvell,i2c-polling", NULL)) > > i2c->use_pio = 1; > > - if (of_get_property(np, "mrvl,i2c-fast-mode", NULL)) > > + if (of_get_property(np, "marvell,i2c-fast-mode", NULL)) > > i2c->fast_mode = 1; > > *i2c_types = (u32)(of_id->data); > > return 0; > > diff --git a/drivers/mmc/host/sdhci-pxav2.c > > b/drivers/mmc/host/sdhci-pxav2.c index 6a3f702..1dd6500 100644 > > --- a/drivers/mmc/host/sdhci-pxav2.c > > +++ b/drivers/mmc/host/sdhci-pxav2.c > > @@ -120,7 +120,7 @@ static const struct sdhci_ops pxav2_sdhci_ops = { > > #ifdef CONFIG_OF static const struct of_device_id > > sdhci_pxav2_of_match[] = { > > { > > - .compatible = "mrvl,pxav2-mmc", > > + .compatible = "marvell,pxav2-mmc", > > }, > > {}, > > }; > > @@ -144,7 +144,7 @@ static struct sdhci_pxa_platdata > *pxav2_get_mmc_pdata(struct device *dev) > > if (bus_width == 8) > > pdata->flags |= PXA_FLAG_SD_8_BIT_CAPABLE_SLOT; > > > > - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); > > + of_property_read_u32(np, "marvell,clk-delay-cycles", > > +&clk_delay_cycles); > > if (clk_delay_cycles > 0) { > > pdata->clk_delay_sel = 1; > > pdata->clk_delay_cycles = clk_delay_cycles; diff --git > > a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c > > index 1ae358e..a88974b 100644 > > --- a/drivers/mmc/host/sdhci-pxav3.c > > +++ b/drivers/mmc/host/sdhci-pxav3.c > > @@ -185,7 +185,7 @@ static struct sdhci_pltfm_data sdhci_pxav3_pdata > = > > { #ifdef CONFIG_OF static const struct of_device_id > > sdhci_pxav3_of_match[] = { > > { > > - .compatible = "mrvl,pxav3-mmc", > > + .compatible = "marvell,pxav3-mmc", > > }, > > {}, > > }; > > @@ -201,7 +201,7 @@ static struct sdhci_pxa_platdata > *pxav3_get_mmc_pdata(struct device *dev) > > if (!pdata) > > return NULL; > > > > - of_property_read_u32(np, "mrvl,clk-delay-cycles", &clk_delay_cycles); > > + of_property_read_u32(np, "marvell,clk-delay-cycles", > > +&clk_delay_cycles); > > if (clk_delay_cycles > 0) > > pdata->clk_delay_cycles = clk_delay_cycles; > > > > diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index > > 0f7adeb..307dd37 100644 > > --- a/drivers/rtc/rtc-sa1100.c > > +++ b/drivers/rtc/rtc-sa1100.c > > @@ -339,8 +339,8 @@ static SIMPLE_DEV_PM_OPS(sa1100_rtc_pm_ops, > > sa1100_rtc_suspend, > > > > #ifdef CONFIG_OF > > static struct of_device_id sa1100_rtc_dt_ids[] = { > > - { .compatible = "mrvl,sa1100-rtc", }, > > - { .compatible = "mrvl,mmp-rtc", }, > > + { .compatible = "marvell,sa1100-rtc", }, > > + { .compatible = "marvell,mmp-rtc", }, > > {} > > }; > > MODULE_DEVICE_TABLE(of, sa1100_rtc_dt_ids); diff --git > > a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index > > 05f504e..cb1a439 100644 > > --- a/drivers/tty/serial/pxa.c > > +++ b/drivers/tty/serial/pxa.c > > @@ -852,8 +852,8 @@ static const struct dev_pm_ops > serial_pxa_pm_ops = > > { #endif > > > > static struct of_device_id serial_pxa_dt_ids[] = { > > - { .compatible = "mrvl,pxa-uart", }, > > - { .compatible = "mrvl,mmp-uart", }, > > + { .compatible = "marvell,pxa-uart", }, > > + { .compatible = "marvell,mmp-uart", }, > > {} > > }; > > MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); > > -- > > 1.7.4.1 > > > > Best Regards, Neil Zhang > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel at lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel