diff options
| author | Simon Glass <sjg@chromium.org> | 2016-07-04 11:58:25 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-14 20:40:24 -0600 |
| commit | 9ca7e6720e96e82be1de9ec0ba6bac9f1beeb02f (patch) | |
| tree | 088e35a23aeea3c95d824b96f70c4c6775c1cb1a /arch/arm | |
| parent | 2fc24d5335a35a4880fdc04cf4d45754d29cd415 (diff) | |
| download | u-boot-9ca7e6720e96e82be1de9ec0ba6bac9f1beeb02f.tar.gz u-boot-9ca7e6720e96e82be1de9ec0ba6bac9f1beeb02f.tar.xz u-boot-9ca7e6720e96e82be1de9ec0ba6bac9f1beeb02f.zip | |
rockchip: Update the sdram-channel property to support of-platdata
Add an extra byte so that this data is not byteswapped. Add a comment to
the code to explain the purpose.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/rk3288-firefly.dts | 3 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/sdram.h | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/dts/rk3288-firefly.dts b/arch/arm/dts/rk3288-firefly.dts index aed8d3a712..3176d5046b 100644 --- a/arch/arm/dts/rk3288-firefly.dts +++ b/arch/arm/dts/rk3288-firefly.dts @@ -30,7 +30,8 @@ 0x5 0x0>; rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200 0xa60 0x40 0x10 0x0>; - rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf>; + /* Add a dummy value to cause of-platdata think this is bytes */ + rockchip,sdram-channel = /bits/ 8 <0x1 0xa 0x3 0x2 0x1 0x0 0xf 0xf 0xff>; rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>; }; diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h index d3de42d297..c9e3001720 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram.h +++ b/arch/arm/include/asm/arch-rockchip/sdram.h @@ -24,6 +24,12 @@ struct rk3288_sdram_channel { u8 row_3_4; u8 cs0_row; u8 cs1_row; + /* + * For of-platdata, which would otherwise convert this into two + * byte-swapped integers. With a size of 9 bytes, this struct will + * appear in of-platdata as a byte array. + */ + u8 dummy; }; struct rk3288_sdram_pctl_timing { |