diff options
| author | Christian Lamparter <chunkeey@gmail.com> | 2021-02-20 17:44:12 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2021-03-05 22:47:14 +0100 |
| commit | be23f9818a1dcb689cb28be39b497262b70d91cf (patch) | |
| tree | 96779c142811f510f7011d6861ac869eb1ff0730 /target/linux/apm821xx/dts | |
| parent | ca14dfb06b09beb664318459241c948bd98c9332 (diff) | |
| download | upstream-be23f9818a1dcb689cb28be39b497262b70d91cf.tar.gz upstream-be23f9818a1dcb689cb28be39b497262b70d91cf.tar.bz2 upstream-be23f9818a1dcb689cb28be39b497262b70d91cf.zip | |
apm821xx: add support for kernel 5.10 for testing
This patch copies over refreshed patches from 5.4.
- dropped crypto patches (they got upstreamed)
- dropped renesas USB 3 firmware loader (they got upstreamed)
- NAND now needs extra device-properties for ECC settings.
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
Diffstat (limited to 'target/linux/apm821xx/dts')
| -rw-r--r-- | target/linux/apm821xx/dts/apm82181.dtsi | 13 | ||||
| -rw-r--r-- | target/linux/apm821xx/dts/meraki-mr24.dts | 2 | ||||
| -rw-r--r-- | target/linux/apm821xx/dts/meraki-mx60.dts | 2 | ||||
| -rw-r--r-- | target/linux/apm821xx/dts/netgear-wndap6x0.dtsi | 2 | ||||
| -rw-r--r-- | target/linux/apm821xx/dts/netgear-wndr4700.dts | 5 |
5 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/apm821xx/dts/apm82181.dtsi b/target/linux/apm821xx/dts/apm82181.dtsi index 5be4487be0..6bab8c41fc 100644 --- a/target/linux/apm821xx/dts/apm82181.dtsi +++ b/target/linux/apm821xx/dts/apm82181.dtsi @@ -233,7 +233,7 @@ status = "disabled"; }; - ndfc@1,0 { + ndfc: ndfc@1,0 { compatible = "ibm,ndfc"; reg = <00000003 00000000 00002000>; ccr = <0x00001000>; @@ -241,6 +241,17 @@ status = "disabled"; nand { + /* + * These are the same fixed "MAGIC" values + * settings as in the drivers code. + * They are the same for all devices that + * have NAND. + */ + nand-ecc-engine = <&ndfc>; + nand-ecc-algo = "hamming"; + nand-ecc-step-size = <256>; + nand-ecc-strength = <1>; + #address-cells = <1>; #size-cells = <1>; }; diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts index 660cf8f789..2f797f8352 100644 --- a/target/linux/apm821xx/dts/meraki-mr24.dts +++ b/target/linux/apm821xx/dts/meraki-mr24.dts @@ -47,6 +47,8 @@ status = "okay"; /* 32 MiB NAND Flash */ nand { + nand-is-boot-medium; + partition@0 { label = "u-boot"; reg = <0x00000000 0x00150000>; diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts index 9bddbdd25d..fd5464f8a1 100644 --- a/target/linux/apm821xx/dts/meraki-mx60.dts +++ b/target/linux/apm821xx/dts/meraki-mx60.dts @@ -50,6 +50,8 @@ ndfc@1,0 { status = "okay"; nand { + nand-is-boot-medium; + partition@0 { label = "u-boot"; reg = <0x00000000 0x00100000>; diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi index eac54011e7..fc428bca0f 100644 --- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi +++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi @@ -36,6 +36,8 @@ status = "okay"; /* 32 MiB SLC NAND Flash */ nand { + nand-is-boot-medium; + partition@0 { label = "u-boot"; reg = <0x00000000 0x00100000>; diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts index 0a1b2f4f32..ad23e8b441 100644 --- a/target/linux/apm821xx/dts/netgear-wndr4700.dts +++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts @@ -173,10 +173,13 @@ }; &EBC0 { - ndfc@1,0 { + ndfc: ndfc@1,0 { + status = "okay"; /* 128 MiB Nand Flash */ nand { + nand-is-boot-medium; + partition0,0@0 { label = "NAND 128MiB 3,3V 8-bit"; reg = <0x00000000 0x08000000>; |