diff for duplicates of <558C7068.7070105@hauke-m.de> diff --git a/a/1.txt b/N1/1.txt index 74fcb29..fc20af7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,9 @@ On 06/02/2015 09:20 AM, Michal Simek wrote: >>>>> l2c310_of_parse(const struct device_node *np, } } >>>>> >>>>> + if (of_property_read_bool(np, "arm,shared-override")) { + ->>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; + *aux_mask &>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; + } + prefetch >>>>> l2x0_saved_regs.prefetch_ctrl; +>>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; + *aux_mask &= +>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; + } + prefetch = +>>>>> l2x0_saved_regs.prefetch_ctrl; >>>>> >>>>> ret = of_property_read_u32(np, "arm,double-linefill", >>>>> &val); diff --git a/a/content_digest b/N1/content_digest index 91259b9..b61b3e3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,9 @@ "ref\020150515101028.GH2067@n2100.arm.linux.org.uk\0" "ref\020150515135513.GH19345@e104818-lin.cambridge.arm.com\0" "ref\0556D593C.1090002@monstr.eu\0" - "From\0Hauke Mehrtens <hauke@hauke-m.de>\0" - "Subject\0Re: [PATCH v2] ARM: l2c: Add support for the \"arm, shared-override\" property\0" - "Date\0Thu, 25 Jun 2015 21:19:36 +0000\0" + "From\0hauke@hauke-m.de (Hauke Mehrtens)\0" + "Subject\0[PATCH v2] ARM: l2c: Add support for the \"arm, shared-override\" property\0" + "Date\0Thu, 25 Jun 2015 23:19:36 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -46,7 +46,9 @@ ">>>>> l2c310_of_parse(const struct device_node *np, } }\n" ">>>>> \n" ">>>>> +\tif (of_property_read_bool(np, \"arm,shared-override\")) { +\n" - ">>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; +\t\t*aux_mask &>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; +\t} + prefetch >>>>> l2x0_saved_regs.prefetch_ctrl;\n" + ">>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; +\t\t*aux_mask &=\n" + ">>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; +\t} + prefetch =\n" + ">>>>> l2x0_saved_regs.prefetch_ctrl;\n" ">>>>> \n" ">>>>> ret = of_property_read_u32(np, \"arm,double-linefill\",\n" ">>>>> &val);\n" @@ -104,4 +106,4 @@ "=MuR/\n" -----END PGP SIGNATURE----- -fe250002aa87f9822943632691bc25a758f1e59674ba5740531ceec1281259c6 +80cd6158ea2bc9b585e7fc8703ef65d46918cb44d28175813ec6660b34a3ce96
diff --git a/a/1.txt b/N2/1.txt index 74fcb29..fc20af7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -35,7 +35,9 @@ On 06/02/2015 09:20 AM, Michal Simek wrote: >>>>> l2c310_of_parse(const struct device_node *np, } } >>>>> >>>>> + if (of_property_read_bool(np, "arm,shared-override")) { + ->>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; + *aux_mask &>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; + } + prefetch >>>>> l2x0_saved_regs.prefetch_ctrl; +>>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; + *aux_mask &= +>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; + } + prefetch = +>>>>> l2x0_saved_regs.prefetch_ctrl; >>>>> >>>>> ret = of_property_read_u32(np, "arm,double-linefill", >>>>> &val); diff --git a/a/content_digest b/N2/content_digest index 91259b9..3f105c6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,8 +5,20 @@ "ref\0556D593C.1090002@monstr.eu\0" "From\0Hauke Mehrtens <hauke@hauke-m.de>\0" "Subject\0Re: [PATCH v2] ARM: l2c: Add support for the \"arm, shared-override\" property\0" - "Date\0Thu, 25 Jun 2015 21:19:36 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 25 Jun 2015 23:19:36 +0200\0" + "To\0Geert Uytterhoeven <geert+renesas@glider.be>\0" + "Cc\0monstr@monstr.eu" + Catalin Marinas <catalin.marinas@arm.com> + Russell King - ARM Linux <linux@arm.linux.org.uk> + Mark Rutland <mark.rutland@arm.com> + Rob Herring <robh@kernel.org> + Arnd Bergmann <arnd@arndb.de> + Pawel Moll <pawel.moll@arm.com> + linux-sh@vger.kernel.org + Magnus Damm <magnus.damm@gmail.com> + devicetree@vger.kernel.org + Simon Horman <horms@verge.net.au> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "-----BEGIN PGP SIGNED MESSAGE-----\n" @@ -46,7 +58,9 @@ ">>>>> l2c310_of_parse(const struct device_node *np, } }\n" ">>>>> \n" ">>>>> +\tif (of_property_read_bool(np, \"arm,shared-override\")) { +\n" - ">>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; +\t\t*aux_mask &>>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; +\t} + prefetch >>>>> l2x0_saved_regs.prefetch_ctrl;\n" + ">>>>> *aux_val |= L2C_AUX_CTRL_SHARED_OVERRIDE; +\t\t*aux_mask &=\n" + ">>>>> ~L2C_AUX_CTRL_SHARED_OVERRIDE; +\t} + prefetch =\n" + ">>>>> l2x0_saved_regs.prefetch_ctrl;\n" ">>>>> \n" ">>>>> ret = of_property_read_u32(np, \"arm,double-linefill\",\n" ">>>>> &val);\n" @@ -104,4 +118,4 @@ "=MuR/\n" -----END PGP SIGNATURE----- -fe250002aa87f9822943632691bc25a758f1e59674ba5740531ceec1281259c6 +a9c38dac3bf3294c218509212ce36f7717ec1d9529e78d37f31726d0306a92e1
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.